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

.env.development

@@ -5,7 +5,7 @@ VITE_APP_TITLE = 掌柜运营平台
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = http://192.168.0.55:8001  #董鑫
 # VITE_APP_API_BASEURL = http://192.168.0.253:8001  #田智
-VITE_APP_API_BASEURL = http://192.168.0.106:8001  #屈晨
+VITE_APP_API_BASEURL = http://192.168.5.47:8001  #屈晨
 # VITE_APP_API_BASEURL = http://192.168.0.59:8001  #徐强
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空

src/views/insuranceCompanyConfiguration/accountOwnershipConfig.vue

@@ -47,7 +47,7 @@
                   </ElCol>
                   <ElCol :md="24" :lg="12" v-if="item.apiType == '2'">
                     <el-form-item label="保司账号登录地址" prop="attributionConfig">
-                      <el-input v-model="item.attributionConfig" placeholder="输入账号登录地址" />
+                      <el-input v-model="item.attributionConfig"  placeholder="输入账号登录地址" />
                     </el-form-item>
                   </ElCol>
                   <ElCol :md="24" :lg="12" v-if="item.apiType == '2'">
@@ -280,30 +280,75 @@ const parameterrules = ref<FormRules>({
   ],
   attributionConfig: [
     { required: true, trigger: 'blur', message: '请输入账号登录地址' },
+    {
+      pattern: /^(((ht|f)tps?):\/\/)?([^!@#$%^&*?.\s-]([^!@#$%^&*?.\s]{1,64})?\.)+[a-z]{2,6}\/?/,
+      message: '请填写正确的地址',
+      trigger: 'blur'
+    }
   ],
   quotation: [
     { required: true, trigger: 'blur', message: '请输入报价链接地址' },
+    {
+      pattern: /^(((ht|f)tps?):\/\/)?([^!@#$%^&*?.\s-]([^!@#$%^&*?.\s]{1,64})?\.)+[a-z]{2,6}\/?/,
+      message: '请填写正确的地址',
+      trigger: 'blur'
+    }
   ],
   imageUpload: [
     { required: true, trigger: 'blur', message: '请输入影像上传链接地址' },
+    {
+      pattern: /^(((ht|f)tps?):\/\/)?([^!@#$%^&*?.\s-]([^!@#$%^&*?.\s]{1,64})?\.)+[a-z]{2,6}\/?/,
+      message: '请填写正确的地址',
+      trigger: 'blur'
+    }
   ],
   insurance: [
     { required: true, trigger: 'blur', message: '请输入核保链接地址' },
+    {
+      pattern: /^(((ht|f)tps?):\/\/)?([^!@#$%^&*?.\s-]([^!@#$%^&*?.\s]{1,64})?\.)+[a-z]{2,6}\/?/,
+      message: '请填写正确的地址',
+      trigger: 'blur'
+    }
   ],
   paymentQuery: [
     { required: true, trigger: 'blur', message: '请输入缴费查询链接地址' },
+    {
+      pattern: /^(((ht|f)tps?):\/\/)?([^!@#$%^&*?.\s-]([^!@#$%^&*?.\s]{1,64})?\.)+[a-z]{2,6}\/?/,
+      message: '请填写正确的地址',
+      trigger: 'blur'
+    }
   ],
   policyDownload: [
     { required: true, trigger: 'blur', message: '请输入保单下载链接地址' },
+    {
+      pattern: /^(((ht|f)tps?):\/\/)?([^!@#$%^&*?.\s-]([^!@#$%^&*?.\s]{1,64})?\.)+[a-z]{2,6}\/?/,
+      message: '请填写正确的地址',
+      trigger: 'blur'
+    }
   ],
   nonCarInsurance: [
     { required: true, trigger: 'blur', message: '请输入非车险查询链接地址' },
+    {
+      pattern: /^(((ht|f)tps?):\/\/)?([^!@#$%^&*?.\s-]([^!@#$%^&*?.\s]{1,64})?\.)+[a-z]{2,6}\/?/,
+      message: '请填写正确的地址',
+      trigger: 'blur'
+    }
   ],
   manualStatusRefresh: [
     { required: true, trigger: 'blur', message: '请输入人工核保状态刷新链接地址' },
+    {
+      pattern: /^(((ht|f)tps?):\/\/)?([^!@#$%^&*?.\s-]([^!@#$%^&*?.\s]{1,64})?\.)+[a-z]{2,6}\/?/,
+      message: '请填写正确的地址',
+      trigger: 'blur'
+    }
   ],
   revokeOrder: [
     { required: true, trigger: 'blur', message: '请输入撤销订单链接地址' },
+    {
+      pattern: /^(((ht|f)tps?):\/\/)?([^!@#$%^&*?.\s-]([^!@#$%^&*?.\s]{1,64})?\.)+[a-z]{2,6}\/?/,
+      message: '请填写正确的地址',
+      trigger: 'blur'
+    }
   ],
 })
 //字典信息处理

src/views/insuranceCompanyConfiguration/companyUrlConfig.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="companyUrlConfig">
-    <el-form :model="searchForm" style="width: 100%">
+    <el-form :model="searchForm" style="width: 100%;">
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="名称">
@@ -14,7 +14,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8" style="display: flex; align-items: center; justify-content: flex-end">
+        <el-col :span="8" style="display: flex; align-items: center; justify-content: flex-end;">
           <el-button plain @click="reset">重置</el-button>
           <el-button type="primary" @click="search">搜索</el-button>
         </el-col>
@@ -174,6 +174,7 @@ let formRules = ref<FormRules>({
   ],
   url: [
     { required: true, trigger: 'blur', message: '请输入地址' },
+
   ],
   companyId: [
     { required: true, trigger: 'change', message: '请选择保险公司' },
@@ -255,18 +256,20 @@ onMounted(() => {
 </script>
 
 <style scoped lang="scss">
-.companyUrlConfig{
+.companyUrlConfig {
   width: calc(100% - 20px);
   height: calc(100vh - 130px);
-  background: #ffffff;
   padding: 24px;
-  .pagination{
-    margin: 10px 0;
+  background: #fff;
+
+  .pagination {
     display: flex;
     align-items: center;
     justify-content: flex-end;
+    margin: 10px 0;
   }
-  .footer{
+
+  .footer {
     display: flex;
     align-items: center;
     justify-content: flex-end;

src/views/organizationManagement/tenantPermissions.vue

@@ -5,7 +5,7 @@
         <ElCol :md="5">
           <div class="flex f-c " style="height: 100%;">
             <ElFormItem>
-              <ElInput v-model="searchValue" placeholder="输入编码，名称查找" type="text" tabindex="1" style="width: 100%;">
+              <ElInput v-model="searchValue" @clear="findpage" clearable placeholder="输入编码，名称查找" type="text" tabindex="1" style="width: 100%;">
                 <template #prefix>
                   <SvgIcon name="i-ri:user-3-fill" />
                 </template>

src/views/personnel/roleManagement.vue

@@ -105,6 +105,7 @@ onBeforeMount(() => {
   // 对 asyncRoutes 进行预处理并转换为树形结构
   const processedRoutes = preprocessRoutes(asyncRoutes);
   treeData.value = convertToTreeData(0, processedRoutes);
+  console.log(JSON.stringify(treeData.value))
 });
 interface roleList {
   id: string,
@@ -172,8 +173,6 @@ async function roleSubmit() {
     return;
   }
   if (roleInfo.id) {
-    console.log(roleInfo)
-    return
     await api.roleApi.roleUpdate(roleInfo).then((res: any) => {
       if (res.code == 200) {
         rolequery();

src/views/productConfiguration/drivingInsurance/drivingInsuranceAdd.vue

@@ -63,14 +63,14 @@
           </ElCol>
           <ElCol :md="24" :lg="12" v-if="productform.premiumSetting == '1'">
             <el-form-item label="总保额" prop="coverage">
-              <el-input v-model="productform.coverage" placeholder="请输入总保额">
+              <el-input v-model="productform.coverage" type="number" placeholder="请输入总保额">
                 <template #append>元</template>
               </el-input>
             </el-form-item>
           </ElCol>
           <ElCol :md="24" :lg="12" v-if="productform.premiumSetting == '1'">
             <el-form-item label="总保费" prop="premium">
-              <el-input v-model="productform.premium" placeholder="请输入总保费">
+              <el-input v-model="productform.premium" type="number" placeholder="请输入总保费">
                 <template #append>元</template>
               </el-input>
             </el-form-item>