Parcourir la source

Merge branch 'DK-dev' of http://39.101.143.165:8090/dong_k/operation-Backend into DK-dev

@dongkboy il y a 6 mois
Parent
commit
f42c68524d

+ 2 - 2
src/views/insuranceCompanyConfiguration/companyUrlConfig.vue

@@ -9,7 +9,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="保险公司">
-            <el-select v-model="searchForm.companyId" clearable>
+            <el-select v-model="searchForm.companyId" filterable clearable>
               <el-option v-for="item in companyList" :key="item.value" :label="item.name" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
@@ -49,7 +49,7 @@
             <el-input v-model="form.url"></el-input>
           </el-form-item>
           <el-form-item label="保险公司" prop="companyId">
-            <el-select v-model="form.companyId">
+            <el-select v-model="form.companyId" filterable>
               <el-option v-for="item in companyList" :key="item.value" :label="item.name" :value="item.id"></el-option>
             </el-select>
           </el-form-item>

+ 1 - 1
src/views/insuranceCompanyConfiguration/paymentCodeConfig.vue

@@ -51,7 +51,7 @@
           ref="paymentFormRef" style="width: 100%;" :size="fromSize">
           <ElCol :md="24" :lg="12">
             <el-form-item label="保险公司" prop="companyId">
-              <el-select v-model="paymentform.companyId" @change="companyIdChange" placeholder="请选择"
+              <el-select v-model="paymentform.companyId" @change="companyIdChange" filterable placeholder="请选择"
                 style="width: 100%;">
                 <el-option :label="item.name" :value="item.id" v-for="(item, index) in companyList" :key="index" />
               </el-select>

+ 3 - 3
src/views/organizationManagement/organization/organizationAdd.vue

@@ -251,9 +251,9 @@ const sysformRules = ref<FormRules>({
   sysType: [
     { required: true, trigger: 'change', message: '请选择类型' },
   ],
-  sysIcon: [
-    { required: true, trigger: 'blur', message: '请上传图片' },
-  ],
+  // sysIcon: [
+  //   { required: true, trigger: 'blur', message: '请上传图片' },
+  // ],
   provinceId: [
     { required: true, trigger: 'change', message: '请选择省市区' },
   ],

+ 3 - 0
src/views/productConfiguration/drivingInsurance/drivingInsuranceindex.vue

@@ -135,6 +135,9 @@ const companyQuery = () => {
   api.company.selectLevelList({ name: companyName.value }).then((res: any) => {
     if (res.code == '200') {
       companyList.value = res.data;
+      companyactiveID.value = companyList.value?.[0].id;
+      companyactiveName.value = companyList.value?.[0].name;
+      findpage()
     }
   });
 }