|
|
@@ -102,9 +102,9 @@
|
|
|
<el-option label="请选择字典生成" value=""/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="箱量" prop="fcntqty">
|
|
|
+ <el-form-item label="箱量" prop="fCntqty">
|
|
|
<el-input
|
|
|
- v-model="queryParams.fcntqty"
|
|
|
+ v-model="queryParams.fCntqty"
|
|
|
placeholder="请输入箱量"
|
|
|
clearable
|
|
|
size="small"
|
|
|
@@ -306,7 +306,7 @@
|
|
|
/>
|
|
|
<el-table-column label="提单号" align="center" prop="fMblno"/>
|
|
|
<el-table-column
|
|
|
- label="船名航次,CMA/A0001"
|
|
|
+ label="提单号"
|
|
|
align="center"
|
|
|
prop="fVslvoy"
|
|
|
/>
|
|
|
@@ -374,32 +374,51 @@
|
|
|
>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="货权方" prop="fcorpid">
|
|
|
+ <el-form-item label="制单人" prop="createBy">
|
|
|
+ <el-input disabled v-model="form.createBy" placeholder="制单人"/>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="制单部门" prop="fDeptid">
|
|
|
<el-select
|
|
|
- v-model="form.fCorpid"
|
|
|
+ v-model="form.fDeptid"
|
|
|
filterable
|
|
|
- remote
|
|
|
- :remote-method="corpsRemoteMethod"
|
|
|
- placeholder="请选择货权方">
|
|
|
+ disabled
|
|
|
+ remote>
|
|
|
<el-option
|
|
|
- v-for="dict in fMblnoOptions"
|
|
|
- :key="dict.fId"
|
|
|
- :label="dict.fName"
|
|
|
- :value="dict.fId"
|
|
|
+ v-for="dict in deptOptions"
|
|
|
+ :key="dict.deptId"
|
|
|
+ :label="dict.deptName"
|
|
|
+ :value="dict.deptId"
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="仓库" prop="fwarehouseid">
|
|
|
+ <el-form-item disabled label="制单日期" prop="fbilldate">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="form.createTime"
|
|
|
+ style="width: 375px"
|
|
|
+ type="date"
|
|
|
+ disabled
|
|
|
+ value-format="timestamp"
|
|
|
+ placeholder="制单日期"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="货权方" prop="fcorpid">
|
|
|
<el-select
|
|
|
- v-model="form.fWarehouseid"
|
|
|
+ v-model="form.fCorpid"
|
|
|
filterable
|
|
|
remote
|
|
|
- :remote-method="warehouseRemoteMethod"
|
|
|
- placeholder="请选择仓库">
|
|
|
+ :remote-method="corpsRemoteMethod"
|
|
|
+ placeholder="请选择货权方">
|
|
|
<el-option
|
|
|
- v-for="dict in warehouseOptions"
|
|
|
+ v-for="dict in fMblnoOptions"
|
|
|
:key="dict.fId"
|
|
|
:label="dict.fName"
|
|
|
:value="dict.fId"
|
|
|
@@ -424,76 +443,21 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- </el-row>
|
|
|
- <el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="电话" prop="ftel">
|
|
|
<el-input v-model="form.fTel" placeholder="请输入电话"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="提单号" prop="fmblno">
|
|
|
- <el-input v-model="form.fMblno" placeholder="请输入提单号"/>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="入库日期" prop="fbsdate">
|
|
|
- <el-date-picker
|
|
|
- v-model="form.fBsdate"
|
|
|
- style="width: 375px"
|
|
|
- type="date"
|
|
|
- value-format="timestamp"
|
|
|
- placeholder="入库日期"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- <el-row>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="仓管人" prop="fstorekeeper">
|
|
|
- <el-input v-model="form.fStorekeeper" placeholder="请输入仓管人"/>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="制单人" prop="createBy">
|
|
|
- <el-input disabled v-model="form.createBy" placeholder="制单人"/>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="制单部门" prop="fDeptid">
|
|
|
- <el-select
|
|
|
- v-model="form.fDeptid"
|
|
|
- filterable
|
|
|
- disabled
|
|
|
- remote>
|
|
|
- <el-option
|
|
|
- v-for="dict in deptOptions"
|
|
|
- :key="dict.deptId"
|
|
|
- :label="dict.deptName"
|
|
|
- :value="dict.deptId"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item disabled label="制单日期" prop="fbilldate">
|
|
|
- <el-date-picker
|
|
|
- v-model="form.createTime"
|
|
|
- style="width: 375px"
|
|
|
- type="date"
|
|
|
- disabled
|
|
|
- value-format="timestamp"
|
|
|
- placeholder="制单日期"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
+ <el-form-item label="提单号" prop="fmblno">
|
|
|
+ <el-input v-model="form.fMblno" placeholder="请输入提单号"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="船航次" prop="fvslvoy">
|
|
|
- <el-input v-model="form.fVslvoy" placeholder="船航次"/>
|
|
|
+ <el-form-item label="船名航次" prop="fvslvoy">
|
|
|
+ <el-input v-model="form.fVslvoy" placeholder="船名航次"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
@@ -509,28 +473,18 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
+
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="贸易方式" prop="ftrademodeid">
|
|
|
- <el-select v-model="form.fTrademodeid" placeholder="请选择贸易方式" clearable size="small">
|
|
|
- <el-option
|
|
|
- v-for="dict in fTrademodeidOptions"
|
|
|
- :key="dict.dictValue"
|
|
|
- :label="dict.dictLabel"
|
|
|
- :value="dict.dictValue"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
+ <el-form-item label="报关单号" prop="fcustomno">
|
|
|
+ <el-input v-model="form.fCustomno" laceholder="报关单号"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="计费方式" prop="fbillingway">
|
|
|
- <el-select v-model="form.fBillingway "
|
|
|
- placeholder="请选择计费方式"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- >
|
|
|
+ <el-form-item label="贸易方式" prop="ftrademodeid">
|
|
|
+ <el-select v-model="form.fTrademodeid" placeholder="请选择贸易方式" clearable size="small">
|
|
|
<el-option
|
|
|
- v-for="dict in fFeetunitOptions"
|
|
|
+ v-for="dict in fTrademodeidOptions"
|
|
|
:key="dict.dictValue"
|
|
|
:label="dict.dictLabel"
|
|
|
:value="dict.dictValue"
|
|
|
@@ -539,15 +493,15 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="计费单位" prop="ffeetunit">
|
|
|
+ <el-form-item label="结算方式" prop="fstltypeid">
|
|
|
<el-select
|
|
|
- v-model="form.fFeetunit"
|
|
|
- placeholder="请选择计费单位"
|
|
|
+ v-model="form.fStltypeid"
|
|
|
+ placeholder="请选择结算方式"
|
|
|
clearable
|
|
|
size="small"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="dict in fFeetunitOptions"
|
|
|
+ v-for="dict in fStltypeOptions"
|
|
|
:key="dict.dictValue"
|
|
|
:label="dict.dictLabel"
|
|
|
:value="dict.dictValue"
|
|
|
@@ -558,25 +512,50 @@
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="客户存货编号" prop="fbscorpno">
|
|
|
- <el-input v-model="form.fBscorpno" laceholder="客户存货编号"/>
|
|
|
+ <el-form-item label="仓库" prop="fwarehouseid">
|
|
|
+ <el-select
|
|
|
+ v-model="form.fWarehouseid"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ :remote-method="warehouseRemoteMethod"
|
|
|
+ placeholder="请选择仓库">
|
|
|
+ <el-option
|
|
|
+ v-for="dict in warehouseOptions"
|
|
|
+ :key="dict.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="报关单号" prop="fcustomno">
|
|
|
- <el-input v-model="form.fCustomno" laceholder="报关单号"/>
|
|
|
+ <el-form-item label="仓管员" prop="fstorekeeper">
|
|
|
+ <el-input v-model="form.fStorekeeper" placeholder="请输入仓管员"/>
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
+ </el-col><el-col :span="8">
|
|
|
+ <el-form-item label="入库日期" prop="fbsdate">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="form.fBsdate"
|
|
|
+ style="width: 375px"
|
|
|
+ type="date"
|
|
|
+ value-format="timestamp"
|
|
|
+ placeholder="入库日期"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="结算方式" prop="fstltypeid">
|
|
|
+ <el-form-item label="是否质押" prop="fifpledge">
|
|
|
<el-select
|
|
|
- v-model="form.fStltypeid"
|
|
|
- placeholder="请选择结算方式"
|
|
|
+ v-model="form.fIfpledge"
|
|
|
+ placeholder="请选择是否过磅"
|
|
|
clearable
|
|
|
size="small"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="dict in fStltypeOptions"
|
|
|
+ v-for="dict in fIfpledgeOptions"
|
|
|
:key="dict.dictValue"
|
|
|
:label="dict.dictLabel"
|
|
|
:value="dict.dictValue"
|
|
|
@@ -584,6 +563,28 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="银行名称" prop="fbankcorpid">
|
|
|
+ <el-input v-model="form.fBankcorpid" laceholder="银行名称"/>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="经营单位" prop="fsbu">
|
|
|
+ <el-select
|
|
|
+ v-model="form.fSbu"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ :remote-method="fSbuRemoteMethod"
|
|
|
+ placeholder="请选择经营单位">
|
|
|
+ <el-option
|
|
|
+ v-for="dict in fSbuOptions"
|
|
|
+ :key="dict.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
@@ -621,34 +622,21 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="经营单位" prop="fsbu">
|
|
|
- <el-select
|
|
|
- v-model="form.fSbu"
|
|
|
- filterable
|
|
|
- remote
|
|
|
- :remote-method="fSbuRemoteMethod"
|
|
|
- placeholder="请选择经营单位">
|
|
|
- <el-option
|
|
|
- v-for="dict in fSbuOptions"
|
|
|
- :key="dict.fId"
|
|
|
- :label="dict.fName"
|
|
|
- :value="dict.fId"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
+ <el-form-item label="客户存货编号" prop="fbscorpno">
|
|
|
+ <el-input v-model="form.fBscorpno" laceholder="客户存货编号"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="是否质押" prop="fifpledge">
|
|
|
- <el-select
|
|
|
- v-model="form.fIfpledge"
|
|
|
- placeholder="请选择是否过磅"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
+ <el-form-item label="计费方式" prop="fbillingway">
|
|
|
+ <el-select v-model="form.fBillingway "
|
|
|
+ placeholder="请选择计费方式"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="dict in fIfpledgeOptions"
|
|
|
+ v-for="dict in fFeetunitOptions"
|
|
|
:key="dict.dictValue"
|
|
|
:label="dict.dictLabel"
|
|
|
:value="dict.dictValue"
|
|
|
@@ -657,8 +645,20 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="银行名称？？？？？？？？？？" prop="fbankcorpid">
|
|
|
- <el-input v-model="form.fBankcorpid" laceholder="银行名称"/>
|
|
|
+ <el-form-item label="计费单位" prop="ffeetunit">
|
|
|
+ <el-select
|
|
|
+ v-model="form.fFeetunit"
|
|
|
+ placeholder="请选择计费单位"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in fFeetunitOptions"
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -704,7 +704,7 @@
|
|
|
prop="fgoodsid"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- label="品牌"
|
|
|
+ label="品名"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-select
|
|
|
@@ -712,7 +712,7 @@
|
|
|
filterable
|
|
|
remote
|
|
|
:remote-method="goodsRemoteMethod"
|
|
|
- placeholder="请选择品牌">
|
|
|
+ placeholder="请选择品名">
|
|
|
<el-option
|
|
|
v-for="dict in goodsOptions"
|
|
|
:key="dict.fId"
|
|
|
@@ -738,7 +738,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fcntqty"
|
|
|
+ prop="fCntqty"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
label="箱量"
|
|
|
@@ -1784,7 +1784,7 @@
|
|
|
this.reset();
|
|
|
this.queryUser()
|
|
|
this.open = true;
|
|
|
- this.title = "添加仓库主(出入库)";
|
|
|
+ this.title = "入库单";
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
阿伏兔