|
|
@@ -11,7 +11,7 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <el-form-item label="修改人">
|
|
|
+ <el-form-item label="修改人">
|
|
|
<el-input :size="overSize" clearable v-model.trim="queryForm.modifiedBy" placeholder="请输入"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -104,11 +104,17 @@
|
|
|
<el-table-column prop="endDate" label="协议失效日期" align="center"></el-table-column>
|
|
|
<el-table-column prop="matchType" label="匹配日期类型" align="center" :formatter="matchtypeFormatter"></el-table-column>
|
|
|
<el-table-column prop="moneyTime" label="结算周期" align="center" :formatter="moneytimeFormatter"></el-table-column>
|
|
|
- <el-table-column prop="validStatus" label="状态" align="center" :formatter="agreestatusFormatter"></el-table-column>
|
|
|
+ <el-table-column prop="auditStatus" label="状态" align="center" >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span :style="'color:'+agreestatusStyle(scope.row.auditStatus)">
|
|
|
+ {{auditstatusFormatter(scope.row)}}
|
|
|
+ </span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column prop="updateTime" label="修改时间" align="center" :formatter="updatetimeFormatter"></el-table-column>
|
|
|
<el-table-column prop="validStatus" label="是否有效" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
- <span :size="overSize" type="primary">{{
|
|
|
+ <span :style="{ color: scope.row.validStatus == '1'?'#67c23a':'#909399' }">{{
|
|
|
scope.row.validStatus == 1 ? "有效" : "无效" }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -386,13 +392,13 @@
|
|
|
</div>
|
|
|
<el-form :inline="true" :model="productpageRequest" class="demo-form-inline" size="small">
|
|
|
<el-form-item label="产品">
|
|
|
- <el-select v-model="productpageRequest.productCode" placeholder="选择产品">
|
|
|
+ <el-select v-model="productpageRequest.productCode" placeholder="选择产品" clearable>
|
|
|
<el-option v-for="item in productsTypeoptions" :key="item.dictValue" :label="item.dictTag"
|
|
|
:value="item.dictValue"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="审核状态">
|
|
|
- <el-select v-model="productpageRequest.isAudit">
|
|
|
+ <el-select v-model="productpageRequest.isAudit" clearable>
|
|
|
<el-option v-for="(item, index) in expenseAuditlist" :key="index" :label="item.label"
|
|
|
:value="item.value"></el-option>
|
|
|
</el-select>
|
|
|
@@ -670,6 +676,55 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
<el-dialog title="产品历史记录" :visible.sync="productHistoryRecordDialogVisible" width="70%" :fullscreen="true">
|
|
|
+ <el-row class="queryFrom">
|
|
|
+ <el-form ref="queryFormRef" :model="productHistoryRecordForm" label-width="80px">
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-form-item label="操作人">
|
|
|
+ <el-input
|
|
|
+ clearable
|
|
|
+ style="width:220px"
|
|
|
+ size="small"
|
|
|
+ placeholder="操作人"
|
|
|
+ v-model="productHistoryRecordForm.modifier"
|
|
|
+ ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-form-item label="操作类型">
|
|
|
+ <el-select clearable size="small" v-model="productHistoryRecordForm.operatorType" placeholder="请选择">
|
|
|
+ <el-option
|
|
|
+ v-for="item in operationTypeOption"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-form-item label="操作时间">
|
|
|
+ <el-date-picker
|
|
|
+ clearable
|
|
|
+ v-model="productHistoryRecordForm.operatorTime"
|
|
|
+ type="date"
|
|
|
+ size="small"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ placeholder="选择日期">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-form-item label="">
|
|
|
+ <el-button
|
|
|
+ size="small"
|
|
|
+ type="primary"
|
|
|
+ @click="productHistoryCostFindPage"
|
|
|
+ >查询</el-button
|
|
|
+ >
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-form>
|
|
|
+ </el-row>
|
|
|
<kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
|
|
|
button2Name="详情" @handleButton2="productHistoryDetails" :showBatchDelete="false" :showBatchSettled="false"
|
|
|
:showBatchPrint="false" :data="productHistoryRecordResult" :columns="productHistoryRecordColumns"
|
|
|
@@ -678,6 +733,55 @@
|
|
|
</el-dialog>
|
|
|
<el-dialog title="承保规则历史记录" :visible.sync="underwritingRulesHistoryRecordDialogVisible" width="70%"
|
|
|
:fullscreen="true">
|
|
|
+ <el-row class="queryFrom">
|
|
|
+ <el-form ref="queryFormRef" :model="underwritingRulesHistoryCostFindForm" label-width="80px">
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-form-item label="操作人">
|
|
|
+ <el-input
|
|
|
+ clearable
|
|
|
+ style="width:220px"
|
|
|
+ size="small"
|
|
|
+ placeholder="操作人"
|
|
|
+ v-model="underwritingRulesHistoryCostFindForm.modifier"
|
|
|
+ ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-form-item label="操作类型">
|
|
|
+ <el-select clearable size="small" v-model="underwritingRulesHistoryCostFindForm.operatorType" placeholder="请选择">
|
|
|
+ <el-option
|
|
|
+ v-for="item in operationTypeOption"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-form-item label="操作时间">
|
|
|
+ <el-date-picker
|
|
|
+ clearable
|
|
|
+ v-model="underwritingRulesHistoryCostFindForm.operatorTime"
|
|
|
+ type="date"
|
|
|
+ size="small"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ placeholder="选择日期">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-form-item label="">
|
|
|
+ <el-button
|
|
|
+ size="small"
|
|
|
+ type="primary"
|
|
|
+ @click="underwritingRulesHistoryCostFindPage"
|
|
|
+ >查询</el-button
|
|
|
+ >
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-form>
|
|
|
+ </el-row>
|
|
|
<kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
|
|
|
:showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" button2Name="详情"
|
|
|
@handleButton2="underwritingRulesHistoryDetails" :data="underwritingRulesHistoryRecordResult"
|
|
|
@@ -685,6 +789,55 @@
|
|
|
</kt-common-table>
|
|
|
</el-dialog>
|
|
|
<el-dialog title="协议历史记录" :visible.sync="agreementHistoryRecordDialogVisible" width="70%" :fullscreen="true">
|
|
|
+ <el-row class="queryFrom">
|
|
|
+ <el-form ref="queryFormRef" :model="productpageRequestForm" label-width="80px">
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-form-item label="操作人">
|
|
|
+ <el-input
|
|
|
+ clearable
|
|
|
+ style="width:220px"
|
|
|
+ size="small"
|
|
|
+ placeholder="操作人"
|
|
|
+ v-model="productpageRequestForm.modifier"
|
|
|
+ ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-form-item label="操作类型">
|
|
|
+ <el-select clearable size="small" v-model="productpageRequestForm.operatorType" placeholder="请选择">
|
|
|
+ <el-option
|
|
|
+ v-for="item in operationTypeOption"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="5">
|
|
|
+ <el-form-item label="操作时间">
|
|
|
+ <el-date-picker
|
|
|
+ clearable
|
|
|
+ v-model="productpageRequestForm.operatorTime"
|
|
|
+ type="date"
|
|
|
+ size="small"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ placeholder="选择日期">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-form-item label="">
|
|
|
+ <el-button
|
|
|
+ size="small"
|
|
|
+ type="primary"
|
|
|
+ @click="agreementHistoryCostFindPage"
|
|
|
+ >查询</el-button
|
|
|
+ >
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-form>
|
|
|
+ </el-row>
|
|
|
<kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
|
|
|
button2Name="详情" @handleButton2="agreementsHistory" :showBatchDelete="false" :showBatchSettled="false"
|
|
|
:showBatchPrint="false" :data="agreementHistoryRecordResult" :columns="agreementHistoryRecordColumns"
|
|
|
@@ -975,45 +1128,57 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ operationTypeOption:[
|
|
|
+ {
|
|
|
+ label:'新增',
|
|
|
+ value:'add'
|
|
|
+ },{
|
|
|
+ label:'修改',
|
|
|
+ value:'update'
|
|
|
+ },{
|
|
|
+ label:'删除',
|
|
|
+ value:'delete'
|
|
|
+ },
|
|
|
+ ],
|
|
|
areaOptions: [],
|
|
|
productCostCopyInfo: {},
|
|
|
agreementHistoryRecordColumns: [
|
|
|
{ prop: "agreementCode", label: "协议代码", minWidth: 180 },
|
|
|
- { prop: "agreementName", label: " 协议名称", minWidth: 160 },
|
|
|
+ { prop: "agreementName", label: "协议名称", minWidth: 160 },
|
|
|
{ prop: "agreementAbbreviation", label: "协议简称", minWidth: 120 },
|
|
|
{
|
|
|
prop: "agreementType",
|
|
|
- label: " 协议类型",
|
|
|
+ label: "协议类型",
|
|
|
minWidth: 160,
|
|
|
formatter: this.agreementtypeFormatter,
|
|
|
},
|
|
|
- { prop: "insuranceCompany", label: " 合作公司", minWidth: 160 },
|
|
|
- { prop: "dockingPerson", label: " 对接人", minWidth: 160 },
|
|
|
- { prop: "dockingPhone", label: " 联系方式（对接人）", minWidth: 160 },
|
|
|
- { prop: "withTax", label: " 含增值税结算", minWidth: 160 },
|
|
|
+ { prop: "insuranceCompany", label: "合作公司", minWidth: 160 },
|
|
|
+ { prop: "dockingPerson", label: "对接人", minWidth: 160 },
|
|
|
+ { prop: "dockingPhone", label: "联系方式（对接人）", minWidth: 160 },
|
|
|
+ { prop: "withTax", label: "含增值税结算", minWidth: 160 },
|
|
|
{
|
|
|
prop: "matchType",
|
|
|
- label: " 保单日期类型",
|
|
|
+ label: "保单日期类型",
|
|
|
minWidth: 160,
|
|
|
formatter: this.matchtypeFormatter,
|
|
|
},
|
|
|
- { prop: "startDate", label: " 协议起期", minWidth: 160 },
|
|
|
- { prop: "endDate", label: " 协议止期", minWidth: 160 },
|
|
|
+ { prop: "startDate", label: "协议起期", minWidth: 160 },
|
|
|
+ { prop: "endDate", label: "协议止期", minWidth: 160 },
|
|
|
{
|
|
|
prop: "moneyType",
|
|
|
- label: " 佣金发放方式",
|
|
|
+ label: "佣金发放方式",
|
|
|
minWidth: 160,
|
|
|
formatter: this.moneyTypeFormatter,
|
|
|
},
|
|
|
{
|
|
|
prop: "validStatus",
|
|
|
- label: " 有效状态",
|
|
|
+ label: "有效状态",
|
|
|
minWidth: 160,
|
|
|
formatter: this.agreestatusFormatter,
|
|
|
},
|
|
|
{
|
|
|
prop: "moneyTime",
|
|
|
- label: " 结算周期",
|
|
|
+ label: "结算周期",
|
|
|
minWidth: 160,
|
|
|
formatter: this.moneytimeFormatter,
|
|
|
},
|
|
|
@@ -1022,8 +1187,10 @@ export default {
|
|
|
label: " 保险公司账号配置",
|
|
|
minWidth: 1060,
|
|
|
},
|
|
|
- { prop: "operator", label: " 操作人", minWidth: 160 },
|
|
|
- { prop: "operatorTime", label: " 操作时间", minWidth: 160 },
|
|
|
+ { prop: "operator", label: "操作人", minWidth: 160 },
|
|
|
+
|
|
|
+ { prop: "operatorType", label: "操作类型", formatter: this.operatorTypeFormatter },
|
|
|
+ { prop: "operatorTime", label: "操作时间", minWidth: 160 },
|
|
|
],
|
|
|
underwritingRulesHistoryRecordColumns: [
|
|
|
{ prop: "modifier", label: "操作人", minWidth: 120 },
|
|
|
@@ -1190,6 +1357,7 @@ export default {
|
|
|
{ prop: "costsStartDate", label: "费用起期", minWidth: 160 },
|
|
|
{ prop: "costsEndDate", label: "费用止期", minWidth: 160 },
|
|
|
{ prop: "desc", label: "费用因子描述", minWidth: 520 },
|
|
|
+ { prop: "isAudit", label: "审核状态", minWidth: 160 ,formatter:this.auditTypeFormation},
|
|
|
{
|
|
|
prop: "jqCarCostsProportion",
|
|
|
label: "费用比例（交强）",
|
|
|
@@ -1724,6 +1892,9 @@ export default {
|
|
|
dockingPerson: [
|
|
|
{ required: true, message: "请添加对接人", trigger: "blur" },
|
|
|
],
|
|
|
+ dockingPhone: [
|
|
|
+ { required: true, message: "请输入联系方式", trigger: "blur" },
|
|
|
+ ],
|
|
|
withTax: [
|
|
|
{ required: true, message: "请选择含增值税结算", trigger: "change" },
|
|
|
],
|
|
|
@@ -1843,6 +2014,11 @@ export default {
|
|
|
{ value: "2", label: "退回修改" },
|
|
|
{ value: "99", label: "已失效" },
|
|
|
],
|
|
|
+ auditstatusoptions: [
|
|
|
+ { value: "0", label: "申请审核" },
|
|
|
+ { value: "1", label: "审核通过" },
|
|
|
+ { value: "2", label: "审核不通过" },
|
|
|
+ ],
|
|
|
prodInsurance: [],
|
|
|
schemeindex: "",
|
|
|
productCostsindex: "",
|
|
|
@@ -1853,9 +2029,13 @@ export default {
|
|
|
productHistoryRecordResult: [],
|
|
|
underwritingRulesHistoryRecordDialogVisible: false,
|
|
|
underwritingRulesHistoryRecordResult: [],
|
|
|
+ productpageRequestForm:{},
|
|
|
+ productHistoryRecordForm:{},
|
|
|
+ underwritingRulesHistoryCostFindForm:{}
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
+
|
|
|
// 机构列表转属性数据
|
|
|
companyListTree() {
|
|
|
let cloneData = JSON.parse(JSON.stringify(this.companyList)); // 对源数据深度克隆
|
|
|
@@ -1944,6 +2124,18 @@ export default {
|
|
|
this.findLeftTreeData();
|
|
|
},
|
|
|
methods: {
|
|
|
+ agreestatusStyle(val){
|
|
|
+ switch (val) {
|
|
|
+ case 0:
|
|
|
+ return '#409eff'
|
|
|
+ case 1:
|
|
|
+ return '#67c23a'
|
|
|
+ case 2:
|
|
|
+ return '#f56c6c'
|
|
|
+ default:
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ },
|
|
|
productFilterListChange(e){
|
|
|
let productstring=e.join(",")
|
|
|
this.agreement.productsCode=productstring;
|
|
|
@@ -2181,7 +2373,7 @@ export default {
|
|
|
}
|
|
|
this.productpageRequest["agreementId"] = this.agreementId;
|
|
|
this.$api.insCompany
|
|
|
- .agreementHistory(this.productpageRequest)
|
|
|
+ .agreementHistory({...this.productpageRequest,...this.productpageRequestForm})
|
|
|
.then((res) => {
|
|
|
this.agreementHistoryRecordResult = res.data;
|
|
|
});
|
|
|
@@ -2206,7 +2398,7 @@ export default {
|
|
|
}
|
|
|
this.productpageRequest["agreementId"] = this.agreementId;
|
|
|
this.$api.insCompany
|
|
|
- .productCostHistory(this.productpageRequest)
|
|
|
+ .productCostHistory({...this.productpageRequest,...this.productHistoryRecordForm})
|
|
|
.then((res) => {
|
|
|
this.productHistoryRecordResult = res.data;
|
|
|
});
|
|
|
@@ -2241,7 +2433,7 @@ export default {
|
|
|
}
|
|
|
this.productpageRequest["agreementId"] = this.agreementId;
|
|
|
this.$api.insCompany
|
|
|
- .undwrtRulesHistoryPage(this.productpageRequest)
|
|
|
+ .undwrtRulesHistoryPage({...this.productpageRequest,...this.underwritingRulesHistoryCostFindForm})
|
|
|
.then((res) => {
|
|
|
this.underwritingRulesHistoryRecordResult = res.data;
|
|
|
});
|
|
|
@@ -2788,15 +2980,6 @@ export default {
|
|
|
|
|
|
// 右侧列表的方法End
|
|
|
//-- formatter begin--
|
|
|
- operatorTypeFormatter(row, column) {
|
|
|
- let operatorType = row.operatorType;
|
|
|
- switch (operatorType) {
|
|
|
- case "add":
|
|
|
- return '新增'
|
|
|
- case "update":
|
|
|
- return '修改'
|
|
|
- }
|
|
|
- },
|
|
|
operatorTypeFormatter(row, column) {
|
|
|
let operatorType = row.operatorType;
|
|
|
switch (operatorType) {
|
|
|
@@ -2808,6 +2991,14 @@ export default {
|
|
|
return '删除'
|
|
|
}
|
|
|
},
|
|
|
+ auditTypeFormation(row){
|
|
|
+ for(var i=0;i<this.expenseAuditlist.length;i++)
|
|
|
+ {
|
|
|
+ if(row.isAudit == parseInt(this.expenseAuditlist[i].value)){
|
|
|
+ return this.expenseAuditlist[i].label;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
agreementtypeFormatter(row, column) {
|
|
|
//协议类型
|
|
|
let agreementType = row.agreementType;
|
|
|
@@ -2857,6 +3048,15 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
+ auditstatusFormatter(row, column) {
|
|
|
+ let status = row.auditStatus;
|
|
|
+ return CommonUtil.getDataName({
|
|
|
+ dataList: this.auditstatusoptions,
|
|
|
+ value: "value",
|
|
|
+ label: "label",
|
|
|
+ data: status,
|
|
|
+ });
|
|
|
+ },
|
|
|
validIndFormatter(row, column) {
|
|
|
let validInd = row.validInd;
|
|
|
if (validInd == 1) {
|
|
|
@@ -3028,6 +3228,7 @@ export default {
|
|
|
};
|
|
|
</script>
|
|
|
<style scoped lang="scss">
|
|
|
+/* 图二 */
|
|
|
.el-divider {
|
|
|
margin: 10px 0px 15px !important;
|
|
|
}
|
