Merge branch 'dev' into dev-wks

src/components/Form/ProductCostForm.vue

@@ -81,7 +81,7 @@
             }}</el-button> -->
           </div>
           <div class="p-2" v-show="CarCollapsed">
-            <el-col v-for=" (formItems, index) in CarAttr" :key="index"
+            <el-col v-for="(formItems, index) in CarAttr" :key="index"
               :span="formItems.attrType == 'checkbox' ? 24 : 11">
               <el-form-item :label="formItems.attrName">
                 <template v-if="formItems.attrType == 'inputNumber'">
@@ -154,9 +154,10 @@
                 </template>
                 <div v-if="formItems.attrType == 'select'" style="display: flex;">
                   <el-select multiple v-model="formItems.minArray" placeholder="请选择" style="width: 100%;"
-                    @change="selectChange($event, formItems.id, 'min')" :filterable="formItems.attrName == '车辆类型' ? true : false">
+                    @change="selectChange($event, formItems.id, 'min')"
+                    :filterable="formItems.attrName == '车辆类型' ? true : false">
                     <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
-                    :value="formItems.attrName == '车辆类型' ? dict.code : dict.name"></el-option>
+                      :value="formItems.attrName == '车辆类型' ? dict.code : dict.name"></el-option>
                   </el-select>
                   <el-checkbox style="margin-left: 10px;" v-if="formItems.attrCode == 'LicenseNo'"
                     v-model="LicenseNoChecked"
@@ -179,7 +180,7 @@
                 <div class="flex " v-if="formItems.attrType == 'radio'">
                   <el-radio-group v-model="formItems.min">
                     <el-radio-button v-for="dict in formItems.dictLabal" :key="dict.id" :label="dict.code">{{ dict.name
-                    }}</el-radio-button>
+                      }}</el-radio-button>
                   </el-radio-group>
                   <el-button v-if="formItems.attrType == 'radio'" size="mini" style="margin-left: 20px;"
                     @click="radiouncheck(formItems)">取消选择</el-button>
@@ -199,7 +200,7 @@
             }}</el-button> -->
           </div>
           <div class="p-2" v-show="CarownersCollapsed">
-            <el-col v-for=" (formItems, index) in CarownersAttr" :key="index"
+            <el-col v-for="(formItems, index) in CarownersAttr" :key="index"
               :span="formItems.attrType == 'checkbox' ? 24 : 12">
               <el-form-item :label="formItems.attrName">
                 <template v-if="formItems.attrType == 'inputNumber'">
@@ -276,8 +277,18 @@
                   <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
                     :value="dict.name"></el-option>
                 </el-select>
-                <el-input v-if="formItems.attrType == 'input'" v-model="formItems.min" placeholder="身份证前2位或前6位
-"></el-input>
+
+                <div v-if="formItems.attrType == 'input'">
+                  <div v-if="formItems.attrCode == 'CarOwnersAddress'" style="display: flex;">
+                    <el-input  v-model="formItems.min" placeholder="车主地址"></el-input>
+                    <el-select v-model="formItems.operator" placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                    <el-option label="包含" value="1"></el-option>
+                    <el-option label="不包含" value="2"></el-option>
+                  </el-select>
+                  </div>
+                  <el-input v-else v-model="formItems.min" placeholder="身份证前2位或前6位
+                  "></el-input>
+                </div>
                 <el-checkbox-group v-if="formItems.attrType == 'checkbox'" v-model="formItems.list"
                   @change="checkboxChange($event, formItems.id, 'min')">
                   <el-checkbox v-for="dict in formItems.dictLabal" :key="dict.id" :label="dict.name"></el-checkbox>
@@ -285,7 +296,7 @@
                 <div class="flex " v-if="formItems.attrType == 'radio'">
                   <el-radio-group v-model="formItems.min">
                     <el-radio-button v-for="dict in formItems.dictLabal" :key="dict.id" :label="dict.code">{{ dict.name
-                    }}</el-radio-button>
+                      }}</el-radio-button>
                   </el-radio-group>
                   <el-button v-if="formItems.attrType == 'radio'" size="mini" style="margin-left: 20px;"
                     @click="radiouncheck(formItems)">取消选择</el-button>
@@ -306,7 +317,7 @@
             }}</el-button> -->
           </div>
           <div class="p-2" v-show="ApplicantCollapsed">
-            <el-col v-for=" (formItems, index) in ApplicantAttr" :key="index"
+            <el-col v-for="(formItems, index) in ApplicantAttr" :key="index"
               :span="formItems.attrType == 'checkbox' ? 24 : 12">
               <el-form-item :label="formItems.attrName">
                 <template v-if="formItems.attrType == 'inputNumber'">
@@ -382,8 +393,17 @@
                   <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
                     :value="dict.name"></el-option>
                 </el-select>
-                <el-input v-if="formItems.attrType == 'input'" v-model="formItems.min" placeholder="身份证前2位或前6位
-"></el-input>
+                <div v-if="formItems.attrType == 'input'">
+                  <div v-if="formItems.attrCode == 'ApplicantAddress'" style="display: flex;">
+                    <el-input  v-model="formItems.min" placeholder="投保人地址"></el-input>
+                    <el-select v-model="formItems.operator" placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                    <el-option label="包含" value="1"></el-option>
+                    <el-option label="不包含" value="2"></el-option>
+                  </el-select>
+                  </div>
+                  <el-input v-else v-model="formItems.min" placeholder="身份证前2位或前6位
+                  "></el-input>
+                </div>
                 <el-checkbox-group v-if="formItems.attrType == 'checkbox'" v-model="formItems.list"
                   @change="checkboxChange($event, formItems.id, 'min')">
                   <el-checkbox v-for="dict in formItems.dictLabal" :key="dict.id" :label="dict.name"></el-checkbox>
@@ -391,7 +411,7 @@
                 <div class="flex " v-if="formItems.attrType == 'radio'">
                   <el-radio-group v-model="formItems.min">
                     <el-radio-button v-for="dict in formItems.dictLabal" :key="dict.id" :label="dict.code">{{ dict.name
-                    }}</el-radio-button>
+                      }}</el-radio-button>
                   </el-radio-group>
                   <el-button v-if="formItems.attrType == 'radio'" size="mini" style="margin-left: 20px;"
                     @click="radiouncheck(formItems)">取消选择</el-button>
@@ -411,7 +431,7 @@
             }}</el-button> -->
           </div>
           <div class="p-2" v-show="InsuredCollapsed">
-            <el-col v-for=" (formItems, index) in InsuredAttr" :key="index"
+            <el-col v-for="(formItems, index) in InsuredAttr" :key="index"
               :span="formItems.attrType == 'checkbox' ? 24 : 12">
               <el-form-item :label="formItems.attrName">
                 <template v-if="formItems.attrType == 'inputNumber'">
@@ -487,8 +507,17 @@
                   <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
                     :value="dict.name"></el-option>
                 </el-select>
-                <el-input v-if="formItems.attrType == 'input'" v-model="formItems.min" placeholder="身份证前2位或前6位
-"></el-input>
+                <div v-if="formItems.attrType == 'input'">
+                  <div v-if="formItems.attrCode == 'InsuredAddress'" style="display: flex;">
+                    <el-input  v-model="formItems.min" placeholder="被保人地址"></el-input>
+                    <el-select v-model="formItems.operator" placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                    <el-option label="包含" value="1"></el-option>
+                    <el-option label="不包含" value="2"></el-option>
+                  </el-select>
+                  </div>
+                  <el-input v-else v-model="formItems.min" placeholder="身份证前2位或前6位
+                  "></el-input>
+                </div>
                 <el-checkbox-group v-if="formItems.attrType == 'checkbox'" v-model="formItems.list"
                   @change="checkboxChange($event, formItems.id, 'min')">
                   <el-checkbox v-for="dict in formItems.dictLabal" :key="dict.id" :label="dict.name"></el-checkbox>
@@ -496,7 +525,7 @@
                 <div class="flex " v-if="formItems.attrType == 'radio'">
                   <el-radio-group v-model="formItems.min">
                     <el-radio-button v-for="dict in formItems.dictLabal" :key="dict.id" :label="dict.code">{{ dict.name
-                    }}</el-radio-button>
+                      }}</el-radio-button>
                   </el-radio-group>
                   <el-button v-if="formItems.attrType == 'radio'" size="mini" style="margin-left: 20px;"
                     @click="radiouncheck(formItems)">取消选择</el-button>
@@ -517,7 +546,7 @@
               }}</el-button> -->
           </div>
           <div class="p-2" v-show="insuranceTypeCollapsed">
-            <el-col v-for=" (formItems, index) in insuranceTypeAttr" :key="index"
+            <el-col v-for="(formItems, index) in insuranceTypeAttr" :key="index"
               :span="formItems.attrType == 'checkbox' ? 24 : 12">
               <el-form-item :label="formItems.attrName">
                 <template v-if="formItems.attrType == 'inputNumber'">
@@ -601,7 +630,7 @@
                 <div class="flex " v-if="formItems.attrType == 'radio'">
                   <el-radio-group v-model="formItems.min">
                     <el-radio-button v-for="dict in formItems.dictLabal" :key="dict.id" :label="dict.code">{{ dict.name
-                    }}</el-radio-button>
+                      }}</el-radio-button>
                   </el-radio-group>
                   <el-button v-if="formItems.attrType == 'radio'" size="mini" style="margin-left: 20px;"
                     @click="radiouncheck(formItems)">取消选择</el-button>
@@ -622,7 +651,7 @@
               }}</el-button> -->
           </div>
           <div class="p-2" v-show="insurerCostFactorCollapsed">
-            <el-col v-for=" (formItems, index) in insurerCostFactorAttr" :key="index"
+            <el-col v-for="(formItems, index) in insurerCostFactorAttr" :key="index"
               :span="formItems.attrType == 'checkbox' ? 24 : 12">
               <el-form-item :label="formItems.attrName">
                 <template v-if="formItems.attrType == 'inputNumber'">
@@ -706,7 +735,7 @@
                 <div class="flex " v-if="formItems.attrType == 'radio'">
                   <el-radio-group v-model="formItems.min">
                     <el-radio-button v-for="dict in formItems.dictLabal" :key="dict.id" :label="dict.code">{{ dict.name
-                    }}</el-radio-button>
+                      }}</el-radio-button>
                   </el-radio-group>
                   <el-button v-if="formItems.attrType == 'radio'" size="mini" style="margin-left: 20px;"
                     @click="radiouncheck(formItems)">取消选择</el-button>
@@ -987,4 +1016,3 @@ export default {
   }
 }
 </style>
-

src/views/Sys/TaiShanAuth.vue

@@ -6,8 +6,14 @@
       fontWeight: '700',
       color: '#606266',
     }">
+      <el-table-column prop="id" label="编号" width="50" align="center"></el-table-column>
       <el-table-column prop="agreementCode" label="协议代码" align="center" width="300"></el-table-column>
-      <el-table-column prop="agreementTitle" label="协议名称" align="center"></el-table-column>
+      <el-table-column prop="agreementTitle" label="协议名称" align="center">
+        <template slot-scope="scope">
+            <span>{{ scope.row.agreementName }} - {{ scope.row.businessDescription }} - {{ scope.row.jobDescription
+              }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" width="200" fixed="right">
         <template slot-scope="scope">
           <el-button @click="smdcode(scope.row)" type="text" size="small">发送验证码</el-button>

src/views/Task/daikeComponents/KtLetter1.vue

@@ -8007,6 +8007,7 @@ export default {
                 this.taikangaccidentDataList = res.data;
                 break;
               case "中国人寿":
+              case "人保财险":
               case "恒邦财险":
               case "太平财险":
               case "安盛天平":
@@ -8499,6 +8500,7 @@ export default {
                     this.dajiaInsuranceData = res.data;
                     break;
                   case "中国人寿":
+                  case "人保财险":
                   case "恒邦财险":
                   case "太平财险":
                   case "华农财险":
@@ -10832,6 +10834,7 @@ export default {
           case "诚泰财险":
           case "泰康财险":
           case "中国人寿":
+          case "人保财险":
           case "恒邦财险":
           case "华农财险":
           case "华安财险":
@@ -10941,6 +10944,15 @@ export default {
         namesimple,
         this.totalCompanyList[num].apiType
       );
+    },
+     //人保
+    renbao(num, id, namesimple) {
+      this.quoteInsurance(
+        num,
+        id,
+        namesimple,
+        this.totalCompanyList[num].apiType
+      );
     },
     //恒邦
     hengbang(num, id, namesimple) {
@@ -12031,6 +12043,7 @@ export default {
               case "安盛天平":
               case "众安财险":
               case "中国人寿":
+              case "人保财险":
               case "太平洋财险":
               // case "诚泰财险":
               case "泰康财险":
@@ -12614,7 +12627,7 @@ export default {
       this.carInfo.modelCode = row.modelCode; //型号代码
       this.carInfo.familyName = row.series; //系列
       this.carInfo.enginedesc = row.displacement; //排量
-      this.carInfo.energyType = row.energyTypes;
+      this.carInfo.energyType =this.carInfo.licenseNo && this.carInfo.licenseNo.length==7? row.energyTypes:'1';//能源种类
       this.carInfo.powerScale = row.powerScale; //功率
       this.chexingdialogVisible = false;
       this.sbdmdialogVisible = false;

src/views/Task/daikeComponents/KtOrder.vue

@@ -148,6 +148,7 @@
                   '诚泰财险',
                   '众安财险',
                   '中国人寿',
+                  '人保财险',
                   '安盛天平',
                   '紫金财险',
                   '渤海财险',
@@ -179,6 +180,7 @@
                   '诚泰财险',
                   '众安财险',
                   '中国人寿',
+                  '人保财险',
                   '安盛天平',
                   '紫金财险',
                   '永诚财险',
@@ -507,6 +509,7 @@
                   '诚泰财险',
                   '众安财险',
                   '中国人寿',
+                  '人保财险',
                   '安盛天平',
                   '紫金财险',
                   '永诚财险',
@@ -1533,6 +1536,7 @@ export default {
         太平洋财险: "auditStatusQuery",
         众安财险: "auditStatusQuery",
         中国人寿: "auditStatusQuery",
+        人保财险: "auditStatusQuery",
         安盛天平: "auditStatusQuery",
         紫金财险: "auditStatusQueryZijin",
         渤海财险: "orderStatusbohai",
@@ -1834,6 +1838,7 @@ export default {
         item.inscompany == "太平洋财险" ||
         item.inscompany == "众安财险" ||
         item.inscompany == "中国人寿" ||
+        item.inscompany == "人保财险" ||
         item.inscompany == "安盛天平" ||
         item.inscompany == "太平财险" ||
         item.inscompany == "泰康财险" ||