|
|
@@ -911,18 +911,6 @@
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
<!-- <el-dropdown-item command="a">收货单</el-dropdown-item>
|
|
|
--> <el-dropdown-item command="g">标准入库单</el-dropdown-item>
|
|
|
- <!-- <el-dropdown-item command="y">标准入库单(件数)</el-dropdown-item>
|
|
|
- <el-dropdown-item command="b">入库单</el-dropdown-item>
|
|
|
- <el-dropdown-item command="c">理货单</el-dropdown-item>
|
|
|
- <el-dropdown-item command="d">货物确认</el-dropdown-item>
|
|
|
- <el-dropdown-item command="e">劳务确认</el-dropdown-item>
|
|
|
- <el-dropdown-item command="f">吊牌信息</el-dropdown-item>
|
|
|
- <el-dropdown-item command="L">叉车对账入库单</el-dropdown-item>
|
|
|
- <el-dropdown-item command="M">分箱垛卡入库单</el-dropdown-item>
|
|
|
- <el-dropdown-item command="i">客户入库单</el-dropdown-item>
|
|
|
- <el-dropdown-item command="j">卸货存档入库单</el-dropdown-item>
|
|
|
- <el-dropdown-item command="k">整票垛卡入库单</el-dropdown-item>
|
|
|
- <el-dropdown-item command="h">入库垛卡</el-dropdown-item> -->
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
<!-- <el-dropdown @command="detailedApproval" style="margin-left: 10px" v-if="showApproval == 0">
|
|
|
@@ -2194,7 +2182,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fBillingway"
|
|
|
+ prop="fFeeUnitid"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="180px"
|
|
|
@@ -2202,7 +2190,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-select
|
|
|
- v-model="scope.row.fBillingway"
|
|
|
+ v-model="scope.row.fFeeUnitid"
|
|
|
placeholder="请选择计价单位"
|
|
|
clearable
|
|
|
:disabled="browseStatus"
|
|
|
@@ -3556,8 +3544,8 @@
|
|
|
<td>提单号</td>
|
|
|
<td>{{ form.fMblno }}</td>
|
|
|
<td>箱号</td>
|
|
|
- <td colspan="3" v-if="Printinglist.length">
|
|
|
- {{ Printinglist[0].fCntrno }}
|
|
|
+ <td colspan="3" v-if="Printinglist1.length">
|
|
|
+ {{ Printinglist1[0].fCntrno }}
|
|
|
</td>
|
|
|
<td colspan="3" v-else></td>
|
|
|
</tr>
|
|
|
@@ -6419,7 +6407,15 @@ export default {
|
|
|
this.form.fMarks = "";
|
|
|
}
|
|
|
// console.log(JSON.stringify(this.form))
|
|
|
- this.$set(this.form, 'fFeetunit', this.form.fFeetUnit)
|
|
|
+ // this.$set(this.form, 'fFeetunit', this.form.fFeetUnit)
|
|
|
+ this.$set(this.form, 'fFeetunit', this.form.fFeetunit)
|
|
|
+ for (let item in this.detailList1) {
|
|
|
+ let num = Number(item) + 1;
|
|
|
+ if (!this.detailList1[item].fBsdate) {
|
|
|
+ this.$message.error("请维护第" + num + "行入库日期")
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ }
|
|
|
formData.append("warehouseBills", JSON.stringify(this.form));
|
|
|
// 库存明细
|
|
|
const stockDc = this.detailList1.concat(this.detailList)
|
|
|
@@ -6467,6 +6463,7 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
Selectinventory1(selection) {
|
|
|
+ console.log(selection)
|
|
|
this.Printinglist1 = selection;
|
|
|
//允许撤销入库list
|
|
|
this.dataWithdrawList = selection;
|
|
|
@@ -7046,7 +7043,7 @@ export default {
|
|
|
// imporComputer() {
|
|
|
// this.playcomputer();
|
|
|
// },
|
|
|
- // 出库明细新行
|
|
|
+ // 入库明细新行
|
|
|
addWarehousing() {
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
@@ -7061,7 +7058,7 @@ export default {
|
|
|
} else {
|
|
|
this.detailList1.push({
|
|
|
fBillstatus: 40,
|
|
|
- fBsdate: '',
|
|
|
+ fBsdate: this.form.fBsdate,
|
|
|
fMblno: this.form.fMblno,
|
|
|
fGoodsid: null,
|
|
|
fBusinessType: null,
|
lichao