承保规则规则因子描述展示

config/dev.env.js

@@ -5,12 +5,12 @@ const prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG:'"dev"',
-  // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
-  BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
+  BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
+  // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   // BASE_URL: '"http:///192.168.0.253:8082/"',//田智
-  // BASE_URL: '"http:///192.168.0.36:8080/"',//靖燕龙
+  // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
 })
 
 

src/http/moudules/insCompany.js

@@ -352,7 +352,7 @@ export const productCostDelete = (id) => {
 //历史记录
 export const productCostHistory = (data) => {
   return axios({
-    url: '/plt/agreementhistory/costsHistoryPage',
+    url: '/plt/new/agreementhistory/agreementHistoryPage',
     method: "post",
     data
   })
@@ -411,7 +411,7 @@ export const undwrtRulesDelete = (id) => {
 //历史记录
 export const undwrtRulesHistoryPage = (data) => {
   return axios({
-    url: '/plt/agreementhistory/rulesHistoryPage',
+    url: '/plt/new/agreementhistory/rulesHistoryPage',
     method: "post",
     data
   })

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -399,7 +399,7 @@
       <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
         :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="productPageResult"
         :columns="productColumns" @findPage="productCostFindPage" button2Name="编辑" button2Background="#E6A23C"
-        @handleButton2="productUpdate" button2Icon="" button3Name="删除" button3Background="#F56C6C"
+        @handleButton2="productUpdate" button2Icon="" button3Name="删除" permsButton2="agreement:input:productCost" permsButton3="agreement:input:productCost" button3Background="#F56C6C"
         @handleButton3="productDelete" button3Icon="">
       </kt-common-table>
     </el-dialog>
@@ -609,11 +609,11 @@
         <el-button type="warning " style="background-color: #52c578; border: #52c578" size="small"
           @click="addUnderwritingRule">添加规则</el-button>
         <el-button type="warning " style="background-color: #52c578; border: #52c578" size="small"
-          @click="underwritingRulesHistoryRecordDialogVisible = true">历史记录</el-button>
+          @click="underwritingRulesHistory">历史记录</el-button>
       </div>
       <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
         :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="underwritingRulesResult"
-        :columns="underwritingRulesColumns" @findPage="underwritingRulesFindPage" button2Name="编辑"
+        :columns="underwritingRulesColumns" @findPage="underwritingRulesFindPage" button2Name="编辑" permsButton2="agreement:input:underwritingRules" permsButton3="agreement:input:underwritingRules"
         button2Background="#E6A23C" @handleButton2="underwritingRulesUpdate" button2Icon="" button3Name="删除"
         button3Background="#F56C6C" @handleButton3="underwritingRulesDelete" button3Icon="">
       </kt-common-table>
@@ -732,166 +732,158 @@ export default {
         { prop: "operatorTime", label: " 操作时间", minWidth: 160 },
       ],
       underwritingRulesHistoryRecordColumns: [
-        { prop: "operator", label: "操作人", minWidth: 120 },
+        { prop: "modifier", label: "操作人", minWidth: 120 },
         { prop: "operatorTime", label: "操作时间", minWidth: 160 },
-        { prop: "validInd", label: " 是否有效", minWidth: 160 },
+        { prop: "validInd", label: " 是否有效", minWidth: 160 ,formatter: this.validIndFormatter,},
         { prop: "ruleDescription", label: " 规则描述", minWidth: 160 },
-        { prop: "transfer", label: " 是否过户车", minWidth: 160 },
-        { prop: "newEnergy", label: "是否新能源", minWidth: 120 },
-        { prop: "oldAndNew", label: "是否新旧车", minWidth: 120 },
-        { prop: "renewal", label: "是否续保车", minWidth: 160 },
-        { prop: "vehicleCategory", label: "车辆大类（条件）", minWidth: 160 },
-        { prop: "natureOfUse", label: "使用性质（条件）", minWidth: 160 },
-        { prop: "minSeats", label: "客车最小座位数", minWidth: 160 },
-        { prop: "maxSeats", label: "客车最大座位数", minWidth: 160 },
-        { prop: "minTruckTonnage", label: "货车最小吨位数", minWidth: 160 },
-        { prop: "maxTruckTonnage", label: "货车最大吨位数", minWidth: 160 },
-        { prop: "minPurchasePrice", label: "新车购置价最小", minWidth: 160 },
-        { prop: "maxPurchasePrice", label: "新车购置价最大", minWidth: 160 },
         {
-          prop: "minApprovedLoadCapacity",
-          label: "核定载质量（最小）",
+          prop: "costsAttrLinks",
+          label: "规则因子描述",
+          minWidth: 660,
+        },
+      ],
+      underwritingRulesColumns: [
+        { prop: "validInd", label: " 是否有效", minWidth: 160 ,formatter: this.validIndFormatter,},
+        { prop: "ruleDescription", label: " 规则描述", minWidth: 160 },
+        { prop: "desc", label: " 规则因子描述", minWidth: 660 },
+      ],
+      productHistoryRecordColumns: [
+        //数据列
+        { prop: "productName", label: " 产品名称", minWidth: 160 },
+        { prop: "costsDescription", label: "费用描述", minWidth: 120 },
+        { prop: "modifier", label: "操作人", minWidth: 120 },
+        { prop: "operatorTime", label: "操作时间", minWidth: 160 },
+        {
+          prop: "jqCarCostsProportion",
+          label: "费用比例（交强）",
+          minWidth: 120,
+        },
+        {
+          prop: "jqCarOtherCostsProportion",
+          label: "其他费用比例（交强）",
           minWidth: 160,
         },
         {
-          prop: "maxApprovedLoadCapacity",
-          label: "核定载质量（最大）",
+          prop: "jqCostsProportion",
+          label: "总费用比例（交强）",
           minWidth: 160,
         },
         {
-          prop: "minCompulsoryInsurancePremium",
-          label: "交强险保费（最小）",
+          prop: "jqExportRadioLevel1",
+          label: "交强出口比例一级",
           minWidth: 160,
         },
         {
-          prop: "maxCompulsoryInsurancePremium",
-          label: "交强险保费（最大）",
+          prop: "jqExportRadioLevel2",
+          label: "交强出口比例二级",
           minWidth: 160,
         },
-        { prop: "minTaxAmount", label: "车船税金额（最小）", minWidth: 160 },
-        { prop: "maxTaxAmount", label: "车船税金额（最大）", minWidth: 160 },
-        { prop: "minDriverAmount", label: "司机保额（最小）", minWidth: 160 },
-        { prop: "maxDriverAmount", label: "司机保额（最大）", minWidth: 160 },
         {
-          prop: "minPassengerAmount",
-          label: "乘客保额（最小）",
+          prop: "jqExportRadioLevel3",
+          label: "交强出口比例三级",
           minWidth: 160,
         },
         {
-          prop: "maxPassengerAmount",
-          label: "乘客保额（最大）",
+          prop: "jqExportRadioLevel4",
+          label: "交强出口比例四级",
           minWidth: 160,
         },
-      ],
-      underwritingRulesColumns: [
-        { prop: "validInd", label: " 是否有效", minWidth: 160 },
-        { prop: "ruleDescription", label: " 规则描述", minWidth: 160 },
-        { prop: "transfer", label: " 是否过户车", minWidth: 160 },
-        { prop: "newEnergy", label: "是否新能源", minWidth: 120 },
-        { prop: "oldAndNew", label: "是否新旧车", minWidth: 120 },
-        { prop: "renewal", label: "是否续保车", minWidth: 160 },
-        { prop: "vehicleCategory", label: "车辆大类（条件）", minWidth: 160 },
-        { prop: "natureOfUse", label: "使用性质（条件）", minWidth: 160 },
-        { prop: "minSeats", label: "客车最小座位数", minWidth: 160 },
-        { prop: "maxSeats", label: "客车最大座位数", minWidth: 160 },
-        { prop: "minTruckTonnage", label: "货车最小吨位数", minWidth: 160 },
-        { prop: "maxTruckTonnage", label: "货车最大吨位数", minWidth: 160 },
-        { prop: "minPurchasePrice", label: "新车购置价最小", minWidth: 160 },
-        { prop: "maxPurchasePrice", label: "新车购置价最大", minWidth: 160 },
         {
-          prop: "minApprovedLoadCapacity",
-          label: "核定载质量（最小）",
+          prop: "jqExportRadioLevel5",
+          label: "交强出口比例五级",
           minWidth: 160,
         },
         {
-          prop: "maxApprovedLoadCapacity",
-          label: "核定载质量（最大）",
+          prop: "jqExportInvestmentRadio",
+          label: "交强出口加投比例",
           minWidth: 160,
         },
         {
-          prop: "minCompulsoryInsurancePremium",
-          label: "交强险保费（最小）",
+          prop: "syCarCostsProportion",
+          label: "费用比例（商业）",
+          minWidth: 120,
+        },
+        {
+          prop: "syCarOtherCostsProportion",
+          label: "其他费用比例（商业）",
           minWidth: 160,
         },
         {
-          prop: "maxCompulsoryInsurancePremium",
-          label: "交强险保费（最大）",
+          prop: "syCostsProportion",
+          label: "总费用比例（商业）",
           minWidth: 160,
         },
-        { prop: "minTaxAmount", label: "车船税金额（最小）", minWidth: 160 },
-        { prop: "maxTaxAmount", label: "车船税金额（最大）", minWidth: 160 },
-        { prop: "minDriverAmount", label: "司机保额（最小）", minWidth: 160 },
-        { prop: "maxDriverAmount", label: "司机保额（最大）", minWidth: 160 },
         {
-          prop: "minPassengerAmount",
-          label: "乘客保额（最小）",
+          prop: "syExportRadioLevel1",
+          label: "商业出口比例一级",
           minWidth: 160,
         },
         {
-          prop: "maxPassengerAmount",
-          label: "乘客保额（最大）",
+          prop: "syExportRadioLevel2",
+          label: "商业出口比例二级",
           minWidth: 160,
         },
-      ],
-      productHistoryRecordColumns: [
-        //数据列
-        { prop: "productName", label: " 产品名称", minWidth: 160 },
-        { prop: "costsDescription", label: "费用描述", minWidth: 120 },
-        { prop: "operator", label: "操作人", minWidth: 120 },
-        { prop: "operatorTime", label: "操作时间", minWidth: 160 },
         {
-          prop: "jqCostsProportion",
-          label: "总费用比例（交强）",
-          minWidth: 180,
+          prop: "syExportRadioLevel3",
+          label: "商业出口比例三级",
+          minWidth: 160,
         },
         {
-          prop: "jqNewCarCostsProportion",
-          label: "新车费用比例（交强）",
-          minWidth: 180,
+          prop: "syExportRadioLevel4",
+          label: "商业出口比例四级",
+          minWidth: 160,
         },
         {
-          prop: "jqNewCarOtherCostsProportion",
-          label: "新车其他费用比例（交强）",
-          minWidth: 180,
+          prop: "syExportRadioLevel5",
+          label: "商业出口比例五级",
+          minWidth: 160,
         },
         {
-          prop: "jqOldCarCostsProportion",
-          label: "旧车费用比例（交强）",
-          minWidth: 180,
+          prop: "syExportInvestmentRadio",
+          label: "商业出口加投比例",
+          minWidth: 160,
         },
         {
-          prop: "jqOldCarOtherCostsProportion",
-          label: "旧车其他费用比例（交强）",
-          minWidth: 180,
+          prop: "noCarCostsProportion",
+          label: "费用比例（非车）",
+          minWidth: 120,
         },
-
         {
-          prop: "syCostsProportion",
-          label: "总费用比例（商业）",
-          minWidth: 180,
+          prop: "noCarOtherCostsProportion",
+          label: "其他费用比例（非车）",
+          minWidth: 160,
         },
         {
-          prop: "syNewCarCostsProportion",
-          label: "新车费用比例（商业）",
-          minWidth: 180,
+          prop: "noCostsProportion",
+          label: "总费用比例（非车）",
+          minWidth: 160,
         },
         {
-          prop: "syNewCarOtherCostsProportion",
-          label: "新车其他费用比例（商业）",
-          minWidth: 180,
+          prop: "noCarExportRadioLevel1",
+          label: "非车出口比例一级",
+          minWidth: 160,
         },
         {
-          prop: "syOldCarCostsProportion",
-          label: "旧车费用比例（商业）",
-          minWidth: 180,
+          prop: "noCarExportRadioLevel2",
+          label: "非车出口比例二级",
+          minWidth: 160,
         },
         {
-          prop: "syOldCarOtherCostsProportion",
-          label: "旧车其他费用比例（商业）",
-          minWidth: 180,
+          prop: "noCarExportRadioLevel3",
+          label: "非车出口比例三级",
+          minWidth: 160,
         },
-
-
+        {
+          prop: "noCarExportRadioLevel4",
+          label: "非车出口比例四级",
+          minWidth: 160,
+        },
+        {
+          prop: "noCarExportRadioLevel5",
+          label: "非车出口比例五级",
+          minWidth: 160,
+        },
+        { prop: "costsAttrLinks", label: "费用因子描述", minWidth: 680 },
         { prop: "costsStartDate", label: "费用起期", minWidth: 180 },
         { prop: "costsEndDate", label: "费用止期", minWidth: 180 },
         { prop: "priorityLevel", label: "方案优先级", minWidth: 180 },
@@ -1033,7 +1025,6 @@ export default {
         },
         { prop: "costsDescription", label: "费用描述", minWidth: 220 },
         { prop: "desc", label: "费用因子描述", minWidth: 520 },
-
         { prop: "priorityLevel", label: "方案优先级", minWidth: 120 },
       ],
       labelWidth: "160px",
@@ -1638,13 +1629,19 @@ export default {
     },
     //产品历史记录
     productHistory() {
+      this.productCostFindPage();
       this.productHistoryRecordDialogVisible = true;
     },
+    underwritingRulesHistory(){
+      this.underwritingRulesHistoryCostFindPage();
+      this.underwritingRulesHistoryRecordDialogVisible=true;
+    },
     //承保规则
     underwritingRulesButton(index, row) {
       this.agreementId = row.id;
       this.underwritingRulesForm.agreementId = row.id;
       this.underwritingRulesVehicleFactorVisible = true;
+      this.underwritingRulesFindPage();
     },
     //添加承保规则
     addUnderwritingRule() {
@@ -2292,6 +2289,14 @@ export default {
         });
       }
     },
+    validIndFormatter(row, column){
+      let validInd=row.validInd;
+      if(validInd==1){
+        return '有效'
+      }else{
+        return '无效'
+      }
+    },
     updatetimeFormatter(row, column) {
       let updateTime = row.updateTime;
       return format(updateTime);

src/views/Core/KtButton.vue

@@ -54,7 +54,6 @@ export default {
       this.$emit('click', {})
     },
     hasPerms: function (perms) {
-      console.log(hasPermission(perms))
       // 根据权限标识和外部指示状态进行权限判断
       if(!hasPermission(perms) ){
         return false