|
|
@@ -9,7 +9,7 @@
|
|
|
>
|
|
|
<el-form-item label="业务编号" prop="fbillno">
|
|
|
<el-input
|
|
|
- v-model="queryParams.fbillno"
|
|
|
+ v-model="queryParams.fBillno"
|
|
|
placeholder="请输入业务编号"
|
|
|
clearable
|
|
|
size="small"
|
|
|
@@ -17,46 +17,73 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="制单人" prop="createBy">
|
|
|
- <el-input
|
|
|
+ <el-select
|
|
|
v-model="queryParams.createBy"
|
|
|
- placeholder="请输入制单人"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
+ style="width: 250px"
|
|
|
+ :remote-method="userRemoteMethod"
|
|
|
+ placeholder="请选择制单人"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in userOptions"
|
|
|
+ :key="index.userName"
|
|
|
+ :label="dict.nickName"
|
|
|
+ :value="dict.userName"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="出库日期" prop="createTime">
|
|
|
+ <el-form-item label="出库日期" prop="timeInterval">
|
|
|
<el-date-picker
|
|
|
+ v-model="queryParams.timeInterval"
|
|
|
+ type="daterange"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
clearable
|
|
|
- size="small"
|
|
|
- v-model="queryParams.createTime"
|
|
|
- type="date"
|
|
|
- value-format="timestamp"
|
|
|
- placeholder="选择出库日期"
|
|
|
- >
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ @keyup.enter.native="handleQuery">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="贸易方式" prop="ftrademodeid">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.frademodeid"
|
|
|
- placeholder="请输入贸易方式"
|
|
|
+ <el-form-item label="贸易方式" prop="fTrademodeid">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fTrademodeid"
|
|
|
+ placeholder="请选择贸易方式"
|
|
|
clearable
|
|
|
- size="small"
|
|
|
+ style="width: 250px"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in fTrademodeidOptions"
|
|
|
+ :key="index.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="货权方" prop="fCorpid">
|
|
|
- <el-input
|
|
|
+ <el-select
|
|
|
v-model="queryParams.fCorpid"
|
|
|
- placeholder="请输入货权方"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
clearable
|
|
|
- size="small"
|
|
|
+ style="width: 250px"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
+ :remote-method="corpsRemoteMethod"
|
|
|
+ placeholder="请选择货权方"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in fMblnoOptions"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="提单号" prop="fmblno">
|
|
|
<el-input
|
|
|
- v-model="queryParams.fmblno"
|
|
|
+ v-model="queryParams.fMblno"
|
|
|
placeholder="请输入提单号"
|
|
|
clearable
|
|
|
size="small"
|
|
|
@@ -64,32 +91,61 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="经营单位" prop="fsbu">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.fsbu"
|
|
|
- placeholder="请输入经营单位"
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fSbu"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
clearable
|
|
|
- size="small"
|
|
|
+ :remote-method="fSbuRemoteMethod"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
+ style="width: 250px"
|
|
|
+ placeholder="请选择经营单位"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in fSbuOptions"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="货物名称" prop="fgoodsid">
|
|
|
<el-select
|
|
|
- v-model="queryParams.fgoodsids"
|
|
|
- placeholder="请选择货物名称"
|
|
|
+ v-model="queryParams.fGoodsid"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
clearable
|
|
|
- size="small"
|
|
|
+ :remote-method="goodsRemoteMethod"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ placeholder="请选择货物名称"
|
|
|
>
|
|
|
- <el-option label="请选择字典生成" value="" />
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in goodsOptions"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="仓库" prop="fwarehouseid">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.fwarehouseid"
|
|
|
- placeholder="请输入仓库"
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fWarehouseid"
|
|
|
+ filterable
|
|
|
+ :disabled="browseStatus"
|
|
|
+ remote
|
|
|
clearable
|
|
|
- size="small"
|
|
|
+ style="width: 250px"
|
|
|
+ :remote-method="warehouseRemoteMethod"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
+ placeholder="请选择仓库"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in warehouseOptions"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button
|
|
|
@@ -548,21 +604,6 @@
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="单据编号" prop="foriginalbillno">
|
|
|
- <!-- <el-select
|
|
|
- v-model="form.fSbu"
|
|
|
- filterable
|
|
|
- remote
|
|
|
- :remote-method="fSbuRemoteMethod"
|
|
|
- style="width: 250px"
|
|
|
- placeholder="请选择经营单位"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="dict in fSbuOptions"
|
|
|
- :key="dict.fId"
|
|
|
- :label="dict.fName"
|
|
|
- :value="dict.fId"
|
|
|
- ></el-option>
|
|
|
- </el-select> -->
|
|
|
<el-input
|
|
|
v-model="form.fOriginalbillno"
|
|
|
style="width: 250px"
|
|
|
@@ -821,14 +862,6 @@
|
|
|
align="center"
|
|
|
label="库区"
|
|
|
>
|
|
|
- <!-- <template slot-scope="scope">
|
|
|
- <el-input
|
|
|
- oninput="value=value.replace(/[^\d.]/g,'')"
|
|
|
- v-model="scope.row.fWarehouselocid"
|
|
|
- placeholder="库区"
|
|
|
- show-word-limit
|
|
|
- />
|
|
|
- </template> -->
|
|
|
<template slot-scope="scope">
|
|
|
<el-select
|
|
|
v-model="scope.row.fWarehouselocid"
|
|
|
@@ -1047,12 +1080,6 @@
|
|
|
label="客户名称"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <!-- <el-input
|
|
|
- v-model="scope.row.fCorpid"
|
|
|
- :disabled="browseStatus"
|
|
|
- placeholder="客户名称"
|
|
|
- show-word-limitfMblnoOptions
|
|
|
- /> -->
|
|
|
<el-select
|
|
|
v-model="scope.row.fCorpid"
|
|
|
filterable
|
|
|
@@ -1282,12 +1309,6 @@
|
|
|
label="客户名称"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <!-- <el-input
|
|
|
- v-model="scope.row.fCorpid"
|
|
|
- :disabled="browseStatus"
|
|
|
- placeholder="客户名称"
|
|
|
- show-word-limit
|
|
|
- /> -->
|
|
|
<el-select
|
|
|
v-model="scope.row.fCorpid"
|
|
|
filterable
|
|
|
@@ -1313,11 +1334,6 @@
|
|
|
label="费用名称"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <!-- <el-input
|
|
|
- v-model="scope.row.fFeeid"
|
|
|
- placeholder="费用名称"
|
|
|
- show-word-limit
|
|
|
- /> -->
|
|
|
<el-select
|
|
|
v-model="scope.row.fFeeid"
|
|
|
filterable
|
|
|
@@ -1343,11 +1359,6 @@
|
|
|
label="计价单位"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <!-- <el-input
|
|
|
- v-model="scope.row.fFeeUnitid"
|
|
|
- placeholder="计价单位"
|
|
|
- show-word-limit
|
|
|
- /> -->
|
|
|
<el-select
|
|
|
v-model="scope.row.fFeeUnitid"
|
|
|
placeholder="请选择计费单位"
|
|
|
@@ -2249,7 +2260,7 @@
|
|
|
this.whgenlegParams.fCorpid = this.form.fCorpid
|
|
|
this.whgenlegParams.fWarehouseid = this.form.fWarehouseid
|
|
|
this.whgenlegParams.fTrademodeid = this.form.fTrademodeid
|
|
|
-
|
|
|
+
|
|
|
listWhgenleg(this.whgenlegParams).then(response => {
|
|
|
this.whgenlegList = response.rows
|
|
|
this.whgenlegTotal = response.total
|
|
|
@@ -2339,6 +2350,14 @@
|
|
|
fCntrtype: null,
|
|
|
fCntqty: null,
|
|
|
};
|
|
|
+ this.deptOptions = []
|
|
|
+ this.userOptions = []
|
|
|
+ this.fSbuOptions = []
|
|
|
+ this.fWbuOptions = []
|
|
|
+ this.goodsOptions = []
|
|
|
+ this.KHblnoOptions = []
|
|
|
+ this.fMblnoOptions = []
|
|
|
+ this.kqhouseOptions = []
|
|
|
this.resetForm("form");
|
|
|
},
|
|
|
/** 搜索按钮操作 */
|
|
|
@@ -2412,7 +2431,7 @@
|
|
|
"fBsdate",
|
|
|
Date.parse(response.data.warehousebills.fBsdate)
|
|
|
);
|
|
|
-
|
|
|
+
|
|
|
this.open = true;
|
|
|
this.title = "修改出库";
|
|
|
});
|
|
|
@@ -2464,7 +2483,7 @@
|
|
|
}
|
|
|
if (column.property === 'fgrossweight') {
|
|
|
values = data.map(item => Number(item['fGrossweight']))
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
if (column.property === 'fnetweight') {
|
|
|
values = data.map(item => Number(item['fNetweight']))
|
|
|
@@ -2676,14 +2695,14 @@
|
|
|
this.$message.error('请选择客户名称')
|
|
|
return false
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
for (let list in this.warehouseCrList) {
|
|
|
if (!this.warehouseCrList[list].fCorpid) {
|
|
|
this.$message.error('请选择客户名称')
|
|
|
return false
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
if (valid) {
|
|
|
this.form.fBillstatus = status;
|
|
|
@@ -2814,7 +2833,7 @@
|
|
|
this.$message.error('请输入仓库!')
|
|
|
return false
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
let queryParams = { pageNum: 1, pageSize: 10, fWarehouseid:this.form.fWarehouseid , fName: name };
|
|
|
listArea(queryParams).then((response) => {
|
|
|
console.log(response);
|
阿伏兔