|
|
@@ -88,7 +88,22 @@
|
|
|
<el-option label="审核通过" value="6"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
-
|
|
|
+ <el-form-item label="贸易方式" prop="fTrademodeid" v-if="showTrademode == '0'">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fTrademodeid"
|
|
|
+ placeholder="请选择贸易方式"
|
|
|
+ clearable
|
|
|
+ style="width: 210px"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(item, index) in fTrademodeidOptions"
|
|
|
+ :key="index.dictValue"
|
|
|
+ :label="item.dictLabel"
|
|
|
+ :value="item.dictValue"
|
|
|
+ style="width: 210px;"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="计费日期" prop="timeInterval2">
|
|
|
<el-date-picker
|
|
|
v-model="queryParams.timeInterval2"
|
|
|
@@ -282,10 +297,18 @@
|
|
|
prop="remark"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
+ v-if="showTrademode == '0'"
|
|
|
+ label="计费方式"
|
|
|
+ align="center"
|
|
|
+ prop="fTrademodeName"
|
|
|
+ width="160"
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
label="单据状态"
|
|
|
align="center"
|
|
|
sortable
|
|
|
prop="fBillstatus"
|
|
|
+ width="160"
|
|
|
>
|
|
|
<!-- <template slot-scope="scope">
|
|
|
<span v-if="scope.row.fBillstatus === 1">新建</span>
|
|
|
@@ -356,11 +379,21 @@
|
|
|
type="text"
|
|
|
icon="el-icon-delete"
|
|
|
v-if="
|
|
|
- scope.row.fBillstatus == '录入' ||
|
|
|
+ (scope.row.fBillstatus == '录入' ||
|
|
|
scope.row.fBillstatus == '暂存' ||
|
|
|
scope.row.fBillstatus == '审核驳回' ||
|
|
|
scope.row.fBillstatus == '保存' ||
|
|
|
- scope.row.fBillstatus == '请核驳回'
|
|
|
+ scope.row.fBillstatus == '请核驳回')
|
|
|
+ &&
|
|
|
+ scope.row.isCreate == 0
|
|
|
+ ||
|
|
|
+ (scope.row.fBillstatus == '录入' ||
|
|
|
+ scope.row.fBillstatus == '暂存' ||
|
|
|
+ scope.row.fBillstatus == '审核驳回' ||
|
|
|
+ scope.row.fBillstatus == '保存' ||
|
|
|
+ scope.row.fBillstatus == '请核驳回')
|
|
|
+ &&
|
|
|
+ scope.row.isCreate == 1
|
|
|
"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
v-hasPermi="['warehouseBusiness:storageFeeCalculation:remove']"
|
|
|
@@ -546,13 +579,44 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :span="8" v-if="showTrademode == '0'">
|
|
|
+ <el-form-item label="贸易方式" prop="fTrademodeid">
|
|
|
+ <el-select
|
|
|
+ v-model="form.fTrademodeid"
|
|
|
+ :disabled="notChange"
|
|
|
+ placeholder="请选择贸易方式"
|
|
|
+ clearable
|
|
|
+ style="width: 210px"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(item, index) in fTrademodeidOptions"
|
|
|
+ :key="index.dictValue"
|
|
|
+ :label="item.dictLabel"
|
|
|
+ :value="item.dictValue"
|
|
|
+ style="width: 210px;"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8" v-if="showTrademode == '1'">
|
|
|
+ <el-form-item disabled label="备注" prop="remark">
|
|
|
+ <el-input
|
|
|
+ style="width:80%"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ v-model="form.remark"
|
|
|
+ placeholder="请输入备注"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row v-if="showTrademode == '0'">
|
|
|
<el-col :span="8">
|
|
|
<el-form-item disabled label="备注" prop="remark">
|
|
|
<el-input
|
|
|
- style="width:80%"
|
|
|
- :disabled="browseStatus"
|
|
|
- v-model="form.remark"
|
|
|
- placeholder="请输入备注"
|
|
|
+ style="width:80%"
|
|
|
+ :disabled="browseStatus"
|
|
|
+ v-model="form.remark"
|
|
|
+ placeholder="请输入备注"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -1118,7 +1182,7 @@
|
|
|
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;">
|
|
|
+ <el-table border :data="contractnoList" @selection-change="handleSelectionChange" style="width: 30%;float:left;flex: 1;" @cell-click="selectShow">
|
|
|
<el-table-column
|
|
|
prop="fContractno"
|
|
|
header-align="center"
|
|
|
@@ -1127,7 +1191,7 @@
|
|
|
label="合同编号"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <el-link type="primary" @click="selectShow(scope.row)">{{ scope.row.fContractno }}</el-link>
|
|
|
+ <el-link :underline="false">{{ scope.row.fContractno }}</el-link>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -1156,7 +1220,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="有效期至" sortable align="center" prop="fEnddate" width="120">
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{ parseTime(scope.row.fEnddate, '{y}-{m}-{d}') }}</span>
|
|
|
+ <el-link :underline="false">{{ parseTime(scope.row.fEnddate, '{y}-{m}-{d}') }}</el-link>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -1256,11 +1320,10 @@
|
|
|
filterable
|
|
|
remote
|
|
|
:disabled="true"
|
|
|
- :remote-method="fWRemoteMethod"
|
|
|
placeholder="费用名称"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="(dict, index) in fWbuOptions"
|
|
|
+ v-for="(dict, index) in fWbuOptionsN"
|
|
|
:key="index.fId"
|
|
|
:label="dict.fName"
|
|
|
:value="dict.fId"
|
|
|
@@ -1564,6 +1627,7 @@ export default {
|
|
|
fTaxrate: 0,
|
|
|
// 费用名称
|
|
|
fWbuOptions: [],
|
|
|
+ fWbuOptionsN: [],
|
|
|
// 查询参数
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
|
@@ -1647,6 +1711,9 @@ export default {
|
|
|
}
|
|
|
}]
|
|
|
},
|
|
|
+ // 贸易方式,对应t_trademodels 字典
|
|
|
+ fTrademodeidOptions: [],
|
|
|
+ showTrademode: null,
|
|
|
};
|
|
|
},
|
|
|
|
|
|
@@ -1685,9 +1752,15 @@ export default {
|
|
|
this.getDicts('data_unitfees').then((response) => {
|
|
|
this.fFeetunitOptions = response.data
|
|
|
})
|
|
|
+ this.getDicts('data_trademodes').then(response => {
|
|
|
+ this.fTrademodeidOptions = response.data
|
|
|
+ });
|
|
|
this.getConfigKey("agreement.warehouse").then((response) => {
|
|
|
this.showWarehouse = response.msg;
|
|
|
});
|
|
|
+ this.getConfigKey("agreement.trademode").then((response) => {
|
|
|
+ this.showTrademode = response.msg;
|
|
|
+ });
|
|
|
this.register()
|
|
|
listWarehousesss({fStatus: 0, delFlag: 0}).then((response) => {
|
|
|
this.warehouseOptions = response.rows;
|
|
|
@@ -2087,7 +2160,11 @@ export default {
|
|
|
for (let item in this.agreementitemsList) {
|
|
|
this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
|
|
|
}
|
|
|
- this.fWbuOptions = response.data.feesList
|
|
|
+ this.fWbuOptionsN = response.data.feesList
|
|
|
+ let queryParams = { fName: name }
|
|
|
+ listFees(queryParams).then((response) => {
|
|
|
+ this.fWbuOptionsN = response.rows
|
|
|
+ })
|
|
|
})
|
|
|
this.getDicts("data_unitfees").then(response => {
|
|
|
this.jFeetunitOptions = response.data;
|
|
|
@@ -2225,6 +2302,12 @@ export default {
|
|
|
this.relevantAttachments = [];
|
|
|
this.title = "出库单";
|
|
|
},
|
|
|
+ TFformdata(data) {
|
|
|
+ this.form = data;
|
|
|
+ if (this.form.fTrademodeid) {
|
|
|
+ this.$set(this.form, "fTrademodeid", this.form.fTrademodeid.toString());
|
|
|
+ }
|
|
|
+ },
|
|
|
handleUpdate_s(row, status) {
|
|
|
const queryParams = {fName: ''};
|
|
|
listGoods(queryParams).then((response) => {
|
|
|
@@ -2245,6 +2328,7 @@ export default {
|
|
|
this.$set(this.form, 'createTime', Date.parse(this.form.createTime))
|
|
|
this.$set(this.form, 'fBillingDeadline', Date.parse(this.form.fBillingDeadline))
|
|
|
}
|
|
|
+ this.TFformdata(response.data.warehouse)
|
|
|
if (response.data.warehouseItemsList) {
|
|
|
this.dataList = response.data.warehouseItemsList
|
|
|
for (let li in this.dataList) {
|
|
|
@@ -2295,6 +2379,7 @@ export default {
|
|
|
this.$set(this.form, 'createTime', Date.parse(this.form.createTime))
|
|
|
this.$set(this.form, 'fBillingDeadline', Date.parse(this.form.fBillingDeadline))
|
|
|
}
|
|
|
+ this.TFformdata(response.data.warehouse)
|
|
|
if (response.data.warehouseItemsList) {
|
|
|
this.dataList = response.data.warehouseItemsList
|
|
|
for (let li in this.dataList) {
|
nzf