|
|
@@ -6,8 +6,8 @@
|
|
|
:option="option"
|
|
|
ref="crud"
|
|
|
:data="warehousebillsList"
|
|
|
- @resetColumn="resetColumn"
|
|
|
- @saveColumn="saveColumn">
|
|
|
+ @resetColumn="resetColumn('crud','option','optionList',171)"
|
|
|
+ @saveColumn="saveColumn('crud','option','optionList',171)">
|
|
|
<template slot="menuLeft">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
@@ -134,7 +134,7 @@
|
|
|
<el-option label="审核通过" value="6"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="贸易方式" prop="trademodeid" v-if="showTrademode == '0'">
|
|
|
+ <el-form-item label="贸易方式" prop="trademodeid" v-if="showTrademode == '0'">
|
|
|
<el-select
|
|
|
v-model="queryParams.trademodeid"
|
|
|
placeholder="请选择贸易方式"
|
|
|
@@ -463,13 +463,15 @@
|
|
|
:visible.sync="open"
|
|
|
:close-on-click-modal="false"
|
|
|
width="80%"
|
|
|
+ top="1vh"
|
|
|
+ custom-class="customClass"
|
|
|
append-to-body
|
|
|
:show-close="Xbutton"
|
|
|
- :before-close="handleClose"
|
|
|
- >
|
|
|
+ :before-close="handleClose">
|
|
|
<template slot="title">
|
|
|
<div class="avue-crud__dialog__header">
|
|
|
<span class="el-dialog__title">
|
|
|
+ 仓储费明细
|
|
|
<span
|
|
|
style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px"></span>
|
|
|
</span>
|
|
|
@@ -478,7 +480,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
- <el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
|
|
+ <el-form ref="form" :model="form" :rules="rules" style="margin-top: -30px" label-width="120px">
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label="客户名称" prop="corpid">
|
|
|
@@ -632,7 +634,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8" v-if="showTrademode == '0'">
|
|
|
- <el-form-item label="贸易方式" prop="trademodeid">
|
|
|
+ <el-form-item label="贸易方式" prop="trademodeid">
|
|
|
<el-select
|
|
|
v-model="form.trademodeid"
|
|
|
:disabled="notChange"
|
|
|
@@ -675,26 +677,60 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
- <div style="font-size:18px; padding-top:8px">
|
|
|
- 计费物资明细
|
|
|
- <el-button size="small" :disabled="browseStatus" @click="calculateCost">计算仓储费</el-button>
|
|
|
- <el-button size="small" type="primary" :disabled="browseStatus" @click="submitForm(2)">保 存</el-button>
|
|
|
- <el-button
|
|
|
- size="small"
|
|
|
- type="warning"
|
|
|
- icon="el-icon-download"
|
|
|
- @click="handleExportItems"
|
|
|
- >导出
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
- type="warning"
|
|
|
- icon="el-icon-download"
|
|
|
- @click="exportDetail"
|
|
|
- v-show="dataList.length > 0 && form.mblno"
|
|
|
- >明细导出</el-button>
|
|
|
- <el-button type="danger" v-show="showAgreementStatus" @click="showAgreement">查看仓储费用协议</el-button>
|
|
|
- </div>
|
|
|
- <div class="dialogTableTitle flex a-center jlr"
|
|
|
+ <avue-crud
|
|
|
+ ref="payment"
|
|
|
+ :option="optionTwo"
|
|
|
+ :data="dataList"
|
|
|
+ @resetColumn="resetColumn('payment','optionTwo','optionTwoBack',171.1)"
|
|
|
+ @saveColumn="saveColumn('payment','optionTwo','optionTwoBack',171.1)">
|
|
|
+ <template slot="menuLeft">
|
|
|
+ <div style="font-size:18px; padding-top:8px">
|
|
|
+ 计费物资明细
|
|
|
+ <el-button size="small" :disabled="browseStatus" @click="calculateCost">计算仓储费</el-button>
|
|
|
+ <el-button size="small" type="primary" :disabled="browseStatus" @click="submitForm(2)">保 存</el-button>
|
|
|
+ <el-button
|
|
|
+ size="small"
|
|
|
+ type="warning"
|
|
|
+ icon="el-icon-download"
|
|
|
+ @click="handleExportItems"
|
|
|
+ >导出
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ type="warning"
|
|
|
+ icon="el-icon-download"
|
|
|
+ @click="exportDetail"
|
|
|
+ v-show="dataList.length > 0 && form.mblno"
|
|
|
+ >明细导出
|
|
|
+ </el-button>
|
|
|
+ <el-button type="danger" v-show="showAgreementStatus" @click="showAgreement">查看仓储费用协议</el-button>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ <template slot="billtype" slot-scope="scope">
|
|
|
+ <span v-if="scope.row.billtype === 'SJRK'">入库</span>
|
|
|
+ <span v-if="scope.row.billtype === 'SJCK'">出库</span>
|
|
|
+ <span v-if="scope.row.billtype === 'KCZZ'">库存总账</span>
|
|
|
+ <span v-if="scope.row.billtype === 'HQZY'">货权转移</span>
|
|
|
+ </template>
|
|
|
+ <template slot-scope="{row,index}" slot="menu">
|
|
|
+ <el-button
|
|
|
+ type="text"
|
|
|
+ size="small"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"
|
|
|
+ @click="paymentRowCell(row,index)"
|
|
|
+ >{{ row.$cellEdit ? '保存' : '编辑' }}
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
+ type="text"
|
|
|
+ size="small"
|
|
|
+ icon="el-icon-delete"
|
|
|
+ @click.native.prevent="deleteRow(index, dataList)"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ >移除
|
|
|
+ </el-button>
|
|
|
+ </template>
|
|
|
+ </avue-crud>
|
|
|
+ <div v-if="false" class="dialogTableTitle flex a-center jlr"
|
|
|
style="display:flex;justify-content:space-between;align-items:center;margin: 10px 0;">
|
|
|
<el-table
|
|
|
:data="dataList"
|
|
|
@@ -880,7 +916,7 @@
|
|
|
v-if="!browseStatus"
|
|
|
show-word-limit
|
|
|
/>
|
|
|
- <span v-else>{{scope.row.remark}}</span>
|
|
|
+ <span v-else>{{ scope.row.remark }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -892,7 +928,7 @@
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <span @click="showRemarkDetail(scope.row)">{{scope.row.priceDateRemarks}}</span>
|
|
|
+ <span @click="showRemarkDetail(scope.row)">{{ scope.row.priceDateRemarks }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -914,284 +950,7 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</div>
|
|
|
- <!-- <div>-->
|
|
|
- <!-- <el-button :disabled="browseStatus" @click.prevent="addCollection()"-->
|
|
|
- <!-- >新行-->
|
|
|
- <!-- </el-button>-->
|
|
|
- <!-- <el-button type="primary" :disabled="browseStatus" @click="submitForm(2)">保 存</el-button>-->
|
|
|
- <!-- </div>-->
|
|
|
- <!-- <div style="font-size:18px">应收款明细</div>-->
|
|
|
- <!-- <div class="dialogTableTitle flex a-center jlr"-->
|
|
|
- <!-- style="display:flex;justify-content:space-between;align-items:center;margin: 10px 0;">-->
|
|
|
- <!-- <el-table-->
|
|
|
- <!-- :data="warehouseDrList"-->
|
|
|
- <!-- ref="table"-->
|
|
|
- <!-- tooltip-effect="dark"-->
|
|
|
- <!-- border-->
|
|
|
- <!-- stripe-->
|
|
|
- <!-- show-summary-->
|
|
|
- <!-- :summary-method="warehouseDrSummaries"-->
|
|
|
- <!-- >-->
|
|
|
- <!-- <el-table-column label="序号" type="index" width="80">-->
|
|
|
- <!-- </el-table-column>-->
|
|
|
- <!-- <el-table-column-->
|
|
|
- <!-- prop="corpid"-->
|
|
|
- <!-- header-align="center"-->
|
|
|
- <!-- align="center"-->
|
|
|
- <!-- width="180px"-->
|
|
|
- <!-- label="客户名称"-->
|
|
|
- <!-- >-->
|
|
|
- <!-- <template slot-scope="scope">-->
|
|
|
- <!-- <el-select-->
|
|
|
- <!-- v-model="scope.row.corpid"-->
|
|
|
- <!-- filterable-->
|
|
|
- <!-- remote-->
|
|
|
- <!-- :disabled="browseStatus"-->
|
|
|
- <!-- :remote-method="corpsRemoteMethod"-->
|
|
|
- <!-- placeholder="客户名称"-->
|
|
|
- <!-- >-->
|
|
|
- <!-- <el-option-->
|
|
|
- <!-- v-for="(dict, index) in mblnoOptions"-->
|
|
|
- <!-- :key="index.id"-->
|
|
|
- <!-- :label="dict.name"-->
|
|
|
- <!-- :value="dict.id"-->
|
|
|
- <!-- ></el-option>-->
|
|
|
- <!-- </el-select>-->
|
|
|
- <!-- </template>-->
|
|
|
- <!-- </el-table-column>-->
|
|
|
- <!-- <el-table-column-->
|
|
|
- <!-- prop="feeid"-->
|
|
|
- <!-- header-align="center"-->
|
|
|
- <!-- align="center"-->
|
|
|
- <!-- width="180px"-->
|
|
|
- <!-- label="费用名称"-->
|
|
|
- <!-- >-->
|
|
|
- <!-- <template slot-scope="scope">-->
|
|
|
- <!-- <el-select-->
|
|
|
- <!-- v-model="scope.row.feeid"-->
|
|
|
- <!-- filterable-->
|
|
|
- <!-- remote-->
|
|
|
- <!-- :disabled="browseStatus"-->
|
|
|
- <!-- :remote-method="wRemoteMethod"-->
|
|
|
- <!-- placeholder="费用名称"-->
|
|
|
- <!-- >-->
|
|
|
- <!-- <el-option-->
|
|
|
- <!-- v-for="dict in wbuOptions"-->
|
|
|
- <!-- :key="dict.id"-->
|
|
|
- <!-- :label="dict.name"-->
|
|
|
- <!-- :value="dict.id"-->
|
|
|
- <!-- ></el-option>-->
|
|
|
- <!-- </el-select>-->
|
|
|
- <!-- </template>-->
|
|
|
- <!-- </el-table-column>-->
|
|
|
- <!-- <el-table-column-->
|
|
|
- <!-- prop="feeunitid"-->
|
|
|
- <!-- header-align="center"-->
|
|
|
- <!-- align="center"-->
|
|
|
- <!-- width="180px"-->
|
|
|
- <!-- label="计价单位"-->
|
|
|
- <!-- >-->
|
|
|
- <!-- <template slot-scope="scope">-->
|
|
|
- <!-- <el-select-->
|
|
|
- <!-- v-model="scope.row.feeunitid"-->
|
|
|
- <!-- placeholder="请选择计价单位"-->
|
|
|
- <!-- :disabled="browseStatus"-->
|
|
|
- <!-- clearable-->
|
|
|
- <!-- >-->
|
|
|
- <!-- <el-option-->
|
|
|
- <!-- v-for="dict in feetunitOptions"-->
|
|
|
- <!-- :key="dict.dictValue"-->
|
|
|
- <!-- :label="dict.dictLabel"-->
|
|
|
- <!-- :value="dict.dictValue"-->
|
|
|
- <!-- />-->
|
|
|
- <!-- </el-select>-->
|
|
|
- <!-- </template>-->
|
|
|
- <!-- </el-table-column>-->
|
|
|
- <!-- <el-table-column-->
|
|
|
- <!-- prop="qty"-->
|
|
|
- <!-- header-align="center"-->
|
|
|
- <!-- align="center"-->
|
|
|
- <!-- width="150px"-->
|
|
|
- <!-- label="数量"-->
|
|
|
- <!-- >-->
|
|
|
- <!-- <template slot-scope="scope">-->
|
|
|
- <!-- <el-input-->
|
|
|
- <!-- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'-->
|
|
|
- <!-- v-model="scope.row.qty"-->
|
|
|
- <!-- @change="changeEstmateAmt(scope.row)"-->
|
|
|
- <!-- :disabled="browseStatus"-->
|
|
|
- <!-- placeholder="数量"-->
|
|
|
- <!-- show-word-limit-->
|
|
|
- <!-- />-->
|
|
|
- <!-- </template>-->
|
|
|
- <!-- </el-table-column>-->
|
|
|
- <!-- <el-table-column-->
|
|
|
- <!-- prop="unitprice"-->
|
|
|
- <!-- header-align="center"-->
|
|
|
- <!-- align="center"-->
|
|
|
- <!-- width="150px"-->
|
|
|
- <!-- label="单价"-->
|
|
|
- <!-- >-->
|
|
|
- <!-- <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.unitprice"-->
|
|
|
- <!-- @change="changeEstmateAmt(scope.row)"-->
|
|
|
- <!-- :disabled="browseStatus"-->
|
|
|
- <!-- placeholder="单价"-->
|
|
|
- <!-- show-word-limit-->
|
|
|
- <!-- />-->
|
|
|
- <!-- </template>-->
|
|
|
- <!-- </el-table-column>-->
|
|
|
- <!-- <el-table-column-->
|
|
|
- <!-- prop="amount"-->
|
|
|
- <!-- header-align="center"-->
|
|
|
- <!-- align="center"-->
|
|
|
- <!-- width="150px"-->
|
|
|
- <!-- label="金额"-->
|
|
|
- <!-- >-->
|
|
|
- <!-- <template slot-scope="scope">-->
|
|
|
- <!-- <el-input-->
|
|
|
- <!-- disabled-->
|
|
|
- <!-- oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'-->
|
|
|
- <!-- v-model="scope.row.amount"-->
|
|
|
- <!-- placeholder="金额"-->
|
|
|
- <!-- show-word-limit-->
|
|
|
- <!-- />-->
|
|
|
- <!-- </template>-->
|
|
|
- <!-- </el-table-column>-->
|
|
|
- <!-- <el-table-column-->
|
|
|
- <!-- prop="currency"-->
|
|
|
- <!-- header-align="center"-->
|
|
|
- <!-- align="center"-->
|
|
|
- <!-- width="150px"-->
|
|
|
- <!-- label="币别"-->
|
|
|
- <!-- >-->
|
|
|
- <!-- <template slot-scope="scope">-->
|
|
|
- <!-- <el-input-->
|
|
|
- <!-- v-model="scope.row.currency"-->
|
|
|
- <!-- :disabled="browseStatus"-->
|
|
|
- <!-- placeholder="币别"-->
|
|
|
- <!-- show-word-limit-->
|
|
|
- <!-- />-->
|
|
|
- <!-- </template>-->
|
|
|
- <!-- </el-table-column>-->
|
|
|
- <!-- <el-table-column-->
|
|
|
- <!-- prop="exrate"-->
|
|
|
- <!-- header-align="center"-->
|
|
|
- <!-- align="center"-->
|
|
|
- <!-- width="150px"-->
|
|
|
- <!-- label="汇率"-->
|
|
|
- <!-- >-->
|
|
|
- <!-- <template slot-scope="scope">-->
|
|
|
- <!-- <el-input-->
|
|
|
- <!-- v-model="scope.row.exrate"-->
|
|
|
- <!-- :disabled="browseStatus"-->
|
|
|
- <!-- placeholder="汇率"-->
|
|
|
- <!-- show-word-limit-->
|
|
|
- <!-- />-->
|
|
|
- <!-- </template>-->
|
|
|
- <!-- </el-table-column>-->
|
|
|
- <!-- <el-table-column-->
|
|
|
- <!-- prop="taxrate"-->
|
|
|
- <!-- header-align="center"-->
|
|
|
- <!-- align="center"-->
|
|
|
- <!-- width="150px"-->
|
|
|
- <!-- label="税率"-->
|
|
|
- <!-- >-->
|
|
|
- <!-- <template slot-scope="scope">-->
|
|
|
- <!-- <el-input-->
|
|
|
- <!-- v-model="scope.row.taxrate"-->
|
|
|
- <!-- :disabled="browseStatus"-->
|
|
|
- <!-- placeholder="税率"-->
|
|
|
- <!-- show-word-limit-->
|
|
|
- <!-- />-->
|
|
|
- <!-- </template>-->
|
|
|
- <!-- </el-table-column>-->
|
|
|
- <!-- <el-table-column-->
|
|
|
- <!-- prop="mblno"-->
|
|
|
- <!-- header-align="center"-->
|
|
|
- <!-- align="center"-->
|
|
|
- <!-- width="130px"-->
|
|
|
- <!-- label="提单号"-->
|
|
|
- <!-- >-->
|
|
|
- <!-- <template slot-scope="scope">-->
|
|
|
- <!-- <el-input-->
|
|
|
- <!-- v-model="scope.row.mblno"-->
|
|
|
- <!-- :disabled="browseStatus"-->
|
|
|
- <!-- placeholder="提单号"-->
|
|
|
- <!-- show-word-limit-->
|
|
|
- <!-- />-->
|
|
|
- <!-- </template>-->
|
|
|
- <!-- </el-table-column>-->
|
|
|
-
|
|
|
- <!-- <el-table-column-->
|
|
|
- <!-- prop="productName"-->
|
|
|
- <!-- header-align="center"-->
|
|
|
- <!-- align="center"-->
|
|
|
- <!-- width="140px"-->
|
|
|
- <!-- label="品名"-->
|
|
|
- <!-- >-->
|
|
|
- <!-- <template slot-scope="scope">-->
|
|
|
- <!-- <el-input-->
|
|
|
- <!-- v-model="scope.row.productName"-->
|
|
|
- <!-- :disabled="browseStatus"-->
|
|
|
- <!-- placeholder="品名"-->
|
|
|
- <!-- show-word-limit-->
|
|
|
- <!-- />-->
|
|
|
- <!-- </template>-->
|
|
|
- <!-- </el-table-column>-->
|
|
|
-
|
|
|
- <!-- <el-table-column-->
|
|
|
- <!-- prop="marks"-->
|
|
|
- <!-- header-align="center"-->
|
|
|
- <!-- align="center"-->
|
|
|
- <!-- width="130px"-->
|
|
|
- <!-- label="品牌"-->
|
|
|
- <!-- >-->
|
|
|
- <!-- <template slot-scope="scope">-->
|
|
|
- <!-- <el-input-->
|
|
|
- <!-- v-model="scope.row.marks"-->
|
|
|
- <!-- :disabled="browseStatus"-->
|
|
|
- <!-- placeholder="品牌"-->
|
|
|
- <!-- show-word-limit-->
|
|
|
- <!-- />-->
|
|
|
- <!-- </template>-->
|
|
|
- <!-- </el-table-column>-->
|
|
|
- <!-- <el-table-column-->
|
|
|
- <!-- prop="remark"-->
|
|
|
- <!-- header-align="center"-->
|
|
|
- <!-- align="center"-->
|
|
|
- <!-- width="150px"-->
|
|
|
- <!-- label="备注"-->
|
|
|
- <!-- >-->
|
|
|
- <!-- <template slot-scope="scope">-->
|
|
|
- <!-- <el-input-->
|
|
|
- <!-- v-model="scope.row.remark"-->
|
|
|
- <!-- :disabled="browseStatus"-->
|
|
|
- <!-- placeholder="备注"-->
|
|
|
- <!-- show-word-limit-->
|
|
|
- <!-- />-->
|
|
|
- <!-- </template>-->
|
|
|
- <!-- </el-table-column>-->
|
|
|
- <!-- <el-table-column-->
|
|
|
- <!-- header-align="center"-->
|
|
|
- <!-- align="center"-->
|
|
|
- <!-- width="200px"-->
|
|
|
- <!-- label="操作"-->
|
|
|
- <!-- >-->
|
|
|
- <!-- <template slot-scope="scope">-->
|
|
|
- <!-- <el-button-->
|
|
|
- <!-- @click.native.prevent="deleteRow(scope.$index, warehouseDrList)"-->
|
|
|
- <!-- size="small"-->
|
|
|
- <!-- >移除-->
|
|
|
- <!-- </el-button-->
|
|
|
- <!-- >-->
|
|
|
- <!-- </template>-->
|
|
|
- <!-- </el-table-column>-->
|
|
|
- <!-- </el-table>-->
|
|
|
- <!-- </div>-->
|
|
|
- <div slot="footer" class="dialog-footer">
|
|
|
+ <div slot="footer" class="dialog-footer" style="margin-top: -12px">
|
|
|
<el-button type="success" v-if="form.billstatus === 6" @click="backrRconciliation">撤销请核</el-button>
|
|
|
<el-button v-if="approve === true" @click="goApproval('f_billstatus')">审批</el-button>
|
|
|
<el-button type="primary" v-if="form.billstatus > 3" @click="addOrUpdateHandle('f_billstatus')">查看审批流
|
|
|
@@ -1236,7 +995,8 @@
|
|
|
append-to-body
|
|
|
>
|
|
|
<div style="display: flex;padding: 4% 0;">
|
|
|
- <el-table border :data="contractnoList" @selection-change="handleSelectionChange" style="width: 30%;float:left;flex: 1;" @cell-click="selectShow">
|
|
|
+ <el-table border :data="contractnoList" @selection-change="handleSelectionChange"
|
|
|
+ style="width: 30%;float:left;flex: 1;" @cell-click="selectShow">
|
|
|
<el-table-column
|
|
|
prop="contractno"
|
|
|
header-align="center"
|
|
|
@@ -1278,7 +1038,8 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
- <el-table v-loading="loading_s" border :data="agreementitemsList" @selection-change="handleSelectionChange" style="width: 70%;float:right;flex: 1.86;">
|
|
|
+ <el-table v-loading="loading_s" border :data="agreementitemsList" @selection-change="handleSelectionChange"
|
|
|
+ style="width: 70%;float:right;flex: 1.86;">
|
|
|
<el-table-column label="行号" align="center" type="index" fixed="left" min-width="150"/>
|
|
|
|
|
|
<el-table-column
|
|
|
@@ -1491,7 +1252,7 @@ export default {
|
|
|
return {
|
|
|
// 仓库
|
|
|
warehouseOptions: [],
|
|
|
- innerVisible:false,
|
|
|
+ innerVisible: false,
|
|
|
showDetail: {
|
|
|
priceDateRemarks: [],
|
|
|
},
|
|
|
@@ -1500,8 +1261,124 @@ export default {
|
|
|
dialogFull: false,
|
|
|
drag: false,
|
|
|
countstate: false,
|
|
|
- option:{},
|
|
|
- optionList:{
|
|
|
+ optionTwo:{},
|
|
|
+ optionTwoBack: {
|
|
|
+ border: true,
|
|
|
+ align: 'center',
|
|
|
+ refreshBtn: false,
|
|
|
+ stripe: true,
|
|
|
+ index: true,
|
|
|
+ menu: true,
|
|
|
+ addBtn: false,
|
|
|
+ cell: true,
|
|
|
+ editBtn: false,
|
|
|
+ delBtn: false,
|
|
|
+ height: "auto",
|
|
|
+ searchSpan: 8,
|
|
|
+ searchIcon: true,
|
|
|
+ searchIndex: 2,
|
|
|
+ highlightCurrentRow: true,
|
|
|
+ column: [{
|
|
|
+ index: '1',
|
|
|
+ prop: "billtype",
|
|
|
+ label: "业务来源",
|
|
|
+ width: 140
|
|
|
+ },{
|
|
|
+ index: '2',
|
|
|
+ prop: "mblno",
|
|
|
+ label: "业务单号",
|
|
|
+ width: 140
|
|
|
+ },{
|
|
|
+ index: '3',
|
|
|
+ prop: "productName",
|
|
|
+ label: "货物名称",
|
|
|
+ width: 140
|
|
|
+ },{
|
|
|
+ index: '4',
|
|
|
+ prop: "warehouseName",
|
|
|
+ label: "仓库",
|
|
|
+ width: 140
|
|
|
+ },{
|
|
|
+ index: '5',
|
|
|
+ prop: "marks",
|
|
|
+ label: "唛头",
|
|
|
+ width: 140
|
|
|
+ },{
|
|
|
+ index: '6',
|
|
|
+ prop: "bsdate",
|
|
|
+ label: "业务日期",
|
|
|
+ width: 140,
|
|
|
+ type:'date',
|
|
|
+ cell: true,
|
|
|
+ format:'yyyy-MM-dd',
|
|
|
+ valueFormat:'yyyy-MM-dd',
|
|
|
+ },{
|
|
|
+ index: '7',
|
|
|
+ prop: "billingway",
|
|
|
+ label: "计费单位",
|
|
|
+ width: 180,
|
|
|
+ cell: true,
|
|
|
+ type:'select',
|
|
|
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=data_unitfees",
|
|
|
+ props: {
|
|
|
+ label: "dictValue",
|
|
|
+ value: "dictKey"
|
|
|
+ },
|
|
|
+ },{
|
|
|
+ index: '8',
|
|
|
+ prop: "billingQty",
|
|
|
+ label: "计费数量",
|
|
|
+ width: 140
|
|
|
+ },{
|
|
|
+ index: '9',
|
|
|
+ prop: "chargedate",
|
|
|
+ label: "计费起始日期",
|
|
|
+ width: 140,
|
|
|
+ type:'date',
|
|
|
+ cell: true,
|
|
|
+ format:'yyyy-MM-dd',
|
|
|
+ valueFormat:'yyyy-MM-dd',
|
|
|
+ },{
|
|
|
+ index: '10',
|
|
|
+ prop: "billingDeadline",
|
|
|
+ label: "计费截止日期",
|
|
|
+ width: 140,
|
|
|
+ type:'date',
|
|
|
+ cell: true,
|
|
|
+ format:'yyyy-MM-dd',
|
|
|
+ valueFormat:'yyyy-MM-dd',
|
|
|
+ },{
|
|
|
+ index: '11',
|
|
|
+ prop: "billingDays",
|
|
|
+ label: "计费天数",
|
|
|
+ width: 140
|
|
|
+ },{
|
|
|
+ index: '12',
|
|
|
+ prop: "inventoryDays",
|
|
|
+ label: "库存天数",
|
|
|
+ width: 140
|
|
|
+ },{
|
|
|
+ index: '13',
|
|
|
+ prop: "amt",
|
|
|
+ label: "计费金额",
|
|
|
+ width: 140
|
|
|
+ },{
|
|
|
+ index: '14',
|
|
|
+ prop: "remark",
|
|
|
+ label: "备注",
|
|
|
+ width: 150,
|
|
|
+ overHidden:true
|
|
|
+ },{
|
|
|
+ index: '15',
|
|
|
+ prop: "priceDateRemarks",
|
|
|
+ label: "计费详情",
|
|
|
+ width: 150,
|
|
|
+ overHidden:true
|
|
|
+ }]
|
|
|
+ },
|
|
|
+ option: {},
|
|
|
+ optionList: {
|
|
|
+ border: true,
|
|
|
align: 'center',
|
|
|
stripe: true,
|
|
|
index: true,
|
|
|
@@ -1514,42 +1391,42 @@ export default {
|
|
|
searchIcon: true,
|
|
|
searchIndex: 2,
|
|
|
highlightCurrentRow: true,
|
|
|
- column:[
|
|
|
+ column: [
|
|
|
{
|
|
|
- index:'999',
|
|
|
+ index: '999',
|
|
|
prop: "billno",
|
|
|
label: "业务编号",
|
|
|
- width:160,
|
|
|
+ width: 160,
|
|
|
search: true,
|
|
|
- hide:true,
|
|
|
- showColumn:false,
|
|
|
+ hide: true,
|
|
|
+ showColumn: false,
|
|
|
},
|
|
|
{
|
|
|
- index:'999',
|
|
|
+ index: '999',
|
|
|
prop: "corpid",
|
|
|
label: "货权方",
|
|
|
- width:160,
|
|
|
+ width: 160,
|
|
|
search: true,
|
|
|
- hide:true,
|
|
|
- showColumn:false,
|
|
|
+ hide: true,
|
|
|
+ showColumn: false,
|
|
|
},
|
|
|
{
|
|
|
- index:'999',
|
|
|
+ index: '999',
|
|
|
prop: "mblno",
|
|
|
label: "提单号",
|
|
|
- width:160,
|
|
|
+ width: 160,
|
|
|
search: true,
|
|
|
- hide:true,
|
|
|
- showColumn:false,
|
|
|
+ hide: true,
|
|
|
+ showColumn: false,
|
|
|
},
|
|
|
{
|
|
|
- index:'999',
|
|
|
+ index: '999',
|
|
|
prop: "marks",
|
|
|
label: "唛头",
|
|
|
- width:160,
|
|
|
+ width: 160,
|
|
|
search: true,
|
|
|
- hide:true,
|
|
|
- showColumn:false,
|
|
|
+ hide: true,
|
|
|
+ showColumn: false,
|
|
|
},
|
|
|
{
|
|
|
index: "2",
|
|
|
@@ -1583,10 +1460,10 @@ export default {
|
|
|
search: true,
|
|
|
},
|
|
|
{
|
|
|
- index:'7',
|
|
|
+ index: '7',
|
|
|
prop: "createBy",
|
|
|
label: "制单人",
|
|
|
- width:160,
|
|
|
+ width: 160,
|
|
|
search: true,
|
|
|
},
|
|
|
{
|
|
|
@@ -1595,8 +1472,8 @@ export default {
|
|
|
label: "计费日期",
|
|
|
width: 160,
|
|
|
search: true,
|
|
|
- hide:true,
|
|
|
- showColumn:false,
|
|
|
+ hide: true,
|
|
|
+ showColumn: false,
|
|
|
},
|
|
|
{
|
|
|
index: "8",
|
|
|
@@ -1877,6 +1754,7 @@ export default {
|
|
|
|
|
|
async created() {
|
|
|
this.option = await this.getColumnData(this.getColumnName(171), this.optionList);
|
|
|
+ this.optionTwo = await this.getColumnData(this.getColumnName(171.1), this.optionTwoBack);
|
|
|
let i = 0;
|
|
|
this.option.column.forEach(item => {
|
|
|
if (item.search) i++
|
|
|
@@ -1959,26 +1837,26 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
//自定义列保存
|
|
|
- async saveColumn() {
|
|
|
+ async saveColumn(ref,option,optionBack,code) {
|
|
|
/**
|
|
|
* 已定义全局方法，直接使用，saveColumnData保存列数据方法,参数传值(表格名称，当前表格的option数据)
|
|
|
* 已定义全局方法，直接使用，getColumnName方法用来获取枚举值，参数根据自己定义的code值获取中文名
|
|
|
* 一定要执行异步操作，要等接口成功返回，才能执行下一行代码
|
|
|
*/
|
|
|
- const inSave = await this.saveColumnData(this.getColumnName(171), this.option);
|
|
|
+ const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
|
|
|
if (inSave) {
|
|
|
this.$message.success("保存成功");
|
|
|
//关闭窗口
|
|
|
- this.$refs.crud.$refs.dialogColumn.columnBox = false;
|
|
|
+ this.$refs[ref].$refs.dialogColumn.columnBox = false;
|
|
|
}
|
|
|
},
|
|
|
//自定义列重置
|
|
|
- async resetColumn() {
|
|
|
- this.option = this.optionList;
|
|
|
- const inSave = await this.delColumnData(this.getColumnName(171), this.optionList);
|
|
|
+ async resetColumn(ref,option,optionBack,code) {
|
|
|
+ this[option] = this[optionBack];
|
|
|
+ const inSave = await this.delColumnData(this.getColumnName(code), this.optionList);
|
|
|
if (inSave) {
|
|
|
this.$message.success("重置成功");
|
|
|
- this.$refs.crud.$refs.dialogColumn.columnBox = false;
|
|
|
+ this.$refs[ref].$refs.dialogColumn.columnBox = false;
|
|
|
}
|
|
|
},
|
|
|
full() {
|
|
|
@@ -1992,7 +1870,7 @@ export default {
|
|
|
let currentMonth = date.getMonth()
|
|
|
let nextMonth = ++currentMonth
|
|
|
let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1) // 下个月的第一天
|
|
|
- let oneDay = 1000*60*60*24
|
|
|
+ let oneDay = 1000 * 60 * 60 * 24
|
|
|
let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天，就是上个月的最后一天
|
|
|
let day = lastTime.getDate()
|
|
|
if (day < 10) {
|
|
|
@@ -2332,7 +2210,7 @@ export default {
|
|
|
}
|
|
|
this.countstate = false
|
|
|
this.showAgreementStatus = false
|
|
|
- },(error) => {
|
|
|
+ }, (error) => {
|
|
|
this.showAgreementStatus = true
|
|
|
});
|
|
|
},
|
|
|
@@ -2345,7 +2223,7 @@ export default {
|
|
|
})
|
|
|
this.openAgreement = true
|
|
|
},
|
|
|
- handleClose () {
|
|
|
+ handleClose() {
|
|
|
this.showAgreementStatus = false;
|
|
|
this.open = false;
|
|
|
},
|
|
|
@@ -2356,7 +2234,7 @@ export default {
|
|
|
this.$set(this.agreementitemsList[item], 'feeunitid', this.agreementitemsList[item].feeunitid + '')
|
|
|
}
|
|
|
this.wbuOptionsN = response.data.feesList
|
|
|
- let queryParams = { name: name }
|
|
|
+ let queryParams = {name: name}
|
|
|
listFees(queryParams).then((response) => {
|
|
|
this.wbuOptionsN = response.rows
|
|
|
})
|
|
|
@@ -2783,6 +2661,10 @@ export default {
|
|
|
deleteRow(index, rows) {
|
|
|
rows.splice(index, 1);
|
|
|
},
|
|
|
+ paymentRowCell(row, index) {
|
|
|
+ row.$cellEdit = !row.$cellEdit
|
|
|
+ // this.$refs.payment.rowCell(row, index)
|
|
|
+ },
|
|
|
/* 远程模糊查询用户 */
|
|
|
corpsRemoteMethod(name) {
|
|
|
if (name == null || name === "") {
|
|
|
@@ -2863,7 +2745,6 @@ export default {
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|
|
|
//@import 'src/assets/styles/element-variables.scss';
|
|
|
-
|
|
|
.tabSetting {
|
|
|
display: flex;
|
|
|
justify-content: flex-end;
|
|
|
@@ -2952,4 +2833,7 @@ export default {
|
|
|
.el-icon-full-screen:before {
|
|
|
content: "\e719";
|
|
|
}
|
|
|
+::v-deep .customClass{
|
|
|
+ margin: 5px auto 5px!important;
|
|
|
+}
|
|
|
</style>
|
caojunjie