Merge branch 'master' of http://kpt.kptyun.cn:3000/Epans/calf-feed-pc

src/views/formulaPlan/FeedPlan.vue

@@ -123,7 +123,7 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="班次：" prop="class_number">
-                <el-select  v-model="addForm.class_number" filterable placeholder="请选择" class="filter-item" style="width: 80%;" >
+                <el-select  v-model="addForm.class_number"    filterable placeholder="请选择" class="filter-item" style="width: 80%;" >
                   <el-option v-for="item in enumList.class_list" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
@@ -145,7 +145,7 @@
             </el-row>
             <el-row :gutter="20">
               <el-col :span="12">
-                <el-table   key="0"  :data="selectBarnGroupList"  element-loading-text="给我一点时间"  @selection-change="change_barn_group_selection"   border fit >
+                <el-table ref="multipleTable1"  key="0"  :data="selectBarnGroupList"  element-loading-text="给我一点时间"  @selection-change="change_barn_group_selection"   border fit >
                   <el-table-column   type="selection"   width="55">  </el-table-column>
                   <el-table-column label="栏舍组名称" min-width="150px" align="center">
                     <template slot-scope="scope">
@@ -160,7 +160,7 @@
                 </el-table>
               </el-col>
               <el-col :span="12">
-                <el-table   key="0"  :data="selectBarnList"  element-loading-text="给我一点时间"  @selection-change="change_barn_selection"   border fit >
+                <el-table  ref="multipleTable2"  key="0"  :data="selectBarnList"  element-loading-text="给我一点时间"  @selection-change="change_barn_selection"   border fit >
                   <el-table-column   type="selection"   width="55">  </el-table-column>
                   <el-table-column label="栏舍名称" min-width="150px" align="center">
                     <template slot-scope="scope">
@@ -278,6 +278,9 @@ export default {
       barnIds:[],
       selectBarnGroupList:[],
       selectBarnList:[],
+
+      barnGroupIdsArr:[],
+      barnIdsArr:[],
     }
   },
   created(){
@@ -338,6 +341,13 @@ export default {
           me.enumList = e.data
         }
       })
+
+      //栏舍组表格
+      ajaxDataPost('/api/v1/ops/barn_group/list?page=1&page_size=1000', {name:""}).then(e => {
+        if(e.code === 200 ){
+          me.selectBarnGroupList = e.data.list
+        }
+      })
     },
 
 
@@ -399,6 +409,8 @@ export default {
       this.addForm.id = undefined
       this.addForm.barn_group_id = undefined
       this.addForm.number = ''
+
+      
     },
 
     //新增
@@ -409,19 +421,16 @@ export default {
       this.$nextTick(() => {
         this.$refs['addFormRef'].clearValidate()
       })
-      this.form_barn_group_list()
-    },
+       
+      this.barnGroupIdsArr = []
+      this.$refs.multipleTable1.clearSelection()
+      this.$refs.multipleTable2.clearSelection()
 
-    // 栏舍组
-    form_barn_group_list(){
-      var me = this
-      ajaxDataPost('/api/v1/ops/barn_group/list?page=1&page_size=10', {name:""}).then(e => {
-        if(e.code === 200 ){
-          me.selectBarnGroupList = e.data.list
-        }
-      })
+     
     },
 
+     
+
     //编辑
     form_edit(row) {
       this.reset_form()
@@ -451,16 +460,17 @@ export default {
         if (valid) {
           //发起请求
           var send_data = {
-            "clas_number": me.addForm.barn_id,
-            "formula_id": me.addForm.calf_code,
-            "formula_name": me.addForm.calf_category_id,
-            "feed_vehicle_id": parseFloat(me.addForm.birth_weight) ,
-            "feed_vehicle_name": me.addForm.genders,
-            "status":parseFloat(me.addForm.current_weight) ,
-            "feed_time": me.addForm.mother_code,
-            "barn_group_ids":undefined,
+            "class_number": me.addForm.class_number,
+            "formula_id":parseFloat(me.addForm.formula_id),
+            "formula_name": me.addForm.formula_name,
+            "feed_vehicle_id": parseFloat(me.addForm.feed_vehicle_id) ,
+            "feed_vehicle_name": me.addForm.feed_vehicle_name,
+            "status": parseFloat(me.addForm.status) ,
+            "feed_time": me.addForm.feed_time,
+            "barn_group_ids":me.barnGroupIdsArr,
+            "barn_ids":me.barnIdsArr,
           }
-
+     
           //关闭弹窗
           me.addFormShow = false
          //加载 - 发送新增保存
@@ -564,7 +574,16 @@ export default {
     },
 
     change_barn_group_selection(val){
+      console.log(val)
       var me = this
+      var barnGroupIdsArr = []
+      val.forEach(function (item,index) {
+        barnGroupIdsArr.push(item.id)
+        
+      })
+     me.barnGroupIdsArr = barnGroupIdsArr
+
+
       me.barnIds = []
       val.forEach(function (item,index) {
         item.barns.forEach(function (v,k){
@@ -583,8 +602,20 @@ export default {
     },
 
     change_barn_selection(val){
+      var me = this
       this.selectList2 = val
-      console.log('勾选数据selectList2', this.selectList1)
+      console.log('勾选数据selectList2', this.selectList2)
+
+      var barnIdsArr = []
+      val.forEach(function (item,index) {
+        barnIdsArr.push(item.id)
+        
+      })
+      me.barnIdsArr = barnIdsArr
+      
+
+    
+
     },
 
     form_export() {