Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -65,7 +65,7 @@
           <template slot-scope="scope">
             <kt-button label="编辑" :size="overSize" type="text" perms="agreement:input:update"
               @click="uplatequery(scope.$index, scope.row)" style="color: #e6a23c !important " />
-              <kt-button label="删除" :size="overSize" type="text" perms="agreement:input:delete"
+            <kt-button label="删除" :size="overSize" type="text" perms="agreement:input:delete"
               @click="deletequery(scope.$index, scope.row)" style="color: #f56c6c !important " />
             <el-button type="text" size="mini">
               <el-dropdown trigger="click">
@@ -75,15 +75,18 @@
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item>
                     <kt-button label="协议历史记录" :size="overSize" type="text" perms="agreement:input:historyRecord"
-              @click="historyRecord(scope.$index, scope.row)"  />
+                      @click="historyRecord(scope.$index, scope.row)" />
+                      @click="historyRecord(scope.$index, scope.row)" />
                   </el-dropdown-item>
                   <el-dropdown-item>
                     <kt-button label="产品费用" :size="overSize" type="text" perms="agreement:input:productCost"
-              @click="productCost(scope.$index, scope.row)"  />
+                      @click="productCost(scope.$index, scope.row)" />
+                      @click="productCost(scope.$index, scope.row)" />
                   </el-dropdown-item>
                   <el-dropdown-item>
                     <kt-button label="承保规则" :size="overSize" type="text" perms="agreement:input:underwritingRules"
-              @click="underwritingRulesButton(scope.$index, scope.row)"  />
+                      @click="underwritingRulesButton(scope.$index, scope.row)" />
+                      @click="underwritingRulesButton(scope.$index, scope.row)" />
                   </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
@@ -399,8 +402,9 @@
       <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="删除" permsButton2="agreement:input:productCost" permsButton3="agreement:input:productCost" button3Background="#F56C6C"
-        @handleButton3="productDelete" button3Icon="">
+        @handleButton2="productUpdate" button2Icon="" button3Name="删除" permsButton2="agreement:input:productCost"
+        permsButton3="agreement:input:productCost" button3Background="#F56C6C" @handleButton3="productDelete"
+        button3Icon="">
       </kt-common-table>
     </el-dialog>
     <el-dialog :title="productCostAddDialogTitle" :visible.sync="productCostAddVehicleFactorVisible" width="80%" top="6vh"
@@ -613,7 +617,8 @@
       </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="编辑" permsButton2="agreement:input:underwritingRules" permsButton3="agreement:input:underwritingRules"
+        :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>
@@ -734,7 +739,8 @@ export default {
       underwritingRulesHistoryRecordColumns: [
         { prop: "modifier", label: "操作人", minWidth: 120 },
         { prop: "operatorTime", label: "操作时间", minWidth: 160 },
-        { prop: "validInd", label: " 是否有效", minWidth: 160 ,formatter: this.validIndFormatter,},
+        { prop: "operatorType", label: "操作类型", minWidth: 120, formatter: this.operatorTypeFormatter },
+        { prop: "validInd", label: " 是否有效", minWidth: 160, formatter: this.validIndFormatter, },
         { prop: "ruleDescription", label: " 规则描述", minWidth: 160 },
         {
           prop: "costsAttrLinks",
@@ -743,7 +749,7 @@ export default {
         },
       ],
       underwritingRulesColumns: [
-        { prop: "validInd", label: " 是否有效", minWidth: 160 ,formatter: this.validIndFormatter,},
+        { prop: "validInd", label: " 是否有效", minWidth: 160, formatter: this.validIndFormatter, },
         { prop: "ruleDescription", label: " 规则描述", minWidth: 160 },
         { prop: "desc", label: " 规则因子描述", minWidth: 660 },
       ],
@@ -753,6 +759,7 @@ export default {
         { prop: "costsDescription", label: "费用描述", minWidth: 120 },
         { prop: "modifier", label: "操作人", minWidth: 120 },
         { prop: "operatorTime", label: "操作时间", minWidth: 160 },
+        { prop: "operatorType", label: "操作类型", minWidth: 120, formatter: this.operatorTypeFormatter },
         {
           prop: "jqCarCostsProportion",
           label: "费用比例（交强）",
@@ -1481,7 +1488,6 @@ export default {
   mounted() {
     this.labelWidth = "auto";
     this.findLeftTreeData();
-    this.getAllCompany();
   },
   methods: {
 
@@ -1629,12 +1635,12 @@ export default {
     },
     //产品历史记录
     productHistory() {
-      this.productCostFindPage();
+      this.productHistoryCostFindPage();
       this.productHistoryRecordDialogVisible = true;
     },
-    underwritingRulesHistory(){
+    underwritingRulesHistory() {
       this.underwritingRulesHistoryCostFindPage();
-      this.underwritingRulesHistoryRecordDialogVisible=true;
+      this.underwritingRulesHistoryRecordDialogVisible = true;
     },
     //承保规则
     underwritingRulesButton(index, row) {
@@ -2121,20 +2127,6 @@ export default {
         });
       }
     },
-    //获取所有机构列表Start
-    getAllCompany() {
-      this.companyList = [];
-      this.$api.dept.findLeftDeptTree(this.peopledeptid).then((res) => {
-        for (let i = 0; i < res.data.length; i++) {
-          if (
-            res.data[i].id.indexOf("D") < 0 ||
-            (res.data[i].id.indexOf("D") > 0 && res.data[i].id.indexOf("M") > 0)
-          ) {
-            this.companyList.push(res.data[i]);
-          }
-        }
-      });
-    },
     //获取所有机构列表End
     /**Split 开始 */
     // changeTreeWidth(widthVal) {
@@ -2238,8 +2230,29 @@ 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) {
+        case "add":
+          return '新增'
+        case "update":
+          return '修改'
+        case "delete":
+          return '删除'
+      }
+    },
     agreementtypeFormatter(row, column) {
       //协议类型
       let agreementType = row.agreementType;
@@ -2289,11 +2302,11 @@ export default {
         });
       }
     },
-    validIndFormatter(row, column){
-      let validInd=row.validInd;
-      if(validInd==1){
+    validIndFormatter(row, column) {
+      let validInd = row.validInd;
+      if (validInd == 1) {
         return '有效'
-      }else{
+      } else {
         return '无效'
       }
     },