|
@@ -297,10 +297,9 @@
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="停机时间" min-width="70px" align="center">
|
|
|
+ <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"/>
|
|
|
+ <el-switch v-model="scope.row.shutdown" :disabled="scope.row.NoEdit==true" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="顺序" min-width="70px" align="center">
|
|
@@ -350,7 +349,7 @@
|
|
|
@cell-dblclick="celldblclick"
|
|
|
>
|
|
|
<el-table-column type="selection" width="50" />
|
|
|
- <el-table-column label="序号" align="center" type="index" width="50px" />
|
|
|
+ <el-table-column label="序号11" align="center" type="index" width="50px" />
|
|
|
<el-table-column label="饲料组" min-width="120px" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="scope.row.groupNoEdit">{{ scope.row.feedgroup }}</span>
|
|
@@ -365,7 +364,7 @@
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="重量(KG)" prop="fweight" width="120px" align="center">
|
|
|
+ <el-table-column label="重量123(KG)" prop="fweight" width="120px" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="scope.row.NoEdit">{{ scope.row.fweight }}</span>
|
|
|
<el-input v-if="scope.row.Edit" v-model="scope.row.fweight" placeholder="重量" step="0.0001" type="number" style="width:95%;padding:10px 0;" />
|
|
@@ -379,6 +378,19 @@
|
|
|
</el-select>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <!-- TODO: -->
|
|
|
+ <el-table-column label="允许延时偏差(min)" min-width="80px" align="center">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="scope.row.NoEdit">{{ scope.row.deviation }}</span>
|
|
|
+ <el-input v-if="scope.row.Edit" v-model="scope.row.deviation" 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">
|
|
|
+ <el-switch v-model="scope.row.shutdown" :disabled="scope.row.NoEdit==true" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <!-- -->
|
|
|
<el-table-column v-if="lockCount.isLockCount" label="是否锁定牛头数比例" min-width="80px" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="scope.row.NoEdit && scope.row.islockcount == '0'">否</span>
|
|
@@ -2347,10 +2359,13 @@ export default {
|
|
|
}else if (this.table2.temp.fid === '') {
|
|
|
this.$message({ type: 'error', message: '饲料名称不能为空', duration: 2000 })
|
|
|
return false
|
|
|
- } else if (this.table2.temp.fweight === '') {
|
|
|
- this.$message({ type: 'error', message: '重量不能为空', duration: 2000 })
|
|
|
- return false
|
|
|
- } else if (this.table2.temp.autosecond === '') {
|
|
|
+ }
|
|
|
+ // TODO: 临时去掉限制重量
|
|
|
+ // else if (this.table2.temp.fweight === '') {
|
|
|
+ // this.$message({ type: 'error', message: '重量不能为空', duration: 2000 })
|
|
|
+ // return false
|
|
|
+ // }
|
|
|
+ else if (this.table2.temp.autosecond === '') {
|
|
|
this.$message({ type: 'error', message: '搅拌延时不能为空', duration: 2000 })
|
|
|
return false
|
|
|
} else if (this.table2.temp.deviation === '') {
|
|
@@ -2392,10 +2407,12 @@ export default {
|
|
|
row.fweight = formatNum(row.fweight, 4)
|
|
|
// return
|
|
|
// var ruleWeight = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/
|
|
|
- if (this.table2.temp.fweight == 0) {
|
|
|
- this.$message({ type: 'error', message: '重量请输入正数,最多保留四位小数', duration: 2000 })
|
|
|
- return false
|
|
|
- }
|
|
|
+
|
|
|
+ //TODO:
|
|
|
+ // if (this.table2.temp.fweight == 0) {
|
|
|
+ // this.$message({ type: 'error', message: '重量请输入正数,最多保留四位小数', duration: 2000 })
|
|
|
+ // return false
|
|
|
+ // }
|
|
|
this.isokDisable = true
|
|
|
setTimeout(() => {
|
|
|
this.isokDisable = false
|
|
@@ -2578,10 +2595,13 @@ export default {
|
|
|
}else if (this.table2.temp.fid === '') {
|
|
|
this.$message({ type: 'error', message: '饲料名称不能为空', duration: 2000 })
|
|
|
return false
|
|
|
- } else if (this.table2.temp.fweight === '') {
|
|
|
- this.$message({ type: 'error', message: '重量不能为空', duration: 2000 })
|
|
|
- return false
|
|
|
- } else if (this.table2.temp.autosecond === '') {
|
|
|
+ }
|
|
|
+ //TODO:
|
|
|
+ // else if (this.table2.temp.fweight === '') {
|
|
|
+ // this.$message({ type: 'error', message: '重量不能为空', duration: 2000 })
|
|
|
+ // return false
|
|
|
+ // }
|
|
|
+ else if (this.table2.temp.autosecond === '') {
|
|
|
this.$message({ type: 'error', message: '搅拌延时不能为空', duration: 2000 })
|
|
|
return false
|
|
|
} else if (this.table2.temp.deviation === '') {
|
|
@@ -2616,10 +2636,11 @@ export default {
|
|
|
row.fweight = formatNum(row.fweight, 4)
|
|
|
// 检验重量>0
|
|
|
// var ruleWeight = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/
|
|
|
- if (this.table2.temp.fweight == 0) {
|
|
|
- this.$message({ type: 'error', message: '重量请输入正数,最多保留四位小数', duration: 2000 })
|
|
|
- return false
|
|
|
- }
|
|
|
+ //TODO:
|
|
|
+ // if (this.table2.temp.fweight == 0) {
|
|
|
+ // this.$message({ type: 'error', message: '重量请输入正数,最多保留四位小数', duration: 2000 })
|
|
|
+ // return false
|
|
|
+ // }
|
|
|
console.log(row.fweight,'row.fweight')
|
|
|
let dateTime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
|
|
|
this.requestParam.common = { 'returnmap': '0' }
|