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

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -25,7 +25,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="保险公司">
-              <el-cascader v-model="agreement.partnerCompaniesId" :size="overSize" :show-all-levels="true"
+              <el-cascader v-model="agreement.partnerCompaniesId" :size="overSize" :show-all-levels="false"
                 :options="ztreeNodes" :props="optionProps" @change="handleChange" clearable filterable></el-cascader>
             </el-form-item>
           </el-col>
@@ -212,9 +212,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="保险公司" :prop="supplierType == '1' ? '' : 'associationCompaniesId'">
+                <el-form-item label="保险公司" :prop="supplierType == '1' ? '' : 'insuranceCompanyId'">
                   <el-cascader style="width: 100%" :disabled="supplierType == '1' || operType == 'EDIT'"
-                    v-model="agreement.associationCompaniesId" :show-all-levels="false" :options="prodInsurance"
+                    v-model="agreement.insuranceCompanyId" :show-all-levels="false" :options="prodInsurance"
                     :props="optionProps" @change="prodhandleChange" clearable filterable></el-cascader>
                 </el-form-item>
               </el-col>
@@ -889,9 +889,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="保险公司" :prop="supplierType == '1' ? '' : 'associationCompaniesId'">
+                <el-form-item label="保险公司" :prop="supplierType == '1' ? '' : 'insuranceCompanyId'">
                   <el-cascader :disabled="supplierType == '1' || operType == 'EDIT'" style="width: 100%"
-                    v-model="agreementsHistoryInfo.agreement.associationCompaniesId" :show-all-levels="false"
+                    v-model="agreementsHistoryInfo.agreement.insuranceCompanyId" :show-all-levels="false"
                     :options="prodInsurance" :props="optionProps" @change="prodhandleChange" clearable
                     filterable></el-cascader>
                 </el-form-item>
@@ -1669,7 +1669,7 @@ export default {
         dockingPhone: "", //联系方式（对接人）
         endDate: "", //协议止期
         fileId: "", //	附件id
-        associationCompaniesId: "", //保险公司id
+        insuranceCompanyId: "", //保险公司id
         matchType: "", //保单日期类型
         moneyTime: 0, //结算周期
         moneyType: "", //佣金发放方式
@@ -1847,7 +1847,7 @@ export default {
         agreementType: [
           { required: true, message: "请选择协议类型", trigger: "blur" },
         ],
-        associationCompaniesId: [
+        insuranceCompanyId: [
           { required: true, message: "请选择保险公司", trigger: "change" },
         ],
         partnerCompaniesId: [
@@ -3066,7 +3066,7 @@ export default {
       this.attributionform.apiType = ""; //每次更改公司选择后清除保险公司账号配置
       this.attributionform.fields = []; //每次更改公司选择后清除保险公司账号配置参数
       this.agreement.partnerCompaniesId = value[value.length - 1];
-      this.agreement.associationCompaniesId = value[0];
+      this.agreement.insuranceCompanyId = value[0];
       if (this.supplierType == "1") {
         this.agreement.agreementType = "1";
       } else if (this.supplierType == "0") {
@@ -3075,18 +3075,18 @@ export default {
       //协议编码，新增时可能为空
       // let agreementId = this.agreementId;
       // //保险公司代码  协议归属渠道时，取保险公司代码   协议归属财险时，取合作机构代码
-      // let compangId = this.agreement.associationCompaniesId
-      //   ? this.agreement.associationCompaniesId
+      // let compangId = this.agreement.insuranceCompanyId
+      //   ? this.agreement.insuranceCompanyId
       //   : this.agreement.partnerCompaniesId;
       // this.queryNonCarCostList(agreementId, compangId);
     },
     prodhandleChange(value) {
-      this.agreement.associationCompaniesId = value[value.length - 1];
+      this.agreement.insuranceCompanyId = value[value.length - 1];
       //协议编码，新增时可能为空
       // let agreementId = this.agreementId;
       //保险公司代码  协议归属渠道时，取保险公司代码   协议归属财险时，取合作机构代码
-      // let compangId = this.agreement.associationCompaniesId
-      //   ? this.agreement.associationCompaniesId
+      // let compangId = this.agreement.insuranceCompanyId
+      //   ? this.agreement.insuranceCompanyId
       //   : this.agreement.partnerCompaniesId;
       // this.queryNonCarCostList(agreementId, compangId);
     },