配方模板新增停机时间

.env.development

@@ -4,9 +4,9 @@ ENV = 'development'
 # base api
 # 测试线
 # VUE_APP_BASE_API = 'http://192.168.1.70:8082/'
-# VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
+VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
 # 白少后台本地
-VUE_APP_BASE_API = 'http://192.168.1.56:8081/'
+# VUE_APP_BASE_API = 'http://192.168.1.56:8081/'
 # VUE_APP_BASE_API = 'http://192.168.1.93/'
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

src/views/formulationPlan/recipeTemplate/index.vue

@@ -297,6 +297,12 @@
                 </el-select>
               </template>
             </el-table-column>
+            <el-table-column label="停机时间" min-width="70px" align="center">
+              <template slot-scope="scope">
+                <span v-if="scope.row.NoEdit">{{ scope.row.shutdown }}</span>
+                <el-input v-if="scope.row.Edit" v-model="scope.row.shutdown" step="0.01" type="number" style="width:95%;padding:10px 0;" min-number="0"/>
+              </template>
+            </el-table-column>
             <el-table-column label="顺序" min-width="70px" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.NoEdit">{{ scope.row.sort }}</span>
@@ -2230,7 +2236,7 @@ export default {
       } else {
         var mysort = parseInt(this.table2.list[this.table2.list.length - 1].sort) + 1
       }
-      this.table2.list.unshift({ 'myId': (new Date()).valueOf(), 'Edit': true, 'NoEdit': false, 'isCreate': true, 'isUpdate': false, 'isUpdateSave': false, 'groupEdit': false, 'groupNoEdit': true, 'enable': 1, 'feedgroup': '', 'fid': '', 'fname': '', 'fweight': '', 'autosecond': '0','deviation':'0','islockcount': '0', 'sort': mysort })
+      this.table2.list.unshift({ 'myId': (new Date()).valueOf(), 'Edit': true, 'NoEdit': false, 'isCreate': true, 'isUpdate': false, 'isUpdateSave': false, 'groupEdit': false, 'groupNoEdit': true, 'enable': 1, 'feedgroup': '', 'fid': '', 'fname': '', 'fweight': '', 'autosecond': '0','deviation':'0','islockcount': '0', 'sort': mysort,'shutdown':'0' })
       console.log(this.table2.list)
     },
     changeFname(item, row) {
@@ -2328,6 +2334,7 @@ export default {
       this.table2.temp.preftid = this.table2.temp.preftid
       this.table2.temp.autosecond = row.autosecond
       this.table2.temp.deviation = row.deviation
+      this.table2.temp.shutdown = row.shutdown
       if (this.table2.temp.fid === '' && this.table2.temp.fweight === '' && this.table2.temp.autosecond === '' && this.table2.temp.deviation === '') {
         this.$message({ type: 'error', message: '饲料名称/重量/搅拌延时/允许延时偏差不能为空', duration: 2000 })
         return false
@@ -2365,6 +2372,9 @@ export default {
           row.sort = parseInt(this.table2.list[this.table2.list.length - 1].sort) + 1
         }
       }
+      if (this.table2.temp.shutdown == '') {
+        this.table2.temp.shutdown = 0
+      }
       if (this.table2.getdataListParm.parammaps.fttypeid == 2) {
         if (parseInt(this.table2.temp.preftid) > 0) {
           this.$message({ type: 'error', message: '饲料名称不能选择预混配方', duration: 2000 })
@@ -2406,7 +2416,8 @@ export default {
         feedgroup: row.feedgroup,
         preftid: this.table2.temp.preftid,
         autosecond: row.autosecond,
-        deviation: row.deviation
+        deviation: row.deviation,
+        shutdown:  this.table2.temp.shutdown,
       }}
       this.requestParam.data[1] = { 'name': 'updateFPbyFTChange', 'type': 'e', 'parammaps': {
         pastureid: this.table2.temp.pastureid,
@@ -2545,6 +2556,7 @@ export default {
           this.table2.temp.preftid = this.table2.temp.preftid
           this.table2.temp.autosecond = row.autosecond
           this.table2.temp.deviation = row.deviation
+          this.table2.temp.shutdown = row.shutdown
           this.table2.temp.id = row.id
           console.log('this.table2.updateList', this.table2.updateList)
           console.log('temp', this.table2.temp)
@@ -2580,6 +2592,9 @@ export default {
             this.$message({ type: 'error', message: '允许延时偏差不可超出搅拌延时', duration: 2000 })
             return false
           }
+          if (this.table2.temp.shutdown == '') {
+            this.table2.temp.shutdown = 0
+          }
           if (this.table2.temp.sort !== '') {
             this.table2.temp.sort = this.table2.temp.sort
           } else {
@@ -2634,7 +2649,8 @@ export default {
             preftid: this.table2.temp.preftid,
             autosecond: row.autosecond,
             id: row.id,
-            deviation:row.deviation
+            deviation:row.deviation,
+            shutdown: this.table2.temp.shutdown,
           }}
           this.requestParam.data[2] = { 'name': 'updateFPbyFTChange', 'type': 'e', 'parammaps': {
             pastureid: row.pastureid,
@@ -3092,6 +3108,7 @@ export default {
           ftid: this.table2.getdataListParm.parammaps.ftid,
           fid: this.detail.list2[0].id,
           fname: '@insertSpotList2.tname',
+          shutdown: '0',
           fweight: sumFweight,
           islockcount: '0',
           sort: parseInt(this.table2.list[this.table2.list.length - 1].sort) + 1,
@@ -3173,7 +3190,8 @@ export default {
           sort: '@insertSpotList.sort',
           feedgroup: '@insertSpotList.feedgroup',
           preftid: '@insertSpotList.preftid',
-          autosecond: '@insertSpotList.autosecond'
+          autosecond: '@insertSpotList.autosecond',
+          shutdown: '@insertSpotList.shutdown'
         }}
         this.requestParam.data[1].children[1] = { 'name': 'deleteFTdetail', 'type': 'e', 'parammaps': {
           pastureid: '@insertSpotList.pastureid',
@@ -3186,6 +3204,7 @@ export default {
           ftid: this.table2.getdataListParm.parammaps.ftid,
           fid: '@insertFT.LastInsertId',
           fname: '@insertSpotList2.tname',
+          shutdown: '0',
           fweight: sumFweight,
           islockcount: '0',
           sort: parseInt(this.table2.list[this.table2.list.length - 1].sort) + 1,