|
|
@@ -249,10 +249,7 @@
|
|
|
maxlength="9"
|
|
|
laceholder="计划件数"
|
|
|
:disabled="browseStatus || current !== before"
|
|
|
- @change="tfQty"
|
|
|
- >
|
|
|
- <template slot="append">{{ tfQtynum }}吨</template>
|
|
|
- </el-input>
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
@@ -1084,6 +1081,7 @@
|
|
|
<up-load
|
|
|
:relevantAttachments="relevantAttachments"
|
|
|
:createBy="form.createBy"
|
|
|
+ :browseStatus="browseStatus"
|
|
|
></up-load>
|
|
|
</el-collapse-item>
|
|
|
|
|
|
@@ -1929,7 +1927,10 @@
|
|
|
v-input-limit="2"
|
|
|
style="width: 100%"
|
|
|
placeholder="毛重"
|
|
|
- />
|
|
|
+ @change="tfGrossweight2"
|
|
|
+ >
|
|
|
+ <template slot="append">{{ tfGrossweightnum2 }}吨</template>
|
|
|
+ </el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
@@ -1938,8 +1939,11 @@
|
|
|
v-model.number="importList.fNetweight"
|
|
|
v-input-limit="2"
|
|
|
style="width: 100%"
|
|
|
- placeholder="毛重"
|
|
|
- />
|
|
|
+ placeholder="净重"
|
|
|
+ @change="tfNetweight2"
|
|
|
+ >
|
|
|
+ <template slot="append">{{ tfNetweightnum2 }}吨</template>
|
|
|
+ </el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -3580,9 +3584,10 @@ export default {
|
|
|
getRowList: [],
|
|
|
allCheck: false,
|
|
|
showSetting: false,
|
|
|
- tfQtynum: 0,
|
|
|
tfNetweightnum: 0,
|
|
|
tfGrossweightnum: 0,
|
|
|
+ tfNetweightnum2: 0,
|
|
|
+ tfGrossweightnum2: 0,
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -3794,15 +3799,18 @@ export default {
|
|
|
remark: null,
|
|
|
};
|
|
|
},
|
|
|
- tfQty(row) {
|
|
|
- this.tfQtynum = (row / 1000).toFixed(2);
|
|
|
- },
|
|
|
tfNetweight(row) {
|
|
|
this.tfNetweightnum = (row / 1000).toFixed(2);
|
|
|
},
|
|
|
+ tfNetweight2(row) {
|
|
|
+ this.tfNetweightnum2 = (row / 1000).toFixed(2);
|
|
|
+ },
|
|
|
tfGrossweight(row) {
|
|
|
this.tfGrossweightnum = (row / 1000).toFixed(2);
|
|
|
},
|
|
|
+ tfGrossweight2(row) {
|
|
|
+ this.tfGrossweightnum2 = (row / 1000).toFixed(2);
|
|
|
+ },
|
|
|
//列设置全选
|
|
|
allChecked() {
|
|
|
if (this.allCheck == true) {
|
|
|
@@ -4231,7 +4239,6 @@ export default {
|
|
|
Date.parse(this.form.freeContainerDate)
|
|
|
);
|
|
|
this.$set(this.form, "fFeetUnit", this.form.fFeetunit);
|
|
|
- this.tfQtynum = (this.form.fPlanqty / 1000).toFixed(2);
|
|
|
this.tfNetweightnum = (this.form.fPlannetweight / 1000).toFixed(2);
|
|
|
this.tfGrossweightnum = (this.form.fPlangrossweight / 1000).toFixed(2);
|
|
|
if (this.form.fTrademodeid) {
|
|
|
@@ -4721,7 +4728,13 @@ export default {
|
|
|
return prev;
|
|
|
}
|
|
|
}, 0);
|
|
|
- sums[index] = sums[index].toFixed(2);
|
|
|
+ if (column.property === "fGrossweight") {
|
|
|
+ sums[index] = (sums[index] / 1000).toFixed(2) + "吨";
|
|
|
+ } else if (column.property === "fNetweight") {
|
|
|
+ sums[index] = (sums[index] / 1000).toFixed(2) + "吨";
|
|
|
+ } else {
|
|
|
+ sums[index] = sums[index].toFixed(2);
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
this.sums = sums;
|
|
|
@@ -4740,7 +4753,6 @@ export default {
|
|
|
if (
|
|
|
column.property === "fUnitprice" ||
|
|
|
column.property === "fAmount" ||
|
|
|
- column.property === "fQty" ||
|
|
|
column.property === "fQty"
|
|
|
) {
|
|
|
sums[index] = values.reduce((prev, curr) => {
|
|
|
@@ -4763,9 +4775,11 @@ export default {
|
|
|
this.importList.fNetweight = Number(
|
|
|
(this.importList.fQty * Num1).toFixed(2)
|
|
|
);
|
|
|
+ this.tfNetweightnum2 = (this.importList.fNetweight / 1000).toFixed(2);
|
|
|
this.importList.fGrossweight = Number(
|
|
|
(this.importList.fQty * Num2).toFixed(2)
|
|
|
);
|
|
|
+ this.tfGrossweightnum2 = (this.importList.fGrossweight / 1000).toFixed(2);
|
|
|
},
|
|
|
imporComputer() {
|
|
|
this.playcomputer();
|
|
|
@@ -5019,6 +5033,8 @@ export default {
|
|
|
this.fWarehouseidOptions = response.data;
|
|
|
});
|
|
|
this.allfPlanqty += row.fQty;
|
|
|
+ this.tfNetweightnum2 = (row.fNetweight / 1000).toFixed(2);
|
|
|
+ this.tfGrossweightnum2 = (row.fGrossweight / 1000).toFixed(2);
|
|
|
row.fBsdate = new Date(row.fBsdate).getTime();
|
|
|
row.fBusinessType = row.fBusinessType.toString();
|
|
|
row.fCntrtype = Number(row.fCntrtype);
|
qukaidi