|
|
@@ -36,9 +36,9 @@
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="贸易方式" prop="ftrademodeid">
|
|
|
+ <el-form-item label="贸易方式" prop="fTrademodeid">
|
|
|
<el-input
|
|
|
- v-model="queryParams.ftrademodeid"
|
|
|
+ v-model="queryParams.fTrademodeid"
|
|
|
placeholder="请输入贸易方式"
|
|
|
clearable
|
|
|
size="small"
|
|
|
@@ -248,8 +248,8 @@
|
|
|
placeholder="请选择货权方"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="(dict, index) in fMblnoOptions"
|
|
|
- :key="index.fId"
|
|
|
+ v-for="dict in fMblnoOptions"
|
|
|
+ :key="dict.fId"
|
|
|
:label="dict.fName"
|
|
|
:value="dict.fId"
|
|
|
></el-option>
|
|
|
@@ -257,7 +257,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="结算方式" prop="fstltypeid">
|
|
|
+ <el-form-item label="结算方式" prop="fStltypeid">
|
|
|
<el-select
|
|
|
v-model="form.fStltypeid"
|
|
|
placeholder="请选择结算方式"
|
|
|
@@ -349,7 +349,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="破损" prop="fifdamage">
|
|
|
+ <el-form-item label="破损" prop="fIfdamage">
|
|
|
<el-select
|
|
|
v-model="form.fIfdamage"
|
|
|
placeholder="请选择是否破损"
|
|
|
@@ -366,7 +366,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="过磅" prop="fifweigh">
|
|
|
+ <el-form-item label="过磅" prop="fIfweigh">
|
|
|
<el-select
|
|
|
v-model="form.fIfweigh"
|
|
|
placeholder="请选择是否过磅"
|
|
|
@@ -386,7 +386,7 @@
|
|
|
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="质押" prop="fifpledge">
|
|
|
+ <el-form-item label="质押" prop="fIfpledge">
|
|
|
<el-select
|
|
|
v-model="form.fIfpledge"
|
|
|
placeholder="请选择是否过磅"
|
|
|
@@ -403,7 +403,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="质押银行" prop="fbankcorpid">
|
|
|
+ <el-form-item label="质押银行" prop="fBankcorpid">
|
|
|
<el-input
|
|
|
v-model="form.fBankcorpid"
|
|
|
laceholder="质押银行"
|
|
|
@@ -412,7 +412,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="计费单位" prop="ffeetunit">
|
|
|
+ <el-form-item label="计费单位" prop="fFeetunit">
|
|
|
<el-select
|
|
|
v-model="form.fFeetunit"
|
|
|
placeholder="请选择计费单位"
|
|
|
@@ -442,21 +442,6 @@
|
|
|
<el-row style="margin-top: 30px">
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="仓库联系人" prop="fContacts">
|
|
|
- <!-- <el-select
|
|
|
- v-model="form.fContacts"
|
|
|
- filterable
|
|
|
- remote
|
|
|
- :remote-method="userRemoteMethod"
|
|
|
- style="width: 250px"
|
|
|
- placeholder="请选择仓库联系人"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="dict in userOptions"
|
|
|
- :key="dict.userName"
|
|
|
- :label="dict.nickName"
|
|
|
- :value="dict.userName"
|
|
|
- ></el-option>
|
|
|
- </el-select> -->
|
|
|
<el-input
|
|
|
v-model="form.fContacts"
|
|
|
style="width: 250px"
|
|
|
@@ -465,7 +450,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="仓库电话" prop="ftel">
|
|
|
+ <el-form-item label="仓库电话" prop="fTel">
|
|
|
<el-input
|
|
|
v-model="form.fTel"
|
|
|
style="width: 250px"
|
|
|
@@ -474,7 +459,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="船名航次" prop="fvslvoy">
|
|
|
+ <el-form-item label="船名航次" prop="fVslvoy">
|
|
|
<el-input
|
|
|
v-model="form.fVslvoy"
|
|
|
style="width: 250px"
|
|
|
@@ -485,7 +470,7 @@
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="到港日期" prop="feta">
|
|
|
+ <el-form-item label="到港日期" prop="fEta">
|
|
|
<el-date-picker
|
|
|
v-model="form.fEta"
|
|
|
style="width: 250px"
|
|
|
@@ -497,7 +482,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="报关单号" prop="fcustomno">
|
|
|
+ <el-form-item label="报关单号" prop="fCustomno">
|
|
|
<el-input
|
|
|
v-model="form.fCustomno"
|
|
|
style="width: 250px"
|
|
|
@@ -507,7 +492,7 @@
|
|
|
</el-col>
|
|
|
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="经营单位" prop="fsbu">
|
|
|
+ <el-form-item label="经营单位" prop="fSbu">
|
|
|
<el-select
|
|
|
v-model="form.fSbu"
|
|
|
filterable
|
|
|
@@ -528,24 +513,9 @@
|
|
|
</el-row>
|
|
|
<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-form-item label="单据编号" prop="fBillno">
|
|
|
<el-input
|
|
|
- v-model="form.fOriginalbillno"
|
|
|
+ v-model="form.fBillno"
|
|
|
style="width: 250px"
|
|
|
placeholder="单据编号"
|
|
|
/>
|
|
|
@@ -640,7 +610,7 @@
|
|
|
<el-table-column label="序号" type="index" width="80">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fbsdate"
|
|
|
+ prop="fBsdate"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="180px"
|
|
|
@@ -659,7 +629,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fgoodsid"
|
|
|
+ prop="fGoodsid"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="140px"
|
|
|
@@ -698,9 +668,8 @@
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
-
|
|
|
<el-table-column
|
|
|
- prop="fplangrossweight"
|
|
|
+ prop="fPlangrossweight"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="180px"
|
|
|
@@ -716,7 +685,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fplannetweight"
|
|
|
+ prop="fPlannetweight"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="180px"
|
|
|
@@ -725,14 +694,14 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
- v-model="scope.row.fplannetweight"
|
|
|
+ v-model="scope.row.fPlannetweight"
|
|
|
placeholder="计划净重"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fplanvolumn"
|
|
|
+ prop="fPlanvolumn"
|
|
|
header-align="center"
|
|
|
width="180px"
|
|
|
align="center"
|
|
|
@@ -748,7 +717,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fplanqty"
|
|
|
+ prop="fPlanqty"
|
|
|
header-align="center"
|
|
|
width="180px"
|
|
|
align="center"
|
|
|
@@ -764,7 +733,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fgrossweight"
|
|
|
+ prop="fGrossweight"
|
|
|
header-align="center"
|
|
|
width="180px"
|
|
|
align="center"
|
|
|
@@ -780,7 +749,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fnetweight"
|
|
|
+ prop="fNetweight"
|
|
|
header-align="center"
|
|
|
width="180px"
|
|
|
align="center"
|
|
|
@@ -796,7 +765,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fqty"
|
|
|
+ prop="fQty"
|
|
|
header-align="center"
|
|
|
width="180px"
|
|
|
align="center"
|
|
|
@@ -828,20 +797,12 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fwarehouselocid"
|
|
|
+ prop="fWarehouselocid"
|
|
|
header-align="center"
|
|
|
width="150px"
|
|
|
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"
|
|
|
@@ -891,7 +852,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="ftruckno"
|
|
|
+ prop="fTruckno"
|
|
|
header-align="center"
|
|
|
width="150px"
|
|
|
align="center"
|
|
|
@@ -1046,19 +1007,13 @@
|
|
|
<el-table-column label="序号" type="index" width="80">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fcorpid"
|
|
|
+ prop="fCorpid"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="180px"
|
|
|
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
|
|
|
@@ -1067,8 +1022,8 @@
|
|
|
placeholder="客户名称"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="(dict, index) in KHblnoOptions"
|
|
|
- :key="index.fId"
|
|
|
+ v-for="dict in KHblnoOptions"
|
|
|
+ :key="dict.fId"
|
|
|
:label="dict.fName"
|
|
|
:value="dict.fId"
|
|
|
></el-option>
|
|
|
@@ -1076,20 +1031,15 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="ffeeid"
|
|
|
+ prop="fFeeid"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="180px"
|
|
|
label="费用名称"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <!-- <el-input
|
|
|
- v-model="scope.row.fFeeid"
|
|
|
- placeholder="费用名称"
|
|
|
- show-word-limit
|
|
|
- /> -->
|
|
|
<el-select
|
|
|
- v-model="scope.row.fCorpid"
|
|
|
+ v-model="scope.row.fFeeid"
|
|
|
filterable
|
|
|
remote
|
|
|
:remote-method="fWRemoteMethod"
|
|
|
@@ -1105,18 +1055,13 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="ffeeUnitid"
|
|
|
+ prop="fFeeUnitid"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="150px"
|
|
|
label="计价单位"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <!-- <el-input
|
|
|
- v-model="scope.row.fFeeUnitid"
|
|
|
- placeholder="计价单位"
|
|
|
- show-word-limit
|
|
|
- /> -->
|
|
|
<el-select
|
|
|
v-model="scope.row.fFeeUnitid"
|
|
|
placeholder="请选择计费单位"
|
|
|
@@ -1149,7 +1094,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="funitprice"
|
|
|
+ prop="fUnitprice"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="150px"
|
|
|
@@ -1199,7 +1144,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fCxrate"
|
|
|
+ prop="fExrate"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="150px"
|
|
|
@@ -1207,7 +1152,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.fCxrate"
|
|
|
+ v-model="scope.row.fExrate"
|
|
|
:disabled="browseStatus"
|
|
|
placeholder="汇率"
|
|
|
show-word-limit
|
|
|
@@ -1215,7 +1160,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fRate"
|
|
|
+ prop="fTaxrate"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="150px"
|
|
|
@@ -1223,7 +1168,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.fRate"
|
|
|
+ v-model="scope.row.fTaxrate"
|
|
|
:disabled="browseStatus"
|
|
|
placeholder="税率"
|
|
|
show-word-limit
|
|
|
@@ -1279,19 +1224,13 @@
|
|
|
<el-table-column label="序号" type="index" width="80">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fcorpid"
|
|
|
+ prop="fCorpid"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="180px"
|
|
|
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
|
|
|
@@ -1309,20 +1248,15 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="ffeeid"
|
|
|
+ prop="fFeeid"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="180px"
|
|
|
label="费用名称"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <!-- <el-input
|
|
|
- v-model="scope.row.fFeeid"
|
|
|
- placeholder="费用名称"
|
|
|
- show-word-limit
|
|
|
- /> -->
|
|
|
<el-select
|
|
|
- v-model="scope.row.fCorpid"
|
|
|
+ v-model="scope.row.fFeeid"
|
|
|
filterable
|
|
|
remote
|
|
|
:remote-method="fWRemoteMethod"
|
|
|
@@ -1338,20 +1272,15 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="ffeeUnitid"
|
|
|
+ prop="fFeeunitid"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="180px"
|
|
|
label="计价单位"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <!-- <el-input
|
|
|
- v-model="scope.row.fFeeUnitid"
|
|
|
- placeholder="计价单位"
|
|
|
- show-word-limit
|
|
|
- /> -->
|
|
|
<el-select
|
|
|
- v-model="scope.row.fFeeUnitid"
|
|
|
+ v-model="scope.row.fFeeunitid"
|
|
|
placeholder="请选择计费单位"
|
|
|
clearable
|
|
|
>
|
|
|
@@ -1382,7 +1311,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="funitprice"
|
|
|
+ prop="fUnitprice"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="150px"
|
|
|
@@ -1432,7 +1361,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fCxrate"
|
|
|
+ prop="fExrate"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="150px"
|
|
|
@@ -1440,7 +1369,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.fCxrate"
|
|
|
+ v-model="scope.row.fExrate"
|
|
|
:disabled="browseStatus"
|
|
|
placeholder="汇率"
|
|
|
show-word-limit
|
|
|
@@ -1448,7 +1377,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="fRate"
|
|
|
+ prop="fTaxrate"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
width="150px"
|
|
|
@@ -1456,7 +1385,7 @@
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-model="scope.row.fRate"
|
|
|
+ v-model="scope.row.fTaxrate"
|
|
|
:disabled="browseStatus"
|
|
|
placeholder="税率"
|
|
|
show-word-limit
|
|
|
@@ -2010,7 +1939,6 @@ export default {
|
|
|
methods: {
|
|
|
// 上传成功返回数据
|
|
|
showFile(row) {
|
|
|
- console.log(row);
|
|
|
// this.$set(this.relevantAttachments[0], 'fName', row.fileName)
|
|
|
this.$set(this.relevantAttachments[0], "fUrl", row.url);
|
|
|
},
|
|
|
@@ -2036,7 +1964,6 @@ export default {
|
|
|
},
|
|
|
// 添加list
|
|
|
addRelevant() {
|
|
|
- console.log(JSON.stringify(this.dataList));
|
|
|
this.dataList.push({
|
|
|
fbsdate: null,
|
|
|
fgoodsid: null,
|
|
|
@@ -2064,7 +1991,6 @@ export default {
|
|
|
},
|
|
|
// 收款信息
|
|
|
addCollection() {
|
|
|
- console.log(this.warehouseDrList);
|
|
|
this.warehouseDrList.push({
|
|
|
fcorpid: null,
|
|
|
ffeeid: null,
|
|
|
@@ -2094,9 +2020,6 @@ export default {
|
|
|
},
|
|
|
queryUser() {
|
|
|
queryUserVal().then((response) => {
|
|
|
- console.log(response);
|
|
|
- console.log(this.form);
|
|
|
- console.log(this.relevantAttachments);
|
|
|
if (response.user !== null) {
|
|
|
this.userVal = response.user;
|
|
|
this.$set(this.form, "fDeptid", this.userVal.deptId);
|
|
|
@@ -2131,6 +2054,10 @@ export default {
|
|
|
fIfweighFormat(row, column) {
|
|
|
return this.selectDictLabel(this.fIfweighOptions, row.fIfweigh);
|
|
|
},
|
|
|
+ // 编号字典翻译
|
|
|
+ fStltypeidFormat(row, column) {
|
|
|
+ return this.selectDictLabel(this.fStltypeOptions, row.fStltypeid);
|
|
|
+ },
|
|
|
// 是否质押(数据字典),默认 F ,质押T 否者F 下拉选择字典翻译
|
|
|
fIfpledgeFormat(row, column) {
|
|
|
return this.selectDictLabel(this.fIfpledgeOptions, row.fIfpledge);
|
|
|
@@ -2237,149 +2164,31 @@ export default {
|
|
|
this.reset();
|
|
|
const fId = row.fId || this.ids;
|
|
|
getWarehousebills(fId).then((response) => {
|
|
|
- console.log(response);
|
|
|
- console.log(response.data.corps);
|
|
|
this.form = response.data.warehousebills;
|
|
|
this.fMblnoOptions = response.data.corps;
|
|
|
this.KHblnoOptions = response.data.corps;
|
|
|
- this.dataList = response.data.warehouseBillsItem;
|
|
|
- this.relevantAttachments = response.data.enclosures;
|
|
|
- this.warehouseDrList = response.data.warehousebillsfeesDr;
|
|
|
- this.warehouseCrList = response.data.warehousebillsfeesCr;
|
|
|
+ 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, 'fTrademodeid', this.form.fTrademodeid + '')
|
|
|
+ this.dataList = response.data.warehouseBillsItem;
|
|
|
+ for (let list in this.dataList) {
|
|
|
+ this.$set(this.dataList[list], 'fBsdate', this.dataList[list].fBsdate)
|
|
|
+ }
|
|
|
+ this.goodsOptions = response.data.goodsList
|
|
|
+ this.kqhouseOptions = response.data.warehouseAreas
|
|
|
+ this.relevantAttachments = response.data.enclosures
|
|
|
+ this.warehouseDrList = response.data.warehousebillsfeesDr
|
|
|
+ this.warehouseCrList = response.data.warehousebillsfeesCr
|
|
|
this.userOptions = response.data.sysUser;
|
|
|
- this.goodsOptions = response.data.goodsList;
|
|
|
- this.$set(
|
|
|
- this.form,
|
|
|
- "fBsdate",
|
|
|
- Date.parse(response.data.warehousebills.fBsdate)
|
|
|
- );
|
|
|
- // this.$set(
|
|
|
- // this.dataList,
|
|
|
- // "fBsdate",
|
|
|
- // Date.parse(response.data.warehouseBillsItem[0].fBsdate)
|
|
|
- // );
|
|
|
- // this.$set(this.form, "fCorpid", response.data.corps[0].fName);
|
|
|
- // this.$set(this.form, "fStltypeid", response.data.corps[0].fName);
|
|
|
- // console.log(this.form)
|
|
|
- // this.$set(this.form, "fCorpid", response.data.warehousebills.fcorpid);
|
|
|
- // this.$set(
|
|
|
- // this.form,
|
|
|
- // "fWarehouseid",
|
|
|
- // response.data.warehousebills.fwarehouseid
|
|
|
- // );
|
|
|
- // this.$set(
|
|
|
- // this.form,
|
|
|
- // "fContacts",
|
|
|
- // response.data.warehousebills.fcontacts
|
|
|
- // );
|
|
|
- // this.$set(this.form, "fTel", response.data.warehousebills.ftel);
|
|
|
- // this.$set(this.form, "fMblno", response.data.warehousebills.fmblno);
|
|
|
-
|
|
|
- // this.$set(
|
|
|
- // this.form,
|
|
|
- // "fStorekeeper",
|
|
|
- // response.data.warehousebills.fstorekeeper
|
|
|
- // );
|
|
|
- // this.$set(this.form, "createBy", response.data.warehousebills.createBy);
|
|
|
- // this.$set(this.form, "fDeptid", response.data.warehousebills.fdeptid);
|
|
|
- // this.$set(
|
|
|
- // this.form,
|
|
|
- // "fDilldate",
|
|
|
- // Date.parse(response.data.warehousebills.fbilldate)
|
|
|
- // );
|
|
|
- // this.$set(this.form, "fVslvoy", response.data.warehousebills.fvslvoy);
|
|
|
- // this.$set(
|
|
|
- // this.form,
|
|
|
- // "fEta",
|
|
|
- // Date.parse(response.data.warehousebills.feta)
|
|
|
- // );
|
|
|
- // this.$set(
|
|
|
- // this.form,
|
|
|
- // "createTime",
|
|
|
- // Date.parse(response.data.warehousebills.createTime)
|
|
|
- // );
|
|
|
- // this.$set(
|
|
|
- // this.form,
|
|
|
- // "fTrademodeid",
|
|
|
- // response.data.warehousebills.ftrademodeid + ""
|
|
|
- // );
|
|
|
- // this.$set(
|
|
|
- // this.form,
|
|
|
- // "fBillingway",
|
|
|
- // response.data.warehousebills.fbillingway + ""
|
|
|
- // );
|
|
|
- // this.$set(
|
|
|
- // this.form,
|
|
|
- // "fFeetunit",
|
|
|
- // response.data.warehousebills.ffeetunit + ""
|
|
|
- // );
|
|
|
- // this.$set(
|
|
|
- // this.form,
|
|
|
- // "fBscorpno",
|
|
|
- // response.data.warehousebills.fbscorpno
|
|
|
- // );
|
|
|
- // this.$set(
|
|
|
- // this.form,
|
|
|
- // "fCustomno",
|
|
|
- // response.data.warehousebills.fcustomno
|
|
|
- // );
|
|
|
- // this.$set(
|
|
|
- // this.form,
|
|
|
- // "fStltypeid",
|
|
|
- // response.data.warehousebills.fstltypeid + ""
|
|
|
- // );
|
|
|
- // this.$set(
|
|
|
- // this.form,
|
|
|
- // "fIfweigh",
|
|
|
- // response.data.warehousebills.fifweigh + ""
|
|
|
- // );
|
|
|
- // this.$set(
|
|
|
- // this.form,
|
|
|
- // "fIfdamage",
|
|
|
- // response.data.warehousebills.fifdamage + ""
|
|
|
- // );
|
|
|
- // this.$set(this.form, "fSbu", response.data.warehousebills.fsbu);
|
|
|
- // this.$set(
|
|
|
- // this.form,
|
|
|
- // "fIfpledge",
|
|
|
- // response.data.warehousebills.fifpledge + ""
|
|
|
- // );
|
|
|
- // this.$set(
|
|
|
- // this.form,
|
|
|
- // "fBankcorpid",
|
|
|
- // response.data.warehousebills.fbankcorpid
|
|
|
- // );
|
|
|
- // this.$set(this.form, "remark", response.data.warehousebills.remark);
|
|
|
- // this.deptOptions = [];
|
|
|
- // this.deptOptions.push(response.data.dept);
|
|
|
- // this.fMblnoOptions = [];
|
|
|
- // this.fMblnoOptions.push(response.data.fCorps);
|
|
|
- // if (response.data.fSbu !== null) {
|
|
|
- // this.fSbuOptions = [];
|
|
|
- // this.fSbuOptions.push(response.data.fSbu);
|
|
|
- // }
|
|
|
- // if (response.data.warehouse !== null) {
|
|
|
- // this.warehouseOptions = [];
|
|
|
- // this.warehouseOptions.push(response.data.warehouse);
|
|
|
- // }
|
|
|
- // if (
|
|
|
- // typeof response.data.warehouseBillsItem !== "undefined" &&
|
|
|
- // response.data.warehouseBillsItem !== null
|
|
|
- // ) {
|
|
|
- // this.dataList = response.data.warehouseBillsItem;
|
|
|
- // if (response.data.goodsList !== null) {
|
|
|
- // this.goodsOptions = [];
|
|
|
- // this.goodsOptions = response.data.goodsList;
|
|
|
- // }
|
|
|
- // }
|
|
|
+ this.$set(this.form, "fBsdate", Date.parse(response.data.warehousebills.fBsdate))
|
|
|
this.open = true;
|
|
|
this.title = "修改仓库主(出入库)";
|
|
|
});
|
|
|
},
|
|
|
// 数量计算
|
|
|
changeContractAmt(row) {
|
|
|
- console.log(row);
|
|
|
if (row.fUnitprice !== "") {
|
|
|
if (row.fQty !== "") {
|
|
|
this.$set(
|
|
|
@@ -2393,7 +2202,6 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
changeEstmateAmt(row) {
|
|
|
- console.log(row);
|
|
|
if (row.fUnitprice !== "") {
|
|
|
if (row.fQty !== "") {
|
|
|
this.$set(
|
|
|
@@ -2415,88 +2223,61 @@ export default {
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
submitForm() {
|
|
|
- console.log(this.dataList)
|
|
|
- console.log(this.relevantAttachments)
|
|
|
- console.log(this.warehouseDrList)
|
|
|
- console.log(this.warehouseCrList)
|
|
|
-
|
|
|
if (
|
|
|
typeof this.form.fBillstatus === "undefined" ||
|
|
|
this.form.fBillstatus == null || this.dataList
|
|
|
) {
|
|
|
this.form.fBillstatus = 6;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
this.$refs["form"].validate((valid) => {
|
|
|
if (this.dataList.length === 0) {
|
|
|
this.$message.error('请添加库存明细!')
|
|
|
return false
|
|
|
}
|
|
|
- if (this.relevantAttachments.length === 0) {
|
|
|
+ if (this.relevantAttachments.length === 0) {
|
|
|
this.$message.error('请添加附件上传!')
|
|
|
return false
|
|
|
}
|
|
|
- if (this.warehouseDrList.length === 0) {
|
|
|
+ if (this.warehouseDrList.length === 0) {
|
|
|
this.$message.error('请添加收款信息!')
|
|
|
return false
|
|
|
}
|
|
|
- if (this.warehouseCrList.length === 0) {
|
|
|
+ if (this.warehouseCrList.length === 0) {
|
|
|
this.$message.error('请添加付款信息!')
|
|
|
return false
|
|
|
}
|
|
|
- // this.dataList.map((item, index)=> {
|
|
|
- // console.log(index)
|
|
|
- // if (!this.dataList[index].fGoodsid) {
|
|
|
- // this.$message.error('请输入品名!')
|
|
|
- // return false
|
|
|
- // }
|
|
|
- // })
|
|
|
-// for( var i = 0; i <= this.dataList.length;i++){
|
|
|
-// console.log(JSON.stringify(this.dataList[i].fGoodsid))
|
|
|
-// if (!this.dataList[i].fGoodsid) {
|
|
|
-// this.$message.error('请输入品名!')
|
|
|
-// return false
|
|
|
-// }
|
|
|
-// }
|
|
|
-
|
|
|
- for (let list in this.dataList) {
|
|
|
- console.log(JSON.stringify(this.dataList))
|
|
|
- if (!this.dataList[list].fGoodsid) {
|
|
|
- this.$message.error('请输入品名!')
|
|
|
- return false
|
|
|
- }
|
|
|
- }
|
|
|
- for (let list in this.dataList) {
|
|
|
- console.log(JSON.stringify(this.dataList))
|
|
|
- if (!this.dataList[list].fWarehouselocid) {
|
|
|
- this.$message.error('请输入库区!')
|
|
|
- return false
|
|
|
- }
|
|
|
- }
|
|
|
- for (let list in this.relevantAttachments) {
|
|
|
- if (this.relevantAttachments[list].fName === null) {
|
|
|
- this.$message.error('请输入附件名称!')
|
|
|
- return false
|
|
|
+ for (let list in this.dataList) {
|
|
|
+ if (!this.dataList[list].fGoodsid) {
|
|
|
+ this.$message.error('请输入品名!')
|
|
|
+ return false
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- // if (this.relevantAttachments[0].fUrl === null) {
|
|
|
- // this.$message.error('请上传附件')
|
|
|
- // return false
|
|
|
- // }
|
|
|
- for (let list in this.warehouseDrList) {
|
|
|
- if (!this.warehouseDrList[list].fCorpid) {
|
|
|
- this.$message.error('请选择客户名称')
|
|
|
- return false
|
|
|
+ for (let list in this.dataList) {
|
|
|
+ if (!this.dataList[list].fWarehouselocid) {
|
|
|
+ this.$message.error('请输入库区!')
|
|
|
+ return false
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
- }
|
|
|
- for (let list in this.warehouseCrList) {
|
|
|
- if (!this.warehouseDrList[list].fCorpid) {
|
|
|
- this.$message.error('请选择客户名称')
|
|
|
- return false
|
|
|
+ for (let list in this.relevantAttachments) {
|
|
|
+ if (this.relevantAttachments[list].fName === null) {
|
|
|
+ this.$message.error('请输入附件名称!')
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ }
|
|
|
+ for (let list in this.warehouseDrList) {
|
|
|
+ if (!this.warehouseDrList[list].fCorpid) {
|
|
|
+ this.$message.error('请选择客户名称')
|
|
|
+ return false
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ for (let list in this.warehouseCrList) {
|
|
|
+ if (!this.warehouseDrList[list].fCorpid) {
|
|
|
+ this.$message.error('请选择客户名称')
|
|
|
+ return false
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
- }
|
|
|
if (valid) {
|
|
|
let formData = new window.FormData();
|
|
|
// 附件数据
|
|
|
@@ -2521,9 +2302,7 @@ export default {
|
|
|
"tWarehousebillsitems",
|
|
|
JSON.stringify(this.dataList)
|
|
|
);
|
|
|
- console.log(this.dataList)
|
|
|
addWarehousebills(formData).then((response) => {
|
|
|
- console.log(response);
|
|
|
this.msgSuccess("新增成功");
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
|
@@ -2576,7 +2355,6 @@ export default {
|
|
|
}
|
|
|
let queryParams = { pageNum: 1, pageSize: 10, fName: name };
|
|
|
listCorps(queryParams).then((response) => {
|
|
|
- console.log(response);
|
|
|
this.fMblnoOptions = response.rows;
|
|
|
this.KHblnoOptions = response.rows;
|
|
|
});
|
|
|
@@ -2599,7 +2377,6 @@ export default {
|
|
|
let queryParams = { pageNum: 1, pageSize: 10, fName: name };
|
|
|
listFees(queryParams).then((response) => {
|
|
|
this.fWbuOptions = response.rows;
|
|
|
- console.log(response);
|
|
|
});
|
|
|
},
|
|
|
/* 远程模糊查询经营单位 */
|
|
|
@@ -2619,7 +2396,6 @@ export default {
|
|
|
}
|
|
|
let queryParams = { pageNum: 1, pageSize: 10, fName: name };
|
|
|
listWarehouse(queryParams).then((response) => {
|
|
|
- console.log(response);
|
|
|
this.warehouseOptions = response.rows;
|
|
|
});
|
|
|
},
|
|
|
@@ -2632,10 +2408,9 @@ export default {
|
|
|
this.$message.error('请输入仓库!')
|
|
|
return false
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
let queryParams = { pageNum: 1, pageSize: 10, fWarehouseid:this.form.fWarehouseid , fName: name };
|
|
|
listArea(queryParams).then((response) => {
|
|
|
- console.log(response);
|
|
|
this.kqhouseOptions = response.rows;
|
|
|
});
|
|
|
},
|
|
|
@@ -2647,7 +2422,6 @@ export default {
|
|
|
let queryParams = { pageNum: 1, pageSize: 10, userName: name };
|
|
|
listUser(queryParams).then((response) => {
|
|
|
this.userOptions = response.rows;
|
|
|
- console.log(response.rows);
|
|
|
});
|
|
|
},
|
|
|
},
|
阿伏兔