|
@@ -1,95 +1,91 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
- <!-- <el-form-item label="业务编号" prop="fBillno">-->
|
|
|
- <!-- <el-input-->
|
|
|
- <!-- v-model="queryParams.fBillno"-->
|
|
|
- <!-- placeholder="请输入业务编号"-->
|
|
|
- <!-- clearable-->
|
|
|
- <!-- size="small"-->
|
|
|
- <!-- @keyup.enter.native="handleQuery"-->
|
|
|
- <!-- />-->
|
|
|
- <!-- </el-form-item>-->
|
|
|
- <el-form-item label="客户名称" prop="fCorpid">
|
|
|
- <el-select
|
|
|
- v-model="queryParams.fCorpid"
|
|
|
- filterable
|
|
|
- remote
|
|
|
- clearable
|
|
|
- style="width: 200px"
|
|
|
- @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-form-item label="货物品名" prop="fGoodsid">-->
|
|
|
-<!-- <el-select-->
|
|
|
-<!-- v-model="queryParams.fGoodsid"-->
|
|
|
-<!-- filterable-->
|
|
|
-<!-- remote-->
|
|
|
-<!-- clearable-->
|
|
|
-<!-- style="width: 200px"-->
|
|
|
-<!-- :remote-method="goodsRemoteMethod"-->
|
|
|
-<!-- @keyup.enter.native="handleQuery"-->
|
|
|
-<!-- placeholder="请输入货物品名"-->
|
|
|
-<!-- >-->
|
|
|
-<!-- <el-option-->
|
|
|
-<!-- v-for="(dict, index) in goodsOptions"-->
|
|
|
-<!-- :key="index.fId"-->
|
|
|
-<!-- :label="dict.fName"-->
|
|
|
-<!-- :value="dict.fId"-->
|
|
|
-<!-- ></el-option>-->
|
|
|
-<!-- </el-select>-->
|
|
|
-<!-- </el-form-item>-->
|
|
|
- <el-form-item label="制单部门" prop="fDeptid">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.fDeptid"
|
|
|
- placeholder="请输入制单部门"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="有效期起" prop="fBegindate">
|
|
|
- <el-date-picker clearable size="small" style="width: 200px"
|
|
|
- v-model="queryParams.fBegindate"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择有效期起"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="有效期至" prop="fEnddate">
|
|
|
- <el-date-picker clearable size="small" style="width: 200px"
|
|
|
- v-model="queryParams.fEnddate"
|
|
|
- type="date"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- placeholder="选择有效期至"
|
|
|
- >
|
|
|
- </el-date-picker>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="协议编号" prop="fContractno">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.fContractno"
|
|
|
- placeholder="请输入协议编号"
|
|
|
- clearable
|
|
|
- size="small"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
+ <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="88px">
|
|
|
<el-row>
|
|
|
- <el-form-item style="float: right;padding: 5px">
|
|
|
+ <el-form-item label="客户名称" prop="fCorpid">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.fCorpid"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ clearable
|
|
|
+ style="width: 200px"
|
|
|
+ @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-form-item label="制单部门" prop="fDeptid">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.fDeptid"
|
|
|
+ placeholder="请输入制单部门"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="有效期起" prop="fBegindate">
|
|
|
+ <el-date-picker clearable size="small" style="width: 200px"
|
|
|
+ v-model="queryParams.fBegindate"
|
|
|
+ type="date"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ placeholder="选择有效期起"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="有效期至" prop="fEnddate">
|
|
|
+ <el-date-picker clearable size="small" style="width: 200px"
|
|
|
+ v-model="queryParams.fEnddate"
|
|
|
+ type="date"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ placeholder="选择有效期至"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="协议编号" prop="fContractno">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.fContractno"
|
|
|
+ placeholder="请输入协议编号"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="作业费类型" prop="fTaskType" label-width="90px">
|
|
|
+ <el-select v-model="queryParams.fTaskType" clearable placeholder="请选择作业费类型" :disabled="browseStatus">
|
|
|
+ <el-option label="车队作业费" value="1"/>
|
|
|
+ <el-option label="劳务作业费" value="2"/>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="商品类别" prop="tPackages">
|
|
|
+ <el-select v-model="queryParams.tPackages" clearable placeholder="请选择商品类别" :disabled="browseStatus">
|
|
|
+ <el-option
|
|
|
+ v-for="dict in fTypeidOptions"
|
|
|
+ :key="dict.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ style="width: 200px;"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="费用类型" prop="fDc">
|
|
|
+ <el-select v-model="queryParams.fDc" clearable placeholder="请选择费用类型" style="width: 200px;" :disabled="browseStatus">
|
|
|
+ <el-option label="收" value="D"></el-option>
|
|
|
+ <el-option label="付" value="C"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item>
|
|
|
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
</el-form-item>
|
|
|
</el-row>
|
|
|
+
|
|
|
</el-form>
|
|
|
|
|
|
<el-row :gutter="10" class="mb8">
|
|
@@ -150,7 +146,21 @@
|
|
|
</el-row>
|
|
|
<el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange">
|
|
|
<el-table-column type="selection" width="55" align="center"/>
|
|
|
- <el-table-column label="客户名称" sortable align="center" prop="fCorpid" width="220"/>
|
|
|
+ <el-table-column type="index" label="行号" align="center" fixed/>
|
|
|
+ <el-table-column label="客户名称" sortable align="center" prop="fCorpid" fixed width="220"/>
|
|
|
+ <el-table-column label="作业费类型" sortable align="center" prop="fTaskType" fixed width="220">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="scope.row.fTaskType === 1">车队作业费</span>
|
|
|
+ <span v-if="scope.row.fTaskType === 2">劳务作业费</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="商品类别" sortable align="center" prop="tPackages" fixed width="220" :formatter="tPackagesFormat"/>
|
|
|
+ <el-table-column label="费用类型" sortable align="center" prop="fDc" fixed width="220">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="scope.row.fDc === 'D'">收</span>
|
|
|
+ <span v-if="scope.row.fDc === 'C'">付</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="协议编号" sortable align="center" prop="fContractno" show-overflow-tooltip/>
|
|
|
<!-- <el-table-column label="费用名称" align="center" prop="fFeeid"/>-->
|
|
|
<el-table-column label="有效期起" sortable align="center" prop="fBegindate" width="180">
|
|
@@ -531,7 +541,9 @@ export default {
|
|
|
fFreedays: null,
|
|
|
fBegindate: null,
|
|
|
fEnddate: null,
|
|
|
- fBillstatus: null
|
|
|
+ fBillstatus: null,
|
|
|
+ fTaskType:null,
|
|
|
+ fDc:null,
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {
|
|
@@ -579,6 +591,10 @@ export default {
|
|
|
this.getDicts("data_unitfees").then(response => {
|
|
|
this.jFeetunitOptions = response.data;
|
|
|
});
|
|
|
+ let queryParams = { pageNum: 1, type: 1 };
|
|
|
+ listCorps(queryParams).then((response) => {
|
|
|
+ this.fMblnoOptions = response.rows;
|
|
|
+ });
|
|
|
this.register()
|
|
|
},
|
|
|
activated(){
|
|
@@ -621,7 +637,6 @@ export default {
|
|
|
this.form = response.data.tWarehouseAgreement
|
|
|
this.$set(this.form, 'fEnddate', Date.parse(this.form.fEnddate))
|
|
|
this.$set(this.form, 'fBegindate', Date.parse(this.form.fBegindate))
|
|
|
- this.fMblnoOptions = response.data.corps
|
|
|
this.agreementitemsList = response.data.tWarehouseAgreementitems
|
|
|
for (let item in this.agreementitemsList) {
|
|
|
this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
|
|
@@ -709,7 +724,6 @@ export default {
|
|
|
this.$set(this.form, 'fEnddate', Date.parse(this.form.fEnddate))
|
|
|
this.$set(this.form, 'fBegindate', Date.parse(this.form.fBegindate))
|
|
|
this.operator = this.form.createBy
|
|
|
- this.fMblnoOptions = response.data.corps
|
|
|
this.agreementitemsList = response.data.tWarehouseAgreementitems
|
|
|
for (let item in this.agreementitemsList) {
|
|
|
this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
|
|
@@ -729,7 +743,6 @@ export default {
|
|
|
this.approvalProhibit = false
|
|
|
const fId = row.fId || this.ids
|
|
|
getAgreement(fId).then(response => {
|
|
|
- this.fMblnoOptions = response.data.corps
|
|
|
this.deptName = response.data.dept.deptName
|
|
|
this.form = response.data.tWarehouseAgreement
|
|
|
this.$set(this.form, 'fEnddate', Date.parse(this.form.fEnddate))
|
|
@@ -827,14 +840,13 @@ export default {
|
|
|
this.loading = false
|
|
|
})
|
|
|
},
|
|
|
-
|
|
|
// 结算方式,也可以从表t_stltypes中下拉选择,存储id,显示name字典翻译
|
|
|
fStltypeidFormat(row, column) {
|
|
|
return this.selectDictLabel(this.fStltypeidOptions, row.fStltypeid)
|
|
|
},
|
|
|
// 货物类别,存储t_packages,f_id 显示名称,可以多选t_packages 中的no或 name,模糊查找选择后,存储f_id,显示name字典翻译
|
|
|
tPackagesFormat(row, column) {
|
|
|
- return this.selectDictLabel(this.tPackagesOptions, row.tPackages)
|
|
|
+ return this.selectDictLabel(this.fTypeidOptions, row.tPackages)
|
|
|
},
|
|
|
// 贸易方式,对应t_trademodels 字典翻译
|
|
|
fTrademodeidFormat(row, column) {
|
|
@@ -973,7 +985,6 @@ export default {
|
|
|
this.$set(this.form, 'fEnddate', Date.parse(this.form.fEnddate))
|
|
|
this.$set(this.form, 'fBegindate', Date.parse(this.form.fBegindate))
|
|
|
this.operator = this.form.createBy
|
|
|
- this.fMblnoOptions = response.data.corps
|
|
|
this.agreementitemsList = response.data.tWarehouseAgreementitems
|
|
|
for (let item in this.agreementitemsList) {
|
|
|
this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
|
|
@@ -997,7 +1008,6 @@ export default {
|
|
|
this.$set(this.form, 'fEnddate', Date.parse(this.form.fEnddate))
|
|
|
this.$set(this.form, 'fBegindate', Date.parse(this.form.fBegindate))
|
|
|
this.operator = this.form.createBy
|
|
|
- this.fMblnoOptions = response.data.corps
|
|
|
this.agreementitemsList = response.data.tWarehouseAgreementitems
|
|
|
for (let item in this.agreementitemsList) {
|
|
|
this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
|
|
@@ -1013,8 +1023,9 @@ export default {
|
|
|
if (name == null || name === "") {
|
|
|
return false;
|
|
|
}
|
|
|
- let queryParams = { pageNum: 1, pageSize: 10, fName: name, type: 1 };
|
|
|
+ let queryParams = { pageNum: 1, fName: name, type: 1 };
|
|
|
listCorps(queryParams).then((response) => {
|
|
|
+ console.log(response)
|
|
|
this.fMblnoOptions = response.rows;
|
|
|
this.KHblnoOptions = response.rows;
|
|
|
});
|