|
|
@@ -7,9 +7,9 @@
|
|
|
v-show="showSearch"
|
|
|
label-width="88px"
|
|
|
>
|
|
|
- <el-form-item label="业务编号" prop="fbillno">
|
|
|
+ <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="fBsdate">
|
|
|
<el-date-picker
|
|
|
+ v-model="queryParams.timeInterval"
|
|
|
+ type="daterange"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
clearable
|
|
|
- size="small"
|
|
|
- v-model="queryParams.fBsdate"
|
|
|
- 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
|
|
|
+ <el-select
|
|
|
v-model="queryParams.fTrademodeid"
|
|
|
- placeholder="请输入贸易方式"
|
|
|
+ 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
|
|
|
+ <el-select
|
|
|
v-model="queryParams.fSbu"
|
|
|
- placeholder="请输入经营单位"
|
|
|
+ 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.fGoodsid"
|
|
|
- placeholder="请选择货物名称"
|
|
|
+ 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
|
|
|
+ <el-select
|
|
|
v-model="queryParams.fWarehouseid"
|
|
|
- placeholder="请输入仓库"
|
|
|
+ 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
|
|
|
@@ -104,7 +160,6 @@
|
|
|
</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
-
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
@@ -2005,6 +2060,13 @@ export default {
|
|
|
fCntrtype: null,
|
|
|
fCntqty: null,
|
|
|
};
|
|
|
+ this.deptOptions = []
|
|
|
+ this.fWbuOptions = []
|
|
|
+ this.fWbuOptions = []
|
|
|
+ this.fMblnoOptions = []
|
|
|
+ this.KHblnoOptions = []
|
|
|
+ this.KHblnoOptions = []
|
|
|
+ this.warehouseOptions = []
|
|
|
this.resetForm("form");
|
|
|
},
|
|
|
/** 搜索按钮操作 */
|
|
|
@@ -2039,28 +2101,36 @@ export default {
|
|
|
this.browseStatus = status
|
|
|
this.reset();
|
|
|
const fId = row.fId || this.ids;
|
|
|
- getgoodsTransfer(fId).then((response) => {
|
|
|
- this.form = response.data.goodsTransfer
|
|
|
+ getGoodsTransfer(fId).then((response) => {
|
|
|
+ this.form = response.data.warehousebills
|
|
|
+ if (this.form.fStltypeid) {
|
|
|
+ this.$set(this.form, 'fStltypeid', this.form.fStltypeid + '')
|
|
|
+ }
|
|
|
+ if (this.form.fChargedate) {
|
|
|
+ this.$set(this.form, 'fChargedate', Date.parse(this.form.fChargedate))
|
|
|
+ }
|
|
|
+ if (this.form.fTrademodeid) {
|
|
|
+ this.$set(this.form, 'fTrademodeid', this.form.fTrademodeid + '')
|
|
|
+ }
|
|
|
this.fMblnoOptions = response.data.corps
|
|
|
this.KHblnoOptions = response.data.corps
|
|
|
- this.fSbuOptions = response.data.corps
|
|
|
this.fWbuOptions = response.data.feesList
|
|
|
this.warehouseOptions = response.data.warehouse;
|
|
|
- this.$set(this.form, 'fStltypeid', this.form.fStltypeid + '')
|
|
|
- this.$set(this.form,'fEta', Date.parse(this.form.fEta))
|
|
|
- this.$set(this.form,'createTime', Date.parse(this.form.createTime))
|
|
|
- this.$set(this.form, 'fTrademodeid', this.form.fTrademodeid + '')
|
|
|
- this.dataList = response.data.goodsTransferItem;
|
|
|
+ if (response.data.dept) {
|
|
|
+ this.deptOptions = [];
|
|
|
+ this.deptOptions.push(response.data.dept);
|
|
|
+ }
|
|
|
+ this.dataList = response.data.warehouseBillsItem;
|
|
|
for (let list in this.dataList) {
|
|
|
this.$set(this.dataList[list], 'fBsdate', Date.parse(this.dataList[list].fBsdate))
|
|
|
}
|
|
|
this.goodsOptions = response.data.goodsList
|
|
|
this.relevantAttachments = response.data.enclosures
|
|
|
- this.warehouseDrList = response.data.goodsTransferfeesDr
|
|
|
+ this.warehouseDrList = response.data.warehousebillsfeesDr
|
|
|
for (let dr in this.warehouseDrList) {
|
|
|
this.$set(this.warehouseDrList[dr], 'fFeeUnitid', this.warehouseDrList[dr].fFeeUnitid + "")
|
|
|
}
|
|
|
- this.warehouseCrList = response.data.goodsTransferfeesCr
|
|
|
+ this.warehouseCrList = response.data.warehousebillsfeesCr
|
|
|
for (let cr in this.warehouseCrList) {
|
|
|
this.$set(this.warehouseCrList[cr], 'fFeeUnitid', this.warehouseCrList[cr].fFeeUnitid + "")
|
|
|
}
|
阿伏兔