|
|
@@ -531,12 +531,12 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="唛头" prop="fMarks">
|
|
|
+ <el-form-item label="品牌" prop="fMarks">
|
|
|
<el-input
|
|
|
v-model="form.fMarks"
|
|
|
style="width: 80%"
|
|
|
:disabled="browseStatus || formBrowseStatus"
|
|
|
- placeholder="唛头"
|
|
|
+ placeholder="品牌"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -939,12 +939,12 @@
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="140px"
|
|
|
- label="*唛头"
|
|
|
+ label="*品牌"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
v-model="scope.row.fMarks"
|
|
|
- placeholder="唛头"
|
|
|
+ placeholder="品牌"
|
|
|
:disabled="
|
|
|
browseStatus ||
|
|
|
scope.row.fBillstatus === 20 ||
|
|
|
@@ -2230,7 +2230,7 @@
|
|
|
<td width="100"></td>
|
|
|
<td width="100">包</td>
|
|
|
<td width="100">吨</td>
|
|
|
- <td width="100"></td>
|
|
|
+ <td width="100">{{ fPackagespecs }}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td width="100">序号</td>
|
|
|
@@ -2527,6 +2527,7 @@ export default {
|
|
|
fGrossweight: 0,
|
|
|
fid: "",
|
|
|
fCntqty: "",
|
|
|
+ fPackagespecs: '',
|
|
|
fNetweight: 0,
|
|
|
fQty: 0,
|
|
|
mum: 0,
|
|
|
@@ -3002,7 +3003,7 @@ export default {
|
|
|
return false;
|
|
|
}
|
|
|
if (!this.Printinglist[warehouseCr].fMarks) {
|
|
|
- this.$message.error("请输入唛头");
|
|
|
+ this.$message.error("请输入品牌");
|
|
|
return false;
|
|
|
}
|
|
|
if (!this.Printinglist[warehouseCr].fQty) {
|
|
|
@@ -3357,10 +3358,14 @@ export default {
|
|
|
console.log(this.dataWithdrawList)
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ console.log(this.dataListSelection)
|
|
|
if (this.dataListSelection.length > 0) {
|
|
|
this.fTruckno = selection[0].fTruckno;
|
|
|
this.fCntrtype = selection[0].fCntrtype;
|
|
|
this.fGoodsids = selection[0].fGoodsids;
|
|
|
+ this.fPackagespecs = selection[0].fPackagespecs;
|
|
|
+ console.log(this.fGoodsids)
|
|
|
var date = new Date(selection[0].fBsdate);
|
|
|
var Y = date.getFullYear() + "-";
|
|
|
var M =
|
|
|
@@ -3371,6 +3376,7 @@ export default {
|
|
|
(date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
|
|
|
this.fBsdates = Y + M + D;
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
// 打印回显仓库
|
|
|
for (let corp in this.warehouseOptions) {
|
|
|
@@ -3604,10 +3610,10 @@ export default {
|
|
|
this.fPlangNumber = this.form.fPlangrossweight / this.form.fPlanqty;
|
|
|
this.planningList.fPlannetweight = (
|
|
|
Number(this.planningList.fPlanqty) * Number(this.fPlaNnumber)
|
|
|
- ).toFixed(6);
|
|
|
+ ).toFixed(2);
|
|
|
this.planningList.fPlangrossweight = (
|
|
|
Number(this.planningList.fPlanqty) * Number(this.fPlangNumber)
|
|
|
- ).toFixed(6);
|
|
|
+ ).toFixed(2);
|
|
|
},
|
|
|
// 数量计算
|
|
|
changeContractAmt(row) {
|
tong