|
@@ -226,7 +226,7 @@
|
|
|
v-if="!isNaN(Number(itemform['成品焦']))"
|
|
|
refcous="true"
|
|
|
:rules="tableFormRules.weight"
|
|
|
- onkeyup="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
+ oninput="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
@keydown.native="keyDown" :id="scope.$index + scope.column.id"
|
|
|
@change="chnageSecondVal(scope.row.seq, tableFormDataObj[scope.row.seq].secondVal, scope.$index)"
|
|
|
:key="key"
|
|
@@ -253,7 +253,7 @@
|
|
|
v-if="!isNaN(Number(itemform['成品焦']))"
|
|
|
refcous="true"
|
|
|
:rules="tableFormRules.weight"
|
|
|
- onkeyup="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
+ oninput="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
@keydown.native="keyDown" :id="scope.$index + scope.column.id"
|
|
|
@change="chnageSecondVal(scope.row.seq, tableFormDataObj[scope.row.seq].secondVal, scope.$index)"
|
|
|
:key="key"
|
|
@@ -280,7 +280,7 @@
|
|
|
v-if="!isNaN(Number(itemform['成品焦']))"
|
|
|
refcous="true"
|
|
|
:rules="tableFormRules.weight"
|
|
|
- onkeyup="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
+ oninput="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
@keydown.native="keyDown" :id="scope.$index + scope.column.id"
|
|
|
@change="chnageSecondVal(scope.row.seq, tableFormDataObj[scope.row.seq].secondVal, scope.$index)"
|
|
|
:key="key"
|
|
@@ -306,15 +306,15 @@
|
|
|
:prop="scope.row.seq + '.weight'"
|
|
|
><el-input clearable
|
|
|
v-for="(itemform, key) in tableFormDataObj[scope.row.seq].weight"
|
|
|
+ :key="key"
|
|
|
+ v-if="!isNaN(Number(itemform['小粒焦']))"
|
|
|
style="width: 100%;"
|
|
|
v-model="itemform['小粒焦']"
|
|
|
- v-if="!isNaN(Number(itemform['小粒焦']))"
|
|
|
+ oninput="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
refcous="true"
|
|
|
- :rules="tableFormRules.weight"
|
|
|
- onkeyup="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
+ :rules="dialog.editorBox.form.weight"
|
|
|
@keydown.native="keyDown" :id="scope.$index + scope.column.id"
|
|
|
@change="chnageSecondVal(scope.row.seq, tableFormDataObj[scope.row.seq].secondVal, scope.$index)"
|
|
|
- :key="key"
|
|
|
></el-input>
|
|
|
<template slot="error" slot-scope="scope">
|
|
|
<p class="error" :title="scope.error">{{ scope.error }}</p>
|
|
@@ -338,7 +338,7 @@
|
|
|
v-if="!isNaN(Number(itemform['小粒焦']))"
|
|
|
refcous="true"
|
|
|
:rules="tableFormRules.weight"
|
|
|
- onkeyup="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
+ oninput="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
@keydown.native="keyDown" :id="scope.$index + scope.column.id"
|
|
|
@change="chnageSecondVal(scope.row.seq, tableFormDataObj[scope.row.seq].secondVal, scope.$index)"
|
|
|
:key="key"
|
|
@@ -365,7 +365,7 @@
|
|
|
v-if="!isNaN(Number(itemform['小粒焦']))"
|
|
|
refcous="true"
|
|
|
:rules="tableFormRules.weight"
|
|
|
- onkeyup="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
+ oninput="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
@keydown.native="keyDown" :id="scope.$index + scope.column.id"
|
|
|
@change="chnageSecondVal(scope.row.seq, tableFormDataObj[scope.row.seq].secondVal, scope.$index)"
|
|
|
:key="key"
|
|
@@ -395,7 +395,7 @@
|
|
|
v-if="!isNaN(Number(itemform['焦粉']))"
|
|
|
refcous="true"
|
|
|
:rules="tableFormRules.weight"
|
|
|
- onkeyup="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
+ oninput="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
@keydown.native="keyDown" :id="scope.$index + scope.column.id"
|
|
|
@change="chnageSecondVal(scope.row.seq, tableFormDataObj[scope.row.seq].secondVal, scope.$index)"
|
|
|
:key="key"
|
|
@@ -422,7 +422,7 @@
|
|
|
v-if="!isNaN(Number(itemform['焦粉']))"
|
|
|
refcous="true"
|
|
|
:rules="tableFormRules.weight"
|
|
|
- onkeyup="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
+ oninput="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
@keydown.native="keyDown" :id="scope.$index + scope.column.id"
|
|
|
@change="chnageSecondVal(scope.row.seq, tableFormDataObj[scope.row.seq].secondVal, scope.$index)"
|
|
|
:key="key"
|
|
@@ -449,7 +449,7 @@
|
|
|
v-if="!isNaN(Number(itemform['焦粉']))"
|
|
|
refcous="true"
|
|
|
:rules="tableFormRules.weight"
|
|
|
- onkeyup="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
+ oninput="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
@keydown.native="keyDown" :id="scope.$index + scope.column.id"
|
|
|
@change="chnageSecondVal(scope.row.seq, tableFormDataObj[scope.row.seq].secondVal, scope.$index)"
|
|
|
:key="key"
|
|
@@ -479,7 +479,7 @@
|
|
|
v-if="!isNaN(Number(itemform['除尘焦粉']))"
|
|
|
refcous="true"
|
|
|
:rules="tableFormRules.weight"
|
|
|
- onkeyup="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
+ oninput="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
@keydown.native="keyDown" :id="scope.$index + scope.column.id"
|
|
|
@change="chnageSecondVal(scope.row.seq, tableFormDataObj[scope.row.seq].secondVal, scope.$index)"
|
|
|
:key="key"
|
|
@@ -506,7 +506,7 @@
|
|
|
v-if="!isNaN(Number(itemform['除尘焦粉']))"
|
|
|
refcous="true"
|
|
|
:rules="tableFormRules.weight"
|
|
|
- onkeyup="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
+ oninput="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
@keydown.native="keyDown" :id="scope.$index + scope.column.id"
|
|
|
@change="chnageSecondVal(scope.row.seq, tableFormDataObj[scope.row.seq].secondVal, scope.$index)"
|
|
|
:key="key"
|
|
@@ -532,7 +532,7 @@
|
|
|
v-model="itemform['除尘焦粉']"
|
|
|
v-if="!isNaN(Number(itemform['除尘焦粉']))"
|
|
|
refcous="true"
|
|
|
- onkeyup="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
+ oninput="this.value = this.value.replace(/[^\d.]/g,'');"
|
|
|
:rules="tableFormRules.weight"
|
|
|
@keydown.native="keyDown" :id="scope.$index + scope.column.id"
|
|
|
@change="chnageSecondVal(scope.row.seq, tableFormDataObj[scope.row.seq].secondVal, scope.$index)"
|
|
@@ -1224,8 +1224,9 @@ export default {
|
|
|
priductIdTotal3 += Number(weiItem);
|
|
|
});
|
|
|
};
|
|
|
- sums[index] = (index % 15 === 0) ? priductIdTotal3 : (
|
|
|
- (index % 12 === 0) ? priductIdTotal2 : (index % 9 === 0) ? priductIdTotal1 : priductIdTotal);
|
|
|
+ console.log('1111');
|
|
|
+ sums[index] = (index % 14 === 0) ? priductIdTotal3 : (
|
|
|
+ (index % 11 === 0) ? priductIdTotal2 : (index % 8 === 0) ? priductIdTotal1 : priductIdTotal);
|
|
|
break;
|
|
|
case 'weight1':
|
|
|
priductIdTotal = 0;
|
|
@@ -1250,8 +1251,8 @@ export default {
|
|
|
priductIdTotal3 += Number(weiItem);
|
|
|
});
|
|
|
};
|
|
|
- sums[index] = (index % 16 === 0) ? priductIdTotal3 : (
|
|
|
- (index % 13 === 0) ? priductIdTotal2 : (index % 10 === 0) ? priductIdTotal1 : priductIdTotal);
|
|
|
+ sums[index] = (index % 15 === 0) ? priductIdTotal3 : (
|
|
|
+ (index % 12 === 0) ? priductIdTotal2 : (index % 9 === 0) ? priductIdTotal1 : priductIdTotal);
|
|
|
break;
|
|
|
case 'weight2':
|
|
|
priductIdTotal = 0;
|
|
@@ -1276,8 +1277,8 @@ export default {
|
|
|
priductIdTotal3 += Number(weiItem);
|
|
|
});
|
|
|
};
|
|
|
- sums[index] = (index % 17 === 0) ? priductIdTotal3 : (
|
|
|
- (index % 14 === 0) ? priductIdTotal2 : (index % 11 === 0) ? priductIdTotal1 : priductIdTotal);
|
|
|
+ sums[index] = (index % 16 === 0) ? priductIdTotal3 : (
|
|
|
+ (index % 13 === 0) ? priductIdTotal2 : (index % 10 === 0) ? priductIdTotal1 : priductIdTotal);
|
|
|
break;
|
|
|
default:
|
|
|
break;
|
|
@@ -1459,7 +1460,8 @@ export default {
|
|
|
zt: that.filterForm.data.zt,
|
|
|
measureid: that.filterForm.data.measureid,
|
|
|
exactsearch: that.filterForm.data.searchtype,
|
|
|
- parentid: that.filterForm.data.parentid
|
|
|
+ parentid: that.filterForm.data.parentid,
|
|
|
+ parentNum: that.nameObj.productid.arr.length
|
|
|
};
|
|
|
for (let key in pData) {
|
|
|
if (pData[key]) {
|
|
@@ -2071,6 +2073,7 @@ export default {
|
|
|
computed: {
|
|
|
activeUsers: function () {
|
|
|
let that = this;
|
|
|
+ console.log('111');
|
|
|
return that.tableData.filter(function (tableData) {
|
|
|
// console.log(tableData);
|
|
|
for (let item in tableData.weight) {
|