Signed-off-by: 段小段 <1729609802@qq.com>

src/views/formulationPlan/dhedFormula/index.vue

@@ -775,7 +775,7 @@ export default {
         }
       },
       requestParams: [
-        { name: 'getFTSWList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }},
+        { name: 'getFTSWLSList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }},
         { name: 'getFTBLList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }},
         { name: 'getCowclassListEnable', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }},
         { name: 'getBarListEnable', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
@@ -1097,7 +1097,7 @@ export default {
     },
     getDownList() {
       GetDataByNames(this.requestParams).then(response => {
-        this.recipeTemplateList = response.data.getFTSWList.list
+        this.recipeTemplateList = response.data.getFTSWLSList.list
         this.feedingFormulaList = response.data.getFTBLList.list
         this.livestockTypeList = response.data.getCowclassListEnable.list
         this.barList = response.data.getBarListEnable.list

src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -188,7 +188,7 @@
             <el-col :span="8">
               <el-form-item label="TMR编号:" prop="tmrid2">
                 <el-select v-model="create.temp.tmrid2" style="width: 100%;" placeholder="TMR编号" @change="changeTMRNumber">
-                  <el-option v-for="item in TMRNumberList" :key="item.id" :label="item.eqcode" :value="item.id" />
+                  <el-option v-for="item in equipmentList" :key="item.id" :label="item.eqcode" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -584,23 +584,23 @@ export default {
           confirmButtonText: '是', cancelButtonText: '否', type: 'warning'
         }).then(() => {
           this.create.temp.tmrid = this.create.temp.tmrid2
-          this.create.temp.tmrname = this.TMRNumberList.find(obj => obj.id === item).eqcode
-          this.create.temp.maxweight = this.TMRNumberList.find(obj => obj.id === item).maxstirfeed
+          this.create.temp.tmrname = this.equipmentList.find(obj => obj.id === item).eqcode
+          this.create.temp.maxweight = this.equipmentList.find(obj => obj.id === item).maxstirfeed
           console.log('tmrname==>', this.create.temp)
           if (this.isDispaly || this.create.dialogStatus == 'update') {
             this.getClearList()
           }
         }).catch(() => {
           this.create.temp.tmrid2 = this.create.temp.tmrid
-          this.create.temp.tmrname = this.TMRNumberList.find(obj => obj.id === this.create.temp.tmrid2).eqcode
-          this.create.temp.maxweight = this.TMRNumberList.find(obj => obj.id === this.create.temp.tmrid2).maxstirfeed
+          this.create.temp.tmrname = this.equipmentList.find(obj => obj.id === this.create.temp.tmrid2).eqcode
+          this.create.temp.maxweight = this.equipmentList.find(obj => obj.id === this.create.temp.tmrid2).maxstirfeed
           console.log(this.create.temp)
           this.$message({ type: 'info', message: '已取消' })
         })
       } else {
         this.create.temp.tmrid = this.create.temp.tmrid2
-        this.create.temp.tmrname = this.TMRNumberList.find(obj => obj.id === item).eqcode
-        this.create.temp.maxweight = this.TMRNumberList.find(obj => obj.id === item).maxstirfeed
+        this.create.temp.tmrname = this.equipmentList.find(obj => obj.id === item).eqcode
+        this.create.temp.maxweight = this.equipmentList.find(obj => obj.id === item).maxstirfeed
         console.log('TMR编号item==>', item)
         console.log('tmrname==>', this.create.temp)
       }

src/views/formulationPlan/recipeTemplate/index.vue

@@ -902,7 +902,8 @@ export default {
         list: [],
         total: 0,
         listLoading: true,
-        temp: {}
+        temp: {},
+        updateList: {}
       },
       isDetailDialog: false,
       template: {
@@ -2291,7 +2292,8 @@ export default {
       this.requestParam.data[1] = { 'name': 'updateFPbyFTChange', 'type': 'e', 'parammaps': {
         pastureid: this.table2.temp.pastureid,
         ftid: this.table2.getdataListParm.parammaps.ftid,
-        type: this.table2.getdataListParm.parammaps.fttypeid
+        type: this.table2.getdataListParm.parammaps.fttypeid,
+        status: 0
       }}
       this.requestParam.data[2] = { 'name': 'updateftversion', 'type': 'e', 'parammaps': {
         pastureid: this.table2.getdataListParm.parammaps.pastureid,
@@ -2333,7 +2335,7 @@ export default {
 
     // 详情编辑
     handleUpdate2(row) {
-      console.log('详情编辑', row)
+      console.log('详情编辑', row)
       this.dropState = true
       row.isGroupDisabled = false
       row.islockcount = String(row.islockcount)
@@ -2354,7 +2356,7 @@ export default {
         if (rowArr[i] == row.sort) {
           count++
         }
-      }
+      }
       // 判断是否有相同顺序，如果没有饲料组不可编辑，若有饲料组可编辑
       if (count == 1) {
         // 饲料组编辑false，不可编辑true
@@ -2380,14 +2382,15 @@ export default {
         row.isUpdate = false
         row.isUpdateSave = true
         return false
-      }
+      }
+      this.table2.updateList = Object.assign({}, row)
     },
     updateData2(row) {
       console.log('点击了详情编辑保存', row)
       this.isokDisable = true
       setTimeout(() => {
         this.isokDisable = false
-      }, 1000)
+      }, 1000)
       this.table2.temp.pastureid = row.pastureid
       this.table2.temp.ftid = this.table2.getdataListParm.parammaps.ftid
       this.table2.temp.fid = row.fid
@@ -2398,7 +2401,15 @@ export default {
       this.table2.temp.feedgroup = row.feedgroup
       this.table2.temp.preftid = this.table2.temp.preftid
       this.table2.temp.autosecond = row.autosecond
-      this.table2.temp.id = row.id
+      this.table2.temp.id = row.id
+      console.log('this.table2.updateList', this.table2.updateList)
+      console.log('temp', this.table2.temp)
+      var status = ''
+      if (parseFloat(this.table2.temp.fweight) > parseFloat(this.table2.updateList.fweight)) {
+        status = 0
+      } else {
+        status = 1
+      }
       if (this.table2.temp.fid == '' && this.table2.temp.fweight == '' && this.table2.temp.autosecond == '') {
         this.$message({ type: 'error', message: '饲料名称/重量/搅拌延时不能为空', duration: 2000 })
         return false
@@ -2467,7 +2478,8 @@ export default {
       this.requestParam.data[2] = { 'name': 'updateFPbyFTChange', 'type': 'e', 'parammaps': {
         pastureid: row.pastureid,
         ftid: this.table2.getdataListParm.parammaps.ftid,
-        type: this.table2.getdataListParm.parammaps.fttypeid
+        type: this.table2.getdataListParm.parammaps.fttypeid,
+        status: status
       }}
       this.requestParam.data[3] = { 'name': 'updateFTdetailbySort', 'type': 'e', 'parammaps': {
         pastureid: row.pastureid,
@@ -2533,7 +2545,8 @@ export default {
           this.requestParam.data[2] = { 'name': 'updateFPbyFTChange', 'type': 'e', 'parammaps': {
             pastureid: row.pastureid,
             ftid: this.table2.getdataListParm.parammaps.ftid,
-            type: this.table2.getdataListParm.parammaps.fttypeid
+            type: this.table2.getdataListParm.parammaps.fttypeid,
+            status: 1
           }}
           this.requestParam.data[3] = { 'name': 'updateftversion', 'type': 'e', 'parammaps': {
             pastureid: this.table2.getdataListParm.parammaps.pastureid,
@@ -2562,7 +2575,8 @@ export default {
           this.requestParam.data[3] = { 'name': 'updateFPbyFTChange', 'type': 'e', 'parammaps': {
             pastureid: row.pastureid,
             ftid: this.table2.getdataListParm.parammaps.ftid,
-            type: this.table2.getdataListParm.parammaps.fttypeid
+            type: this.table2.getdataListParm.parammaps.fttypeid,
+            status: 1
           }}
           this.requestParam.data[4] = { 'name': 'updateftversion', 'type': 'e', 'parammaps': {
             pastureid: this.table2.getdataListParm.parammaps.pastureid,