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

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -267,6 +267,11 @@
                         </el-date-picker>
                       </el-form-item>
                     </el-col>
+                    <el-col :span="10" :offset="2">
+                      <el-form-item label="优先级(值小优先)" prop="priorityLevel"  >
+                        <el-input style="width: 100%" v-model="productCostsitem.priorityLevel"   @change="vm=> changePriorityLevel(vm,schemeindex,productCostsindex)"   label="方案匹配优先级"></el-input>
+                      </el-form-item>
+                    </el-col>
                   </el-row>
                   <el-row v-if="['单交', '交三', '交商','兜底配置'].includes(schemeitem.name)">
                     <h4 style="color: tomato;">交强险费用</h4>
@@ -290,33 +295,23 @@
                         <el-input v-model="productCostsitem.jqOldCarCostsProportion" @blur="val => jqOldCarCostsProportioninput(val, schemeindex, productCostsindex)" placeholder="请输入旧车费用比例"></el-input>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="10" :offset="2">
-                      <el-form-item label="费用级别" prop="jqCostsLevel">
-                        <el-select v-model="productCostsitem.jqCostsLevel" placeholder="请选择费用级别" style="width:100%;">
-                          <el-option label="常规" value="1"></el-option>
-                          <el-option label="默认" value="2"></el-option>
-                          <el-option label="优先级最高" value="3"></el-option>
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="10" v-if="permissions">
-                      <el-form-item label="总费用比例" prop="jqCostsProportion">
-                        <el-input v-model="productCostsitem.jqCostsProportion"
-                          @blur="val => jqCostsProportioninput(val, schemeindex, productCostsindex)"
-                          placeholder="请输入总费用比例"></el-input>
-                      </el-form-item>
-                    </el-col>
-
                     <el-col :span="10" :offset="2" v-if="permissions">
                       <el-form-item label="新车其他费用比例">
                         <el-input disabled v-model="productCostsitem.jqNewCarOtherCostsProportion"
-                          placeholder="请输入新车其他费用比例"></el-input>
+                                  placeholder="请输入新车其他费用比例"></el-input>
                       </el-form-item>
                     </el-col>
                     <el-col :span="10" v-if="permissions">
                       <el-form-item label="旧车其他费用比例">
                         <el-input disabled v-model="productCostsitem.jqOldCarOtherCostsProportion"
-                          placeholder="请输入旧车其他费用比例"></el-input>
+                                  placeholder="请输入旧车其他费用比例"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="10" :offset="2">
+                      <el-form-item label="总费用比例" prop="jqCostsProportion">
+                        <el-input v-model="productCostsitem.jqCostsProportion"
+                                  @blur="val => jqCostsProportioninput(val, schemeindex, productCostsindex)"
+                                  placeholder="请输入总费用比例"></el-input>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -342,22 +337,6 @@
                         <el-input v-model="productCostsitem.syOldCarCostsProportion" @blur="val => syOldCarCostsProportioninput(val, schemeindex, productCostsindex)" placeholder="请输入旧车费用比例"></el-input>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="10" :offset="2">
-                      <el-form-item label="费用级别" prop="syCostsLevel">
-                        <el-select v-model="productCostsitem.syCostsLevel" placeholder="请选择费用级别" style="width:100%;">
-                          <el-option label="常规" value="1"></el-option>
-                          <el-option label="默认" value="2"></el-option>
-                          <el-option label="优先级最高" value="3"></el-option>
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="10" v-if="permissions">
-                      <el-form-item label="总费用比例" prop="syCostsProportion">
-                        <el-input v-model="productCostsitem.syCostsProportion" placeholder="请输入总费用比例"
-                          @blur="val => syCostsProportioninput(val, schemeindex, productCostsindex)"></el-input>
-                      </el-form-item>
-                    </el-col>
-
                     <el-col :span="10" :offset="2" v-if="permissions">
                       <el-form-item label="新车其他费用比例">
                         <el-input v-model="productCostsitem.syNewCarOtherCostsProportion" placeholder="请输入新车其他费用比例"
@@ -370,6 +349,12 @@
                           disabled></el-input>
                       </el-form-item>
                     </el-col>
+                    <el-col :span="10" :offset="2">
+                      <el-form-item label="总费用比例" prop="syCostsProportion">
+                        <el-input v-model="productCostsitem.syCostsProportion" placeholder="请输入总费用比例"
+                                  @blur="val => syCostsProportioninput(val, schemeindex, productCostsindex)"></el-input>
+                      </el-form-item>
+                    </el-col>
                   </el-row>
                 </el-form>
               </div>
@@ -2031,9 +2016,6 @@ export default {
             trigger: "blur"
           }
         ],
-        jqCostsLevel: [
-          { required: true, message: "请选择费用级别", trigger: "change" },
-        ],
         sySpilloverPremiums: [
           { required: true, message: "请输入溢出保费", trigger: "blur" },
           {
@@ -2074,8 +2056,13 @@ export default {
             trigger: "blur"
           }
         ],
-        syCostsLevel: [
-          { required: true, message: "请选择费用级别", trigger: "change" },
+        priorityLevel: [
+          { required: true, message: "请输入方案优先级", trigger: "change" },
+          {
+            pattern: /^[1-9][0-9]{0,3}$/,
+            message: "请输入1-10000的整数",
+            trigger: "blur"
+          }
         ],
       },
       NoncarformRules: {
@@ -2210,6 +2197,21 @@ export default {
     this.changeTreeWidth(250); // 初始化树的宽度
   },
   methods: {
+    //改变方案优先级时，校验
+    changePriorityLevel(val,schemeindex, productCostsindex){
+      for(let tempScheme in this.costform.scheme[schemeindex].productCosts){
+        if(productCostsindex!=tempScheme){
+          if(this.costform.scheme[schemeindex].productCosts[tempScheme].priorityLevel==val){
+            this.costform.scheme[schemeindex].productCosts[productCostsindex].priorityLevel='';
+              this.$message({
+                message: "同类型方案下已存值该优先级配置！",
+                type: 'error'
+              });
+              return false;
+          }
+        }
+      }
+    },
     selectSyncAgreement(type){
       if(type=='copy'){
         if(this.copyAgreementId==''){
@@ -2541,7 +2543,6 @@ export default {
           costsDescription: "",//费用描述
           costsStartDate:"",//费用起期
           costsEndDate: "",//费用止期
-          jqCostsLevel: "",//费用级别（交强）
           jqCostsProportion: "",//总费用比例（交强）
           jqNewCarCostsProportion: "4",//新车费用比例（交强）
           jqNewCarOtherCostsProportion: "",//新车其他费用比例（交强）
@@ -2549,7 +2550,6 @@ export default {
           jqOldCarOtherCostsProportion: "",//旧车其他费用比例（交强）
           jqSpilloverPremiums: "",//溢出保费（交强）
           jqSpilloverProportion: "",//溢出比例（交强）
-          syCostsLevel: "",//费用级别（商业）
           syCostsProportion: "",//总费用比例（商业）
           syNewCarCostsProportion: "",//新车费用比例（商业）
           syNewCarOtherCostsProportion: "",//新车其他费用比例（商业）
@@ -2557,6 +2557,7 @@ export default {
           syOldCarOtherCostsProportion: "",//旧车其他费用比例（商业）
           sySpilloverPremiums: "",//溢出保费（商业）
           sySpilloverProportion: "",//溢出比例（商业）
+          priorityLevel:'',//方案优先级
         })
 
     },
@@ -2570,7 +2571,6 @@ export default {
             costsDescription: "",//费用描述
             costsStartDate: "",//费用起期
             costsEndDate: "",//费用止期
-            jqCostsLevel: "",//费用级别（交强）
             jqCostsProportion: "",//总费用比例（交强）
             jqNewCarCostsProportion: "4",//新车费用比例（交强）
             jqNewCarOtherCostsProportion: "",//新车其他费用比例（交强）
@@ -2578,7 +2578,6 @@ export default {
             jqOldCarOtherCostsProportion: "",//旧车其他费用比例（交强）
             jqSpilloverPremiums: "",//溢出保费（交强）
             jqSpilloverProportion: "",//溢出比例（交强）
-            syCostsLevel: "",//费用级别（商业）
             syCostsProportion: "",//总费用比例（商业）
             syNewCarCostsProportion: "",//新车费用比例（商业）
             syNewCarOtherCostsProportion: "",//新车其他费用比例（商业）
@@ -2586,6 +2585,7 @@ export default {
             syOldCarOtherCostsProportion: "",//旧车其他费用比例（商业）
             sySpilloverPremiums: "",//溢出保费（商业）
             sySpilloverProportion: "",//溢出比例（商业）
+            priorityLevel:'',//方案优先级
           }]
         })
       } else {
@@ -2672,12 +2672,12 @@ export default {
       //校验司乘保额关联关系值
        let driverConfigFlag=false;//默认没有配置司机保额
        let passengerConfigFlag=false;//默认没有配置乘客保额
-       if(this.CostfactorForm.minDriverAmount==0&&this.CostfactorForm.maxDriverAmount==0){
+       if((!this.CostfactorForm.minDriverAmount||this.CostfactorForm.minDriverAmount==0)&&(!this.CostfactorForm.maxDriverAmount||this.CostfactorForm.maxDriverAmount==0)){
          driverConfigFlag=false;
        }else{
          driverConfigFlag=true;
        }
-      if(this.CostfactorForm.minPassengerAmount==0&&this.CostfactorForm.maxPassengerAmount==0){
+      if((!this.CostfactorForm.minPassengerAmount||this.CostfactorForm.minPassengerAmount==0)&&(!this.CostfactorForm.maxPassengerAmount||this.CostfactorForm.maxPassengerAmount==0)){
         passengerConfigFlag=false;
       }else{
         passengerConfigFlag=true;