剩料计划转投栏舍问题

src/views/formulationPlan/pushMaterialPlan/index.vue

@@ -60,9 +60,8 @@
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.times }}</span>
             
-            <!-- <el-tag v-for="tag in row.timesArr" :key="tag.name" closable @close="tag_close1(tag)" type="success">{{tag}}</el-tag>
-             -->
-          
+            <el-tag v-if="scope.row.Edit" v-for="tag  in  scope.row.timesArr" :key="tag" closable @close="tag_close(scope.$index,row,tag)" type="success">{{tag}}</el-tag>
+         
           </template>
         </el-table-column>
         <el-table-column :key="5" label="允许误差时间(分钟)" min-width="85px" align="center">
@@ -381,6 +380,12 @@ export default {
            
           }
 
+          response.data.list.forEach(function(item){
+            if(item.times !== ""){
+              item.timesArr = item.times.split(',')
+            }
+          })
+
           // console.log(response.data.list, sumr)
       
           this.table.list = response.data.list
@@ -423,9 +428,9 @@ export default {
     
 
     create_sure1(){
-
+        console.log(this.timetags1)
     },
-    
+
     handleCreate2() {
       console.log('点击了新增')
       this.resetTemp2()
@@ -460,7 +465,13 @@ export default {
         console.log("timetags1", this.timetags1)
         this.timetags1.splice(this.timetags1.indexOf(tag), 1);
     },
+    
 
+    tag_close(index,row,tag){
+        console.log("tag", index,row,tag)
+      
+        this.timetags1.splice(this.timetags1.indexOf(tag), 1);
+    },
 
 
 
@@ -484,67 +495,70 @@ export default {
     },
 
     handleTakeEffect() {
+
+      console.log(this.selectList)
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
+        this.$message({ type: 'error', message: '请选择推料信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息，是否生效?', {
           confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
         }).then(() => {
-          for (let i = 0; i < this.selectList.length; i++) {
-            // this.$set(this.selectList[i], 'enable', '1')
-            this.selectList[i].enable = 1
+
+
+          var selectArr = this.selectList
+          var idsArr = []
+
+          selectArr.forEach(function(item){
+            idsArr.push(item.id)
+          })
+
+          var send_data =  {
+            "name":"updateEnableByIds",
+            "parammaps":{"enable":"1","ids":idsArr.join(",")}
           }
-          console.log('生效', this.selectList)
-          this.requestParam.common = { 'returnmap': '0' }
-          this.requestParam.data = []
-          this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList }}
-          this.requestParam.data[0].children = []
-          this.requestParam.data[0].children[0] = { 'name': 'updateRemainplanEnable', 'type': 'e', 'parammaps': {
-            enable: '@insertSpotList.enable',
-            id: '@insertSpotList.id',
-            pastureid: '@insertSpotList.pastureid'
-          }}
-          ExecDataByConfig(this.requestParam).then(response => {
-            console.log('生效保存发送参数', this.requestParam)
-            if (response.msg === 'fail') {
+          GetDataByName(send_data).then(response => {
+            
+
+             if (response.msg == 'fail') {
               this.$notify({ title: '生效失败', message: response.data, type: 'warning', duration: 2000 })
             } else {
               this.$notify({ title: '', message: '生效成功', type: 'success', duration: 2000 })
               this.getList()
             }
+             
           })
+  
         })
       }
     },
     handleDisable() {
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
+        this.$message({ type: 'error', message: '请选择推料信息', duration: 2000 })
       } else {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息，是否禁用?', {
           confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
         }).then(() => {
-          for (let i = 0; i < this.selectList.length; i++) {
-            // this.$set(this.selectList[i], 'enable', '1')
-            this.selectList[i].enable = 0
+          var selectArr = this.selectList
+          var idsArr = []
+
+          selectArr.forEach(function(item){
+            idsArr.push(item.id)
+          })
+
+          var send_data =  {
+            "name":"updateEnableByIds",
+            "parammaps":{"enable":"0","ids":idsArr.join(",")}
           }
-          console.log('禁用', this.selectList)
-          this.requestParam.common = { 'returnmap': '0' }
-          this.requestParam.data = []
-          this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList }}
-          this.requestParam.data[0].children = []
-          this.requestParam.data[0].children[0] = { 'name': 'updateRemainplanEnable', 'type': 'e', 'parammaps': {
-            enable: '@insertSpotList.enable',
-            id: '@insertSpotList.id',
-            pastureid: '@insertSpotList.pastureid'
-          }}
-          ExecDataByConfig(this.requestParam).then(response => {
-            console.log('禁用保存发送参数', this.requestParam)
-            if (response.msg === 'fail') {
+          GetDataByName(send_data).then(response => {
+            
+
+             if (response.msg == 'fail') {
               this.$notify({ title: '禁用失败', message: response.data, type: 'warning', duration: 2000 })
             } else {
               this.$notify({ title: '', message: '禁用成功', type: 'success', duration: 2000 })
               this.getList()
             }
+             
           })
         })
       }

src/views/formulationPlan/surplusMaterialPlan/index.vue

@@ -548,11 +548,12 @@ export default {
 
           arr.map(function(i, j) {
             if (i.hstrids) {
-              return i.useinbarid = i.hstrids.split(',')
+              return i.useinbarid = i.hstrids
             } else {
-              return i.useinbarid = []
+              return i.useinbarid = ""
             }
           })
+
           this.table.list = arr
           // this.table.list = response.data.list
           this.table.pageNum = response.data.pageNum
@@ -696,7 +697,7 @@ console.log('点击了栏舍1', barSortList)
       console.log(this.barSortList)
 
        this.table.temp.barid = this.barSortList
-      this.barsNamesIdTempArr = this.barSortList
+       this.barsNamesIdTempArr = this.barSortList
     },
     // // TMR编号
     // changeTMRNumber(item, row) {
@@ -770,13 +771,13 @@ console.log('点击了栏舍1', barSortList)
 
 
 
-      // 已改未更，先注释
+ 
       
-      // if(item == "继续饲喂"){
-      //   this.isDis = true
-      // } else {
-      //    this.isDis = false
-      // }
+      if(item == "继续饲喂"){
+        this.isDis = true
+      } else {
+         this.isDis = false
+      }
     },
     getTransferbarsList() {
       GetDataByName(this.getTransferbarsParm).then(response => {
@@ -804,15 +805,15 @@ console.log('点击了栏舍1', barSortList)
     // 转头栏舍
     changeTransferbars(val) {
       console.log('点击了转头栏舍', val)
-      var arr2 = []
-      this.transferbarsList.forEach(function(i) {
-        val.forEach(function(j) {
-          if (i.id == j) { arr2.push(i) }
-        })
-      })
-      this.table.temp2.useinbar = arr2
-      this.useinbarNamesIdTempArr = arr2
-      this.$forceUpdate()
+      // var arr2 = []
+      // this.transferbarsList.forEach(function(i) {
+      //   val.forEach(function(j) {
+      //     if (i.id == j) { arr2.push(i) }
+      //   })
+      // })
+      // this.table.temp2.useinbar = arr2
+      // // this.useinbarNamesIdTempArr = arr2
+      // this.$forceUpdate()
     },
 
     // createData(row) {
@@ -974,6 +975,7 @@ console.log('点击了栏舍1', barSortList)
             }
           }
           if (this.create.temp.treatmethod !== '' && this.create.temp.treatmethod == '继续饲喂') {
+            // this.create.temp.useinbarid = '0'
             this.create.temp.useinbarid = '0'
           }
           if (this.create.temp.rtime == '' || this.create.temp.rtime == null) {
@@ -1002,39 +1004,117 @@ console.log('点击了栏舍1', barSortList)
           setTimeout(() => {
             this.isokDisable = false
           }, 1000)
-          this.requestParam.common = { 'returnmap': '0' }
-          this.requestParam.data = []
-          this.requestParam.data[0] = { 'name': 'insertRemainplan', 'type': 'e', 'parammaps': {
-            pastureid: Cookies.get('pastureid'),
-            sort: this.create.temp.sort,
-            tmrid: this.create.temp.tmrid,
-            tmrcode: this.create.temp.tmrcode,
-            enable: this.create.temp.enable,
-            times: this.create.temp.times,
-            lppid: this.create.temp.lppid,
-            lppcode: this.create.temp.lppcode,
-            rtime: this.create.temp.rtime,
-            treatmethod: this.create.temp.treatmethod
-          }}
-          this.requestParam.data[1] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.barsNamesIdTempArr }}
-          this.requestParam.data[1].children = []
-          this.requestParam.data[1].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
-            pastureid: Cookies.get('pastureid'),
-            bigid: '@insertRemainplan.LastInsertId',
-            barid: '@insertSpotList.id',
-            bar: '@insertSpotList.bname',
-            type: 0
-          }}
-          this.requestParam.data[2] = { 'name': 'insertSpotList2', 'resultmaps': { 'list': this.useinbarNamesIdTempArr }}
-          this.requestParam.data[2].children = []
-          this.requestParam.data[2].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
-            pastureid: Cookies.get('pastureid'),
-            bigid: '@insertRemainplan.LastInsertId',
-            barid: '@insertSpotList2.id',
-            bar: '@insertSpotList2.bname',
-            type: 1
-          }}
-          ExecDataByConfig(this.requestParam).then(response => {
+
+
+          console.log(this.create.temp)
+
+
+          var ztlasArr = [{"bname": "","id": this.create.temp.useinbarid }]
+      
+          this.transferbarsList.forEach(function(item){
+            if(item.id == ztlasArr[0].id){
+              ztlasArr[0].bname = item.bname
+            }
+          })
+
+          console.log("ztlasArr",ztlasArr)
+
+
+
+
+          var ssss_data = {
+                "common": {
+                    "returnmap": "0"
+                },
+                "data": [
+                    {
+                        "name": "insertRemainplan",
+                        "type": "e",
+                        "parammaps": {
+                          
+                            pastureid: Cookies.get('pastureid'),
+                            sort: this.create.temp.sort,
+                            tmrid: this.create.temp.tmrid,
+                            tmrcode: this.create.temp.tmrcode,
+                            enable: this.create.temp.enable,
+                            times: this.create.temp.times,
+                            lppid: this.create.temp.lppid,
+                            lppcode: this.create.temp.lppcode,
+                            rtime: this.create.temp.rtime,
+                            treatmethod: this.create.temp.treatmethod
+                        }
+                    },
+                    {
+                        "name": "insertSpotList",
+                        "resultmaps": {
+                          'list': this.barsNamesIdTempArr
+                        },
+                        "children": [
+                            {
+                                "name": "insertRpdetail",
+                                "type": "e",
+                                "parammaps": {
+                                    "pastureid":  Cookies.get('pastureid'),
+                                    "bigid": "@insertRemainplan.LastInsertId",
+                                    "barid": "@insertSpotList.id",
+                                    "bar": "@insertSpotList.bname",
+                                    "type": 0
+                                }
+                            }
+                        ]
+                    },
+                    {
+                        "name": "insertRpdetail",
+                        "type": "e",
+                        "parammaps": {
+                            "pastureid": "1647917519",
+                            "bigid": "@insertRemainplan.LastInsertId",
+                            "barid": ztlasArr[0].id,
+                            "bar": ztlasArr[0].bname ,
+                            "type": 1
+                        }
+                    }
+                ]
+            }
+
+
+
+
+          // this.requestParam.common = { 'returnmap': '0' }
+          // this.requestParam.data = []
+          // this.requestParam.data[0] = { 'name': 'insertRemainplan', 'type': 'e', 'parammaps': {
+          //   pastureid: Cookies.get('pastureid'),
+          //   sort: this.create.temp.sort,
+          //   tmrid: this.create.temp.tmrid,
+          //   tmrcode: this.create.temp.tmrcode,
+          //   enable: this.create.temp.enable,
+          //   times: this.create.temp.times,
+          //   lppid: this.create.temp.lppid,
+          //   lppcode: this.create.temp.lppcode,
+          //   rtime: this.create.temp.rtime,
+          //   treatmethod: this.create.temp.treatmethod
+          // }}
+          // this.requestParam.data[1] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.barsNamesIdTempArr }}
+          // this.requestParam.data[1].children = []
+          // this.requestParam.data[1].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
+          //   pastureid: Cookies.get('pastureid'),
+          //   bigid: '@insertRemainplan.LastInsertId',
+          //   barid: '@insertSpotList.id',
+          //   bar: '@insertSpotList.bname',
+          //   type: 0
+          // }}
+          // this.requestParam.data[2] = { 'name': 'insertSpotList2', 'resultmaps': { 'list': this.useinbarNamesIdTempArr }}
+          // this.requestParam.data[2].children = []
+          // this.requestParam.data[2].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
+          //   pastureid: Cookies.get('pastureid'),
+          //   bigid: '@insertRemainplan.LastInsertId',
+          //   barid: '@insertSpotList2.id',
+          //   bar: '@insertSpotList2.bname',
+          //   type: 1
+          // }}
+
+
+          ExecDataByConfig(ssss_data).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
               this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
@@ -1150,7 +1230,17 @@ console.log('点击了栏舍1', barSortList)
 
       row.temp = {}
       row.temp2 = {}
-      if (row.useinbarid == '0') { row.useinbarid = [] }
+
+
+      if(row.treatmethod == "继续饲喂"){
+        this.isDis = true
+      } else {
+         this.isDis = false
+      }
+
+
+
+      // if (row.useinbarid == '0') { row.useinbarid = "" }
       if (row.barid == undefined) { row.barid = [] }
       if (row.tmrid == undefined) { row.tmrid = '' }
       if (row.times == undefined) { row.times = '' }
@@ -1185,8 +1275,11 @@ console.log('点击了栏舍1', barSortList)
       }
 
       this.getTransferbarsList()
-      // row.barid = row.qstrids.split(',')
-      // row.useinbarid = row.hstrids.split(',')
+      row.barid = row.qstrids.split(',')
+      row.useinbarid = row.hstrids 
+
+       if (row.useinbarid == '0') { row.useinbarid = "" }
+
       var arr3 = []
       for (let i = 0; i < row.barid.length; i++) {
         arr3.push(this.barsList.find(obj => obj.id == row.barid[i]))
@@ -1194,13 +1287,18 @@ console.log('点击了栏舍1', barSortList)
       this.barsNamesIdTempArr = arr3
       this.barSortList = arr3
       var arr4 = []
-      setTimeout(() => {
-        for (let i = 0; i < row.useinbarid.length; i++) {
-          arr4.push(this.transferbarsList.find(obj => obj.id == row.useinbarid[i]))
-        }
-      }, 500)
-      this.useinbarNamesIdTempArr = arr4
-      console.log(this.useinbarNamesIdTempArr, 'this.useinbarNamesIdTempArr')
+
+
+      // setTimeout(() => {
+      //   for (let i = 0; i < row.useinbarid.length; i++) {
+      //     arr4.push(this.transferbarsList.find(obj => obj.id == row.useinbarid[i]))
+      //   }
+      // }, 500)
+
+
+
+      // this.useinbarNamesIdTempArr = arr4
+      // console.log(this.useinbarNamesIdTempArr, 'this.useinbarNamesIdTempArr')
       this.dropState = true
 
 
@@ -1427,49 +1525,136 @@ console.log('点击了栏舍1', barSortList)
         setTimeout(() => {
           this.isokDisable = false
         }, 1000)
-        this.requestParam = {}
-        this.requestParam.common = { 'returnmap': '0' }
-        this.requestParam.data = []
-        this.requestParam.data[0] = { 'name': 'updateRemainplan', 'type': 'e', 'parammaps': {
-          pastureid: this.create.temp.pastureid,
-          id: this.create.temp.id,
-          sort: this.create.temp.sort,
-          tmrid: this.create.temp.tmrid,
-          tmrcode: this.create.temp.tmrcode,
-          enable: this.create.temp.enable,
-          times: this.create.temp.times,
-          lppid: this.create.temp.lppid,
-          lppcode: this.create.temp.lppcode,
-          rtime: this.create.temp.rtime,
-          treatmethod: this.create.temp.treatmethod
-        }}
-        this.requestParam.data[1] = { 'name': 'deleteRpdetail', 'type': 'e', 'parammaps': {
-          pastureid: this.create.temp.pastureid,
-          bigid: this.create.temp.id
-        }}
-        this.requestParam.data[2] = { 'name': 'insertSpotList2', 'resultmaps': { 'list': this.barsNamesIdTempArr }}
-        this.requestParam.data[2].children = []
-        this.requestParam.data[2].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
-          pastureid: this.create.temp.pastureid,
-          bigid: this.create.temp.id,
-          barid: '@insertSpotList2.id',
-          bar: '@insertSpotList2.bname',
-          type: 0
-        }}
-        // this.requestParam.data[3] = { 'name': 'insertSpotList3', 'resultmaps': { 'list': this.useinbarNamesIdTempArr }}
-
-        this.requestParam.data[3] = { 'name': 'insertSpotList3', 'resultmaps': { 'list': this.barsNamesIdTempArr }}
-
-        this.requestParam.data[3].children = []
-        this.requestParam.data[3].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
-          pastureid: this.create.temp.pastureid,
-          bigid: this.create.temp.id,
-          barid: '@insertSpotList3.id',
-          bar: '@insertSpotList3.bname',
-          type: 1
-        }}
-        ExecDataByConfig(this.requestParam).then(response => {
-          console.log('新增保存发送参数', this.requestParam)
+
+
+         var ztlasArr2 = [{"bname": "","id": this.create.temp.useinbarid }]
+      
+          this.transferbarsList.forEach(function(item){
+            if(item.id == ztlasArr2[0].id){
+              ztlasArr2[0].bname = item.bname
+            }
+          })
+
+          console.log("ztlasArr2",ztlasArr2)
+
+
+
+
+        var ssss_data2 = {
+            "common": {
+                "returnmap": "0"
+            },
+            "data": [
+                {
+                    "name": "updateRemainplan",
+                    "type": "e",
+                    "parammaps": {
+                             pastureid: this.create.temp.pastureid,
+                          id: this.create.temp.id,
+                          sort: this.create.temp.sort,
+                          tmrid: this.create.temp.tmrid,
+                          tmrcode: this.create.temp.tmrcode,
+                          enable: this.create.temp.enable,
+                          times: this.create.temp.times,
+                          lppid: this.create.temp.lppid,
+                          lppcode: this.create.temp.lppcode,
+                          rtime: this.create.temp.rtime,
+                          treatmethod: this.create.temp.treatmethod
+                    }
+                },
+                {
+                    "name": "deleteRpdetail",
+                    "type": "e",
+                    "parammaps": {
+                        pastureid: this.create.temp.pastureid,
+                      bigid: this.create.temp.id
+                    }
+                },
+                {
+                    "name": "insertSpotList2",
+                    "resultmaps": {
+                        "list":  this.barsNamesIdTempArr
+                        
+                    },
+                    "children": [
+                        {
+                            "name": "insertRpdetail",
+                            "type": "e",
+                            "parammaps": {
+                                     pastureid: this.create.temp.pastureid,
+                                  bigid: this.create.temp.id,
+                                "barid": "@insertSpotList2.id",
+                                "bar": "@insertSpotList2.bname",
+                                "type": 0
+                            }
+                        }
+                    ]
+                },
+                {
+                    "name": "insertRpdetail",
+                    "type": "e",
+                    "parammaps": {
+                        "pastureid": this.create.temp.pastureid,
+                        "bigid": this.create.temp.id,
+                       
+      "barid":ztlasArr2[0].id,
+                            "bar":ztlasArr2[0].bname ,
+                        "type": 1
+                    }
+                }
+            ]
+        }
+
+
+       
+
+
+
+        // this.requestParam = {}
+        // this.requestParam.common = { 'returnmap': '0' }
+        // this.requestParam.data = []
+        // this.requestParam.data[0] = { 'name': 'updateRemainplan', 'type': 'e', 'parammaps': {
+        //   pastureid: this.create.temp.pastureid,
+        //   id: this.create.temp.id,
+        //   sort: this.create.temp.sort,
+        //   tmrid: this.create.temp.tmrid,
+        //   tmrcode: this.create.temp.tmrcode,
+        //   enable: this.create.temp.enable,
+        //   times: this.create.temp.times,
+        //   lppid: this.create.temp.lppid,
+        //   lppcode: this.create.temp.lppcode,
+        //   rtime: this.create.temp.rtime,
+        //   treatmethod: this.create.temp.treatmethod
+        // }}
+        // this.requestParam.data[1] = { 'name': 'deleteRpdetail', 'type': 'e', 'parammaps': {
+        //   pastureid: this.create.temp.pastureid,
+        //   bigid: this.create.temp.id
+        // }}
+        // this.requestParam.data[2] = { 'name': 'insertSpotList2', 'resultmaps': { 'list': this.barsNamesIdTempArr }}
+        // this.requestParam.data[2].children = []
+        // this.requestParam.data[2].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
+        //   pastureid: this.create.temp.pastureid,
+        //   bigid: this.create.temp.id,
+        //   barid: '@insertSpotList2.id',
+        //   bar: '@insertSpotList2.bname',
+        //   type: 0
+        // }}
+        // // this.requestParam.data[3] = { 'name': 'insertSpotList3', 'resultmaps': { 'list': this.useinbarNamesIdTempArr }}
+
+        // this.requestParam.data[3] = { 'name': 'insertSpotList3', 'resultmaps': { 'list': this.barsNamesIdTempArr }}
+
+        // this.requestParam.data[3].children = []
+        // this.requestParam.data[3].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
+        //   pastureid: this.create.temp.pastureid,
+        //   bigid: this.create.temp.id,
+        //   barid: '@insertSpotList3.id',
+        //   bar: '@insertSpotList3.bname',
+        //   type: 1
+        // }}
+
+        
+        ExecDataByConfig(ssss_data2).then(response => {
+          console.log('保存发送参数', this.requestParam)
           if (response.msg === 'fail') {
             this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
           } else {
@@ -1479,6 +1664,7 @@ console.log('点击了栏舍1', barSortList)
             this.dropState = false
           }
         })
+
         }
       })
     },