|
|
@@ -22,7 +22,7 @@
|
|
|
filterable
|
|
|
remote
|
|
|
clearable
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
:remote-method="userRemoteMethod"
|
|
|
placeholder="请选择制单人"
|
|
|
>
|
|
|
@@ -52,7 +52,7 @@
|
|
|
v-model="queryParams.fTrademodeid"
|
|
|
placeholder="请选择贸易方式"
|
|
|
clearable
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -69,10 +69,10 @@
|
|
|
filterable
|
|
|
remote
|
|
|
clearable
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
:remote-method="corpsRemoteMethod"
|
|
|
- placeholder="请选择货权方"
|
|
|
+ placeholder="请输入"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in fMblnoOptions"
|
|
|
@@ -99,7 +99,7 @@
|
|
|
clearable
|
|
|
:remote-method="fSbuRemoteMethod"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
placeholder="请选择经营单位"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -135,10 +135,10 @@
|
|
|
:disabled="browseStatus"
|
|
|
remote
|
|
|
clearable
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
:remote-method="warehouseRemoteMethod"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
- placeholder="请选择仓库"
|
|
|
+ placeholder="请输入"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in warehouseOptions"
|
|
|
@@ -218,9 +218,9 @@
|
|
|
>
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
<el-table-column type="index" label="行号" align="center" />
|
|
|
- <el-table-column label="货权方" align="center" prop="fCorpid" />
|
|
|
+ <el-table-column :show-overflow-tooltip="true" label="货权方" align="center" prop="fCorpid" />
|
|
|
<el-table-column label="提单号" align="center" prop="fMblno" />
|
|
|
- <el-table-column label="经营单位" align="center" prop="fSbu" />
|
|
|
+ <el-table-column :show-overflow-tooltip="true" label="经营单位" align="center" prop="fSbu" />
|
|
|
<el-table-column
|
|
|
label="入库日期"
|
|
|
align="center"
|
|
|
@@ -230,12 +230,12 @@
|
|
|
<span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column
|
|
|
+ <!-- <el-table-column
|
|
|
label="贸易方式"
|
|
|
align="center"
|
|
|
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"/>-->
|
|
|
@@ -286,7 +286,7 @@
|
|
|
:limit.sync="queryParams.pageSize"
|
|
|
@pagination="getList"
|
|
|
/>
|
|
|
- <!-- 添加或修改仓库主(出入库)对话框 -->
|
|
|
+ <!-- 新增或修改仓库主(出入库)对话框 -->
|
|
|
<el-dialog
|
|
|
:title="title"
|
|
|
:visible.sync="open"
|
|
|
@@ -303,9 +303,9 @@
|
|
|
filterable
|
|
|
remote
|
|
|
:disabled="browseStatus"
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
:remote-method="corpsRemoteMethod"
|
|
|
- placeholder="请选择货权方"
|
|
|
+ placeholder="请输入"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in fMblnoOptions"
|
|
|
@@ -323,7 +323,7 @@
|
|
|
placeholder="请选择结算方式"
|
|
|
clearable
|
|
|
:disabled="browseStatus"
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in fStltypeOptions"
|
|
|
@@ -339,7 +339,7 @@
|
|
|
<el-input
|
|
|
v-model="form.fMblno"
|
|
|
:disabled="browseStatus"
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
placeholder="手工输入"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -350,7 +350,7 @@
|
|
|
<el-form-item label="业务日期" prop="fBsdate">
|
|
|
<el-date-picker
|
|
|
v-model="form.fBsdate"
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
type="date"
|
|
|
:disabled="browseStatus"
|
|
|
@change="changefBsdate"
|
|
|
@@ -368,9 +368,9 @@
|
|
|
filterable
|
|
|
remote
|
|
|
:disabled="browseStatus"
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
:remote-method="userRemoteMethod"
|
|
|
- placeholder="请选择仓管员"
|
|
|
+ placeholder="请输入"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in userOptions"
|
|
|
@@ -388,9 +388,9 @@
|
|
|
filterable
|
|
|
:disabled="browseStatus"
|
|
|
remote
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
:remote-method="warehouseRemoteMethod"
|
|
|
- placeholder="请选择仓库"
|
|
|
+ placeholder="请输入"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in warehouseOptions"
|
|
|
@@ -409,7 +409,7 @@
|
|
|
<el-input
|
|
|
disabled
|
|
|
v-model="form.fBscorpno"
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
laceholder="存货编号"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -421,7 +421,7 @@
|
|
|
placeholder="请选择是否破损"
|
|
|
clearable
|
|
|
:disabled="browseStatus"
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in fIfdamageOptions"
|
|
|
@@ -439,7 +439,7 @@
|
|
|
placeholder="请选择是否过磅"
|
|
|
clearable
|
|
|
:disabled="browseStatus"
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in fIfweighOptions"
|
|
|
@@ -460,7 +460,7 @@
|
|
|
placeholder="请选择是否过磅"
|
|
|
clearable
|
|
|
:disabled="browseStatus"
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in fIfpledgeOptions"
|
|
|
@@ -473,12 +473,29 @@
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="质押银行" prop="fBankcorpid">
|
|
|
- <el-input
|
|
|
+ <!-- <el-input
|
|
|
v-model="form.fBankcorpid"
|
|
|
laceholder="质押银行"
|
|
|
:disabled="browseStatus"
|
|
|
- style="width: 250px"
|
|
|
- />
|
|
|
+ style="width: 80%"
|
|
|
+ /> -->
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fBankcorpid"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ clearable
|
|
|
+ style="width: 80%"
|
|
|
+ @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-col>
|
|
|
<el-col :span="8">
|
|
|
@@ -488,7 +505,7 @@
|
|
|
placeholder="请选择计费单位"
|
|
|
clearable
|
|
|
:disabled="browseStatus"
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in fFeetunitOptions"
|
|
|
@@ -499,6 +516,16 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-form-item label="唛头" prop="fbarks">
|
|
|
+ <el-input
|
|
|
+ v-model="form.fMarks"
|
|
|
+ style="width: 80%"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ placeholder="唛头"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-form-item label="备注" prop="remark">
|
|
|
@@ -518,13 +545,33 @@
|
|
|
"
|
|
|
>展开</el-button
|
|
|
>
|
|
|
+ <el-button
|
|
|
+ type="danger"
|
|
|
+ prop="打印"
|
|
|
+ @click="showEditDialog_ss"
|
|
|
+ >收货单
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ type="danger"
|
|
|
+ prop="打印"
|
|
|
+ @click="showEditDialog_s"
|
|
|
+ >出库单
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ type="danger"
|
|
|
+ prop="打印"
|
|
|
+ @click="showEditDialog_sss"
|
|
|
+ >作业单
|
|
|
+ </el-button>
|
|
|
+ <el-button type="primary" @click="submitForm(2)">保 存</el-button>
|
|
|
+ <el-button type="primary" @click="submitForm(6)">提交审核</el-button>
|
|
|
<div v-if="detailsHidden">
|
|
|
<el-row style="margin-top: 30px">
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="仓库联系人" prop="fContacts">
|
|
|
<el-input
|
|
|
v-model="form.fContacts"
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
:disabled="browseStatus"
|
|
|
placeholder="仓库联系人"
|
|
|
/>
|
|
|
@@ -535,7 +582,7 @@
|
|
|
<el-input
|
|
|
v-model="form.fTel"
|
|
|
:disabled="browseStatus"
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
placeholder="请输仓库入电话"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -544,7 +591,7 @@
|
|
|
<el-form-item label="船名航次" prop="fVslvoy">
|
|
|
<el-input
|
|
|
v-model="form.fVslvoy"
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
:disabled="browseStatus"
|
|
|
placeholder="船名航次"
|
|
|
/>
|
|
|
@@ -556,7 +603,7 @@
|
|
|
<el-form-item label="到港日期" prop="fEta">
|
|
|
<el-date-picker
|
|
|
v-model="form.fEta"
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
type="date"
|
|
|
:disabled="browseStatus"
|
|
|
value-format="timestamp"
|
|
|
@@ -569,7 +616,7 @@
|
|
|
<el-form-item label="报关单号" prop="fCustomno">
|
|
|
<el-input
|
|
|
v-model="form.fCustomno"
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
:disabled="browseStatus"
|
|
|
laceholder="报关单号"
|
|
|
/>
|
|
|
@@ -584,7 +631,7 @@
|
|
|
remote
|
|
|
:disabled="browseStatus"
|
|
|
:remote-method="fSbuRemoteMethod"
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
placeholder="请选择经营单位"
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -603,7 +650,7 @@
|
|
|
<el-input
|
|
|
v-model="form.fBillno"
|
|
|
disabled
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
placeholder="单据编号"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -615,7 +662,7 @@
|
|
|
placeholder="请选择贸易方式"
|
|
|
:disabled="browseStatus"
|
|
|
clearable
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(dict, index) in fTrademodeidOptions"
|
|
|
@@ -631,7 +678,7 @@
|
|
|
<el-input
|
|
|
disabled
|
|
|
v-model="form.createBy"
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
placeholder="制单人"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
@@ -644,7 +691,7 @@
|
|
|
v-model="form.fDeptid"
|
|
|
filterable
|
|
|
disabled
|
|
|
- style="width: 250px"
|
|
|
+ style="width: 80%"
|
|
|
remote
|
|
|
>
|
|
|
<el-option
|
|
|
@@ -670,16 +717,7 @@
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="8">
|
|
|
- <el-form-item label="唛头" prop="fbarks">
|
|
|
- <el-input
|
|
|
- v-model="form.fMarks"
|
|
|
- style="width: 250px"
|
|
|
- :disabled="browseStatus"
|
|
|
- placeholder="唛头"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
+
|
|
|
</el-row>
|
|
|
</div>
|
|
|
</el-form>
|
|
|
@@ -687,7 +725,7 @@
|
|
|
<div class="dialogTableTitle flex a-center jlr">
|
|
|
<h2>库存明细</h2>
|
|
|
<el-button :disabled="browseStatus" @click.prevent="addRelevant()"
|
|
|
- >添加
|
|
|
+ >新增
|
|
|
</el-button>
|
|
|
</div>
|
|
|
<el-table
|
|
|
@@ -707,13 +745,13 @@
|
|
|
prop="fBsdate"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- width="180px"
|
|
|
+ width="150px"
|
|
|
label="入库日期"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<el-date-picker
|
|
|
v-model="scope.row.fBsdate"
|
|
|
- style="width: 150px"
|
|
|
+ style="width: 138px"
|
|
|
type="date"
|
|
|
disabled
|
|
|
value-format="timestamp"
|
|
|
@@ -785,7 +823,7 @@
|
|
|
prop="fPlangrossweight"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- width="180px"
|
|
|
+ width="150px"
|
|
|
label="计划毛重"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
@@ -802,7 +840,7 @@
|
|
|
prop="fPlannetweight"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- width="180px"
|
|
|
+ width="150px"
|
|
|
label="计划净重"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
@@ -818,7 +856,7 @@
|
|
|
<el-table-column
|
|
|
prop="fPlanvolumn"
|
|
|
header-align="center"
|
|
|
- width="180px"
|
|
|
+ width="150px"
|
|
|
align="center"
|
|
|
label="计划尺码"
|
|
|
>
|
|
|
@@ -835,7 +873,7 @@
|
|
|
<el-table-column
|
|
|
prop="fPlanqty"
|
|
|
header-align="center"
|
|
|
- width="180px"
|
|
|
+ width="150px"
|
|
|
align="center"
|
|
|
label="计划件数"
|
|
|
>
|
|
|
@@ -852,7 +890,7 @@
|
|
|
<el-table-column
|
|
|
prop="fGrossweight"
|
|
|
header-align="center"
|
|
|
- width="180px"
|
|
|
+ width="150px"
|
|
|
align="center"
|
|
|
label="入库毛重"
|
|
|
>
|
|
|
@@ -869,7 +907,7 @@
|
|
|
<el-table-column
|
|
|
prop="fNetweight"
|
|
|
header-align="center"
|
|
|
- width="180px"
|
|
|
+ width="150px"
|
|
|
align="center"
|
|
|
label="入库净重"
|
|
|
>
|
|
|
@@ -886,7 +924,7 @@
|
|
|
<el-table-column
|
|
|
prop="fQty"
|
|
|
header-align="center"
|
|
|
- width="180px"
|
|
|
+ width="150px"
|
|
|
align="center"
|
|
|
label="入库件数"
|
|
|
>
|
|
|
@@ -903,7 +941,7 @@
|
|
|
<el-table-column
|
|
|
prop="fPackagespecs"
|
|
|
header-align="center"
|
|
|
- width="180px"
|
|
|
+ width="150px"
|
|
|
align="center"
|
|
|
label="包装规格"
|
|
|
>
|
|
|
@@ -920,7 +958,7 @@
|
|
|
<el-table-column
|
|
|
prop="fWarehouselocid"
|
|
|
header-align="center"
|
|
|
- width="150px"
|
|
|
+ width="140px"
|
|
|
align="center"
|
|
|
label="库区"
|
|
|
>
|
|
|
@@ -945,7 +983,7 @@
|
|
|
<el-table-column
|
|
|
prop="fCntrno"
|
|
|
header-align="center"
|
|
|
- width="150px"
|
|
|
+ width="130px"
|
|
|
align="center"
|
|
|
label="箱号"
|
|
|
>
|
|
|
@@ -961,7 +999,7 @@
|
|
|
<el-table-column
|
|
|
prop="fGoodsval"
|
|
|
header-align="center"
|
|
|
- width="150px"
|
|
|
+ width="130px"
|
|
|
align="center"
|
|
|
label="货值"
|
|
|
>
|
|
|
@@ -978,7 +1016,7 @@
|
|
|
<el-table-column
|
|
|
prop="fTruckno"
|
|
|
header-align="center"
|
|
|
- width="150px"
|
|
|
+ width="130px"
|
|
|
align="center"
|
|
|
label="车号"
|
|
|
>
|
|
|
@@ -995,7 +1033,7 @@
|
|
|
<el-table-column
|
|
|
prop="remark"
|
|
|
header-align="center"
|
|
|
- width="150px"
|
|
|
+ width="130px"
|
|
|
align="center"
|
|
|
label="备注"
|
|
|
>
|
|
|
@@ -1026,7 +1064,7 @@
|
|
|
<div class="dialogTableTitle flex a-center jlr">
|
|
|
<h2>附件上传</h2>
|
|
|
<el-button :disabled="browseStatus" @click.prevent="addRelevt()"
|
|
|
- >添加
|
|
|
+ >新增
|
|
|
</el-button>
|
|
|
</div>
|
|
|
<el-table
|
|
|
@@ -1091,7 +1129,6 @@
|
|
|
prop="fUrl"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- width="250PX"
|
|
|
label="上传附件"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
@@ -1119,7 +1156,10 @@
|
|
|
<div class="dialogTableTitle flex a-center jlr">
|
|
|
<h2>收款信息</h2>
|
|
|
<el-button :disabled="browseStatus" @click.prevent="addCollection()"
|
|
|
- >添加
|
|
|
+ >新增
|
|
|
+ </el-button>
|
|
|
+ <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseDrList)"
|
|
|
+ >删除
|
|
|
</el-button>
|
|
|
</div>
|
|
|
<el-table
|
|
|
@@ -1129,8 +1169,10 @@
|
|
|
border
|
|
|
stripe
|
|
|
show-summary
|
|
|
+ @selection-change="Collectionoptions"
|
|
|
:summary-method="warehouseDrSummaries"
|
|
|
>
|
|
|
+ <el-table-column type="selection" width="55" align="center" />
|
|
|
<el-table-column label="序号" type="index" width="80">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -1211,7 +1253,7 @@
|
|
|
prop="fQty"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- width="150px"
|
|
|
+ width="130px"
|
|
|
label="数量"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
@@ -1229,7 +1271,7 @@
|
|
|
prop="fUnitprice"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- width="150px"
|
|
|
+ width="130px"
|
|
|
label="单价"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
@@ -1247,7 +1289,7 @@
|
|
|
prop="fAmount"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- width="150px"
|
|
|
+ width="130px"
|
|
|
label="金额"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
@@ -1264,7 +1306,7 @@
|
|
|
prop="fCurrency"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- width="150px"
|
|
|
+ width="130px"
|
|
|
label="币别"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
@@ -1280,7 +1322,7 @@
|
|
|
prop="fExrate"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- width="150px"
|
|
|
+ width="130px"
|
|
|
label="汇率"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
@@ -1296,7 +1338,7 @@
|
|
|
prop="fTaxrate"
|
|
|
header-align="center"
|
|
|
align="center"
|
|
|
- width="150px"
|
|
|
+ width="130px"
|
|
|
label="税率"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
@@ -1331,7 +1373,7 @@
|
|
|
width="200px"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button size="small">审核费用</el-button>
|
|
|
+ <!-- <el-button size="small">审核费用</el-button> -->
|
|
|
<el-button
|
|
|
@click.native.prevent="deleteRow(scope.$index, warehouseDrList)"
|
|
|
size="small"
|
|
|
@@ -1343,7 +1385,10 @@
|
|
|
<div class="dialogTableTitle flex a-center jlr">
|
|
|
<h2>付款信息</h2>
|
|
|
<el-button :disabled="browseStatus" @click.prevent="addpayment()"
|
|
|
- >添加
|
|
|
+ >新增
|
|
|
+ </el-button>
|
|
|
+ <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseCrList)"
|
|
|
+ >删除
|
|
|
</el-button>
|
|
|
</div>
|
|
|
<el-table
|
|
|
@@ -1353,8 +1398,10 @@
|
|
|
border
|
|
|
stripe
|
|
|
show-summary
|
|
|
+ @selection-change="Paymentoptions"
|
|
|
:summary-method="warehouseDrSummaries"
|
|
|
>
|
|
|
+ <el-table-column type="selection" width="55" align="center" />
|
|
|
<el-table-column label="序号" type="index" width="80">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -1557,7 +1604,7 @@
|
|
|
label="操作"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button size="small">审核费用</el-button>
|
|
|
+ <!-- <el-button size="small">审核费用</el-button> -->
|
|
|
<el-button
|
|
|
@click.native.prevent="deleteRow(scope.$index, warehouseCrList)"
|
|
|
size="small"
|
|
|
@@ -1945,13 +1992,14 @@ export default {
|
|
|
// 选中数组
|
|
|
ids: [],
|
|
|
Printinglist: [],
|
|
|
+ Collectionoptionss: [],
|
|
|
userVal: {
|
|
|
userName: null,
|
|
|
nickName: null,
|
|
|
deptId: null,
|
|
|
},
|
|
|
queryForm: {},
|
|
|
- // 添加用户对话框
|
|
|
+ // 新增用户对话框
|
|
|
editDialogVisible_s: false,
|
|
|
editDialogVisible_ss: false,
|
|
|
editDialogVisible_sss: false,
|
|
|
@@ -2062,38 +2110,38 @@ export default {
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
fDeptid: [
|
|
|
- { required: true, message: "制单部门不能为空", trigger: "blur" },
|
|
|
+ { required: true, message: " ", trigger: "blur" },
|
|
|
],
|
|
|
- fMblno: [{ required: true, message: "请输入提单号", trigger: "blur" }],
|
|
|
+ fMblno: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
fBsdeptid: [
|
|
|
- { required: true, message: "业务所属部门不能为空", trigger: "blur" },
|
|
|
+ { required: true, message: " ", trigger: "blur" },
|
|
|
],
|
|
|
fCorpid: [
|
|
|
{
|
|
|
required: true,
|
|
|
- message: "请选择货权方",
|
|
|
+ message: " ",
|
|
|
trigger: "blur",
|
|
|
},
|
|
|
],
|
|
|
fBsdate: [
|
|
|
- { required: true, message: "请选择业务日期", trigger: "blur" },
|
|
|
+ { required: true, message: " ", trigger: "blur" },
|
|
|
],
|
|
|
fTrademodeid: [
|
|
|
- { required: true, message: "请选择贸易方式", trigger: "blur" },
|
|
|
+ { required: true, message: " ", trigger: "blur" },
|
|
|
],
|
|
|
- fSbu: [{ required: true, message: "请选择经营单位", trigger: "blur" }],
|
|
|
+ fSbu: [{ required: true, message: " ", trigger: "blur" }],
|
|
|
fStorekeeper: {
|
|
|
required: true,
|
|
|
- message: "请输入仓管员",
|
|
|
+ message: " ",
|
|
|
trigger: "blur",
|
|
|
},
|
|
|
fWarehouseid: [
|
|
|
- { required: true, message: "请选择仓库", trigger: "blur" },
|
|
|
+ { required: true, message: " ", trigger: "blur" },
|
|
|
],
|
|
|
fbillingway: [
|
|
|
{
|
|
|
required: true,
|
|
|
- message: "请选择结算方式",
|
|
|
+ message: " ",
|
|
|
trigger: "blur",
|
|
|
},
|
|
|
],
|
|
|
@@ -2101,7 +2149,7 @@ export default {
|
|
|
{
|
|
|
required: true,
|
|
|
message:
|
|
|
- "货转客户名称，t_corps 中的no或 name，模糊查找选择后，存储id，显示name，自有在货权转移是该字段有效不能为空",
|
|
|
+ " ",
|
|
|
trigger: "blur",
|
|
|
},
|
|
|
],
|
|
|
@@ -2122,6 +2170,7 @@ export default {
|
|
|
});
|
|
|
this.getDicts("data_ifweigh_status").then((response) => {
|
|
|
this.fIfweighOptions = response.data;
|
|
|
+ console.log(this.fIfweighOptions)
|
|
|
});
|
|
|
this.getDicts("data_ifpledge_status").then((response) => {
|
|
|
this.fIfpledgeOptions = response.data;
|
|
|
@@ -2153,7 +2202,7 @@ export default {
|
|
|
scanStyles: false,
|
|
|
});
|
|
|
},
|
|
|
- // 添加附件上传
|
|
|
+ // 新增附件上传
|
|
|
addRelevt() {
|
|
|
this.relevantAttachments.push({
|
|
|
fUrl: null,
|
|
|
@@ -2162,7 +2211,7 @@ export default {
|
|
|
createTime: Date.parse(new Date()),
|
|
|
});
|
|
|
},
|
|
|
- // 添加list
|
|
|
+ // 新增list
|
|
|
addRelevant() {
|
|
|
let time = null;
|
|
|
if (this.form.fBsdate) {
|
|
|
@@ -2208,7 +2257,8 @@ export default {
|
|
|
fQty: null,
|
|
|
fUnitprice: null,
|
|
|
fAmount: null,
|
|
|
- fCurrency: null,
|
|
|
+ fCurrency: "RMB",
|
|
|
+ fExrate: "1",
|
|
|
fCxrate: null,
|
|
|
fRate: null,
|
|
|
remarks: null,
|
|
|
@@ -2222,7 +2272,8 @@ export default {
|
|
|
fQty: null,
|
|
|
fUnitprice: null,
|
|
|
fAmount: null,
|
|
|
- fCurrency: null,
|
|
|
+ fCurrency: 'RMB',
|
|
|
+ fExrate: "1",
|
|
|
fCxrate: null,
|
|
|
fRate: null,
|
|
|
remarks: null,
|
|
|
@@ -2230,10 +2281,14 @@ export default {
|
|
|
},
|
|
|
queryUser() {
|
|
|
queryUserVal().then((response) => {
|
|
|
+ console.log(response)
|
|
|
if (response.user !== null) {
|
|
|
this.userVal = response.user;
|
|
|
+ console.log(this.userVal)
|
|
|
this.$set(this.form, "fDeptid", this.userVal.deptId);
|
|
|
this.$set(this.form, "createBy", this.userVal.userName);
|
|
|
+ this.$set(this.form, "fIfdamage", "1");
|
|
|
+ this.$set(this.form, "fIfweigh", "1");
|
|
|
// this.$set(this.relevantAttachments, "opUserName", this.userVal.userName);
|
|
|
this.$set(this.form, "createTime", Date.parse(new Date()));
|
|
|
}
|
|
|
@@ -2381,6 +2436,22 @@ export default {
|
|
|
}
|
|
|
|
|
|
},
|
|
|
+ // 收款选择
|
|
|
+ Collectionoptions(selection) {
|
|
|
+ console.log(selection)
|
|
|
+ console.log("666")
|
|
|
+ this.Collectionoptionss = selection
|
|
|
+
|
|
|
+ },
|
|
|
+ // 收款删除
|
|
|
+ deleteRow(row) {
|
|
|
+ console.log("$")
|
|
|
+ row.splice(this.Collectionoptionss);
|
|
|
+ },
|
|
|
+ // 付款选择
|
|
|
+ Paymentoptions(selection) {
|
|
|
+ console.log(selection)
|
|
|
+ },
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd(status) {
|
|
|
this.browseStatus = status;
|
|
|
@@ -2400,6 +2471,7 @@ export default {
|
|
|
this.reset();
|
|
|
const fId = row.fId || this.ids;
|
|
|
getWarehousebills(fId).then((response) => {
|
|
|
+ console.log(response)
|
|
|
if (response.data.warehousebills) {
|
|
|
this.form = response.data.warehousebills;
|
|
|
}
|
|
|
@@ -2464,7 +2536,7 @@ export default {
|
|
|
var values = [];
|
|
|
columns.forEach((column, index) => {
|
|
|
if (index === 0) {
|
|
|
- sums[index] = "总价";
|
|
|
+ sums[index] = "";
|
|
|
return;
|
|
|
}
|
|
|
if (column.property === "fPlangrossweight") {
|
|
|
@@ -2662,19 +2734,19 @@ export default {
|
|
|
}
|
|
|
} else {
|
|
|
if (this.dataList.length === 0) {
|
|
|
- this.$message.error("请添加库存明细!");
|
|
|
+ this.$message.error("请新增库存明细!");
|
|
|
return false;
|
|
|
}
|
|
|
if (this.relevantAttachments.length === 0) {
|
|
|
- this.$message.error("请添加附件上传!");
|
|
|
+ this.$message.error("请新增附件上传!");
|
|
|
return false;
|
|
|
}
|
|
|
if (this.warehouseDrList.length === 0) {
|
|
|
- this.$message.error("请添加收款信息!");
|
|
|
+ this.$message.error("请新增收款信息!");
|
|
|
return false;
|
|
|
}
|
|
|
if (this.warehouseCrList.length === 0) {
|
|
|
- this.$message.error("请添加付款信息!");
|
|
|
+ this.$message.error("请新增付款信息!");
|
|
|
return false;
|
|
|
}
|
|
|
for (let list in this.dataList) {
|
|
|
@@ -2798,15 +2870,16 @@ export default {
|
|
|
this.download(response.msg);
|
|
|
});
|
|
|
},
|
|
|
- deleteRow(index, rows) {
|
|
|
- rows.splice(index, 1);
|
|
|
- },
|
|
|
+ // deleteRow(index, rows) {
|
|
|
+
|
|
|
+ // rows.splice(index, 1);
|
|
|
+ // },
|
|
|
/* 远程模糊查询用户 */
|
|
|
corpsRemoteMethod(name) {
|
|
|
if (name == null || name === "") {
|
|
|
return false;
|
|
|
}
|
|
|
- let queryParams = { pageNum: 1, pageSize: 10, fName: name };
|
|
|
+ let queryParams = { pageNum: 1, pageSize: 10, fName: name, type: 1 };
|
|
|
listCorps(queryParams).then((response) => {
|
|
|
this.fMblnoOptions = response.rows;
|
|
|
this.KHblnoOptions = response.rows;
|
|
|
@@ -2904,4 +2977,7 @@ export default {
|
|
|
.upload-demo {
|
|
|
margin-left: 50px;
|
|
|
}
|
|
|
+.el-form-item {
|
|
|
+ margin-bottom: 5px;
|
|
|
+}
|
|
|
</style>
|
tong