@dongkboy 1 سال پیش
والد
کامیت
6fc6a97b85

+ 2 - 2
.env.development

@@ -3,8 +3,8 @@ VITE_APP_SETTING = true
 # 页面标题
 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.55:8001  #董鑫
+# VITE_APP_API_BASEURL = http://192.168.0.253:8001  #田智
 # VITE_APP_API_BASEURL = http://192.168.0.59:8001  #徐强
 
 # 调试工具,可设置 eruda 或 vconsole,如果不需要开启则留空

+ 1 - 1
.env.test

@@ -7,7 +7,7 @@ VITE_APP_API_BASEURL = http://test-platform.baoxianzhanggui.com/api #测试地
 # 调试工具,可设置 eruda 或 vconsole,如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =
 # 是否禁用开发者工具,可防止被调试
-VITE_APP_DISABLE_DEVTOOL = false
+VITE_APP_DISABLE_DEVTOOL = true
 
 # 是否在打包时启用 Mock
 VITE_BUILD_MOCK = false

+ 7 - 2
src/views/insuranceCompanyConfiguration/insuranceCompanyConfig.vue

@@ -7,7 +7,11 @@
           <el-input v-model="formInline.name" placeholder="输入保险公司查找" clearable />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="companyQuery" v-auth="'insuranceCompanyConfig.view'">查询</el-button>
+          <el-button type="primary" @click="companyQuery" v-auth="'insuranceCompanyConfig.view'">
+            <template #icon>
+              <SvgIcon name="i-ep:search" />
+            </template>
+            查询</el-button>
         </el-form-item>
       </el-form>
       <div>
@@ -25,7 +29,8 @@
                 ref="multipleTableRef" :expand-column-key="expandColumnKey" header-class="header-class">
                 <template #cell="scope">
                   <div v-if="scope.column.key == 'option'" class="flex j-s a-c">
-                    <el-button type="primary" link @click="addSubsidiary(scope.rowData)" v-auth="'insuranceCompanyConfig.add'"> 添加子公司
+                    <el-button type="primary" link @click="addSubsidiary(scope.rowData)"
+                      v-auth="'insuranceCompanyConfig.add'"> 添加子公司
                     </el-button>
                     <el-dropdown placement="bottom-start">
                       <span class="el-dropdown-link">

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

@@ -9,7 +9,11 @@
             </ElFormItem>
           </ElCol>
           <ElCol :md="4">
-            <el-button type="primary" v-auth="'paymentCodeConfig.view'" @click="findpage">查询</el-button>
+            <el-button type="primary" v-auth="'paymentCodeConfig.view'" @click="findpage">
+              <template #icon>
+                <SvgIcon name="i-ep:search" />
+              </template>
+              查询</el-button>
           </ElCol>
         </ElRow>
       </ElForm>

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

@@ -9,7 +9,7 @@
           style="max-width: 1000px;" class="flex a-c f-wrap" :size="fromSize">
           <ElCol :md="24" :lg="12">
             <el-form-item label="编码" prop="sysCode">
-              <el-input v-model="sysform.sysCode" placeholder="请输入编码(唯一标识)" />
+              <el-input v-model="sysform.sysCode" placeholder="请输入编码(唯一标识)" :disabled="id?true:false" ></el-input>
               <span style="font-size: 0.7rem;color: #999;">可填写有字母数字组成的编码,用于用户登录</span>
             </el-form-item>
           </ElCol>
@@ -54,7 +54,7 @@
           </ElCol>
           <ElCol :md="24" :lg="12">
             <el-form-item label="详细地址" prop="address">
-              <el-input v-model="sysform.address" placeholder="请输入详细地址" />
+              <el-input v-model="sysform.address" type="textarea" placeholder="请输入详细地址" maxlength="50" show-word-limit />
             </el-form-item>
           </ElCol>
           <ElCol :md="24" :lg="12">
@@ -150,7 +150,7 @@ import { useRoute } from 'vue-router';
 import api from '@/api';
 import router from '@/router';
 const route = useRoute();
-const id = ref(route.query.id);//id参数
+const id = ref(route.query.id as string);//id参数
 const provinceoptions = ref()//省市区回显数据
 const areaOptions = ref()//省市区数据
 const uploadDisabled = ref(false)
@@ -283,6 +283,7 @@ const userAccountblur = (event: any) => {
       sysform.value.userName = res.data[0].username;
       userNameShow.value = true;
     } else {
+      userNameShow.value = false;
     }
   });
 

+ 1 - 1
src/views/organizationManagement/organization/organizationDetail.vue

@@ -75,7 +75,7 @@
                 {{ tenantInfo.contactJob }}
               </el-descriptions-item>
               <el-descriptions-item label="企业规模:">{{ tenantInfo.businessSize }}人</el-descriptions-item>
-              <el-descriptions-item label="法人代表">{{ tenantInfo.legalName }}</el-descriptions-item>
+              <el-descriptions-item label="法人代表">{{ tenantInfo.legalName }}</el-descriptions-item>
 
             </el-descriptions>
           </el-tab-pane>

+ 10 - 7
src/views/organizationManagement/organization/organizationlist.vue

@@ -30,16 +30,19 @@
           <ElCol :md="6" :offset="10">
             <ElFormItem>
               <div class="flex j-end" style="width: 100%;">
-                <el-button type="primary" v-auth="'organizationlist.view'" @click="roleQuery">查询</el-button>
-                <el-button type="primary" v-auth="'organizationlist.view'" @click="resetForm">重置</el-button>
+                <el-button type="primary" v-auth="'organizationlist.view'" @click="roleQuery">
+                  <template #icon>
+                    <SvgIcon name="i-ep:search" />
+                  </template>
+                  查询</el-button>
+                <el-button type="default" v-auth="'organizationlist.view'" @click="resetForm">重置</el-button>
               </div>
             </ElFormItem>
           </ElCol>
         </ElRow>
       </ElForm>
       <Table :tableData="tableData" :columns="columns" :showIndex="false" :columnwidth="200" :showSelect="true"
-        :pageInfo="pageInfo" @getList="getList"
-        @selectionChange="selectionChange">
+        :pageInfo="pageInfo" @getList="getList" @selectionChange="selectionChange">
         <template v-slot:table-title-btn>
           <RouterLink :to="{ name: 'OrganizationAdd' }">
             <el-button type="primary" v-auth="'organizationlist.add'">
@@ -214,7 +217,7 @@ const columns = [
       return sysType
     }
   },
-  { prop: "division", label: "所在地区",  width: '200',},
+  { prop: "division", label: "所在地区", width: '200', },
   {
     prop: "deptCount", label: "下级机构", width: '100',
     component: "RouterLink",
@@ -233,7 +236,7 @@ const columns = [
   { prop: "createTime", label: "创建时间", width: '180', },
   { prop: "createBy", label: "创建人", width: '120', },
   { prop: "contact", label: "联系人", width: '120', },
-  { prop: "telephone", label: "联系电话", width: '200'},
+  { prop: "telephone", label: "联系电话", width: '200' },
 ];
 
 function getList(item: PageInfo) {
@@ -392,7 +395,7 @@ const resetForm = () => {
   formInline.cityId = '';
   formInline.districtId = '';
   formInline.sysType = '';
-  provinceoptions.value=[];
+  provinceoptions.value = [];
   findpage();
 }
 

+ 5 - 2
src/views/personnel/memberManagement.vue

@@ -20,8 +20,11 @@
           <ElCol :md="8">
             <ElFormItem>
               <div class="flex j-end" style="width: 100%;">
-                <el-button type="primary" @click="memberQuery" v-auth="'member.view'"
-                  @keydown.enter="handleEnter">查询</el-button>
+                <el-button type="primary" @click="memberQuery" v-auth="'member.view'" @keydown.enter="handleEnter">
+                  <template #icon>
+                    <SvgIcon name="i-ep:search" />
+                  </template>
+                  查询</el-button>
                 <el-button type="default" @click="resetForm" v-auth="'member.view'">重置</el-button>
               </div>
             </ElFormItem>

+ 16 - 9
src/views/productConfiguration/drivingInsurance/drivingInsuranceindex.vue

@@ -5,7 +5,8 @@
         <ElCol :md="4">
           <div class="flex f-c " style="height: 100%;">
             <ElFormItem>
-              <ElInput v-model="companyName" placeholder="输入保险公司名称查找" type="text" tabindex="1" clearable style="width: 100%;"  @clear="companyQuery">
+              <ElInput v-model="companyName" placeholder="输入保险公司名称查找" type="text" tabindex="1" clearable
+                style="width: 100%;" @clear="companyQuery">
                 <template #append>
                   <el-button :icon="Search" @click="companyQuery" v-auth="'drivingInsurance.add'" />
                 </template>
@@ -27,7 +28,7 @@
             <span class="strong">驾意险配置</span>
             <RouterLink
               :to="{ name: 'DrivingInsuranceAdd', query: { companyID: companyactiveID, companyName: companyactiveName } }">
-              <ElButton type="default" v-if="companyactiveID">
+              <ElButton type="default" v-if="companyactiveID" v-auth="'drivingInsurance.add'">
                 <template #icon>
                   <el-icon>
                     <Plus />
@@ -52,7 +53,11 @@
                 </el-input>
               </el-form-item>
               <el-form-item>
-                <el-button type="primary" @click="findpage" v-auth="'drivingInsurance.view'">查询</el-button>
+                <el-button type="primary" @click="findpage" v-auth="'drivingInsurance.view'">
+                  <template #icon>
+                    <SvgIcon name="i-ep:search" />
+                  </template>
+                  查询</el-button>
                 <el-button type="default" @click="reset" v-auth="'drivingInsurance.view'">重置</el-button>
               </el-form-item>
             </el-form>
@@ -64,9 +69,11 @@
               <el-button type="primary" link style="margin-right: 15px;" v-if="scope.operationData.parentId == '0'"
                 @click="add(scope.operationData)" v-auth="'drivingInsurance.add'"> 添加
               </el-button>
-              <el-button type="primary" link style="margin-right: 15px;" @click="edit(scope.operationData.id)" v-auth="'drivingInsurance.edit'"> 编辑
+              <el-button type="primary" link style="margin-right: 15px;" @click="edit(scope.operationData.id)"
+                v-auth="'drivingInsurance.edit'"> 编辑
               </el-button>
-              <el-button type="primary" link style="margin-right: 15px;" @click="del(scope.operationData)" v-auth="'drivingInsurance.delete'"> 删除
+              <el-button type="primary" link style="margin-right: 15px;" @click="del(scope.operationData)"
+                v-auth="'drivingInsurance.delete'"> 删除
               </el-button>
             </template>
           </TableTree>
@@ -111,13 +118,13 @@ const columns = [
   { prop: "alias", label: "产品别名", width: '180' },
 
 ];
-const reset=()=>{
-  formInline.params="";
-  formInline.seats="";
+const reset = () => {
+  formInline.params = "";
+  formInline.seats = "";
 }
 //获取驾意险
 const findpage = () => {
-  api.product.jyxList({ company: companyactiveID.value,...formInline }).then((res: any) => {
+  api.product.jyxList({ company: companyactiveID.value, ...formInline }).then((res: any) => {
     if (res.code == '200') {
       tableData.value = res.data;
     } else {

+ 9 - 3
src/views/productConfiguration/specialClause/specialClauseindex.vue

@@ -36,7 +36,11 @@
           </ElCol>
           <ElCol :md="8">
             <div class="flex a-c j-end" style="width: 100%;">
-              <el-button type="primary" @click="findpage" v-auth="'specialClause.view'">查询</el-button>
+              <el-button type="primary" @click="findpage" v-auth="'specialClause.view'">
+                <template #icon>
+                  <SvgIcon name="i-ep:search" />
+                </template>
+                查询</el-button>
               <el-button type="default" @click="reset">重置</el-button>
             </div>
           </ElCol>
@@ -129,8 +133,10 @@ const columns = [
   {
     prop: "riskCode", label: "特约类型", width: '150', formatter: (row: any) => {
       let riskCode = row.riskCode;
-      let riskCodeName = getDict('risk_code').find(val => val.value == riskCode).label;
-      return riskCodeName
+      if(riskCode){
+        let riskCodeName = getDict('risk_code').find(val => val.value == riskCode).label;
+        return riskCodeName
+      }
     }
   },
   { prop: "clauseName", label: "特约名称", align: 'left' },