|
|
@@ -205,6 +205,17 @@
|
|
|
>导出
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ type="warning"
|
|
|
+ icon="el-icon-download"
|
|
|
+ size="mini"
|
|
|
+ @click="handleExport"
|
|
|
+ :disabled="multiple"
|
|
|
+ v-hasPermi="['warehouseBusiness:warehousebills:export']"
|
|
|
+ >导入
|
|
|
+ </el-button>
|
|
|
+ </el-col>
|
|
|
<right-toolbar
|
|
|
:showSearch.sync="showSearch"
|
|
|
@queryTable="getList"
|
|
|
@@ -241,9 +252,8 @@
|
|
|
<!-- <el-table-column label="入库毛重" align="center" prop="fGrossweight"/>-->
|
|
|
<!-- <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
|
|
|
label="操作"
|
|
|
align="center"
|
|
|
@@ -717,7 +727,6 @@
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
-
|
|
|
</el-row>
|
|
|
</div>
|
|
|
</el-form>
|
|
|
@@ -727,6 +736,13 @@
|
|
|
<el-button :disabled="browseStatus" @click.prevent="addRelevant()"
|
|
|
>新增
|
|
|
</el-button>
|
|
|
+ <el-button :disabled="dataListSelection.length <= 0" @click.prevent="creditClick()"
|
|
|
+ >入库确认
|
|
|
+ </el-button>
|
|
|
+ <el-button :disabled="browseStatus" @click.prevent="deleteRoww(warehouseDrList)"
|
|
|
+ >删除
|
|
|
+ </el-button>
|
|
|
+ <el-button type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
</div>
|
|
|
<el-table
|
|
|
:data="dataList"
|
|
|
@@ -794,7 +810,6 @@
|
|
|
>
|
|
|
<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.fCntrtype"
|
|
|
placeholder="箱型"
|
|
|
:disabled="browseStatus"
|
|
|
@@ -811,7 +826,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$4")'
|
|
|
v-model="scope.row.fCntqty"
|
|
|
placeholder="箱量"
|
|
|
:disabled="browseStatus"
|
|
|
@@ -828,7 +843,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
+ 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"
|
|
|
@@ -845,7 +860,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
+ 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"
|
|
|
placeholder="计划净重"
|
|
|
@@ -862,7 +877,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fPlanvolumn"
|
|
|
placeholder="尺码"
|
|
|
:disabled="browseStatus"
|
|
|
@@ -896,7 +911,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fGrossweight"
|
|
|
placeholder="入库毛重"
|
|
|
:disabled="browseStatus"
|
|
|
@@ -913,7 +928,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d).*$/, "$1$2.$3")'
|
|
|
v-model="scope.row.fNetweight"
|
|
|
placeholder="入库净重"
|
|
|
:disabled="browseStatus"
|
|
|
@@ -1047,6 +1062,22 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
+ prop="remark"
|
|
|
+ header-align="center"
|
|
|
+ width="150px"
|
|
|
+ align="center"
|
|
|
+ label="状态"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.fstatus"
|
|
|
+ placeholder="状态"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ show-word-limit
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="操作"
|
|
|
@@ -1161,6 +1192,9 @@
|
|
|
<el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseDrList)"
|
|
|
>删除
|
|
|
</el-button>
|
|
|
+ <el-button type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
+ <el-button type="primary">仓储费协议</el-button>
|
|
|
+ <el-button type="primary">作业费协议</el-button>
|
|
|
</div>
|
|
|
<el-table
|
|
|
:data="warehouseDrList"
|
|
|
@@ -1390,6 +1424,9 @@
|
|
|
<el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseCrList)"
|
|
|
>删除
|
|
|
</el-button>
|
|
|
+ <el-button type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
+ <el-button type="primary">仓储费协议</el-button>
|
|
|
+ <el-button type="primary">作业费协议</el-button>
|
|
|
</div>
|
|
|
<el-table
|
|
|
:data="warehouseCrList"
|
|
|
@@ -2027,6 +2064,8 @@ export default {
|
|
|
// 货权方(客户数据)
|
|
|
// 客户名称
|
|
|
KHblnoOptions: [],
|
|
|
+ // 库存明细入账数组
|
|
|
+ dataListSelection: [],
|
|
|
fSbuOptions: [],
|
|
|
// 操作员
|
|
|
userOptions: [],
|
|
|
@@ -2239,6 +2278,14 @@ export default {
|
|
|
},
|
|
|
// 收货单打印界面
|
|
|
showEditDialog_s() {
|
|
|
+
|
|
|
+ for(let corp in this.fMblnoOptions){
|
|
|
+ if(this.form.fCorpId === this.fMblnoOptions[corp].fId) {
|
|
|
+ this.fMblnoOptions[corp].fName
|
|
|
+ console.log(this.fMblnoOptions[corp].fName)
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
console.log(this.form)
|
|
|
this.editDialogVisible_s = true;
|
|
|
},
|
|
|
@@ -2289,6 +2336,7 @@ export default {
|
|
|
this.$set(this.form, "createBy", this.userVal.userName);
|
|
|
this.$set(this.form, "fIfdamage", "1");
|
|
|
this.$set(this.form, "fIfweigh", "1");
|
|
|
+ this.$set(this.form, "fTrademodeid", "1");
|
|
|
// this.$set(this.relevantAttachments, "opUserName", this.userVal.userName);
|
|
|
this.$set(this.form, "createTime", Date.parse(new Date()));
|
|
|
}
|
|
|
@@ -2428,6 +2476,7 @@ export default {
|
|
|
Selectinventory(selection) {
|
|
|
console.log(selection);
|
|
|
this.Printinglist = selection;
|
|
|
+ this.dataListSelection = selection;
|
|
|
if (this.Printinglist.length > 0) {
|
|
|
this.fTruckno = selection[0].fTruckno;
|
|
|
this.fBsdate = selection[0].fBsdate;
|
|
|
@@ -2448,6 +2497,9 @@ export default {
|
|
|
console.log("$")
|
|
|
row.splice(this.Collectionoptionss);
|
|
|
},
|
|
|
+ deleteRoww(row) {
|
|
|
+
|
|
|
+ },
|
|
|
// 付款选择
|
|
|
Paymentoptions(selection) {
|
|
|
console.log(selection)
|
|
|
@@ -2528,6 +2580,11 @@ export default {
|
|
|
this.title = "修改仓入库)";
|
|
|
});
|
|
|
},
|
|
|
+ // 库存明细多选框结果
|
|
|
+ dataListChange (row) {
|
|
|
+ console.log(JSON.stringify(row))
|
|
|
+ this.dataListSelection = row
|
|
|
+ },
|
|
|
// 合计
|
|
|
getSummaries(param) {
|
|
|
console.log(param);
|
|
|
@@ -2685,6 +2742,35 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ // 入账
|
|
|
+ creditClick () {
|
|
|
+ this.$refs["form"].validate((valid) => {
|
|
|
+ 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) => {
|
|
|
+ this.creditStatus = true
|
|
|
+ this.msgSuccess("入账成功");
|
|
|
+ for (let li in this.dataListSelection) {
|
|
|
+ for (let i in this.dataList) {
|
|
|
+ let fQty = this.dataList[i].fQty === this.dataListSelection[li].fQty;
|
|
|
+ let fBsdate = this.dataList[i].fBsdate === this.dataListSelection[li].fBsdate;
|
|
|
+ let fGoodsid = this.dataList[i].fGoodsid === this.dataListSelection[li].fGoodsid;
|
|
|
+ let fcntrtype = this.dataList[i].fcntrtype === this.dataListSelection[li].fcntrtype;
|
|
|
+ let fNetweight = this.dataList[i].fNetweight === this.dataListSelection[li].fNetweight;
|
|
|
+ let fGrossweight = this.dataList[i].fGrossweight === this.dataListSelection[li].fGrossweight;
|
|
|
+ if (fBsdate && fGoodsid && fcntrtype && fGrossweight && fNetweight && fQty) {
|
|
|
+ this.$set(this.dataList[i], 'fBillstatus', '7')
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+ console.log('有东西')
|
|
|
+ },
|
|
|
/** 提交按钮 */
|
|
|
submitForm(status) {
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
@@ -2870,10 +2956,10 @@ export default {
|
|
|
this.download(response.msg);
|
|
|
});
|
|
|
},
|
|
|
- // deleteRow(index, rows) {
|
|
|
+ deleteRow(index, rows) {
|
|
|
|
|
|
- // rows.splice(index, 1);
|
|
|
- // },
|
|
|
+ rows.splice(index, 1);
|
|
|
+ },
|
|
|
/* 远程模糊查询用户 */
|
|
|
corpsRemoteMethod(name) {
|
|
|
if (name == null || name === "") {
|
tong