|
@@ -25,15 +25,14 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="制单日期" prop="createTime">
|
|
|
+ <el-form-item label="入库日期" prop="createTime">
|
|
|
<el-date-picker
|
|
|
clearable
|
|
|
size="small"
|
|
|
- style="width: 400px"
|
|
|
v-model="queryParams.createTime"
|
|
|
type="date"
|
|
|
value-format="timestamp"
|
|
|
- placeholder="选择制单日期"
|
|
|
+ placeholder="选择入库日期"
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
@@ -55,15 +54,6 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="经营单位" prop="fsbu">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.fsbu"
|
|
|
- placeholder="请输入经营单位"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
<el-form-item label="提单号" prop="fmblno">
|
|
|
<el-input
|
|
|
v-model="queryParams.fmblno"
|
|
@@ -73,10 +63,10 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="报关单号" prop="fcustomsdeclartion">
|
|
|
+ <el-form-item label="经营单位" prop="fsbu">
|
|
|
<el-input
|
|
|
- v-model="queryParams.fcustomsdeclartion"
|
|
|
- placeholder="请输入报关单号"
|
|
|
+ v-model="queryParams.fsbu"
|
|
|
+ placeholder="请输入经营单位"
|
|
|
clearable
|
|
|
size="small"
|
|
|
@keyup.enter.native="handleQuery"
|
|
@@ -92,25 +82,6 @@
|
|
|
<el-option label="请选择字典生成" value=""/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="箱型" prop="fcntrtype">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fcntrtype"
|
|
|
- placeholder="请选择箱型"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- >
|
|
|
- <el-option label="请选择字典生成" value=""/>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="箱量" prop="fCntqty">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.fCntqty"
|
|
|
- placeholder="请输入箱量"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
<el-form-item label="仓库" prop="fwarehouseid">
|
|
|
<el-input
|
|
|
v-model="queryParams.fwarehouseid"
|
|
@@ -195,144 +166,53 @@
|
|
|
@selection-change="handleSelectionChange"
|
|
|
>
|
|
|
<el-table-column type="selection" width="55" align="center"/>
|
|
|
- <el-table-column type="index" label="序号" align="center"/>
|
|
|
- <el-table-column label="业务编号" align="center" prop="fbillno"/>
|
|
|
- <el-table-column label="制单人" align="center" prop="createBy"/>
|
|
|
- <el-table-column label="客户名称" align="center" prop="fcorpid"/>
|
|
|
- <el-table-column label="贸易方式" align="center" prop="ftrademodeid"/>
|
|
|
- <!-- <el-table-column label="货转客户名称" align="center" prop="fTocorpid" /> -->
|
|
|
- <el-table-column label="入库毛重" align="center" prop="fgrossweight"/>
|
|
|
- <!-- <el-table-column
|
|
|
- label="入库日期"
|
|
|
- align="center"
|
|
|
- prop="fcreatetime"
|
|
|
- width="180"
|
|
|
- >
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.fcreatetime, "{y}-{m}-{d}") }}</span>
|
|
|
- </template>
|
|
|
- </el-table-column> -->
|
|
|
- <el-table-column label="入库件数" align="center" prop="fQty"/>
|
|
|
- <el-table-column label="入库毛重" align="center" prop="fGrossweight"/>
|
|
|
- <el-table-column
|
|
|
- label="净重"
|
|
|
- align="center"
|
|
|
- prop="fNetweight"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- label="状态"
|
|
|
- align="center"
|
|
|
- prop="fBillstatus"
|
|
|
- :formatter="fBillstatusFormat"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- label="是否质押"
|
|
|
- align="center"
|
|
|
- prop="fIfpledge"
|
|
|
- :formatter="fIfpledgeFormat"
|
|
|
- />
|
|
|
- <el-table-column label="质押银行" align="center" prop="fBankcorpid"/>
|
|
|
- <el-table-column label="业务编号" align="center" prop="fBillno"/>
|
|
|
- <el-table-column label="报关号" align="center" prop="fCustomno"/>
|
|
|
+ <el-table-column type="index" label="行号" align="center"/>
|
|
|
<el-table-column
|
|
|
- label="原始业务编号,入库时和f_billno 相同,出库 取入库的f_originalbillno"
|
|
|
- align="center"
|
|
|
- prop="fOriginalbillno"
|
|
|
- />
|
|
|
- <el-table-column label="制单部门" align="center" prop="fDeptid"/>
|
|
|
- <el-table-column label="业务所属部门" align="center" prop="fBsdeptid"/>
|
|
|
- <el-table-column label="联系人" align="center" prop="fContacts"/>
|
|
|
- <el-table-column label="电话" align="center" prop="fTel"/>
|
|
|
- <el-table-column
|
|
|
- label="货权方,t_corps 中的no或 name,模糊查找选择后,存储id,显示name"
|
|
|
+ label="货权方"
|
|
|
align="center"
|
|
|
prop="fCorpid"
|
|
|
/>
|
|
|
- <el-table-column
|
|
|
- label="货转客户名称,t_corps 中的no或 name,模糊查找选择后,存储id,显示name,自有在货权转移是该字段有效"
|
|
|
- align="center"
|
|
|
- prop="fTocorpid"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- label="结算方式,默认提取corps中stltypeid 也可以从表t_stltypes中下拉选择,存储id,显示name"
|
|
|
- align="center"
|
|
|
- prop="fStltypeid"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- label="客户存货编号,格式编号客户编号+YYYY +NNNN,
|
|
|
-编号不能断号,要连续、如果删除该编号,下次新建单据,优先使用,每年从001开始"
|
|
|
- align="center"
|
|
|
- prop="fBscorpno"
|
|
|
- />
|
|
|
- <el-table-column label="仓库" align="center" prop="fWarehouseid"/>
|
|
|
- <el-table-column label="仓管人" align="center" prop="fStorekeeper"/>
|
|
|
- <el-table-column
|
|
|
- label="计划件数,由明细表自动合计生成"
|
|
|
- align="center"
|
|
|
- prop="fPlanqty"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- label="计划毛重,由明细表自动合计生成"
|
|
|
- align="center"
|
|
|
- prop="fPlangrossweight"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- label="计划净重,由明细表自动合计生成"
|
|
|
- align="center"
|
|
|
- prop="fPlannetweight"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- label="计划尺码,由明细表自动合计生成"
|
|
|
- align="center"
|
|
|
- prop="fPlanvolumn"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- label="尺码,由明细表自动合计生成"
|
|
|
- align="center"
|
|
|
- prop="fVolumn"
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
- label="贸易方式(数据字典),对应t_trademodels "
|
|
|
- align="center"
|
|
|
- prop="fTrademodeid"
|
|
|
- :formatter="fTrademodeidFormat"
|
|
|
- />
|
|
|
- <el-table-column label="经营单位(客户列表)" align="center" prop="fSbu"/>
|
|
|
- <el-table-column
|
|
|
- label="计费单位(数据字典),下拉选择毛重或净重"
|
|
|
- align="center"
|
|
|
- prop="fFeetunit"
|
|
|
- :formatter="fFeetunitFormat"
|
|
|
- />
|
|
|
<el-table-column label="提单号" align="center" prop="fMblno"/>
|
|
|
+ <el-table-column label="经营单位" align="center" prop="fSbu"/>
|
|
|
<el-table-column
|
|
|
- label="提单号"
|
|
|
+ label="入库日期"
|
|
|
align="center"
|
|
|
- prop="fVslvoy"
|
|
|
- />
|
|
|
- <el-table-column label="到港日期" align="center" prop="fEta" width="180">
|
|
|
- <template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.fEta, "{y}-{m}-{d}") }}</span>
|
|
|
+ prop="fcreatetime"
|
|
|
+ width="180"
|
|
|
+ ><template slot-scope="scope">
|
|
|
+ <span>{{ parseTime(scope.row.fcreatetime, "{y}-{m}-{d}") }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="报关单号" align="center" prop="fCustomno"/>
|
|
|
<el-table-column
|
|
|
- label="是否过磅(数据字典)默认 F ,过磅T 否者F 下拉选择"
|
|
|
+ label="贸易方式"
|
|
|
align="center"
|
|
|
- prop="fIfweigh"
|
|
|
- :formatter="fIfweighFormat"
|
|
|
+ prop="fTrademodeid"
|
|
|
+ :formatter="fTrademodeidFormat"
|
|
|
/>
|
|
|
+ <el-table-column label="仓库" align="center" prop="fWarehouseid"/>
|
|
|
+
|
|
|
+
|
|
|
+ <el-table-column label="入库件数" align="center" prop="fQty"/>
|
|
|
+<!-- <el-table-column label="入库毛重" align="center" prop="fGrossweight"/>-->
|
|
|
+ <!-- <el-table-column label="货转客户名称" align="center" prop="fTocorpid" /> -->
|
|
|
+ <el-table-column label="入库毛重" align="center" prop="fgrossweight"/>
|
|
|
+
|
|
|
<el-table-column
|
|
|
- label="单据类型(数据字典)SJRK"
|
|
|
+ label="净重"
|
|
|
align="center"
|
|
|
- prop="fBilltype"
|
|
|
- :formatter="fBilltypeFormat"
|
|
|
+ prop="fNetweight"
|
|
|
/>
|
|
|
- <el-table-column label="备注" align="center" prop="remark"/>
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
<el-table-column
|
|
|
label="操作"
|
|
|
align="center"
|
|
|
class-name="small-padding fixed-width"
|
|
|
+ width="100"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-button
|
|
@@ -375,7 +255,7 @@
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="制单人" prop="createBy">
|
|
|
- <el-input disabled v-model="form.createBy" style="width: 220px" placeholder="制单人"/>
|
|
|
+ <el-input disabled v-model="form.createBy" style="width: 250px" placeholder="制单人"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
@@ -384,7 +264,7 @@
|
|
|
v-model="form.fDeptid"
|
|
|
filterable
|
|
|
disabled
|
|
|
- style="width: 220px"
|
|
|
+ style="width: 250px"
|
|
|
remote>
|
|
|
<el-option
|
|
|
v-for="dict in deptOptions"
|
|
@@ -416,7 +296,7 @@
|
|
|
v-model="form.fCorpid"
|
|
|
filterable
|
|
|
remote
|
|
|
- style="width: 220px"
|
|
|
+ style="width: 250px"
|
|
|
:remote-method="corpsRemoteMethod"
|
|
|
placeholder="请选择货权方">
|
|
|
<el-option
|
|
@@ -435,7 +315,7 @@
|
|
|
filterable
|
|
|
remote
|
|
|
:remote-method="userRemoteMethod"
|
|
|
- style="width: 220px"
|
|
|
+ style="width: 250px"
|
|
|
placeholder="请选择联系人">
|
|
|
<el-option
|
|
|
v-for="dict in userOptions"
|
|
@@ -448,26 +328,26 @@
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="电话" prop="ftel">
|
|
|
- <el-input v-model="form.fTel" style="width: 220px" placeholder="请输入电话"/>
|
|
|
+ <el-input v-model="form.fTel" style="width: 250px" placeholder="请输入电话"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="提单号" prop="fmblno">
|
|
|
- <el-input v-model="form.fMblno" style="width: 220px" placeholder="请输入提单号"/>
|
|
|
+ <el-input v-model="form.fMblno" style="width: 250px" placeholder="请输入提单号"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="船名航次" prop="fvslvoy">
|
|
|
- <el-input v-model="form.fVslvoy" style="width: 220px" placeholder="船名航次"/>
|
|
|
+ <el-input v-model="form.fVslvoy" style="width: 250px" placeholder="船名航次"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="到港日期" prop="feta">
|
|
|
<el-date-picker
|
|
|
v-model="form.fEta"
|
|
|
- style="width: 220px"
|
|
|
+ style="width: 250px"
|
|
|
type="date"
|
|
|
value-format="timestamp"
|
|
|
placeholder="到港日期"
|
|
@@ -480,12 +360,12 @@
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="报关单号" prop="fcustomno">
|
|
|
- <el-input v-model="form.fCustomno" style="width: 220px" laceholder="报关单号"/>
|
|
|
+ <el-input v-model="form.fCustomno" style="width: 250px" laceholder="报关单号"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="贸易方式" prop="ftrademodeid">
|
|
|
- <el-select v-model="form.fTrademodeid" placeholder="请选择贸易方式" clearable style="width: 220px">
|
|
|
+ <el-select v-model="form.fTrademodeid" placeholder="请选择贸易方式" clearable style="width: 250px">
|
|
|
<el-option
|
|
|
v-for="dict in fTrademodeidOptions"
|
|
|
:key="dict.dictValue"
|
|
@@ -501,7 +381,7 @@
|
|
|
v-model="form.fStltypeid"
|
|
|
placeholder="请选择结算方式"
|
|
|
clearable
|
|
|
- style="width: 220px;"
|
|
|
+ style="width: 250px;"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="dict in fStltypeOptions"
|
|
@@ -520,7 +400,7 @@
|
|
|
v-model="form.fWarehouseid"
|
|
|
filterable
|
|
|
remote
|
|
|
- style="width: 220px"
|
|
|
+ style="width: 250px"
|
|
|
:remote-method="warehouseRemoteMethod"
|
|
|
placeholder="请选择仓库">
|
|
|
<el-option
|
|
@@ -534,13 +414,13 @@
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="仓管员" prop="fstorekeeper">
|
|
|
- <el-input v-model="form.fStorekeeper" placeholder="请输入仓管员" style="width: 220px"/>
|
|
|
+ <el-input v-model="form.fStorekeeper" placeholder="请输入仓管员" style="width: 250px"/>
|
|
|
</el-form-item>
|
|
|
</el-col><el-col :span="8">
|
|
|
<el-form-item label="入库日期" prop="fbsdate">
|
|
|
<el-date-picker
|
|
|
v-model="form.fBsdate"
|
|
|
- style="width: 220px"
|
|
|
+ style="width: 250px"
|
|
|
type="date"
|
|
|
value-format="timestamp"
|
|
|
placeholder="入库日期"
|
|
@@ -556,7 +436,7 @@
|
|
|
v-model="form.fIfpledge"
|
|
|
placeholder="请选择是否过磅"
|
|
|
clearable
|
|
|
- style="width: 220px"
|
|
|
+ style="width: 250px"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="dict in fIfpledgeOptions"
|
|
@@ -569,7 +449,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="银行名称" prop="fbankcorpid">
|
|
|
- <el-input v-model="form.fBankcorpid" laceholder="银行名称" style="width: 220px"/>
|
|
|
+ <el-input v-model="form.fBankcorpid" laceholder="银行名称" style="width: 250px"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
@@ -579,7 +459,7 @@
|
|
|
filterable
|
|
|
remote
|
|
|
:remote-method="fSbuRemoteMethod"
|
|
|
- style="width: 220px"
|
|
|
+ style="width: 250px"
|
|
|
placeholder="请选择经营单位">
|
|
|
<el-option
|
|
|
v-for="dict in fSbuOptions"
|
|
@@ -598,7 +478,7 @@
|
|
|
v-model="form.fIfweigh"
|
|
|
placeholder="请选择是否过磅"
|
|
|
clearable
|
|
|
- style="width: 220px"
|
|
|
+ style="width: 250px"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="dict in fIfweighOptions"
|
|
@@ -615,7 +495,7 @@
|
|
|
v-model="form.fIfdamage"
|
|
|
placeholder="请选择是否破损"
|
|
|
clearable
|
|
|
- style="width: 220px"
|
|
|
+ style="width: 250px"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="dict in fIfdamageOptions"
|
|
@@ -628,7 +508,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="客户存货编号" prop="fbscorpno">
|
|
|
- <el-input v-model="form.fBscorpno" style="width: 220px" laceholder="客户存货编号"/>
|
|
|
+ <el-input v-model="form.fBscorpno" style="width: 250px" laceholder="客户存货编号"/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
@@ -638,7 +518,7 @@
|
|
|
<el-select v-model="form.fBillingway "
|
|
|
placeholder="请选择计费方式"
|
|
|
clearable
|
|
|
- style="width: 220px"
|
|
|
+ style="width: 250px"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="dict in fFeetunitOptions"
|
|
@@ -655,7 +535,7 @@
|
|
|
v-model="form.fFeetunit"
|
|
|
placeholder="请选择计费单位"
|
|
|
clearable
|
|
|
- style="width: 220px"
|
|
|
+ style="width: 250px"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="dict in fFeetunitOptions"
|