|
|
@@ -235,7 +235,7 @@
|
|
|
align="center"
|
|
|
prop="fCorpid"
|
|
|
/>
|
|
|
- <el-table-column label="提单号" align="center" prop="fMblno" />
|
|
|
+ <el-table-column label="提单号" align="center" prop="fMblno" show-overflow-tooltip/>
|
|
|
<el-table-column label="品名" :show-overflow-tooltip="true" align="ceter" prop="fProductName" />
|
|
|
<el-table-column label="品牌" align="center" prop="fMarks" />
|
|
|
<el-table-column
|
|
|
@@ -517,6 +517,15 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
+ <el-form-item label="计划调拨件数" prop="fPlanqty">
|
|
|
+ <el-input
|
|
|
+ v-model="form.fPlanqty"
|
|
|
+ style="width: 80%"
|
|
|
+ placeholder="请输入计划调拨件数"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
<el-form-item label="品牌" prop="fMarks">
|
|
|
<el-input
|
|
|
v-model="form.fMarks"
|
|
|
@@ -846,7 +855,7 @@
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "")'
|
|
|
@change="qtyChange(scope.row)"
|
|
|
v-model="scope.row.fQty"
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus > 10"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus > 20"
|
|
|
placeholder="调拨件数"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
@@ -862,7 +871,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus > 10"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus > 20"
|
|
|
v-model="scope.row.fGrossweight"
|
|
|
@change="changeStock(scope.row)"
|
|
|
placeholder="调拨毛重"
|
|
|
@@ -880,7 +889,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
- :disabled="browseStatus || scope.row.fBillstatus > 10"
|
|
|
+ :disabled="browseStatus || scope.row.fBillstatus > 20"
|
|
|
v-model="scope.row.fNetweight"
|
|
|
@change="changeStock(scope.row)"
|
|
|
placeholder="调拨净重"
|
|
|
@@ -2796,7 +2805,6 @@ export default {
|
|
|
fTransferWarehouselocid: this.dialogWhgenlegList[whgen].fWarehouseLocationid,
|
|
|
remark: null,
|
|
|
});
|
|
|
- console.log(this.fTransferWarehouselocid)
|
|
|
}
|
|
|
this.whgenlegVisible = false;
|
|
|
},
|
|
|
@@ -2808,9 +2816,6 @@ export default {
|
|
|
if(!this.printinglist[warehouseCr].fId) {
|
|
|
this.$message.error("请先保存!");
|
|
|
return false;
|
|
|
- } else if (!this.printinglist[warehouseCr].fQty || this.printinglist[warehouseCr].fQty === 0) {
|
|
|
- this.$message.error('请填写调拨件数')
|
|
|
- return false
|
|
|
} else if (this.printinglist[warehouseCr].fTransferWarehouselocid === this.printinglist[warehouseCr].fWarehouselocid) {
|
|
|
this.$message.error('调拨库区不得与原库区相同')
|
|
|
return false
|
|
|
@@ -3250,7 +3255,6 @@ export default {
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row, status) {
|
|
|
this.reset();
|
|
|
- console.log(this.formBrowseStatus)
|
|
|
this.browseStatus = status;
|
|
|
this.detailsHidden = false;
|
|
|
this.formBrowseStatus = false;
|
wengyuwen