Merge branch 'feature/pushMaterialPlan-redo' of duanxiaoduan/tmr-admin into release/v1.0.2

src/views/basicData/equipmentTMR/index.vue

@@ -348,9 +348,9 @@ export default {
         return false
       }
       if (row.autosecond !== '0') {
-        const autozone = /^(?:[0-9]|1[0-9])$/
+        const autozone = /^(0|[1-9]|[1-3]\d|40)$/
         if (!autozone.test(parseFloat(this.table.temp.autozone))) {
-          this.$message({ type: 'error', message: '跳转重量域请输入0-20之间整数', duration: 2000 })
+          this.$message({ type: 'error', message: '跳转重量域请输入0-40之间整数', duration: 2000 })
           return false
         }
       }
@@ -493,12 +493,12 @@ export default {
         return false
       }
       console.log(row.autozone, '=0000')
-      if (row.autosecond !== '0') {
-        const autozone = /^(?:[0-9]|1[0-9])$/
-        if (!autozone.test(parseFloat(this.table.temp.autozone))) {
-          this.$message({ type: 'error', message: '跳转重量域请输入0-20之间整数', duration: 2000 })
-          return false
-        }
+      if (row.autosecond !== '0') {
+        const autozone = /^(0|[1-9]|[1-3]\d|40)$/
+        if (!autozone.test(parseFloat(this.table.temp.autozone))) {
+          this.$message({ type: 'error', message: '跳转重量域请输入0-40之间整数', duration: 2000 })
+          return false
+        }
       }
       const pattern = new RegExp("[`~!@#$^&*()=|{}':;',\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；：”“'。，、？]")
       if (pattern.test(this.table.temp.eqcode)) {

src/views/formulationPlan/recipeTemplate/index.vue

@@ -145,6 +145,12 @@
                 <el-switch v-model="scope.row.enable" :disabled="scope.row.NoEdit==true" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" @change="handleEnableChange(scope.$index, scope.row)" />
               </template>
             </el-table-column>
+            <el-table-column label="跳转重量域(kg)" min-width="85px" align="center">
+              <template slot-scope="scope">
+                <span v-if="scope.row.NoEdit">{{ scope.row.autozone }}</span>
+                <el-input v-if="scope.row.Edit" v-model="scope.row.autozone" type="textarea" :disabled="scope.row.fttype !=='预混配方'" :autosize="{ minRows: 1.3, maxRows: 4}" style="width:95%;padding:10px 0;" />
+              </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
                 <el-button v-if="row.NoEdit && isRoleEdit && ispastureuse==0" icon="el-icon-tickets" class="miniSuccess" @click="handleRowRecipeRecord(row)" />
@@ -171,6 +177,9 @@
         <div class="recipeTemplate">
           <p>配方详情表</p>
         </div>
+          <div style="line-height: 25px;border-bottom: 1px solid #000;margin-bottom: 10px;font-size:16px; font-weight: 600;">
+            <span :style="{color: table2.getdataListParm.parammaps.tcolor}">配方名称：{{table2.getdataListParm.parammaps.tname }}</span><span style="margin: 0 60px;">牲畜类别：{{table2.getdataListParm.parammaps.ccname}}</span><span>配方类型:{{table2.getdataListParm.parammaps.fttype}}</span>
+          </div>
         <div class="operation">
           <el-button v-if="isRoleEdit" style="float: left;" icon="el-icon-plus" class="success" @click="handleCreate2">新增</el-button>
           <el-button v-if="isRoleEdit" style="float: left;" icon="el-icon-delete" class="danger" @click="form_delete2">删除</el-button>
@@ -1329,7 +1338,7 @@ export default {
           return false
         }
       }
-      this.table.list.unshift({ 'myId': (new Date()).valueOf(), 'Edit': true, 'NoEdit': false, 'isCreate': true, 'isUpdate': false, 'isUpdateSave': false, 'enable': 1, 'tname': '', tcode: '', 'tcolor': '#ccc', 'ccid': '', 'ccname': '', 'fttype': '', 'fttypeid': '','volume':'', 'source': '自定义', 'remark': '','cattle':'' })
+      this.table.list.unshift({ 'myId': (new Date()).valueOf(), 'Edit': true, 'NoEdit': false, 'isCreate': true, 'isUpdate': false, 'isUpdateSave': false, 'enable': 1,'autozone':0, 'tname': '', tcode: '', 'tcolor': '#ccc', 'ccid': '', 'ccname': '', 'fttype': '', 'fttypeid': '','volume':'', 'source': '自定义', 'remark': '','cattle':'' })
       console.log('点击了新增this.table.list====>', this.table.list)
       this.table.temp = this.table.list[0]
       this.getTcodeList()
@@ -1368,6 +1377,9 @@ export default {
       if(this.table.temp.volume == '' || this.table.temp.volume == null){
         this.table.temp.volume = 0
       }
+      if( isNaN(this.table.temp.autozone) || this.table.temp.autozone == '' || this.table.temp.autozone == undefined){
+        this.table.temp.autozone = 0
+      }
       this.table.temp.volume = parseFloat(row.volume)
       this.table.temp.pastureid = Cookies.get('pastureid')
       if (this.table.temp.tname == '' && this.table.temp.ccid == '' && this.table.temp.fttypeid == '') {
@@ -1491,9 +1503,13 @@ export default {
       this.table.temp.pastureid = row.pastureid
       this.table.temp.id = row.id
       this.table.temp.cattle = row.cattle
+      this.table.temp.autozone = row.autozone
       if(this.table.temp.volume == '' || this.table.temp.volume == null || this.table.temp.volume == undefined){
         this.table.temp.volume = 0
       }
+      if( isNaN(this.table.temp.autozone) || this.table.temp.autozone == '' || this.table.temp.autozone == undefined){
+        this.table.temp.autozone = 0
+      }
       this.table.temp.volume = parseFloat(row.volume)
       if (this.table.temp.tname == '' && this.table.temp.ccid == '' && this.table.temp.fttypeid == '') {
         this.$message({ type: 'error', message: '配方名称/牲畜类别/配方类型不能为空', duration: 2000 })
@@ -1545,6 +1561,9 @@ export default {
         this.table.temp.volume = 0
       }
       console.log( this.table.temp.volume,'----')
+      if( isNaN(this.table.temp.autozone) || this.table.temp.autozone == '' || this.table.temp.autozone == undefined){
+        this.table.temp.autozone = 0
+      }
       this.requestParam.parammaps = this.table.temp
       PostDataByName(this.requestParam).then(response => {
         console.log('新增保存发送参数', this.requestParam)
@@ -1983,6 +2002,10 @@ export default {
       } else {
         if (column.label !== '操作') {
           this.isDetail = true // 点击行显示详情
+          this.table2.getdataListParm.parammaps.tcolor = row.tcolor
+          this.table2.getdataListParm.parammaps.tname = row.tname
+          this.table2.getdataListParm.parammaps.ccname = row.ccname
+          this.table2.getdataListParm.parammaps.fttype = row.fttype
           this.table2.getdataListParm.parammaps.ftid = row.id
           this.table2.getdataListParm.parammaps.fttypeid = row.fttypeid
           this.table2.getdataListParm.parammaps.dryweight = row.dryweight
@@ -1991,7 +2014,7 @@ export default {
           } else {
             this.requestParams[2].parammaps.type = ''
           }
-          this.myheight = document.documentElement.clientHeight - 85 - 265 - 185
+          this.myheight = document.documentElement.clientHeight - 85 - 265 - 230
           this.getList2()
           this.getDownList()
         }
@@ -2499,7 +2522,7 @@ export default {
         // 编辑true,不可编辑false
         row.Edit = true
         row.NoEdit = false
-        // 新增false,编辑false,编辑保存true 
+        // 新增false,编辑false,编辑保存true
         row.isCreate = false
         row.isUpdate = false
         row.isUpdateSave = true