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

.env.development

@@ -18,7 +18,7 @@ ENV = 'development'
 # 陈文强
 # VUE_APP_BASE_API = 'http://192.168.1.87:8081/'
 # 白少杰
-VUE_APP_BASE_API = 'http://192.168.1.78:8081/'
+VUE_APP_BASE_API = 'http://192.168.1.89:8081/'
 
 #=====
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,

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

@@ -736,28 +736,15 @@ export default {
           const data = this.requestParam
           postJson(url, data).then(response => {
             if (response.msg === 'fail') {
-              this.$notify({
-                title: '删除失败',
-                message: response.data,
-                type: 'warning',
-                duration: 2000
-              })
+              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({
-                title: '成功',
-                message: '删除成功',
-                type: 'success',
-                duration: 2000
-              })
+              this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
               this.table.getdataListParm.parammaps.refresh = 1
               this.getList()
             }
           })
         }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
+          this.$message({ type: 'info', message: '已取消删除' })
         })
       } else {
         this.$message({
@@ -780,7 +767,8 @@ export default {
       this.getCreateList1()
     },
     // TMR编号
-    changeTMRNumber(item) {
+    changeTMRNumber(item) {
+      console.log(this.create.temp.tmrid,'this.create.temp.tmrid111')
       if (this.create.list2.length > 0) {
         MessageBox.confirm('更换TMR撒料设备,会清空撒料车,是否更换?', {
           confirmButtonText: '是',
@@ -797,21 +785,20 @@ export default {
           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
+        }).catch(() => {
+          console.log(this.create.temp,'====')
+          if(this.create.temp.tclassname == '固定式'){
+            console.log( this.create.temp,'====')
+            this.create.temp.tmrid = this.create.temp.mytmrid
+          }
+          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.tclassname = this.TMRNumberList.find(obj => obj.id === this.create.temp.tmrid2).tclassname
           this.create.temp.mytmrid = this.create.temp.tmrid2
           this.create.temp.mytmrname = this.create.temp.tmrname
-          if (this.isDispaly || this.create.dialogStatus == 'update') {
-            this.getClearList()
-          }
-          console.log(this.create.temp)
-          this.$message({
-            type: 'info',
-            message: '已取消'
-          })
+          console.log(this.create.temp)
+          this.$message({ type: 'info', message: '已取消' })
         })
       } else {
         this.create.temp.tmrid = this.create.temp.tmrid2
@@ -1186,13 +1173,8 @@ export default {
           this.$set(item, 'weight', (parseFloat(evt.maxweight) - parseFloat(evt.sumweight)).toFixed(2))
         }
       }
-      if (parseFloat(evt.maxweight) == parseFloat(evt.sumweight) || parseFloat(evt.maxweight) < parseFloat(evt
-        .sumweight)) {
-        this.$message({
-          type: 'error',
-          message: '计划配方已经是最大容量',
-          duration: 2000
-        })
+      if (parseFloat(evt.maxweight) == parseFloat(evt.sumweight) || parseFloat(evt.maxweight) < parseFloat(evt.sumweight)) {
+        this.$message({ type: 'error', message: '计划配方已经是最大容量', duration: 2000 })
         this.getCreateList1()
         return
       }
@@ -1252,7 +1234,7 @@ export default {
           this.getCreateList1()
         })
       })
-
+      console.log(this.create.temp.tmrid,'66666')
     },
     handleUpdate(row) {
       this.getDownList()

src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -678,6 +678,10 @@ export default {
             this.getClearList()
           }
         }).catch(() => {
+          if(this.create.temp.tclassname == '固定式'){
+            console.log( this.create.temp,'====')
+            this.create.temp.tmrid = this.create.temp.mytmrid
+          }
           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