|
@@ -98,7 +98,6 @@
|
|
|
<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">{{ scope.row.r1 }}</span>
|
|
|
- <!-- <el-input v-if="scope.row.Edit" v-model="scope.row.r1" :disabled="scope.row.isOneWeight" step="0.01" type="number" style="width:100%;padding:10px 0;" @focus="focusR(scope.row)" @blur="blurR(scope.row,1)" /> -->
|
|
|
<el-input v-if="scope.row.Edit" 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)" />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -117,7 +116,6 @@
|
|
|
<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">{{ scope.row.r2 }}</span>
|
|
|
- <!-- <el-input v-if="scope.row.Edit" v-model="scope.row.r2" step="0.01" type="number" :disabled="scope.row.isTwoWeight" style="width:100%;padding:10px 0;" @focus="focusR(scope.row)" @blur="blurR(scope.row,2)" /> -->
|
|
|
<el-input v-if="scope.row.Edit" 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)" />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -136,7 +134,6 @@
|
|
|
<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">{{ scope.row.r3 }}</span>
|
|
|
- <!-- <el-input v-if="scope.row.Edit" v-model="scope.row.r3" step="0.01" type="number" :disabled="scope.row.isThreeWeight" style="width:100%;padding:10px 0;" @focus="focusR(scope.row)" @blur="blurR(scope.row,3)" /> -->
|
|
|
<el-input v-if="scope.row.Edit" 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)" />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -155,7 +152,6 @@
|
|
|
<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">{{ scope.row.r4 }}</span>
|
|
|
- <!-- <el-input v-if="scope.row.Edit" v-model="scope.row.r4" step="0.01" type="number" :disabled="scope.row.isFourWeight" style="width:100%;padding:10px 0;" @focus="focusR(scope.row)" @blur="blurR(scope.row,4)" /> -->
|
|
|
<el-input v-if="scope.row.Edit" 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)" />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -1077,13 +1073,6 @@ export default {
|
|
|
Nutritional: '营养评估',
|
|
|
history: '历史记录'
|
|
|
},
|
|
|
- focusWRow: {}, // 一班重量得到焦点暂存
|
|
|
- focusWRow2: {}, // 2班重量得到焦点暂存
|
|
|
- focusWRow3: {}, // 3班重量得到焦点暂存
|
|
|
- focusWRow4: {}, // 4班重量得到焦点暂存
|
|
|
- focusWRow5: {}, // 5班重量得到焦点暂存
|
|
|
- focusWRow6: {}, // 6班重量得到焦点暂存
|
|
|
- focusList1:{}, //比例失去焦点暂存
|
|
|
|
|
|
requestParam: {},
|
|
|
download: {
|
|
@@ -1774,10 +1763,7 @@ export default {
|
|
|
var todayfeed = parseFloat(sumw) + parseFloat(sumbw)
|
|
|
this.$set(row, 'todayfeed', todayfeed)
|
|
|
},
|
|
|
- // 总比例
|
|
|
- focusR(row){
|
|
|
- this.focusList1 = Object.assign({}, row)
|
|
|
- },
|
|
|
+
|
|
|
blurR(row,item) {
|
|
|
if (row.ftid !== '-1' && row.ftid !== '') {
|
|
|
row.Sfweight = this.recipeTemplateList.find(obj => obj.id == row.ftid).Sfweight
|
|
@@ -1863,31 +1849,6 @@ export default {
|
|
|
var todayfeed = parseFloat(sumw) + parseFloat(sumbw)
|
|
|
this.$set(row, 'todayfeed', todayfeed)
|
|
|
},
|
|
|
- // 一班重量得到焦点
|
|
|
- focusW(row) {
|
|
|
- console.log(row, '====')
|
|
|
- this.focusWRow = Object.assign({}, row)
|
|
|
- },
|
|
|
- // 1班重量得到焦点
|
|
|
- focusW2(row) {
|
|
|
- this.focusWRow2 = Object.assign({}, row)
|
|
|
- },
|
|
|
- // 3班重量得到焦点
|
|
|
- focusW3(row) {
|
|
|
- this.focusWRow3 = Object.assign({}, row)
|
|
|
- },
|
|
|
- // 4班重量得到焦点
|
|
|
- focusW4(row) {
|
|
|
- this.focusWRow4 = Object.assign({}, row)
|
|
|
- },
|
|
|
- // 5班重量得到焦点
|
|
|
- focusW5(row) {
|
|
|
- this.focusWRow5 = Object.assign({}, row)
|
|
|
- },
|
|
|
- // 6班重量得到焦点
|
|
|
- focusW6(row) {
|
|
|
- this.focusWRow6 = Object.assign({}, row)
|
|
|
- },
|
|
|
celldblclick(row, column, cell, event) {
|
|
|
console.log(row, '=====')
|
|
|
this.handleUpdate(row)
|
|
@@ -1991,6 +1952,9 @@ export default {
|
|
|
// }
|
|
|
this.table.rwList = arr
|
|
|
console.log('点击了编辑保存', row)
|
|
|
+ if(row.feedweight == ''){
|
|
|
+ row.feedweight = row.todayweight
|
|
|
+ }
|
|
|
this.table.temp.pastureid = row.pastureid
|
|
|
this.table.temp.id = row.id
|
|
|
this.table.temp.barname = row.barname
|