Merge branch 'feature/recipeTemplate-delate' of duanxiaoduan/tmr-admin into release/v1.0.2

src/views/formulationPlan/dhedFormula/index.vue

@@ -66,7 +66,7 @@
         <el-table-column :key="3" label="实际牛头数" min-width="80px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit && !isproportion">{{ scope.row.ccount }}</span>
-            <el-input v-if="scope.row.Edit || isproportion" v-model="scope.row.ccount" step="0.01" type="number" style="width:100%;padding:10px 0;" @blur="blurCcount(scope.row)" :placeholder="scope.row.placeholder_ccount" />
+            <el-input v-if="scope.row.Edit || isproportion" v-model="scope.row.ccount" step="0.01" type="number" style="width:100%;padding:10px 0;" @blur="blurCcount(scope.row)" :placeholder="scope.row.placeholder_ccount" @focus="focusData(scope.row)" />
           </template>
         </el-table-column>
         <el-table-column :key="4" label="系数(%)" min-width="85px" align="center">
@@ -100,7 +100,7 @@
         <el-table-column v-if="table.isRW1" :key="8" label="第一班比例(%)" min-width="85px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit && !isproportion">{{ scope.row.r1 }}</span>
-            <el-input v-if="scope.row.Edit || isproportion" v-model="scope.row.r1" :disabled="scope.row.isOneWeight" step="0.01" type="number" style="width:100%;padding:10px 0;" @blur="blurR(scope.row,1)" :placeholder="scope.row.placeholder_r1" />
+            <el-input v-if="scope.row.Edit || isproportion" v-model="scope.row.r1" :disabled="scope.row.isOneWeight" step="0.01" type="number" style="width:100%;padding:10px 0;" @blur="blurR(scope.row,1)" :placeholder="scope.row.placeholder_r1" @focus="focusData(scope.row)"/>
           </template>
         </el-table-column>
         <el-table-column v-if="table.isRW1" :key="9" label="第一班重量" min-width="100px" align="center" :render-header="renderHeader">
@@ -118,7 +118,7 @@
         <el-table-column v-if="table.isRW2" :key="11" label="第二班比例(%)" min-width="85px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit && !isproportion">{{ scope.row.r2 }}</span>
-            <el-input v-if="scope.row.Edit || isproportion" v-model="scope.row.r2" step="0.01" type="number" :disabled="scope.row.isTwoWeight" style="width:100%;padding:10px 0;" @blur="blurR(scope.row,2)" :placeholder="scope.row.placeholder_r2" />
+            <el-input v-if="scope.row.Edit || isproportion" v-model="scope.row.r2" step="0.01" type="number" :disabled="scope.row.isTwoWeight" style="width:100%;padding:10px 0;" @blur="blurR(scope.row,2)" :placeholder="scope.row.placeholder_r2" @focus="focusData(scope.row)"/>
           </template>
         </el-table-column>
         <el-table-column v-if="table.isRW2" :key="12" label="第二班重量" min-width="100px" align="center" :render-header="renderHeader">
@@ -136,7 +136,7 @@
         <el-table-column v-if="table.isRW3" :key="14" label="第三班比例(%)" min-width="85px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit && !isproportion">{{ scope.row.r3 }}</span>
-            <el-input v-if="scope.row.Edit || isproportion" v-model="scope.row.r3" step="0.01" type="number" :disabled="scope.row.isThreeWeight" style="width:100%;padding:10px 0;" @blur="blurR(scope.row,3)" :placeholder="scope.row.placeholder_r3"/>
+            <el-input v-if="scope.row.Edit || isproportion" v-model="scope.row.r3" step="0.01" type="number" :disabled="scope.row.isThreeWeight" style="width:100%;padding:10px 0;" @blur="blurR(scope.row,3)" :placeholder="scope.row.placeholder_r3" @focus="focusData(scope.row)"/>
           </template>
         </el-table-column>
         <el-table-column v-if="table.isRW3" :key="15" label="第三班重量" min-width="100px" align="center" :render-header="renderHeader">
@@ -154,7 +154,7 @@
         <el-table-column v-if="table.isRW4" :key="17" label="第四班比例(%)" min-width="85px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit && !isproportion">{{ scope.row.r4 }}</span>
-            <el-input v-if="scope.row.Edit || isproportion" v-model="scope.row.r4" step="0.01" type="number" :disabled="scope.row.isFourWeight" style="width:100%;padding:10px 0;" @blur="blurR(scope.row,4)" :placeholder="scope.row.placeholder_r4" />
+            <el-input v-if="scope.row.Edit || isproportion" v-model="scope.row.r4" step="0.01" type="number" :disabled="scope.row.isFourWeight" style="width:100%;padding:10px 0;" @blur="blurR(scope.row,4)" :placeholder="scope.row.placeholder_r4" @focus="focusData(scope.row)"/>
           </template>
         </el-table-column>
         <el-table-column v-if="table.isRW4" :key="18" label="第四班重量" min-width="100px" align="center" :render-header="renderHeader">
@@ -172,7 +172,7 @@
         <el-table-column v-if="table.isRW5" :key="20" label="第五班比例(%)" min-width="85px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit && !isproportion">{{ scope.row.r5 }}</span>
-            <el-input v-if="scope.row.Edit || isproportion" v-model="scope.row.r5" step="0.01" type="number" :disabled="scope.row.isFiveWeight" style="width:100%;padding:10px 0;" @blur="blurR(scope.row,5)" :placeholder="scope.row.placeholder_r5" />
+            <el-input v-if="scope.row.Edit || isproportion" v-model="scope.row.r5" step="0.01" type="number" :disabled="scope.row.isFiveWeight" style="width:100%;padding:10px 0;" @blur="blurR(scope.row,5)" :placeholder="scope.row.placeholder_r5" @focus="focusData(scope.row)"/>
           </template>
         </el-table-column>
         <el-table-column v-if="table.isRW5" :key="21" label="第五班重量" min-width="100px" align="center" :render-header="renderHeader">
@@ -190,7 +190,7 @@
         <el-table-column v-if="table.isRW6" :key="23" label="第六班比例(%)" min-width="85px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit && !isproportion">{{ scope.row.r6 }}</span>
-            <el-input v-if="scope.row.Edit || isproportion" v-model="scope.row.r6" step="0.01" type="number" :disabled="scope.row.isSixWeight" style="width:100%;padding:10px 0;" @blur="blurR(scope.row,6)" :placeholder="scope.row.placeholder_r6" />
+            <el-input v-if="scope.row.Edit || isproportion" v-model="scope.row.r6" step="0.01" type="number" :disabled="scope.row.isSixWeight" style="width:100%;padding:10px 0;" @blur="blurR(scope.row,6)" :placeholder="scope.row.placeholder_r6" @focus="focusData(scope.row)"/>
           </template>
         </el-table-column>
         <el-table-column v-if="table.isRW6" :key="24" label="第六班重量" min-width="100px" align="center" :render-header="renderHeader">
@@ -247,7 +247,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
+            <el-button v-if="row.isUpdate && isRoleEdit" :disabled="isproportion" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
             <el-button v-if="row.isUpdateSave && isRoleEdit" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
             <span v-if="row.isUpdateSave && isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="row.isUpdateSave && isRoleEdit" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
@@ -3353,15 +3353,27 @@ export default {
       })
     },
     handle_batchEdit(){
+      // this.getList()
       this.isproportion = true
       console.log(this.isproportion)
       this.oldList =  JSON.parse(JSON.stringify(this.table.list));
-      // this.table.list.forEach((item,key)=>{
-      //   item.Edit = true
-      //   item.NoEdit = false
-      // })
+      this.table.list.forEach((item,key)=>{
+        item.Edit = false
+        item.NoEdit = true
+        item.isUpdate = true
+        item.isUpdateSave = false
+      })
       // row.Edit
     },
+    focusData(row){
+      console.log(row,'row')
+      this.oldList.forEach((item,key)=>{
+        if(row.id == item.id){
+          this.oldRowList = {...item}
+        }
+      })
+      console.log(this.oldRowList,'row')
+    },
     handle_batchEdit_save(){
       const arr = this.table.list.filter(item2 => {
         console.log(item2,'item2')

src/views/formulationPlan/recipeTemplate/index.vue

@@ -882,7 +882,7 @@ export default {
             fttypeid: '',
             fttype: '',
             remark: '',
-            enable: '',
+            enable: '1',
             source: ''
           }
         },
@@ -1322,7 +1322,7 @@ export default {
       this.table.getdataListParm.parammaps.fttype = ''
       this.table.getdataListParm.parammaps.tname = ''
       this.table.getdataListParm.parammaps.remark = ''
-      this.table.getdataListParm.parammaps.enable = ''
+      this.table.getdataListParm.parammaps.enable = '1'
       this.table.getdataListParm.parammaps.source = ''
       this.table.getdataListParm.parammaps.all = ''
       this.getList()
@@ -1617,18 +1617,12 @@ export default {
       MessageBox.confirm('是否确认删除此信息?', {
         confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
       }).then(() => {
-        this.requestParam.common = { 'returnmap': '0' }
-        this.requestParam.data = []
-        this.requestParam.data[0] = { 'name': 'checkdeleteFT', 'type': 'v', 'parammaps': {
-          pastureid: row.pastureid,
-          id: row.id
-        }}
-        this.requestParam.data[1] = { 'name': 'deleteFT', 'type': 'e', 'parammaps': {
-          pastureid: row.pastureid,
-          id: row.id
-        }}
-        ExecDataByConfig(this.requestParam).then(response => {
-          console.log('新增保存发送参数', this.requestParam)
+        const url = 'authdata/feedtemplet/del'
+        const data = {
+          ftId:row.id,
+          userId:Cookies.get('employeid')
+        }
+        postJson(url, data).then(response => {
           if (response.msg === 'fail') {
             this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
           } else {