|
@@ -315,8 +315,9 @@
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
icon="el-icon-delete"
|
|
|
+ v-show="scope.row.fItemsStatus !== 6"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
- v-if="scope.row.fBillstatus <= 3"
|
|
|
+ v-if="scope.row.fBillstatus < 4"
|
|
|
v-hasPermi="['warehouseBusiness:stockTransfer:remove']"
|
|
|
>删除
|
|
|
</el-button>
|
|
@@ -459,7 +460,7 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="8">
|
|
|
+ <!-- <el-col :span="8">
|
|
|
<el-form-item label="破损" prop="fifdamage">
|
|
|
<el-select
|
|
|
v-model="form.fIfdamage"
|
|
@@ -514,51 +515,51 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
+ </el-col> -->
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="计划调拨件数">
|
|
|
+ <el-form-item label="品牌" prop="fMarks">
|
|
|
<el-input
|
|
|
- v-model="form.fPlanqty"
|
|
|
+ v-model="form.fMarks"
|
|
|
style="width: 80%"
|
|
|
- placeholder="请输入计划调拨件数"
|
|
|
+ disabled
|
|
|
+ placeholder="品牌"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="计划调拨净重">
|
|
|
+ <el-form-item label="品名" prop="fProductName">
|
|
|
<el-input
|
|
|
- v-model="form.fPlannetweight"
|
|
|
+ v-model="form.fProductName"
|
|
|
style="width: 80%"
|
|
|
- placeholder="请输入计划调拨净重"
|
|
|
+ disabled
|
|
|
+ placeholder="品名"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="计划调拨毛重">
|
|
|
+ <el-form-item label="计划调拨件数">
|
|
|
<el-input
|
|
|
- v-model="form.fPlangrossweight"
|
|
|
+ v-model="form.fPlanqty"
|
|
|
style="width: 80%"
|
|
|
- placeholder="请输入计划调拨毛重"
|
|
|
+ placeholder="请输入计划调拨件数"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="品牌" prop="fMarks">
|
|
|
+ <el-form-item label="计划调拨净重">
|
|
|
<el-input
|
|
|
- v-model="form.fMarks"
|
|
|
+ v-model="form.fPlannetweight"
|
|
|
style="width: 80%"
|
|
|
- disabled
|
|
|
- placeholder="品牌"
|
|
|
+ placeholder="请输入计划调拨净重"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="品名" prop="fProductName">
|
|
|
+ <el-form-item label="计划调拨毛重">
|
|
|
<el-input
|
|
|
- v-model="form.fProductName"
|
|
|
+ v-model="form.fPlangrossweight"
|
|
|
style="width: 80%"
|
|
|
- disabled
|
|
|
- placeholder="品名"
|
|
|
+ placeholder="请输入计划调拨毛重"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
@@ -799,7 +800,7 @@
|
|
|
header-align="center"
|
|
|
width="150px"
|
|
|
align="center"
|
|
|
- label="*仓库"
|
|
|
+ label="*调拨仓库"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
@@ -824,6 +825,7 @@
|
|
|
filterable
|
|
|
remote
|
|
|
style="width: 80%"
|
|
|
+ @change="kqhouseRemoteMethod"
|
|
|
:remote-method="kqhouseRemoteMethod"
|
|
|
placeholder="请输入模糊查找"
|
|
|
>
|
|
@@ -1309,6 +1311,7 @@
|
|
|
remote
|
|
|
:disabled="browseStatus"
|
|
|
:remote-method="fWRemoteMethod"
|
|
|
+ @change="changeFeeId(scope.row)"
|
|
|
placeholder="费用名称"
|
|
|
>
|
|
|
<el-option
|
|
@@ -1593,6 +1596,7 @@
|
|
|
remote
|
|
|
:disabled="browseStatus"
|
|
|
:remote-method="fWRemoteMethod"
|
|
|
+ @change="changeFeeId(scope.row)"
|
|
|
placeholder="费用名称"
|
|
|
>
|
|
|
<el-option
|
|
@@ -1876,6 +1880,13 @@
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
+ prop="fWarehouseids"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ label="仓库"
|
|
|
+ >
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
prop="fWarehouseLocationids"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
@@ -2403,6 +2414,7 @@ export default {
|
|
|
Jump(){
|
|
|
this.approval = this.$route.query.data
|
|
|
if(this.approval){
|
|
|
+ this.reset()
|
|
|
this.colseButton = false
|
|
|
this.approval = JSON.parse(this.approval)
|
|
|
this.hide = false
|
|
@@ -2412,8 +2424,6 @@ export default {
|
|
|
this.approve = true
|
|
|
this.disappear = true
|
|
|
this.cancelButton = false
|
|
|
-
|
|
|
- this.reset()
|
|
|
getStockTransfer(this.approval.billId).then((response) => {
|
|
|
if (response.data.warehousebills) {
|
|
|
this.form = response.data.warehousebills;
|
|
@@ -2749,10 +2759,10 @@ export default {
|
|
|
if (!this.form.fMblno || this.form.fMblno === "") {
|
|
|
this.$set(this.form, "fMblno", this.dialogWhgenlegList[whgen].fMblno);
|
|
|
}
|
|
|
- let haveGoods = false
|
|
|
+ /*let haveGoods = false
|
|
|
if (this.kqhouseOptions.length !== 0) {
|
|
|
- for (let house in this.kqhouseOptions) {
|
|
|
- if (this.kqhouseOptions[house].fId === this.dialogWhgenlegList[whgen].fWarehouseLocationid) {
|
|
|
+ for (let house in this.kqhouseOptions) {ku库区
|
|
|
+ if (this.kqhouseOptions[house].fId === this.dialogWhgenlegList[whgen].fWarehouseLocationid) {
|
|
|
haveGoods = true
|
|
|
break;
|
|
|
}
|
|
@@ -2769,7 +2779,7 @@ export default {
|
|
|
this.kqhouseOptions.push(response.rows[row])
|
|
|
}
|
|
|
});
|
|
|
- }
|
|
|
+ }*/
|
|
|
let fTruckno = null
|
|
|
let fDriverTel = null
|
|
|
let fDriverName = null
|
|
@@ -2819,7 +2829,7 @@ export default {
|
|
|
fWarehouselocid: this.dialogWhgenlegList[whgen].fWarehouseLocationid,
|
|
|
fWarehouselocids: this.dialogWhgenlegList[whgen].fWarehouseLocationids,
|
|
|
fWarehouseLocationids: this.dialogWhgenlegList[whgen].fWarehouseLocationids,
|
|
|
- fTransferWarehouselocid: this.dialogWhgenlegList[whgen].fWarehouseLocationid,
|
|
|
+ fTransferWarehouselocid: null,
|
|
|
remark: null,
|
|
|
});
|
|
|
}
|
|
@@ -3093,23 +3103,9 @@ export default {
|
|
|
},
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd(status) {
|
|
|
- this.form = {
|
|
|
- fCorpid: '',
|
|
|
- fTocorpid: '',
|
|
|
- fBillno: '',
|
|
|
- fBsdate: '',
|
|
|
- fChargedate: '',
|
|
|
- fWarehouseid: '',
|
|
|
- fStltypeid: '',
|
|
|
- fFeetunit: '',
|
|
|
- fTrademodeid: '',
|
|
|
- fMblno: '',
|
|
|
- fOriginalbillno: '',
|
|
|
- orgStorageDate: ''
|
|
|
- }
|
|
|
+ this.reset();
|
|
|
this.browseStatus = status;
|
|
|
this.notChange = false
|
|
|
- this.reset();
|
|
|
this.queryUser();
|
|
|
this.open = true;
|
|
|
this.detailsHidden = false;
|
|
@@ -3196,10 +3192,10 @@ export default {
|
|
|
},
|
|
|
|
|
|
check(row,status,res){
|
|
|
+ this.reset();
|
|
|
this.disappear = false
|
|
|
this.notChange = true
|
|
|
this.browseStatus = status;
|
|
|
- this.reset();
|
|
|
this.detailsHidden = false;
|
|
|
let data = row || this.ids;
|
|
|
getStockTransfer(data.fId).then((response) => {
|
|
@@ -3535,13 +3531,17 @@ export default {
|
|
|
} else if (!this.dataListSelection[warehouse].fTransferWarehouselocid) {
|
|
|
this.$message.error("请选择调拨库区");
|
|
|
return false;
|
|
|
+ } else if (this.dataListSelection[warehouse].fTransferWarehouselocid === this.dataListSelection[warehouse].fWarehouselocids) {
|
|
|
+ this.$message.error("调拨库区不得与原库区相同");
|
|
|
+ return false;
|
|
|
} else if (!this.dataListSelection[warehouse].fNetweight) {
|
|
|
this.$message.error("请选择调拨净重");
|
|
|
return false;
|
|
|
- } else if (!this.dataListSelection[warehouse].fQty) {
|
|
|
- this.$message.error("请维护调拨件数");
|
|
|
- return false;
|
|
|
}
|
|
|
+ // else if (!this.dataListSelection[warehouse].fQty) {
|
|
|
+ // this.$message.error("请维护调拨件数");
|
|
|
+ // return false;
|
|
|
+ // }
|
|
|
}
|
|
|
if (valid) {
|
|
|
let listSelection = JSON.parse(JSON.stringify(this.dataListSelection))
|
|
@@ -3652,7 +3652,8 @@ export default {
|
|
|
} else if (this.dataListSelection[li].fBillstatus >= 30) {
|
|
|
this.$message.error('请勿重复装货')
|
|
|
return false
|
|
|
- } else if (!this.dataListSelection[li].fQty || this.dataListSelection[li].fQty === 0) {
|
|
|
+ }
|
|
|
+ else if (!this.dataListSelection[li].fQty || this.dataListSelection[li].fQty === 0) {
|
|
|
this.$message.error('请填写调拨件数')
|
|
|
return false
|
|
|
} else if (!this.dataListSelection[li].fNetweight) {
|
|
@@ -3968,6 +3969,16 @@ export default {
|
|
|
this.goodsOptions = response.rows;
|
|
|
});
|
|
|
},
|
|
|
+ // 选择费用信息时获取计价单位
|
|
|
+ changeFeeId (row) {
|
|
|
+ for (let li in this.fWbuOptions) {
|
|
|
+ if (row.fFeeid === this.fWbuOptions[li].fId) {
|
|
|
+ this.$set(row, 'fFeeUnitid', this.fWbuOptions[li].fFeeunitid + '')
|
|
|
+ this.changeFeeUnit(row)
|
|
|
+ break
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
// 远程模糊查询费用名称
|
|
|
fWRemoteMethod(name) {
|
|
|
if (name == null || name === "") {
|
|
@@ -4009,7 +4020,9 @@ export default {
|
|
|
fWarehouseid: this.form.fWarehouseid,
|
|
|
fName: name
|
|
|
};
|
|
|
+ console.log(this.kqhouseOptions)
|
|
|
listArea(queryParams).then((response) => {
|
|
|
+ console.log(response)
|
|
|
this.kqhouseOptions = response.rows;
|
|
|
});
|
|
|
},
|