更新5-12

src/views/formulationPlan/dailyExecutionPlan/typePage/materialIssuancePlan.vue

@@ -1211,29 +1211,49 @@ export default {
         return
       }
       console.log('item.weight===>', item.weight)
-      const url = 'authdata/lpplandtl/date/add'
-      const data = {}
-      data.parammaps = {}
-      data.parammaps.id = item.id
-      data.parammaps.pastureid = evt.pastureid
-      data.parammaps.lppid = evt.id
-      data.parammaps.barid = item.barid
-      data.parammaps.barname = item.barname
-      data.parammaps.fpdid = item.id
-      data.parammaps.lweight = item.weight
-      data.parammaps.tmrid = evt.tmrid
-      data.parammaps.tmrname = evt.tmrname
-      data.parammaps.fttype = item.fttype
-      data.parammaps.background = item.background
-      data.parammaps.cowcount = item.cowcount
-      data.parammaps.ccountradio = item.ccountradio
-      data.parammaps.date = this.date
-      postJson(url, data).then(response => {
+      // const url = 'authdata/lpplandtl/date/add'
+      // const data = {}
+      // data.parammaps = {}
+      // data.parammaps.id = item.id
+      // data.parammaps.pastureid = evt.pastureid
+      // data.parammaps.lppid = evt.id
+      // data.parammaps.barid = item.barid
+      // data.parammaps.barname = item.barname
+      // data.parammaps.fpdid = item.id
+      // data.parammaps.lweight = item.weight
+      // data.parammaps.tmrid = evt.tmrid
+      // data.parammaps.tmrname = evt.tmrname
+      // data.parammaps.fttype = item.fttype
+      // data.parammaps.background = item.background
+      // data.parammaps.cowcount = item.cowcount
+      // data.parammaps.ccountradio = item.ccountradio
+      // data.parammaps.date = this.date
+      // postJson(url, data).then(response => {
         this.requestParam = {}
         this.requestParam.common = {
           'returnmap': '0'
         }
         this.requestParam.data = []
+        this.requestParam.data[0] = { 'name': 'insertLppddate', 'type': 'e', 'parammaps': {
+            pastureid:item.pastureid,
+            lppid:evt.id,
+            barid:item.barid,
+            barname:item.barname,
+            fpdid:item.id,
+            tmrid:evt.tmrid,
+            tmrname:evt.tmrname,
+            fttype:item.fttype,
+            background:item.background,
+            cowcount:item.cowcount,
+            ccountradio:item.ccountradio,
+            lweight:item.weight,
+            date: this.date
+          }
+        }
+        ExecDataByConfig(this.requestParam).then(response => {
+        this.requestParam = {}
+        this.requestParam.common = { 'returnmap': '0' }
+        this.requestParam.data = []
         // this.requestParam.data[0] = {
         //   'name': 'updateLpplandtlSortsdate',
         //   'type': 'e',
@@ -1244,16 +1264,8 @@ export default {
         //     date: this.date
         //   }
         // }
-        this.requestParam.data[0] = {
-          'name': 'updateFpdetailUsedate',
-          'type': 'e',
-          'parammaps': {
-            pastureid: item.pastureid,
-            id: item.id,
-            fttype: item.fttype,
-            lweight: item.weight,
-            date: this.date
-          }
+        this.requestParam.data[0] = { 'name': 'updateFpdetailUsedate', 'type': 'e',
+          'parammaps': { pastureid: item.pastureid, id: item.id, fttype: item.fttype, lweight: item.weight, date: this.date }
         }
         const url2 = 'authdata/ExecDataByConfig'
         const data2 = this.requestParam
@@ -1412,16 +1424,38 @@ export default {
       }
       const url = 'authdata/lpplandtl/date/add'
       const data = {}
-      data.parammaps = {}
-      data.parammaps.id = objList.id
-      data.parammaps.pastureid = this.create.temp.pastureid
-      data.parammaps.lppid = this.create.temp.id
-      data.parammaps.tmrid = objList.tmrid
-      data.parammaps.tmrname = objList.tmrname
-      data.parammaps.date = this.date
+      // data.parammaps = {}
+      // data.parammaps.id = objList.id
+      // data.parammaps.pastureid = this.create.temp.pastureid
+      // data.parammaps.lppid = this.create.temp.id
+      // data.parammaps.tmrid = objList.tmrid
+      // data.parammaps.tmrname = objList.tmrname
+      // data.parammaps.date = this.date
 
-      postJson(url, data).then(response => {
-        console.log('新增保存发送参数', this.requestParam)
+      // postJson(url, data).then(response => {
+      //   console.log('新增保存发送参数', this.requestParam)
+      //   if (response.msg === 'fail') {
+      //     this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+      //   } else {
+      //     this.getCreateList2()
+      //     this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+      //   }
+      // })
+      this.requestParam = {}
+      this.requestParam.common = {
+        'returnmap': '0'
+      }
+      this.requestParam.data = []
+      this.requestParam.data[0] = { 'name': 'updateLpplandtl1Tmrdate', 'type': 'e', 'parammaps': {
+          tmrid: objList.tmrid,
+          tmrname: objList.tmrname,
+          id: objList.id,
+          pastureid: this.create.temp.pastureid,
+          date:this.date
+        }
+      }
+      ExecDataByConfig(this.requestParam).then(response => {
+        console.log('编辑保存发送参数', this.requestParam)
         if (response.msg === 'fail') {
           this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
         } else {
@@ -1436,24 +1470,52 @@ export default {
     },
     changeLog1(evt){
        console.log('changeLog1===>', evt)
-       var obj = evt.moved.element
-       const url = 'authdata/lpplandtl/edit/date/sort'
-       const data = {}
-       data.parammaps = {}
-       data.parammaps.tmrid = obj.tmrid
-       data.parammaps.pastureid = obj.pastureid
-       data.parammaps.lppid = obj.lppid
-       data.parammaps.sort = evt.moved.newIndex +1
-       data.parammaps.date = this.date
-       postJson(url, data).then(response => {
-         console.log('拖动保存发送参数', this.requestParam)
-         if (response.msg === 'fail') {
-           this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-         } else {
-           this.getCreateList2()
-           this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
-         }
-       })
+       // var obj = evt.moved.element
+       // const url = 'authdata/lpplandtl/edit/date/sort'
+       // const data = {}
+       // data.parammaps = {}
+       // data.parammaps.tmrid = obj.tmrid
+       // data.parammaps.pastureid = obj.pastureid
+       // data.parammaps.lppid = obj.lppid
+       // data.parammaps.sort = evt.moved.newIndex +1
+       // data.parammaps.date = this.date
+       // postJson(url, data).then(response => {
+       //   console.log('拖动保存发送参数', this.requestParam)
+       //   if (response.msg === 'fail') {
+       //     this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+       //   } else {
+       //     this.getCreateList2()
+       //     this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+       //   }
+       // })
+       var sortArr = []
+       for (let i = 0; i < this.create.list2.length; i++) {
+         var obj = {}
+         obj.sort = i + 1
+         obj.id = this.create.list2[i].id
+         obj.pastureid = this.create.list2[i].pastureid
+         sortArr.push(obj)
+       }
+       this.requestParam = {}
+       this.requestParam.common = { 'returnmap': '0' }
+       this.requestParam.data = []
+       this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': sortArr }}
+       this.requestParam.data[0].children = []
+       this.requestParam.data[0].children[0] = { 'name': 'updateLpplandtlSortonedate', 'type': 'e', 'parammaps': {
+         id: '@insertSpotList.id',
+         pastureid: '@insertSpotList.pastureid',
+         sort: '@insertSpotList.sort',
+         date:this.date
+       }}
+       ExecDataByConfig(this.requestParam).then(response => {
+         console.log('顺序切换保存发送参数', this.requestParam)
+       if (response.msg === 'fail') {
+         this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+       } else {
+         this.getCreateList2()
+         this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+       }
+     })
     },
     start1(evt){
       console.log('start1===>', evt)

src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -966,40 +966,58 @@ export default {
         this.getCreateList1()
         return
       }
-      console.log('item.weight===>', item.weight)
-      const url = 'authdata/lpplandtl/add'
-      const data = {}
-      data.parammaps = {}
-      data.parammaps.id = item.id
-      data.parammaps.pastureid = evt.pastureid
-      data.parammaps.lppid = evt.id
-      data.parammaps.barid = item.barid
-      data.parammaps.barname = item.barname
-      data.parammaps.fpdid = item.id
-      data.parammaps.lweight = item.weight
-      data.parammaps.tmrid = evt.tmrid
-      data.parammaps.tmrname = evt.tmrname
-      data.parammaps.fttype = item.fttype
-      data.parammaps.background = item.background
-      data.parammaps.cowcount = item.cowcount
-      data.parammaps.ccountradio = item.ccountradio
-      postJson(url, data).then(response => {
+      console.log('item.weight===>', evt.maxweight)
+      console.log('item.weight===>', evt.sumweight)
+      // const url = 'authdata/lpplandtl/add'
+      // const data = {}
+      // data.parammaps = {}
+      // data.parammaps.id = item.id
+      // data.parammaps.pastureid = evt.pastureid
+      // data.parammaps.lppid = evt.id
+      // data.parammaps.barid = item.barid
+      // data.parammaps.barname = item.barname
+      // data.parammaps.fpdid = item.id
+      // data.parammaps.lweight = item.weight
+      // data.parammaps.tmrid = evt.tmrid
+      // data.parammaps.tmrname = evt.tmrname
+      // data.parammaps.fttype = item.fttype
+      // data.parammaps.background = item.background
+      // data.parammaps.cowcount = item.cowcount
+      // data.parammaps.ccountradio = item.ccountradio
+      // postJson(url, data).then(response => {
+      //   this.requestParam = {}
+      //   this.requestParam.common = { 'returnmap': '0' }
+      //   this.requestParam.data = []
+      //   this.requestParam.data[0] = { 'name': 'updateFpdetailUse', 'type': 'e',
+      //     'parammaps': { pastureid: item.pastureid, id: item.id, fttype: item.fttype, lweight: item.weight }
+      //   }
         this.requestParam = {}
-        this.requestParam.common = { 'returnmap': '0' }
+        this.requestParam.common = {
+          'returnmap': '0'
+        }
         this.requestParam.data = []
-        // this.requestParam.data[0] = { 'name': 'updateLpplandtlSorts', 'type': 'e',
-        //   'parammaps': { pastureid: evt.pastureid, sort: evt.sort, lppid: evt.id }
-        // }
-        // this.requestParam.data[1] = { 'name': 'insertLppd', 'type': 'e',
-        //   'parammaps': {
-        //     pastureid: evt.pastureid, lppid: evt.id, barid: item.barid, barname: item.barname, fpdid: item.id, fttype: item.fttype,
-        //     lweight: item.weight, sort: evt.sort, tmrid: evt.tmrid, tmrname: evt.tmrname,
-        //     background: item.background, ccountradio: item.ccountradio, cowcount: item.cowcount
-        //   }
-        // }
-        this.requestParam.data[0] = { 'name': 'updateFpdetailUse', 'type': 'e',
-          'parammaps': { pastureid: item.pastureid, id: item.id, fttype: item.fttype, lweight: item.weight }
+        this.requestParam.data[0] = { 'name': 'insertLppd', 'type': 'e', 'parammaps': {
+            pastureid:item.pastureid,
+            lppid:evt.id,
+            barid:item.barid,
+            barname:item.barname,
+            fpdid:item.id,
+            tmrid:evt.tmrid,
+            tmrname:evt.tmrname,
+            fttype:item.fttype,
+            background:item.background,
+            cowcount:item.cowcount,
+            ccountradio:item.ccountradio,
+            lweight:item.weight
+          }
         }
+        ExecDataByConfig(this.requestParam).then(response => {
+          this.requestParam = {}
+          this.requestParam.common = { 'returnmap': '0' }
+          this.requestParam.data = []
+          this.requestParam.data[0] = { 'name': 'updateFpdetailUse', 'type': 'e',
+            'parammaps': { pastureid: item.pastureid, id: item.id, fttype: item.fttype, lweight: item.weight }
+          }
         const url2 = 'authdata/ExecDataByConfig'
         const data2 = this.requestParam
         postJson(url2, data2).then(response => {
@@ -1121,16 +1139,37 @@ export default {
           }
         }
       }
-      const url = 'authdata/lpplandtl/add'
-      const data = {}
-      data.parammaps = {}
-      data.parammaps.id = objList.id
-      data.parammaps.pastureid = this.create.temp.pastureid
-      data.parammaps.lppid = this.create.temp.id
-      data.parammaps.tmrid = objList.tmrid
-      data.parammaps.tmrname = objList.tmrname
-      postJson(url, data).then(response => {
-        console.log('新增保存发送参数', this.requestParam)
+      // const url = 'authdata/lpplandtl/add'
+      // const data = {}
+      // data.parammaps = {}
+      // data.parammaps.id = objList.id
+      // data.parammaps.pastureid = this.create.temp.pastureid
+      // data.parammaps.lppid = this.create.temp.id
+      // data.parammaps.tmrid = objList.tmrid
+      // data.parammaps.tmrname = objList.tmrname
+      // postJson(url, data).then(response => {
+      //   console.log('新增保存发送参数', this.requestParam)
+      //   if (response.msg === 'fail') {
+      //     this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+      //   } else {
+      //     this.getCreateList2()
+      //     this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+      //   }
+      // })
+      this.requestParam = {}
+      this.requestParam.common = {
+        'returnmap': '0'
+      }
+      this.requestParam.data = []
+      this.requestParam.data[0] = { 'name': 'updateLpplandtl1Tmr', 'type': 'e', 'parammaps': {
+          tmrid: objList.tmrid,
+          tmrname: objList.tmrname,
+          id: objList.id,
+          pastureid: this.create.temp.pastureid,
+        }
+      }
+      ExecDataByConfig(this.requestParam).then(response => {
+        console.log('编辑保存发送参数', this.requestParam)
         if (response.msg === 'fail') {
           this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
         } else {
@@ -1138,31 +1177,23 @@ export default {
           this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
         }
       })
-      // this.requestParam = {}
-      // this.requestParam.common = {
-      //   'returnmap': '0'
-      // }
-      // this.requestParam.data = []
-      // this.requestParam.data[0] = {
-      //   'name': 'updateLppd',
-      //   'type': 'e',
-      //   'parammaps': {
-      //     pastureid: this.create.temp.pastureid,
-      //     lppid: this.create.temp.id,
-      //     barid: objList.barid,
-      //     barname: objList.barname,
-      //     fpdid: objList.fpdid,
-      //     fttype: objList.fttype,
-      //     lweight: objList.weight,
-      //     sort: objList.sort,
-      //     tmrid: objList.tmrid,
-      //     tmrname: objList.tmrname,
-      //     background: objList.background,
-      //     id: objList.id
-      //   }
-      // }
-      // ExecDataByConfig(this.requestParam).then(response => {
-      //   console.log('编辑保存发送参数', this.requestParam)
+    },
+    move1(evt, originalEvent){
+      console.log('move1===>evt', evt)
+      console.log('move1===>originalEvent', originalEvent)
+    },
+    changeLog1(evt){
+      // 按组拖拽
+      // const url = 'authdata/lpplandtl/edit/sort'
+      // const data = {}
+      // var obj = evt.moved.element
+      // data.parammaps = {}
+      // data.parammaps.tmrid = obj.tmrid
+      // data.parammaps.pastureid = obj.pastureid
+      // data.parammaps.lppid = obj.lppid
+      // data.parammaps.sort = evt.moved.newIndex +1
+      // postJson(url, data).then(response => {
+      //   console.log('拖动保存发送参数', this.requestParam)
       //   if (response.msg === 'fail') {
       //     this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
       //   } else {
@@ -1170,22 +1201,26 @@ export default {
       //     this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
       //   }
       // })
-    },
-    move1(evt, originalEvent){
-      console.log('move1===>evt', evt)
-      console.log('move1===>originalEvent', originalEvent)
-    },
-    changeLog1(evt){
-      const url = 'authdata/lpplandtl/edit/sort'
-      const data = {}
-      var obj = evt.moved.element
-      data.parammaps = {}
-      data.parammaps.tmrid = obj.tmrid
-      data.parammaps.pastureid = obj.pastureid
-      data.parammaps.lppid = obj.lppid
-      data.parammaps.sort = evt.moved.newIndex +1
-      postJson(url, data).then(response => {
-        console.log('拖动保存发送参数', this.requestParam)
+      var sortArr = []
+      for (let i = 0; i < this.create.list2.length; i++) {
+        var obj = {}
+        obj.sort = i + 1
+        obj.id = this.create.list2[i].id
+        obj.pastureid = this.create.list2[i].pastureid
+        sortArr.push(obj)
+      }
+      this.requestParam = {}
+      this.requestParam.common = { 'returnmap': '0' }
+      this.requestParam.data = []
+      this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': sortArr }}
+      this.requestParam.data[0].children = []
+      this.requestParam.data[0].children[0] = { 'name': 'updateLpplandtlSortone', 'type': 'e', 'parammaps': {
+        id: '@insertSpotList.id',
+        pastureid: '@insertSpotList.pastureid',
+        sort: '@insertSpotList.sort'
+      }}
+      ExecDataByConfig(this.requestParam).then(response => {
+        console.log('顺序切换保存发送参数', this.requestParam)
         if (response.msg === 'fail') {
           this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
         } else {