|
|
@@ -267,7 +267,7 @@
|
|
|
<!-- <el-table-column label="货转客户名称" align="center" prop="fTocorpid" /> -->
|
|
|
<el-table-column label="入库毛重" align="center" prop="fGrossweight" />
|
|
|
<el-table-column label="净重" align="center" prop="fNetweight" />
|
|
|
- <el-table-column width="100" label="状态" align="center" prop="fStatus" />
|
|
|
+ <el-table-column width="100" label="状态" align="center" prop="fItemsStatus" />
|
|
|
<el-table-column
|
|
|
label="操作"
|
|
|
align="center"
|
|
|
@@ -564,19 +564,19 @@
|
|
|
>{{detailsHidden?"隐藏":"展开"}}</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
- type="danger"
|
|
|
+ type="success"
|
|
|
prop="打印"
|
|
|
@click="showEditDialog_ss"
|
|
|
>收货单
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
- type="danger"
|
|
|
+ type="warning"
|
|
|
prop="打印"
|
|
|
@click="showEditDialog_s"
|
|
|
>入库单
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
- type="danger"
|
|
|
+ type="info"
|
|
|
prop="打印"
|
|
|
@click="showEditDialog_sss"
|
|
|
>作业单
|
|
|
@@ -740,7 +740,7 @@
|
|
|
</el-form>
|
|
|
|
|
|
<div class="dialogTableTitle flex a-center jlr">
|
|
|
- <h2>库存明细</h2>
|
|
|
+ <h3>库存明细</h3>
|
|
|
<el-button :disabled="browseStatus" @click.prevent="addRelevant()"
|
|
|
>新增
|
|
|
</el-button>
|
|
|
@@ -776,6 +776,7 @@
|
|
|
<el-date-picker
|
|
|
v-model="scope.row.fBsdate"
|
|
|
style="width: 138px"
|
|
|
+ :disabled="browseStatus"
|
|
|
type="date"
|
|
|
value-format="timestamp"
|
|
|
placeholder="入库日期"
|
|
|
@@ -813,7 +814,7 @@
|
|
|
header-align="center"
|
|
|
width="140px"
|
|
|
align="center"
|
|
|
- label="库区"
|
|
|
+ label="*库区"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-select
|
|
|
@@ -939,7 +940,7 @@
|
|
|
header-align="center"
|
|
|
width="150px"
|
|
|
align="center"
|
|
|
- label="入库毛重"
|
|
|
+ label="*入库毛重"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
@@ -956,7 +957,7 @@
|
|
|
header-align="center"
|
|
|
width="150px"
|
|
|
align="center"
|
|
|
- label="入库净重"
|
|
|
+ label="*入库净重"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
@@ -973,7 +974,7 @@
|
|
|
header-align="center"
|
|
|
width="150px"
|
|
|
align="center"
|
|
|
- label="入库件数"
|
|
|
+ label="*入库件数"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
@@ -990,7 +991,7 @@
|
|
|
header-align="center"
|
|
|
width="150px"
|
|
|
align="center"
|
|
|
- label="包装规格"
|
|
|
+ label="*包装规格"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
@@ -1069,20 +1070,20 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="remark"
|
|
|
+ prop="fBillstatus"
|
|
|
header-align="center"
|
|
|
width="150px"
|
|
|
align="center"
|
|
|
label="状态"
|
|
|
>
|
|
|
- <!-- <template slot-scope="scope">
|
|
|
+ <template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.fstatus"
|
|
|
+ v-model="scope.row.fBillstatus"
|
|
|
placeholder="状态"
|
|
|
:disabled="browseStatus"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
- </template> -->
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
header-align="center"
|
|
|
@@ -1100,7 +1101,7 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<div class="dialogTableTitle flex a-center jlr">
|
|
|
- <h2>附件上传</h2>
|
|
|
+ <h3>附件上传</h3>
|
|
|
<el-button :disabled="browseStatus" @click.prevent="addRelevt()"
|
|
|
>新增
|
|
|
</el-button>
|
|
|
@@ -1192,7 +1193,7 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<div class="dialogTableTitle flex a-center jlr">
|
|
|
- <h2>收款信息</h2>
|
|
|
+ <h3>收款信息</h3>
|
|
|
<el-button :disabled="browseStatus" @click.prevent="addCollection()"
|
|
|
>新增
|
|
|
</el-button>
|
|
|
@@ -1424,7 +1425,7 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<div class="dialogTableTitle flex a-center jlr">
|
|
|
- <h2>付款信息</h2>
|
|
|
+ <h3>付款信息</h3>
|
|
|
<el-button :disabled="browseStatus" @click.prevent="addpayment()"
|
|
|
>新增
|
|
|
</el-button>
|
|
|
@@ -1659,19 +1660,19 @@
|
|
|
</el-table>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button
|
|
|
- type="danger"
|
|
|
+ type="success"
|
|
|
prop="打印"
|
|
|
@click="showEditDialog_ss"
|
|
|
- >收货单
|
|
|
+ >收货单
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
- type="danger"
|
|
|
+ type="warning"
|
|
|
prop="打印"
|
|
|
@click="showEditDialog_s"
|
|
|
- >入库单
|
|
|
+ >入库单
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
- type="danger"
|
|
|
+ type="info"
|
|
|
prop="打印"
|
|
|
@click="showEditDialog_sss"
|
|
|
>作业单
|
|
|
@@ -2024,6 +2025,7 @@ export default {
|
|
|
fFeeUnitid: "",
|
|
|
fFeeUnitids: "",
|
|
|
fGrossweight: "",
|
|
|
+ fid:"",
|
|
|
fCntqty: "",
|
|
|
fNetweight: "",
|
|
|
fQty: "",
|
|
|
@@ -2368,6 +2370,16 @@ export default {
|
|
|
this.loading = true;
|
|
|
listWarehousebills(this.queryParams).then((response) => {
|
|
|
this.warehousebillsList = response.rows;
|
|
|
+ for (let li in this.warehousebillsList) {
|
|
|
+ if(this.warehousebillsList[li].fItemsStatus === '6') {
|
|
|
+ this.warehousebillsList[li].fItemsStatus = "已入账"
|
|
|
+ // this.browseStatus = true;
|
|
|
+ } else if(this.warehousebillsList[li].fItemsStatus === '1') {
|
|
|
+ this.warehousebillsList[li].fItemsStatus = "未入账"
|
|
|
+ } else {
|
|
|
+ this.warehousebillsList[li].fItemsStatus = "未完成所有入账"
|
|
|
+ }
|
|
|
+ }
|
|
|
console.log(response.rows);
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
|
@@ -2575,6 +2587,11 @@ export default {
|
|
|
"fBsdate",
|
|
|
Date.parse(this.dataList[list].fBsdate)
|
|
|
);
|
|
|
+ if(this.dataList[list].fBillstatus === '6'){
|
|
|
+ this.$set(this.dataList[list], "fBillstatus", '已入账');
|
|
|
+ } else {
|
|
|
+ this.$set(this.dataList[list], "fBillstatus", '未入账');
|
|
|
+ }
|
|
|
}
|
|
|
this.goodsOptions = response.data.goodsList;
|
|
|
this.kqhouseOptions = response.data.warehouseAreas;
|
|
|
@@ -2768,12 +2785,36 @@ export default {
|
|
|
// 入账
|
|
|
creditClick () {
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
+ for (let warehouseCr in this.dataListSelection) {
|
|
|
+ if (!this.dataListSelection[warehouseCr].fWarehouselocid) {
|
|
|
+ this.$message.error("请选择库区");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (!this.dataListSelection[warehouseCr].fGrossweight) {
|
|
|
+ this.$message.error("请选择入库毛重");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (!this.dataListSelection[warehouseCr].fNetweight) {
|
|
|
+ this.$message.error("请选择入库净重");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (!this.dataListSelection[warehouseCr].fQty) {
|
|
|
+ this.$message.error("入库件数");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if (!this.dataListSelection[warehouseCr].fPackagespecs) {
|
|
|
+ this.$message.error("入库件数");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ }
|
|
|
if (valid) {
|
|
|
let formData = new window.FormData();
|
|
|
formData.append("warehouseBills", JSON.stringify(this.form))
|
|
|
formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection))
|
|
|
formData.append("whgenleg", JSON.stringify(this.relevantAttachments))
|
|
|
addWhgenleg(formData).then((response) => {
|
|
|
+ console.log(response)
|
|
|
+ this.fid = response.data;
|
|
|
this.creditStatus = true
|
|
|
this.msgSuccess("入账成功");
|
|
|
for (let li in this.dataListSelection) {
|
|
|
@@ -2804,6 +2845,7 @@ export default {
|
|
|
console.log(this.dataList);
|
|
|
console.log(this.warehouseCrList);
|
|
|
console.log(this.warehouseDrList);
|
|
|
+
|
|
|
if (valid) {
|
|
|
this.form.fBillstatus = status;
|
|
|
this.form.fNetweight = this.fNetweight;
|
|
|
@@ -2813,6 +2855,8 @@ export default {
|
|
|
this.form.fPlanqty = this.fPlanqty;
|
|
|
this.form.fGrossweight = this.fGrossweight;
|
|
|
this.form.fQty = this.fQty;
|
|
|
+ this.form.fId = this.fid;
|
|
|
+ console.log(this.form)
|
|
|
let formData = new window.FormData();
|
|
|
// 附件数据
|
|
|
formData.append("tWarehouseBills", JSON.stringify(this.form));
|
|
|
@@ -2903,7 +2947,9 @@ export default {
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
+ console.log(this.warehouseCrList);
|
|
|
if (valid) {
|
|
|
+
|
|
|
this.form.fBillstatus = status;
|
|
|
this.form.fNetweight = this.fNetweight;
|
|
|
this.form.fPlangrossweight = this.fPlangrossweight;
|
|
|
@@ -2912,8 +2958,11 @@ export default {
|
|
|
this.form.fPlanqty = this.fPlanqty;
|
|
|
this.form.fGrossweight = this.fGrossweight;
|
|
|
this.form.fQty = this.fQty;
|
|
|
+ this.form.fId = this.fid
|
|
|
+ console.log(this.form)
|
|
|
console.log(this.amt);
|
|
|
let formData = new window.FormData();
|
|
|
+
|
|
|
// 附件数据
|
|
|
formData.append("tWarehouseBills", JSON.stringify(this.form));
|
|
|
// 库存明细
|
|
|
@@ -3098,6 +3147,9 @@ export default {
|
|
|
margin-left: 50px;
|
|
|
}
|
|
|
.el-form-item {
|
|
|
- margin-bottom: 5px;
|
|
|
+ margin-bottom: 5px!important;
|
|
|
+}
|
|
|
+.el-form-item__label{
|
|
|
+ font-size: 12px!important;
|
|
|
}
|
|
|
</style>
|
caojunjie