|
|
@@ -90,7 +90,10 @@
|
|
|
(categoryMsg.totalWeight =
|
|
|
categoryMsg.number === ''
|
|
|
? ''
|
|
|
- : categoryMsg.number * (infoData.productUnitWeight || 1))
|
|
|
+ : multiply(
|
|
|
+ categoryMsg.number,
|
|
|
+ infoData.productUnitWeight || 1
|
|
|
+ ))
|
|
|
"
|
|
|
clearable
|
|
|
></el-input>
|
|
|
@@ -105,7 +108,7 @@
|
|
|
<el-descriptions-item label="舟皿数量" :span="3"
|
|
|
><el-input
|
|
|
placeholder="请输入"
|
|
|
- v-model="boatMsg.extraField.num"
|
|
|
+ v-model="boatMsg.extraField.boatNum"
|
|
|
></el-input
|
|
|
></el-descriptions-item>
|
|
|
<el-descriptions-item label="质检项" :span="2">
|
|
|
@@ -326,7 +329,7 @@
|
|
|
rootCategoryLevelId: '',
|
|
|
specification: '',
|
|
|
extraField: {
|
|
|
- num: ''
|
|
|
+ boatNum: ''
|
|
|
}
|
|
|
}
|
|
|
};
|
|
|
@@ -436,11 +439,16 @@
|
|
|
name: this.infoData.productName,
|
|
|
code: this.infoData.productCode
|
|
|
});
|
|
|
+
|
|
|
+ const workReportCategoryList = [this.categoryMsg];
|
|
|
+ if (this.boatMsg.code) {
|
|
|
+ workReportCategoryList.push(this.boatMsg);
|
|
|
+ }
|
|
|
fun({
|
|
|
checkState: 1,
|
|
|
workReport: this.workReport,
|
|
|
workReportDeviceList: [this.workReportDeviceList],
|
|
|
- workReportCategoryList: [this.categoryMsg]
|
|
|
+ workReportCategoryList
|
|
|
}).then((res) => {
|
|
|
// this.$message.success('报工成功！');
|
|
|
// this.getReportCount();
|
quwangxin