|
|
@@ -267,6 +267,7 @@
|
|
|
:formatter="fTrademodeidFormat"
|
|
|
/> -->
|
|
|
<el-table-column label="仓库" align="center" prop="fWarehouseid" />
|
|
|
+ <el-table-column label="计划件数" align="center" prop="fPlannetweight" />
|
|
|
<el-table-column label="入库件数" align="center" prop="fQty" />
|
|
|
<!-- <el-table-column label="入库毛重" align="center" prop="fGrossweight"/>-->
|
|
|
<!-- <el-table-column label="货转客户名称" align="center" prop="fTocorpid" /> -->
|
|
|
@@ -1012,94 +1013,6 @@
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <!-- <el-table-column
|
|
|
- prop="fPlangrossweight"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="150px"
|
|
|
- label="计划毛重"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
- v-model="scope.row.fPlangrossweight"
|
|
|
- placeholder="计划毛重"
|
|
|
- :disabled="
|
|
|
- browseStatus ||
|
|
|
- scope.row.fBillstatus === 20 ||
|
|
|
- scope.row.fBillstatus === 30 ||
|
|
|
- scope.row.fBillstatus === 40
|
|
|
- "
|
|
|
- show-word-limit
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column> -->
|
|
|
- <!-- <el-table-column
|
|
|
- prop="fPlannetweight"
|
|
|
- header-align="center"
|
|
|
- align="center"
|
|
|
- width="150px"
|
|
|
- label="计划净重"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
- v-model="scope.row.fPlannetweight"
|
|
|
- :disabled="
|
|
|
- browseStatus ||
|
|
|
- scope.row.fBillstatus === 20 ||
|
|
|
- scope.row.fBillstatus === 30 ||
|
|
|
- scope.row.fBillstatus === 40
|
|
|
- "
|
|
|
- placeholder="计划净重"
|
|
|
- show-word-limit
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fPlanvolumn"
|
|
|
- header-align="center"
|
|
|
- width="150px"
|
|
|
- align="center"
|
|
|
- label="计划尺码"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d).*$/, "$1$2.$3")'
|
|
|
- v-model="scope.row.fPlanvolumn"
|
|
|
- placeholder="尺码"
|
|
|
- :disabled="
|
|
|
- browseStatus ||
|
|
|
- scope.row.fBillstatus === 20 ||
|
|
|
- scope.row.fBillstatus === 30 ||
|
|
|
- scope.row.fBillstatus === 40
|
|
|
- "
|
|
|
- show-word-limit
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
- prop="fPlanqty"
|
|
|
- header-align="center"
|
|
|
- width="150px"
|
|
|
- align="center"
|
|
|
- label="计划件数"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
- v-model="scope.row.fPlanqty"
|
|
|
- placeholder="件数"
|
|
|
- :disabled="
|
|
|
- browseStatus ||
|
|
|
- scope.row.fBillstatus === 20 ||
|
|
|
- scope.row.fBillstatus === 30 ||
|
|
|
- scope.row.fBillstatus === 40
|
|
|
- "
|
|
|
- show-word-limit
|
|
|
- />
|
|
|
- </template>
|
|
|
- </el-table-column> -->
|
|
|
<el-table-column
|
|
|
prop="fGrossweight"
|
|
|
header-align="center"
|
|
|
@@ -1375,8 +1288,8 @@
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="scope.row.fBillstatus === 40">已入账</span>
|
|
|
<span v-if="scope.row.fBillstatus === 20">待入库</span>
|
|
|
- <span v-if="scope.row.fBillstatus === 30">已卸货</span>
|
|
|
- <span v-if="scope.row.fBillstatus === 10">未入账</span>
|
|
|
+ <span v-if="scope.row.fBillstatus === 30">卸货中</span>
|
|
|
+ <span v-if="scope.row.fBillstatus === 10">计划</span>
|
|
|
<!-- <span v-if="scope.row.fBillstatus === '30'">待入库</span> -->
|
|
|
|
|
|
<!-- <span v-else>未入账</span> -->
|
|
|
@@ -2052,12 +1965,12 @@
|
|
|
@close="closeDialog"
|
|
|
width="70%"
|
|
|
>
|
|
|
- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
|
|
+ <el-form ref="planningList" :model="form" :rules="rules" label-width="120px">
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="计划件数" prop="fPlanqty">
|
|
|
<el-input
|
|
|
- v-model="form.fPlanqty"
|
|
|
+ v-model="planningList.fPlanqty"
|
|
|
style="width: 80%"
|
|
|
laceholder="计划件数"
|
|
|
@input="changeList(form)"
|
|
|
@@ -2067,7 +1980,7 @@
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="计划净重" prop="fPlannetweight">
|
|
|
<el-input
|
|
|
- v-model="form.fPlannetweight"
|
|
|
+ v-model="planningList.fPlannetweight"
|
|
|
style="width: 80%"
|
|
|
disabled
|
|
|
laceholder="计划毛重"
|
|
|
@@ -2077,7 +1990,7 @@
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="计划毛重" prop="fPlangrossweight">
|
|
|
<el-input
|
|
|
- v-model="form.fPlangrossweight"
|
|
|
+ v-model="planningList.fPlangrossweight"
|
|
|
style="width: 80%"
|
|
|
disabled
|
|
|
laceholder="计划毛重"
|
|
|
@@ -2773,6 +2686,11 @@ export default {
|
|
|
fCorpid: null,
|
|
|
fLineno: null,
|
|
|
},
|
|
|
+ planningList: {
|
|
|
+ fPlanqty: null,
|
|
|
+ fPlannetweight: null,
|
|
|
+ fPlangrossweight: null
|
|
|
+ },
|
|
|
// 表单参数
|
|
|
form: {
|
|
|
fItemsStatus: null,
|
|
|
@@ -2835,9 +2753,12 @@ export default {
|
|
|
this.getDicts("data_stltype_type").then((response) => {
|
|
|
this.fStltypeOptions = response.data;
|
|
|
});
|
|
|
+ this.getDicts("tax_rate").then((response) => {
|
|
|
+ this.fTaxrate = response.data[0].dictValue
|
|
|
+ console.log(this.fTaxrate)
|
|
|
+ });
|
|
|
this.getDicts("data_ifweigh_status").then((response) => {
|
|
|
this.fIfweighOptions = response.data;
|
|
|
- console.log(this.fIfweighOptions);
|
|
|
});
|
|
|
this.getDicts("data_ifpledge_status").then((response) => {
|
|
|
this.fIfpledgeOptions = response.data;
|
|
|
@@ -2856,11 +2777,12 @@ export default {
|
|
|
methods: {
|
|
|
// 上传成功返回数据
|
|
|
showFile(row) {
|
|
|
- // this.$set(this.relevantAttachments[0], 'fName', row.fileName)
|
|
|
- this.$set(this.relevantAttachments[0], "fUrl", row.url);
|
|
|
+ for(let list in this.relevantAttachments) {
|
|
|
+ this.$set(this.relevantAttachments[list], "fUrl", row.url);
|
|
|
+ this.$set(this.relevantAttachments[list], "fName", row.fileName);
|
|
|
+ }
|
|
|
},
|
|
|
printSomething() {
|
|
|
- console.log("111111");
|
|
|
// 此处的style即为打印时的样式
|
|
|
const style =
|
|
|
"@media print { .print-div{ padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center}}";
|
|
|
@@ -2959,15 +2881,13 @@ export default {
|
|
|
});
|
|
|
return false;
|
|
|
}
|
|
|
+ this.planningList.fPlanqty = Number(this.form.fPlanqty) - Number(this.fQty),
|
|
|
+ this.planningList.fPlannetweight = Number(this.form.fPlannetweight) - Number(this.fNetweight),
|
|
|
+ this.planningList.fPlangrossweight = Number(this.form.fPlangrossweight) - Number(this.fGrossweight),
|
|
|
this.fPlaNnumber = this.form.fPlannetweight/this.form.fPlanqty;
|
|
|
this.fPlangNumber = this.form.fPlangrossweight/this.form.fPlanqty;
|
|
|
this.weightList = true;
|
|
|
let time = null;
|
|
|
- // console.log(this.dataList)
|
|
|
- // console.log(this.dataList[0].fBillstatus)
|
|
|
-
|
|
|
-
|
|
|
- // console.log(this.dataList[0].fBillstatus);
|
|
|
},
|
|
|
|
|
|
// 收货单打印界面
|
|
|
@@ -3130,6 +3050,7 @@ export default {
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
listWarehousebills(this.queryParams).then((response) => {
|
|
|
+ console.log(response)
|
|
|
this.warehousebillsList = response.rows;
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
|
@@ -3154,9 +3075,17 @@ export default {
|
|
|
},
|
|
|
// 导入计划重量
|
|
|
costList() {
|
|
|
- // if (this.form.fBsdate) {
|
|
|
- // time = this.form.fBsdate;
|
|
|
- // }
|
|
|
+ console.log(this.planningList.fPlanqty)
|
|
|
+ console.log(this.form.fPlanqty)
|
|
|
+ if( Number(this.planningList.fPlanqty) > Number(this.form.fPlanqty)) {
|
|
|
+ console.log(this.planningList.fPlanqty)
|
|
|
+ console.log(this.form.fPlanqty)
|
|
|
+ this.$message({
|
|
|
+ message: "计划费件数不能大于主表计划费件数！",
|
|
|
+ type: "warning",
|
|
|
+ });
|
|
|
+ return false;
|
|
|
+ }
|
|
|
this.dataList.push({
|
|
|
fBsdate: this.form.fBsdate,
|
|
|
fGoodsid: null,
|
|
|
@@ -3164,11 +3093,11 @@ export default {
|
|
|
fCntqty: 1,
|
|
|
// fPlangrossweight: 0,
|
|
|
// fPlannetweight: 0,
|
|
|
- fNetweight: this.form.fPlannetweight,
|
|
|
+ fNetweight: this.planningList.fPlannetweight,
|
|
|
fPlanvolumn: 0,
|
|
|
// fPlanqty: 0,
|
|
|
- fGrossweight: this.form.fPlangrossweight,
|
|
|
- fQty: this.form.fPlanqty,
|
|
|
+ fGrossweight: this.planningList.fPlangrossweight,
|
|
|
+ fQty: this.planningList.fPlanqty,
|
|
|
fPackagespecs: null,
|
|
|
fWarehouselocid: null,
|
|
|
fBoxno: null,
|
|
|
@@ -3203,6 +3132,8 @@ export default {
|
|
|
fUnitprice: this.dialogWhgenlegList[whgen].fPrice,
|
|
|
fCurrency: "RMB",
|
|
|
fExrate: "1",
|
|
|
+ fTaxrate: this.fTaxrate
|
|
|
+
|
|
|
});
|
|
|
console.log(JSON.stringify(this.warehouseDrList));
|
|
|
}
|
|
|
@@ -3228,6 +3159,7 @@ export default {
|
|
|
fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
|
|
|
fCurrency: "RMB",
|
|
|
fExrate: "1",
|
|
|
+ fTaxrate: this.fTaxrate
|
|
|
});
|
|
|
}
|
|
|
this.warehousingagreements = false;
|
|
|
@@ -3361,12 +3293,12 @@ export default {
|
|
|
for (let se in selection) {
|
|
|
if (
|
|
|
!selection[se].fBillstatus ||
|
|
|
- selection[se].fBillstatus !== "40"
|
|
|
+ selection[se].fBillstatus !== 40
|
|
|
) {
|
|
|
this.dataListSelection.push(selection[se]);
|
|
|
} else if (
|
|
|
selection[se].fBillstatus &&
|
|
|
- selection[se].fBillstatus === "40"
|
|
|
+ selection[se].fBillstatus === 40
|
|
|
) {
|
|
|
this.dataWithdrawList.push(selection[se]);
|
|
|
}
|
|
|
@@ -3509,18 +3441,9 @@ export default {
|
|
|
sums[index] = "";
|
|
|
return;
|
|
|
}
|
|
|
- // if (column.property === "fPlangrossweight") {
|
|
|
- // values = data.map((item) => Number(item["fPlangrossweight"]));
|
|
|
- // }
|
|
|
- // if (column.property === "fPlannetweight") {
|
|
|
- // values = data.map((item) => Number(item["fPlannetweight"]));
|
|
|
- // }
|
|
|
if (column.property === "fPlanvolumn") {
|
|
|
values = data.map((item) => Number(item["fPlanvolumn"]));
|
|
|
}
|
|
|
- // if (column.property === "fPlanqty") {
|
|
|
- // values = data.map((item) => Number(item["fPlanqty"]));
|
|
|
- // }
|
|
|
if (column.property === "fGrossweight") {
|
|
|
values = data.map((item) => Number(item["fGrossweight"]));
|
|
|
}
|
|
|
@@ -3532,12 +3455,9 @@ export default {
|
|
|
}
|
|
|
if (column.property === "fCntqty") {
|
|
|
values = data.map((item) => Number(item["fCntqty"]));
|
|
|
- } // const values = data.map(item => Number(item[column.property]))
|
|
|
+ }
|
|
|
if (
|
|
|
- // column.property === "fPlangrossweight" ||
|
|
|
- // column.property === "fPlannetweight" ||
|
|
|
column.property === "fPlanvolumn" ||
|
|
|
- // column.property === "fPlanqty" ||
|
|
|
column.property === "fGrossweight" ||
|
|
|
column.property === "fNetweight" ||
|
|
|
column.property === "fQty" ||
|
|
|
@@ -3546,18 +3466,9 @@ export default {
|
|
|
sums[index] = values.reduce((prev, curr) => {
|
|
|
const value = Number(curr);
|
|
|
if (!isNaN(value)) {
|
|
|
- // if (column.property === "fPlangrossweight") {
|
|
|
- // this.fPlangrossweight = prev + curr;
|
|
|
- // }
|
|
|
- // if (column.property === "fPlannetweight") {
|
|
|
- // this.fPlannetweight = prev + curr;
|
|
|
- // }
|
|
|
if (column.property === "fPlanvolumn") {
|
|
|
this.fPlanvolumn = prev + curr;
|
|
|
}
|
|
|
- // if (column.property === "fPlanqty") {
|
|
|
- // this.fPlanqty = prev + curr;
|
|
|
- // }
|
|
|
if (column.property === "fGrossweight") {
|
|
|
this.fGrossweight = prev + curr;
|
|
|
}
|
|
|
@@ -3574,7 +3485,7 @@ export default {
|
|
|
} else {
|
|
|
return prev;
|
|
|
}
|
|
|
- }, 0); // sums[index]
|
|
|
+ }, 0);
|
|
|
}
|
|
|
});
|
|
|
this.sums = sums;
|
|
|
@@ -3603,7 +3514,7 @@ export default {
|
|
|
} else {
|
|
|
return prev;
|
|
|
}
|
|
|
- }, 0); // sums[index]
|
|
|
+ }, 0);
|
|
|
}
|
|
|
});
|
|
|
return sums;
|
|
|
@@ -3612,8 +3523,9 @@ export default {
|
|
|
changeList(row) {
|
|
|
console.log(row)
|
|
|
console.log(this.fPlaNnumber)
|
|
|
- this.form.fPlannetweight = Number(this.form.fPlanqty)*Number(this.fPlaNnumber);
|
|
|
- this.form.fPlangrossweight = Number(this.form.fPlanqty)*Number(this.fPlangNumber);
|
|
|
+
|
|
|
+ this.planningList.fPlannetweight = Number(this.planningList.fPlanqty)*Number(this.fPlaNnumber);
|
|
|
+ this.planningList.fPlangrossweight = Number(this.planningList.fPlanqty)*Number(this.fPlangNumber);
|
|
|
},
|
|
|
// 数量计算
|
|
|
changeContractAmt(row) {
|
|
|
@@ -3663,10 +3575,16 @@ export default {
|
|
|
if (!row.fFeeUnitid) {
|
|
|
return false;
|
|
|
}
|
|
|
- if (row.fFeeUnitid === "0") {
|
|
|
- this.$set(row, "fQty", this.fCntqty);
|
|
|
- } else if (row.fFeeUnitid === "1") {
|
|
|
+ if (row.fFeeUnitid === "2") {
|
|
|
this.$set(row, "fQty", this.fGrossweight);
|
|
|
+ }else if(row.fFeeUnitid === "1") {
|
|
|
+ this.$set(row, "fQty", this.fQty);
|
|
|
+ }
|
|
|
+ else if(row.fFeeUnitid === "3") {
|
|
|
+ this.$set(row, "fQty", this.fNetweight);
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ this.$set(row, "fQty", 0);
|
|
|
}
|
|
|
if (row.fUnitprice) {
|
|
|
this.$set(
|
|
|
@@ -3843,15 +3761,6 @@ export default {
|
|
|
this.$set(this.dataList[i], "fBillstatus", 20);
|
|
|
}
|
|
|
}
|
|
|
- // }
|
|
|
-
|
|
|
- // this.$set(
|
|
|
- // this.dataList[i],
|
|
|
- // "fSerialNumber",
|
|
|
- // response.data.warehousebillsitems[list].fSerialNumber
|
|
|
- // );
|
|
|
- // }
|
|
|
- // }
|
|
|
}
|
|
|
this.$refs.tableList.clearSelection();
|
|
|
});
|
|
|
@@ -3910,20 +3819,8 @@ export default {
|
|
|
discharge() {
|
|
|
if (this.Printinglist.length > 0) {
|
|
|
for (let warehouseCr in this.Printinglist) {
|
|
|
- console.log(this.Printinglist);
|
|
|
- // if (this.Printinglist[warehouseCr].fBillstatus === '20') {
|
|
|
- // this.$message.error("请先入库");
|
|
|
- // return false;
|
|
|
- // if (
|
|
|
- // this.Printinglist[warehouseCr].fDriverName !=
|
|
|
- // this.Printinglist[0].fDriverName
|
|
|
- // ) {
|
|
|
- // this.$message.error("请选择相同司机名");
|
|
|
- // return false;
|
|
|
- // }
|
|
|
}
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
-
|
|
|
if (valid) {
|
|
|
let formData = new window.FormData();
|
|
|
console.log(this.form);
|
|
|
@@ -3982,11 +3879,6 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
});
|
|
|
-
|
|
|
- // }else {
|
|
|
- // this.$message.error("请先入库");
|
|
|
-
|
|
|
- // }
|
|
|
|
|
|
} else {
|
|
|
this.$message.error("请选择需要卸货的明细!");
|
翁玉文