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

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -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>
@@ -296,9 +296,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="产品">
-                  <el-select v-model="productFilterList" multiple   placeholder="选择产品" style="width: 100%" @change="productFilterListChange">
-                    <el-option v-for="item in productsTypeoptions" :key="item.dictValue" :label="item.dictTag"
+                <el-form-item label="险种配置">
+                  <el-select v-model="productFilterList" multiple   placeholder="选择险种" style="width: 100%" @change="productFilterListChange">
+                    <el-option v-for="item in InsInsuranceKindoptions" :key="item.dictValue" :label="item.dictTag"
                       :value="item.dictValue"></el-option>
                   </el-select>
                 </el-form-item>
@@ -392,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>
@@ -1020,9 +1020,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="产品">
-                  <el-select v-model="productFilterList" multiple   placeholder="选择产品" style="width: 100%" @change="productFilterListChange">
-                    <el-option v-for="item in productsTypeoptions" :key="item.dictValue" :label="item.dictTag"
+                <el-form-item label="险种配置">
+                  <el-select v-model="productFilterList" multiple   placeholder="选择险种" style="width: 100%" @change="productFilterListChange">
+                    <el-option v-for="item in InsInsuranceKindoptions" :key="item.dictValue" :label="item.dictTag"
                       :value="item.dictValue"></el-option>
                   </el-select>
                 </el-form-item>
@@ -1189,7 +1189,6 @@ export default {
           minWidth: 1060,
         },
         { prop: "operator", label: "操作人", minWidth: 160 },
-        
         { prop: "operatorType", label: "操作类型", formatter: this.operatorTypeFormatter  },
         { prop: "operatorTime", label: "操作时间", minWidth: 160 },
       ],
@@ -1358,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: "费用比例（交强）",
@@ -1892,6 +1892,9 @@ export default {
         dockingPerson: [
           { required: true, message: "请添加对接人", trigger: "blur" },
         ],
+        dockingPhone: [
+          { required: true, message: "请输入联系方式", trigger: "blur" },
+        ],
         withTax: [
           { required: true, message: "请选择含增值税结算", trigger: "change" },
         ],
@@ -1994,6 +1997,7 @@ export default {
       approvalStatusoptions: [], //审批状态
       productsTypeoptions: [], //车险产品字典
       productsTypeRuleoptions: [], //车险产品字典(不含费用的兜底配置)
+      InsInsuranceKindoptions:[],//险种配置
       //操作符字典
       operator: { "pageNum": 1, "pageSize": 10, "columnFilters": { "label": { "name": "label", "value": "agreement_operator" } } },
       operatorlist: [],
@@ -2031,7 +2035,6 @@ export default {
     };
   },
   computed: {
-  
     // 机构列表转属性数据
     companyListTree() {
       let cloneData = JSON.parse(JSON.stringify(this.companyList)); // 对源数据深度克隆
@@ -2081,6 +2084,7 @@ export default {
     })
     this.agreement.partnerCompaniesId = "";
 
+    this.getDicType("InsInsuranceKind"); //险种类型
     this.getDicType("agreementType"); //协议类型
     this.getDicType("matchType"); //保单日期类型
     this.getDicType("moneyType"); //佣金发放方式
@@ -2196,6 +2200,10 @@ export default {
       this.$api.insCompany.agreementhistoryGetDetail(row.batch).then((res) => {
         if (res.code == '200') {
           this.agreementsHistoryDialogVisible = true;
+          if(res.data.ptlAgreementHistory.productsCode){
+            let productsCodeList=res.data.ptlAgreementHistory.productsCode.split(",");
+          this.productFilterList=productsCodeList;
+          }
           this.agreementsHistoryInfo.agreement = res.data.ptlAgreementHistory;
           this.agreementsHistoryInfo.attributionform = res.data.ptlAgreementAttributionHistory ? res.data.ptlAgreementAttributionHistory : '{}';
           if (res.data.deptHistories.length > 0) {
@@ -2683,6 +2691,10 @@ export default {
       this.$api.insCompany.agreementId(row.id).then((res) => {
         if (res.code == "200") {
           let scheme = res.data.scheme;
+          if(res.data.agreement.productsCode){
+            let productsCodeList=res.data.agreement.productsCode.split(",");
+          this.productFilterList=productsCodeList;
+          }
           this.agreement = res.data.agreement; //协议信息
           this.attributionform = res.data.ptlAgreementAttribution;
           if (res.data.dept.length > 0) {
@@ -2982,6 +2994,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;

src/views/AgreementManage/CarInsurance/ProductCostExamine.vue

@@ -15,7 +15,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="产品代码">
+      <el-form-item label="产品名称">
         <el-select size="small" clearable v-model="productpageRequest.productCode" :placeholder="'请输入'">
           <el-option v-for="(s, i) in insuranceRepertoire" :key="i" :label="s.dictTag" :value="s.dictValue"></el-option>
         </el-select>