|
|
@@ -136,7 +136,7 @@
|
|
|
></el-date-picker>
|
|
|
</template>
|
|
|
<template v-slot:requiredFormingNum="{ row }">
|
|
|
- <span>{{ row.requiredFormingNum }} {{ row.measuringUnit }}</span>
|
|
|
+ <span>{{ row.requiredFormingNum }} {{ row.unit }}</span>
|
|
|
</template>
|
|
|
<template v-slot:action="{ row, $index }">
|
|
|
<el-popconfirm
|
|
|
@@ -327,10 +327,9 @@
|
|
|
produceRoutingName: m.produceRoutingName || '',
|
|
|
productUnitWeight: m.productUnitWeight,
|
|
|
requiredFormingNum: m.requiredFormingNum,
|
|
|
- measuringUnit: m.measuringUnit,
|
|
|
startTime: m.startTime || '',
|
|
|
endTime: m.endTime || '',
|
|
|
- unit: this.unit,
|
|
|
+ unit: m.measuringUnit,
|
|
|
resourceType: 0
|
|
|
};
|
|
|
this.jhList.push(data);
|
|
|
@@ -346,7 +345,7 @@
|
|
|
},
|
|
|
|
|
|
submit: debounce(function (type) {
|
|
|
- this.$emit('publish', type);
|
|
|
+ this.$emit('publish', type, this.jhList);
|
|
|
this.visible = false;
|
|
|
}, 800)
|
|
|
}
|