li.shaoyi 7 ay önce
ebeveyn
işleme
40a68ad746

+ 1 - 4
src/packages/pc/components/modules/region/index.vue

@@ -57,7 +57,7 @@ const { dataList: countryList } = useRequest(getProvince, {
         divisionLevel: 'country'
     },
     onSuccess: () => {
-        if (!provinceList.value.some((e) => e.autoid === provinceId.value)) {
+        if (!countryList.value.some((e) => e.autoid === countryId.value)) {
             countryId.value = undefined
             provinceId.value = undefined
             cityId.value = undefined
@@ -98,8 +98,6 @@ const { dataList: districtList, run: getDistrictList } = useRequest(getProvince,
 
 watch(countryId, (val) => {
     provinceList.value = []
-    cityList.value = []
-    districtList.value = []
     if (val) {
         getProvinceList({ autoId: val.toString() })
     }
@@ -107,7 +105,6 @@ watch(countryId, (val) => {
 
 watch(provinceId, (val) => {
     cityList.value = []
-    districtList.value = []
     if (val) {
         getCityList({ autoId: val.toString() })
     }

+ 21 - 7
src/packages/pc/views/investor/manage/user/components/details/view.vue

@@ -19,10 +19,10 @@
                 </p>
             </template>
             <!-- 是否认证 -->
-            <template #isAuth="{ value }">
+            <template #hasAuth="{ value }">
                 <p>{{ flagEnum.getEnumTypeName(value) }}</p>
-                <p class="g-red" v-if="newData && newData.userAccountDetailVo.isAuth !== value">
-                    {{ flagEnum.getEnumTypeName(newData.userAccountDetailVo.isAuth) }}
+                <p class="g-red" v-if="newData && newData.userAccountDetailVo.hasAuth !== value">
+                    {{ flagEnum.getEnumTypeName(newData.userAccountDetailVo.hasAuth) }}
                 </p>
             </template>
             <!-- 开户方式 -->
@@ -38,6 +38,20 @@
         <app-table-details
             :title="oldData?.userinfoDetailVo.userinfoType === UserInfoType.Personal ? t('investor.manage.user.details.subtitle1') : t('investor.manage.user.details.subtitle2')"
             :data="oldData?.userinfoDetailVo" :label-width="160" :cell-props="detailProps2" :column="2">
+            <!-- 企业名称 -->
+            <template #customerName="{ value }">
+                <p>{{ value }}</p>
+                <p class="g-red" v-if="newData && newData.userinfoDetailVo.customerName !== value">
+                    {{ newData.userinfoDetailVo.customerName }}
+                </p>
+            </template>
+            <!-- 企业性质 -->
+            <template #bizNature="{ value }">
+                <p>{{ value ? biznatureEnum.getEnumTypeName(value) : handleNoneValue() }}</p>
+                <p class="g-red" v-if="newData && newData.userinfoDetailVo.bizNature !== value">
+                    {{ value ? biznatureEnum.getEnumTypeName(newData.userinfoDetailVo.bizNature) : handleNoneValue() }}
+                </p>
+            </template>
             <!-- 证件类型 -->
             <template #cardTypeId="{ value }">
                 <p>{{ certificatetypeEnum.getEnumTypeName(value) }}</p>
@@ -84,7 +98,7 @@
             <template #telPhone="{ value }">
                 <p>{{ handleNoneValue(value) }}</p>
                 <p class="g-red" v-if="newData && newData.userinfoDetailVo.telPhone !== value">
-                    {{ handleNoneValue(newData.userinfoDetailVo.mobile) }}
+                    {{ handleNoneValue(newData.userinfoDetailVo.telPhone) }}
                 </p>
             </template>
             <!-- 地址 -->
@@ -262,7 +276,7 @@ const detailProps1: CellProp[] = [
     { prop: 'createName', formatLabel: () => oldData.value?.userinfoDetailVo.openMode === 1 ? 'investor.manage.user.details.createName1' : 'investor.manage.user.details.createName2' },
     { prop: 'accountStatus', label: 'investor.manage.user.details.accountStatus', formatValue: (val) => areastatusEnum.getEnumTypeName(val), show: !hideField },
     { prop: 'modifyStatus', label: 'investor.manage.user.details.modifyStatus', formatValue: (val) => modifystatusEnum.getEnumTypeName(val) },
-    { prop: 'isAuth', label: 'investor.manage.user.details.isAuth' },
+    { prop: 'hasAuth', label: 'investor.manage.user.details.isAuth' },
     { prop: 'modifyTime', label: 'investor.manage.user.details.modifyTime', formatValue: (val) => formatDate(val) },
     { prop: 'modifyName', label: 'investor.manage.user.details.modifyName' },
     { prop: 'auditTime', label: 'investor.manage.user.details.auditTime', formatValue: (val) => formatDate(val), show: !hideField },
@@ -291,11 +305,11 @@ const detailProps2 = computed<CellProp[]>(() => {
     }
     if (type === UserInfoType.Company) {
         return [
-            { prop: 'needInvoice', label: 'investor.manage.user.details.needInvoice' },
+            { prop: 'needInvoice', label: 'investor.manage.user.details.needInvoice', formatValue: (val) => flagEnum.getEnumTypeName(val) },
             { prop: 'cardTypeId', label: 'investor.manage.user.details.cardTypeId' },
             { prop: 'cardNum', label: 'investor.manage.user.details.cardNum' },
             { prop: 'customerName', label: 'investor.manage.user.details.customerName' },
-            { prop: 'bizNature', label: 'investor.manage.user.details.bizNature', formatValue: (val) => biznatureEnum.getEnumTypeName(val) },
+            { prop: 'bizNature', label: 'investor.manage.user.details.bizNature' },
             { prop: 'legalPersonName', label: 'investor.manage.user.details.legalPersonName' },
             { prop: 'contactName', label: 'investor.manage.user.details.contactName' },
             { prop: 'sex', label: 'investor.manage.user.details.sex', formatValue: (val) => getGenderName(val) },

+ 2 - 2
src/packages/pc/views/investor/manage/user/components/edit/index.vue

@@ -23,8 +23,8 @@
                 <el-form-item :label="t('investor.manage.user.edit.refereeUserName')" prop="refereeUserName">
                     {{ handleNoneValue(formData.userAccountDetailVo.refereeUserName) }}
                 </el-form-item>
-                <el-form-item :label="t('investor.manage.user.edit.isAuth')" prop="isAuth">
-                    <el-radio-group v-model="formData.userAccountDetailVo.isAuth">
+                <el-form-item :label="t('investor.manage.user.edit.isAuth')" prop="hasAuth">
+                    <el-radio-group v-model="formData.userAccountDetailVo.hasAuth">
                         <template v-for="item in flagEnum.getEnumOptions()" :key="item.value">
                             <el-radio :label="item.label" :value="item.value" />
                         </template>

+ 2 - 2
src/packages/pc/views/investor/manage/user/index.vue

@@ -71,7 +71,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'memberUserName', label: 'investor.manage.user.memberUserName' },
     { field: 'parentName', label: 'investor.manage.user.parentName' },
     { field: 'refereeName', label: 'investor.manage.user.refereeName' },
-    { field: 'isAuth', label: 'investor.manage.user.isAuth', formatValue: (val) => hasauthEnum.getEnumTypeName(val) },
+    { field: 'hasAuth', label: 'investor.manage.user.isAuth', formatValue: (val) => hasauthEnum.getEnumTypeName(val) },
     { field: 'accountStatus', label: 'investor.manage.user.accountStatus', formatValue: (val) => areastatusEnum.getEnumTypeName(val) },
     { field: 'modifyStatus', label: 'investor.manage.user.modifyStatus', formatValue: (val) => modifystatusEnum.getEnumTypeName(val) },
     { field: 'createTime', label: 'investor.manage.user.createTime', formatValue: (val) => formatDate(val) },
@@ -93,7 +93,7 @@ filterOptons.selectList = [
         options: () => areastatusEnum.getEnumOptions(),
     },
     {
-        key: 'isAuth',
+        key: 'hasAuth',
         label: t('investor.manage.user.isAuth'),
         options: () => hasauthEnum.getEnumOptions(),
     }

+ 4 - 4
src/types/model/investor.d.ts

@@ -35,7 +35,7 @@ declare namespace Investor {
         brokerName?: string; // 所属经纪人
         cardNum?: string; // 证件号
         endTime?: string; // 结束时间
-        isAuth?: number; // 是否实名
+        hasAuth?: number; // 是否实名
         memberUserId?: number; // 所属会员/机构
         mobilePhone?: string; // 手机号
         pageNum: number; // 页码
@@ -54,7 +54,7 @@ declare namespace Investor {
         auditTime: string; // 审核时间
         cancelTime: string; // 销户时间
         createTime: string; // 开户时间
-        isAuth: number; // 是否实名
+        hasAuth: number; // 是否实名
         loginId: string; // 登录账号
         memberUserName: string; // 所属会员
         modifyStatus: number; // 变更状态
@@ -87,7 +87,7 @@ declare namespace Investor {
             borkerName: string; // userAccount – 经纪人/为空不展示
             createName: string; // userAccount – 开户人/ openmode == 1 展示,openmode != 1 展示申请人accountName
             createTime: string; // userAccount – 开户时间
-            isAuth: number; // userAccount – isAuth/固定用before
+            hasAuth: number; // userAccount – hasAuth/固定用before
             memberUserName: string; // userAccount – 所属会员/ 固定用before
             modifyName: string; // userAccount – 修改人/固定用before
             modifyRemark: string; // userAccount – 变更审核备注/固定用before
@@ -1072,7 +1072,7 @@ declare namespace Investor {
         borkerName: string; // userAccount – 经纪人/为空不展示
         createName: string; // userAccount – 开户人/ openmode == 1 展示,openmode != 1 展示申请人accountName
         createTime: string; // userAccount – 开户时间
-        isAuth: number; // userAccount – isAuth/固定用before
+        hasAuth: number; // userAccount – hasAuth/固定用before
         memberUserName: string; // userAccount – 所属会员/ 固定用before
         modifyName: string; // userAccount – 修改人/固定用before
         modifyRemark: string; // userAccount – 变更审核备注/固定用before

+ 1 - 1
src/types/model/member.d.ts

@@ -332,7 +332,7 @@ declare namespace Member {
         borkerName: string; // userAccount – 经纪人/为空不展示
         createName: string; // userAccount – 开户人/ openmode == 1 展示,openmode != 1 展示申请人accountName
         createTime: string; // userAccount – 开户时间
-        isAuth: number; // userAccount – isAuth/固定用before
+        hasAuth: number; // userAccount – hasAuth/固定用before
         memberUserName: string; // userAccount – 所属会员/ 固定用before
         modifyName: string; // userAccount – 修改人/固定用before
         modifyRemark: string; // userAccount – 变更审核备注/固定用before