解决冲突

public/proto/mtp.proto

@@ -896,6 +896,22 @@ message ErmcpHedgePlanRsp {
 	optional string RetDesc = 3; // string 描述信息
 }
 
+// 客户信息审核通过请求 0 29 122
+message UserInfoCheckMangeReq {
+	optional MessageHead Header = 1; // MessageHead
+	optional uint64 auditflag = 2; // uint64 1审核通过2审核拒绝
+	optional uint64 userid = 3; // uint64 客户userid
+	optional uint64 audituserid = 4; // uint64 审核操作人userid
+	optional string remark = 5; // string 备注
+}
+
+// 客户信息审核通过请求响应 0 29 123
+message UserInfoCheckMangeRsp {
+	optional MessageHead Header = 1; // MessageHead 消息头
+	optional int32 RetCode = 2; // int32 返回码
+	optional string RetDesc = 3; // string 描述信息
+	optional uint64 userid = 4; // uint64 客户userid
+}
 
 
 

src/services/funcode/index.ts

@@ -84,4 +84,8 @@ export const funCode: Code = {
     // 套保计划 -- 新增套保计划
     ErmcpHedgePlanReq: 1900708,  /// 套保计划操作请求(1179650)
     ErmcpHedgePlanRsp: 1900709,  /// 套保计划操作响应(1179651)
+
+    // 信息 - 客户资料 - 审核
+    UserInfoCheckMangeReq: 1900666,    /// 客户信息审核通过请求
+    UserInfoCheckMangeRsp: 1900667,   /// 客户信息审核通过请求响应
 };

src/services/go/ermcp/customInfo/index.ts

@@ -44,6 +44,11 @@ export function QueryModifyUserInfoApply(userInfoApply: ModifyUserInfoApplyReq):
     });
 }
 
+/**
+ * 撤回
+ * @param req
+ * @constructor
+ */
 export function QueryModifyUserInfo(req: ModifyUserInfoReq): Promise<BaseResponse> {
     return commonUpdate_go('/Erms3/ModifyUserInfoApply', req).catch((err) => {
         throw new Error(`修改客户申请状态: ${err.message}`);
@@ -64,11 +69,11 @@ export function QueryDeleteUserInfoApply(userId: number): Promise<BaseResponse>
 
 /**
  * 更新用户状态 /User/UpdateUserAccountStatus
+ * @param userID 需要修改的账户id
  * @param accountStatus 账户状态 - 4:正常 6:注销（停用）
  * @constructor
  */
-export function UpdateUserAccountStatus(accountStatus: number): Promise<BaseResponse> {
-    const userID = APP.get('userAccount').memberuserid;
+export function UpdateUserAccountStatus(userID: number, accountStatus: number): Promise<BaseResponse> {
     return commonUpdate_go('/User/UpdateUserAccountStatus', { userID, accountStatus }, ).catch((err) => {
         throw new Error(`更新用户状态: ${err.message}`);
     });

src/services/proto/accountinfo/index.ts

@@ -1 +1,36 @@
-//
+import {buildProtoReq50, parseProtoRsp50} from "@/services/socket/protobuf/buildReq";
+import APP from "@/services";
+import {Callback} from "@/utils/websocket";
+import {UserInfoCheckMangeReq, UserInfoCheckMangeRsp} from "@/services/proto/accountinfo/interface";
+import {getSelectedAccount} from "@/services/bus/account";
+
+/**
+ * 客户资料审核
+ * @param param
+ */
+export const userInfoCheck = (param: UserInfoCheckMangeReq): Promise<UserInfoCheckMangeRsp> => {
+    return new Promise((resolve, reject) => {
+        const params = {
+            protobufName: 'UserInfoCheckMangeReq',
+            funCodeName: 'UserInfoCheckMangeReq',
+            reqParams:  param,
+            msgHeadParams: {
+                AccountID: getSelectedAccount(),
+                MarketID: 18,
+                GoodsID: 0,
+            }
+        };
+        const package50 = buildProtoReq50(params);
+        APP.sendTradingServer(package50, undefined, {
+            onSuccess: (res) => {
+                const { isSuccess, result } = parseProtoRsp50(res, 'UserInfoCheckMangeRsp');
+                if (isSuccess) {
+                    resolve(result);
+                } else {
+                    reject(result);
+                }
+            },
+            onFail: (err) => reject(err.message),
+        } as Callback);
+    });
+}

src/services/proto/accountinfo/interface.ts

@@ -0,0 +1,12 @@
+// 客户信息审核通过请求 0 29 122
+export interface UserInfoCheckMangeReq{
+    auditflag: number // uint64 1审核通过2审核拒绝
+    userid: number // uint64 客户userid
+    audituserid: number // uint64 审核操作人userid
+    remark: string // string 备注
+}
+// 客户信息审核通过请求响应 0 29 123
+export interface UserInfoCheckMangeRsp {
+    RetCode: number // int32 返回码
+    RetDesc: string // string 描述信息
+}

src/services/request/serviceURL.ts

@@ -73,10 +73,10 @@ export const commonSearchUrl = (url: string): string => {
 export const setServiceURL = (config: URL): void => {
     console.log('URL', config);
     // 外网环境（175），外包同事使用
-    if (process.env.NODE_ENV === 'development') {
-        serviceURL.goCommonSearchUrl = 'http://218.17.158.45:21001/api';
-        serviceURL.quoteUrl = 'ws://218.17.158.45:21004';
-        serviceURL.tradeUrl = 'ws://218.17.158.45:21005';
-    }
+    // if (process.env.NODE_ENV === 'development') {
+    //     serviceURL.goCommonSearchUrl = 'http://218.17.158.45:21001/api';
+    //     serviceURL.quoteUrl = 'ws://218.17.158.45:21004';
+    //     serviceURL.tradeUrl = 'ws://218.17.158.45:21005';
+    // }
     serviceURL = config;
 };

src/views/information/custom/compoments/cancel/index.vue

@@ -37,7 +37,7 @@
               </a-col>
               <a-col :span="12">
                   <a-form-item label="证件类型">
-                      <span class="white">{{ formatValue(selectedRow.cardtypename) }}</span>
+                      <span class="white">{{ getCardTypeName(selectedRow.cardtype) }}</span>
                   </a-form-item>
               </a-col>
           </a-row>
@@ -49,7 +49,7 @@
               </a-col>
               <a-col :span="12">
                   <a-form-item label="证件号码">
-                      <span class="white">{{ formatValue(selectedRow.cardnum) }}</span>
+                      <span class="white">{{ getCardTypeName(selectedRow.cardnum) }}</span>
                   </a-form-item>
               </a-col>
           </a-row>
@@ -115,7 +115,7 @@ import { closeModal } from '@/common/setup/modal/index';
 import { Modal } from 'ant-design-vue';
 import {ModifyUserInfoApplyReq, ModifyUserInfoReq, QueryCustomInfoType} from "@/services/go/ermcp/customInfo/interface";
 import {formatValue} from "@/common/methods";
-import {getStatusName} from "@/views/information/custom/setup";
+import {getCardTypeName, getStatusName} from "@/views/information/custom/setup";
 import {cancelCustomInfo} from "@/views/information/custom/compoments/setup";
 import {getUserId} from "@/services/bus/account";
 
@@ -165,6 +165,7 @@ export default defineComponent({
             loading,
             formatValue,
             getStatusName,
+            getCardTypeName,
         };
     },
 });

src/views/information/custom/compoments/check/index.vue

@@ -6,36 +6,159 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
+        <a-button key="submit"
+                  type="primary"
+                  @click="cancel">取消</a-button>
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
-                @click="submit">完成</a-button>
+                @click="submit">审核通过</a-button>
+        <a-button key="submit"
+                  type="primary"
+                  :loading="loading"
+                  @click="refuseSubmit">审核拒绝</a-button>
     </template>
+      <a-form class="inlineForm"
+              :form="form"
+              @submit="handleSearch">
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="客户类型">
+                      <span class="white">{{ selectedRow.userinfotype === '2' ? '企业' : '个人' }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="企业名称">
+                      <span class="white">{{ formatValue(selectedRow.customername)}}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="企业简称">
+                      <span class="white">{{ formatValue(selectedRow.nickname) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="证件类型">
+                      <span class="white">{{ getCardTypeName(selectedRow.cardtype) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="法定代表人">
+                      <span class="white">{{ formatValue(selectedRow.legalpersonname) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="证件号码">
+                      <span class="white">{{ formatValue(selectedRow.cardnum) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="纳税人识别号">
+                      <span class="white">{{ formatValue(selectedRow.taxpayernum) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="营业执照">
+                      <div class="upload">
+                          <div class="look">查看附件</div>
+                      </div>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="联系人">
+                      <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="联系人手机号">
+                      <span class="white">{{ formatValue(selectedRow.mobile) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="联系电话">
+                      <span class="white">{{ formatValue(selectedRow.telphone) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="状态">
+                      <span class="green">{{ formatValue(getStatusName(selectedRow.status)) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="24">
+                  <a-form-item label="通讯地址">
+                      <span class="white">{{ formatValue(selectedRow.address) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="24">
+                  <a-form-item label="备注">
+                      <span class="white">{{ formatValue(selectedRow.remark) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+      </a-form>
   </a-modal>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import {defineComponent, PropType, ref} from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
+import {ModifyUserInfoReq, QueryCustomInfoType} from "@/services/go/ermcp/customInfo/interface";
+import {formatValue} from "@/common/methods";
+import {getCardTypeName, getStatusName} from "@/views/information/custom/setup";
+import {cancelCustomInfo, checkCustomInfo} from "@/views/information/custom/compoments/setup";
+import {UserInfoCheckMangeReq} from "@/services/proto/accountinfo/interface";
+import {getSelectedAccount, getUserId} from "@/services/bus/account";
 
 export default defineComponent({
     name: 'custom_info_btn_check',
     components: {},
-    setup() {
+    props: {
+        selectedRow: {
+            type: Object as PropType<QueryCustomInfoType>,
+            default: {},
+        },
+    },
+    setup(props) {
+        const {loading, checkCustomerInfo} = checkCustomInfo()
         const { visible, cancel } = closeModal('custom_info_btn_check');
-        const loading = ref<boolean>(false);
+        const req : UserInfoCheckMangeReq = {
+            audituserid: getUserId(),
+            userid : props.selectedRow.userid,
+            auditflag: 1,
+            remark: ''}
         function submit() {
-            loading.value = true;
-            setTimeout(() => {
-                loading.value = false;
-                cancel();
-            }, 2000);
+            req.auditflag = 1
+            req.userid = props.selectedRow.userid
+            checkCustomerInfo(req, cancel)
+        }
+        function refuseSubmit(){
+            req.auditflag = 2
+            req.userid = props.selectedRow.userid
+            checkCustomerInfo(req, cancel)
         }
         return {
             visible,
             cancel,
             submit,
             loading,
+            refuseSubmit,
+            formatValue,
+            getStatusName,
+            getCardTypeName,
         };
     },
 });

src/views/information/custom/compoments/delete/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 恢复客户资料-->
+  <!-- 删除客户资料-->
   <a-modal class="recover-custom"
            title="恢复客户资料"
            v-model:visible="visible"
@@ -9,27 +9,121 @@
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
-                @click="submit">完成</a-button>
+                @click="submit">删除客户资料</a-button>
     </template>
+      <a-form class="inlineForm"
+              :form="form"
+              @submit="handleSearch">
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="客户类型">
+                      <span class="white">{{ selectedRow.userinfotype === '2' ? '企业' : '个人' }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="企业名称">
+                      <span class="white">{{ formatValue(selectedRow.customername) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="企业简称">
+                      <span class="white">{{ formatValue(selectedRow.nickname) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="证件类型">
+                      <span class="white">{{ formatValue(selectedRow.cardtypename) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="法定代表人">
+                      <span class="white">{{ formatValue(selectedRow.legalpersonname) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="证件号码">
+                      <span class="white">{{ formatValue(selectedRow.cardnum) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="纳税人识别号">
+                      <span class="white">{{ formatValue(selectedRow.taxpayernum) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="营业执照">
+                      <a class="blue">查看附件</a>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="联系人">
+                      <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="联系人手机号">
+                      <span class="white">{{ formatValue(selectedRow.mobile) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="12">
+                  <a-form-item label="联系电话">
+                      <span class="white">{{ formatValue(selectedRow.telphone) }}</span>
+                  </a-form-item>
+              </a-col>
+              <a-col :span="12">
+                  <a-form-item label="状态">
+                      <span class="green">{{ formatValue(getStatusName(selectedRow.status)) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="24">
+                  <a-form-item label="通讯地址">
+                      <span class="white">{{ formatValue(selectedRow.address) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+          <a-row :gutter="24">
+              <a-col :span="24">
+                  <a-form-item label="备注">
+                      <span class="white">{{ formatValue(selectedRow.remark) }}</span>
+                  </a-form-item>
+              </a-col>
+          </a-row>
+      </a-form>
   </a-modal>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import {defineComponent, PropType, ref} from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
+import {deleteUserInfo} from "@/views/information/custom/compoments/setup";
+import {QueryCustomInfoType} from "@/services/go/ermcp/customInfo/interface";
 
 export default defineComponent({
     name: 'recover-custom',
     components: {},
-    setup() {
+    props: {
+        selectedRow: {
+            type: Object as PropType<QueryCustomInfoType>,
+            default: {},
+        },
+    },
+    setup(props) {
         const { visible, cancel } = closeModal('custom_info_btn_delete');
-        const loading = ref<boolean>(false);
-        function submit() {
-            loading.value = true;
-            setTimeout(() => {
-                loading.value = false;
-                cancel();
-            }, 2000);
+        const {loading, deleteCustomerInfo} = deleteUserInfo();
+        function submit(){
+            deleteCustomerInfo(props.selectedRow.userid, cancel)
         }
         return {
             visible,

src/views/information/custom/compoments/detail/index.vue

@@ -36,7 +36,7 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="证件类型">
-            <span class="white">{{ formatValue(selectedRow.cardtypename) }}</span>
+            <span class="white">{{ getCardTypeName(selectedRow.cardtype) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
@@ -113,7 +113,7 @@ import { defineComponent, PropType, reactive, ref, watchEffect } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { mergeObj } from '@/utils/objHandle';
-import { getStatusName } from '@/views/information/custom/setup';
+import {getCardTypeName, getStatusName} from '@/views/information/custom/setup';
 import { formatValue, formatTime } from '@/common/methods';
 
 export default defineComponent({
@@ -146,6 +146,7 @@ export default defineComponent({
             formatValue,
             getStatusName,
             maskClosableFlag,
+            getCardTypeName,
         };
     },
 });

src/views/information/custom/compoments/disable/index.vue

@@ -22,43 +22,43 @@
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="客户类型">
-            <span class="white">企业</span>
+            <span class="white">{{ selectedRow.userinfotype === '2' ? '企业' : '个人' }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
           <a-form-item label="企业名称">
-            <span class="white">深圳市前海矿业有限公司</span>
+            <span class="white">{{ formatValue(selectedRow.customername) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="企业简称">
-            <span class="white">前海矿业</span>
+            <span class="white">{{ formatValue(selectedRow.nickname) }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
           <a-form-item label="证件类型">
-            <span class="white">营业执照</span>
+            <span class="white">{{ formatValue(selectedRow.cardtypename) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="法定代表人">
-            <span class="white">李顺利</span>
+            <span class="white">{{ formatValue(selectedRow.legalpersonname) }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
           <a-form-item label="证件号码">
-            <span class="white">4328648236492432</span>
+            <span class="white">{{ formatValue(selectedRow.cardnum) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="纳税人识别号">
-            <span class="white">57465736DR46456</span>
+            <span class="white">{{ formatValue(selectedRow.taxpayernum) }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
@@ -70,38 +70,38 @@
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="联系人">
-            <span class="white">王平</span>
+            <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
           <a-form-item label="联系人手机号">
-            <span class="white">13745653421</span>
+            <span class="white">{{ formatValue(selectedRow.mobile) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="12">
           <a-form-item label="联系电话">
-            <span class="white">0755-34342544</span>
+            <span class="white">{{ formatValue(selectedRow.telphone) }}</span>
           </a-form-item>
         </a-col>
         <a-col :span="12">
           <a-form-item label="状态">
-            <span class="green">正常</span>
+            <span class="green">{{ formatValue(getStatusName(selectedRow.status)) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="24">
           <a-form-item label="通讯地址">
-            <span class="white">广东省深圳市南山区前海街道路平路1324号</span>
+            <span class="white">{{ formatValue(selectedRow.address) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
         <a-col :span="24">
           <a-form-item label="备注">
-            <span class="white">无</span>
+            <span class="white">{{ formatValue(selectedRow.remark) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
@@ -110,22 +110,28 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import {defineComponent, PropType, ref} from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
+import {updateUserAccount} from "@/views/information/custom/compoments/setup";
+import {QueryCustomInfoType} from "@/services/go/ermcp/customInfo/interface";
+import {formatValue} from "@/common/methods";
+import {getStatusName} from "@/views/information/custom/setup";
 
 export default defineComponent({
     name: 'custom-disable',
     components: {},
-    setup() {
+    props: {
+        selectedRow: {
+            type: Object as PropType<QueryCustomInfoType>,
+            default: {},
+        },
+    },
+    setup(props) {
         const { visible, cancel } = closeModal('custom_info_btn_disable');
-        const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
+        const  {loading, ModifyUserInfo} = updateUserAccount();
         function submit() {
-            loading.value = true;
-            setTimeout(() => {
-                loading.value = false;
-                cancel();
-            }, 2000);
+            ModifyUserInfo(props.selectedRow.userid, 6, cancel);
         }
         return {
             visible,
@@ -133,6 +139,8 @@ export default defineComponent({
             submit,
             loading,
             maskClosableFlag,
+            formatValue,
+            getStatusName,
         };
     },
 });

src/views/information/custom/compoments/recover/index.vue

@@ -1,41 +1,147 @@
 <template>
-  <!-- 恢复客户资料-->
-  <a-modal class="modify-custom"
-           title="恢复客户资料"
-           v-model:visible="visible"
-           @cancel="cancel"
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">完成</a-button>
-    </template>
-  </a-modal>
+    <!-- 恢复客户资料-->
+    <a-modal class="modify-custom"
+             title="恢复客户资料"
+             v-model:visible="visible"
+             @cancel="cancel"
+             width="890px">
+        <template #footer>
+            <a-button key="submit"
+                      class="cancelBtn"
+                      @click="cancel">取消
+            </a-button>
+            <a-button key="submit"
+                      type="primary"
+                      :loading="loading"
+                      @click="recover">完成
+            </a-button>
+        </template>
+        <a-form class="inlineForm"
+                :form="form"
+                @submit="handleSearch">
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="客户类型">
+                        <span class="white">{{ selectedRow.userinfotype === '2' ? '企业' : '个人' }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="企业名称">
+                        <span class="white">{{ formatValue(selectedRow.customername) }}</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="企业简称">
+                        <span class="white">{{ formatValue(selectedRow.nickname) }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="证件类型">
+                        <span class="white">{{ formatValue(selectedRow.cardtypename) }}</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="法定代表人">
+                        <span class="white">{{ formatValue(selectedRow.legalpersonname) }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="证件号码">
+                        <span class="white">{{ formatValue(selectedRow.cardnum) }}</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="纳税人识别号">
+                        <span class="white">{{ formatValue(selectedRow.taxpayernum) }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="营业执照">
+                        <div class="upload">
+                            <div class="look">查看附件</div>
+                        </div>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="联系人">
+                        <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="联系人手机号">
+                        <span class="white">{{ formatValue(selectedRow.mobile) }}</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="联系电话">
+                        <span class="white">{{ formatValue(selectedRow.telphone) }}</span>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="12">
+                    <a-form-item label="状态">
+                        <span class="green">{{ formatValue(getStatusName(selectedRow.status)) }}</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="24">
+                    <a-form-item label="通讯地址">
+                        <span class="white">{{ formatValue(selectedRow.address) }}</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+            <a-row :gutter="24">
+                <a-col :span="24">
+                    <a-form-item label="备注">
+                        <span class="white">{{ formatValue(selectedRow.remark) }}</span>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
-import { closeModal } from '@/common/setup/modal/index';
+import {defineComponent, PropType, ref} from 'vue';
+import {closeModal} from '@/common/setup/modal/index';
+import {QueryCustomInfoType} from "@/services/go/ermcp/customInfo/interface";
+import {formatValue} from "@/common/methods";
+import {getStatusName} from "@/views/information/custom/setup";
+import {updateUserAccount} from "@/views/information/custom/compoments/setup";
 
 export default defineComponent({
     name: 'modify-custom',
     components: {},
-    setup() {
-        const { visible, cancel } = closeModal('custom_info_btn_recover');
-        const loading = ref<boolean>(false);
-        function submit() {
-            loading.value = true;
-            setTimeout(() => {
-                loading.value = false;
-                cancel();
-            }, 2000);
+    props: {
+        selectedRow: {
+            type: Object as PropType<QueryCustomInfoType>,
+            default: {},
+        },
+    },
+    setup(props) {
+        const {visible, cancel} = closeModal('custom_info_btn_recover');
+        const {loading, ModifyUserInfo} = updateUserAccount();
+        // 恢复方法
+        function recover(){
+            ModifyUserInfo(props.selectedRow.userid, 4, cancel);
         }
         return {
             visible,
             cancel,
-            submit,
+            recover,
             loading,
+            formatValue,
+            getStatusName,
         };
     },
 });

src/views/information/custom/compoments/setup.ts

@@ -1,7 +1,9 @@
-import {QueryModifyUserInfo } from "@/services/go/ermcp/customInfo";
+import {QueryDeleteUserInfoApply, QueryModifyUserInfo, UpdateUserAccountStatus} from "@/services/go/ermcp/customInfo";
 import { ModifyUserInfoReq} from "@/services/go/ermcp/customInfo/interface";
 import {ref} from "vue";
 import { message } from 'ant-design-vue';
+import {userInfoCheck} from "@/services/proto/accountinfo";
+import {UserInfoCheckMangeReq} from "@/services/proto/accountinfo/interface";
 /**
  *  撤销客户资料 撤销后的数据会进入草稿(未提交)
  */
@@ -19,7 +21,7 @@ export function cancelCustomInfo(){
                     message.error("撤销失败:" + res.message)
                 }
             })
-            .catch((err) => {
+            .catch((err) => {cancelCustomInfo
                 message.error("撤销失败")
             }).finally(() => {
                 loading.value = false
@@ -27,3 +29,93 @@ export function cancelCustomInfo(){
     }
     return {loading, ModifyUserInfo}
 }
+
+/**
+ * 更新用户状态 用在停用或是启用
+ * 4:正常 6:注销（停用）
+ */
+export function updateUserAccount(){
+    const loading = ref<boolean>(false);
+    // 这里调用的是修改客户申请接口
+    function ModifyUserInfo(userID: number, accountStatus: number, callback: Function){
+        UpdateUserAccountStatus(userID, accountStatus)
+            .then((res) => {
+                if(res.result){
+                    if(accountStatus === 4){
+                        message.success("恢复成功")
+                    }else{
+                        message.success("停用成功")
+                    }
+                    console.log('更新用户资料成功 accountStatus = ' + accountStatus);
+                    callback()
+                }else{
+                    if(accountStatus === 4){
+                        message.error("恢复失败:" + res.message)
+                    }else{
+                        message.error("停用失败:" + res.message)
+                    }
+                }
+            })
+            .catch((err) => {cancelCustomInfo
+                message.error("请求失败")
+            }).finally(() => {
+            loading.value = false
+        })
+    }
+    return {loading, ModifyUserInfo}
+}
+
+/**
+ * 审核客户资料 这里是走proto接口
+ */
+export function checkCustomInfo(){
+    const loading = ref<boolean>(false);
+    // 这里调用的是修改客户申请接口
+    function checkCustomerInfo(req: UserInfoCheckMangeReq, callback: Function){
+        userInfoCheck(req)
+            .then((res) => {
+                if(res.RetCode == 200){
+                    debugger
+                    message.success("审核成功")
+                    console.log('审核客户资料成功');
+                }else{
+                    message.success("审核成功:" + res.RetDesc)
+                }
+                callback()
+            })
+            .catch((err) => {
+                message.error("提交失败")
+            }).finally(() => {
+            loading.value = false
+        })
+    }
+    return {loading, checkCustomerInfo}
+}
+
+/**
+ * 删除客户资料
+ */
+export function deleteUserInfo(){
+    const loading = ref<boolean>(false);
+    // 这里调用的是修改客户申请接口
+    function deleteCustomerInfo(userId: number, callback: Function){
+        QueryDeleteUserInfoApply(userId)
+            .then((res) => {
+                if(res.result){
+                    message.success("删除成功")
+                    console.log('撤销客户资料成功');
+                    callback()
+                }else{
+                    message.error("删除失败:" + res.message)
+                }
+            })
+            .catch((err) => {cancelCustomInfo
+                message.error("删除失败")
+            }).finally(() => {
+            loading.value = false
+        })
+    }
+    return {loading, deleteCustomerInfo}
+}
+
+

src/views/information/custom/list/checkpending/index.vue

@@ -1,47 +1,62 @@
 <template>
-  <!-- 客户信息: 正常 -->
-  <div class="custom_info_checkpending"
-       :loading="loading">
-    <filterCustomTable @search="search">
-      <BtnList :btnList="commonBtn" />
-    </filterCustomTable>
-    <contextMenu :contextMenuList="forDataBtn">
-      <a-table :columns="columns"
-               class="topTable hiddenFirstCol"
-               :pagination="false"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               rowKey="key"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{  }">
-          <BtnList :btnList="forDataBtn" />
-        </template>
-        <template #userinfotype="{ text }">
-          <a>{{ text === '2' ? '企业' : '个人' }}</a>
-        </template>
-      </a-table>
-    </contextMenu>
-    <!-- 新增 -->
-    <AddCustom />
-    <!-- 详情 -->
-    <CustomDetail :selectedRow="selectedRow" />
-    <!-- 修改 -->
-    <ModifyCustom :selectedRow="selectedRow" />
-    <!-- 停用 -->
-    <DisableCustom />
-    <!-- 撤销 -->
-    <Cancel :selectedRow="selectedRow" />
-    <!-- 审核客户资料 -->
-    <Check />
-  </div>
+    <!-- 客户信息: 正常 -->
+    <div class="custom_info_checkpending"
+         :loading="loading">
+        <filterCustomTable @search="search">
+            <BtnList :btnList="commonBtn"/>
+        </filterCustomTable>
+        <contextMenu :contextMenuList="forDataBtn">
+            <a-table :columns="columns"
+                     class="topTable hiddenFirstCol"
+                     :pagination="false"
+                     :expandedRowKeys="expandedRowKeys"
+                     :customRow="Rowclick"
+                     rowKey="key"
+                     :data-source="tableList">
+                <!-- 额外的展开行 -->
+                <template #expandedRowRender="{  }">
+                    <BtnList :btnList="forDataBtn"/>
+                </template>
+                <template #userinfotype="{ text }">
+                    <a>{{ text === '2' ? '企业' : '个人' }}</a>
+                </template>
+                <template #status="{ text }">
+                    <a>{{ getStatusName(text) }}</a>
+                </template>
+                <template #cardtype="{ text }">
+                    <a>{{ getCardTypeName(text) }}</a>
+                </template>
+            </a-table>
+        </contextMenu>
+        <!-- 新增 -->
+        <AddCustom/>
+        <!-- 详情 -->
+        <CustomDetail :selectedRow="selectedRow"/>
+        <!-- 修改 -->
+        <ModifyCustom :selectedRow="selectedRow"/>
+        <!-- 停用 -->
+        <DisableCustom/>
+        <!-- 撤销 -->
+        <Cancel :selectedRow="selectedRow"/>
+        <!-- 审核客户资料 -->
+        <Check :selectedRow="selectedRow"/>
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+import {
+    defineComponent,
+    initData,
+    getTableColumns,
+    getTableEvent,
+    getBtnList,
+    contextMenu,
+    BtnList
+} from '@/common/export/table';
 
-import { filterCustomTable, CustomDetail, ModifyCustom, DisableCustom, AddCustom, Cancel, Check } from '../../compoments';
-import { queryTableList, getFilterTableCB, QueryCustomInfoType } from '../index';
+import {filterCustomTable, CustomDetail, ModifyCustom, DisableCustom, AddCustom, Cancel, Check} from '../../compoments';
+import {queryTableList, getFilterTableCB, QueryCustomInfoType} from '../index';
+import {getCardTypeName, getStatusName} from "@/views/information/custom/setup";
 
 export default defineComponent({
     name: 'custom_info_checkpending',
@@ -58,25 +73,27 @@ export default defineComponent({
     },
     setup() {
         // 表头数据
-        const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();
+        const {columns, registerColumn, updateColumn, filteredInfo} = getTableColumns();
         // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QueryCustomInfoType>({});
+        const {expandedRowKeys, selectedRow, Rowclick} = getTableEvent<QueryCustomInfoType>({});
         // 表格操作按钮列表
-        const { commonBtn, forDataBtn } = getBtnList('custom_info_checkpending', true);
+        const {commonBtn, forDataBtn} = getBtnList('custom_info_checkpending', true);
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList(2);
+        const {loading, tableList, queryTable} = queryTableList(2);
         initData(() => {
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
             registerColumn('table_pcweb_userinfo', getFilterTableCB);
         });
+
         // 查询
         function search(value: any) {
             filteredInfo.value = value;
             // 更新表信息
             updateColumn();
         }
+
         return {
             columns,
             filteredInfo,
@@ -88,6 +105,8 @@ export default defineComponent({
             loading,
             tableList,
             search,
+            getStatusName,
+            getCardTypeName,
         };
     },
 });

src/views/information/custom/list/normal-use/index.vue

@@ -1,43 +1,58 @@
 <template>
-  <!-- 客户信息: 正常 -->
-  <div class="custom-normal"
-       :loading="loading">
-    <filterCustomTable @search="search">
-      <BtnList :btnList="commonBtn" />
-    </filterCustomTable>
-    <contextMenu :contextMenuList="forDataBtn">
-      <a-table :columns="columns"
-               class="topTable hiddenFirstCol"
-               :pagination="false"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               rowKey="key"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{  }">
-          <BtnList :btnList="forDataBtn" />
-        </template>
-        <template #userinfotype="{ text }">
-          <a>{{ text === '2' ? '企业' : '个人' }}</a>
-        </template>
-      </a-table>
-    </contextMenu>
-    <!-- 新增 -->
-    <AddCustom />
-    <!-- 详情 -->
-    <CustomDetail :selectedRow="selectedRow" />
-    <!-- 修改 -->
-    <ModifyCustom :selectedRow="selectedRow" />
-    <!-- 停用 -->
-    <DisableCustom />
-  </div>
+    <!-- 客户信息: 正常 -->
+    <div class="custom-normal"
+         :loading="loading">
+        <filterCustomTable @search="search">
+            <BtnList :btnList="commonBtn"/>
+        </filterCustomTable>
+        <contextMenu :contextMenuList="forDataBtn">
+            <a-table :columns="columns"
+                     class="topTable hiddenFirstCol"
+                     :pagination="false"
+                     :expandedRowKeys="expandedRowKeys"
+                     :customRow="Rowclick"
+                     rowKey="key"
+                     :data-source="tableList">
+                <!-- 额外的展开行 -->
+                <template #expandedRowRender="{  }">
+                    <BtnList :btnList="forDataBtn"/>
+                </template>
+                <template #userinfotype="{ text }">
+                    <a>{{ text === '2' ? '企业' : '个人' }}</a>
+                </template>
+                <template #status="{ text }">
+                    <a>{{ getStatusName(text) }}</a>
+                </template>
+                <template #cardtype="{ text }">
+                    <a>{{ getCardTypeName(text) }}</a>
+                </template>
+            </a-table>
+        </contextMenu>
+        <!-- 新增 -->
+        <AddCustom/>
+        <!-- 详情 -->
+        <CustomDetail :selectedRow="selectedRow"/>
+        <!-- 修改 -->
+        <ModifyCustom :selectedRow="selectedRow"/>
+        <!-- 停用 -->
+        <DisableCustom :selectedRow="selectedRow"/>
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+import {
+    defineComponent,
+    initData,
+    getTableColumns,
+    getTableEvent,
+    getBtnList,
+    contextMenu,
+    BtnList
+} from '@/common/export/table';
 
-import { filterCustomTable, CustomDetail, ModifyCustom, DisableCustom, AddCustom } from '../../compoments';
-import { queryTableList, getFilterTableCB, QueryCustomInfoType } from '../index';
+import {filterCustomTable, CustomDetail, ModifyCustom, DisableCustom, AddCustom} from '../../compoments';
+import {queryTableList, getFilterTableCB, QueryCustomInfoType} from '../index';
+import {getCardTypeName, getStatusName} from "@/views/information/custom/setup";
 
 export default defineComponent({
     name: 'custom-normal',
@@ -52,25 +67,27 @@ export default defineComponent({
     },
     setup() {
         // 表头数据
-        const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();
+        const {columns, registerColumn, updateColumn, filteredInfo} = getTableColumns();
         // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QueryCustomInfoType>({});
+        const {expandedRowKeys, selectedRow, Rowclick} = getTableEvent<QueryCustomInfoType>({});
         // 表格操作按钮列表
-        const { commonBtn, forDataBtn } = getBtnList('custom_info_normal', true);
+        const {commonBtn, forDataBtn} = getBtnList('custom_info_normal', true);
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList(3);
+        const {loading, tableList, queryTable} = queryTableList(3);
         initData(() => {
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
             registerColumn('table_pcweb_userinfo', getFilterTableCB);
         });
+
         // 查询
         function search(value: any) {
             filteredInfo.value = value;
             // 更新表信息
             updateColumn();
         }
+
         return {
             columns,
             filteredInfo,
@@ -82,6 +99,8 @@ export default defineComponent({
             loading,
             tableList,
             search,
+            getStatusName,
+            getCardTypeName,
         };
     },
 });

src/views/information/custom/list/setup.ts

@@ -4,6 +4,7 @@ import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { QueryCustomInfoEnum } from '@/services/go/ermcp/customInfo/type';
 import { message } from 'ant-design-vue';
 import { ref } from 'vue';
+import {getStatusName} from "@/views/information/custom/setup";
 
 /**
  * 获取表格列表数据

src/views/information/custom/list/stop-use/index.vue

@@ -1,44 +1,59 @@
 <template>
-  <!-- 客户信息: 停用 -->
-  <div class="custom-normal"
-       :loading="loading">
-    <filterCustomTable @search="search">
-      <BtnList :btnList="commonBtn" />
-    </filterCustomTable>
-    <contextMenu :contextMenuList="forDataBtn">
-      <a-table :columns="columns"
-               class="topTable"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               :pagination="false"
-               rowKey="key"
-               :data-source="customList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{  }">
-          <BtnList :btnList="forDataBtn" />
-        </template>
-        <template #userinfotype="{ text }">
-          <a>{{ text === '2' ? '企业' : '个人' }}</a>
-        </template>
-      </a-table>
-    </contextMenu>
-    <!-- 新增 -->
-    <AddCustom />
-    <!-- 详情 -->
-    <CustomDetail />
-    <!-- 删除 -->
-    <DeleteCustom />
-    <!-- 恢复客户资料 -->
-    <RecoverCustom />
-  </div>
+    <!-- 客户信息: 停用 -->
+    <div class="custom-normal"
+         :loading="loading">
+        <filterCustomTable @search="search">
+            <BtnList :btnList="commonBtn"/>
+        </filterCustomTable>
+        <contextMenu :contextMenuList="forDataBtn">
+            <a-table :columns="columns"
+                     class="topTable"
+                     :expandedRowKeys="expandedRowKeys"
+                     :customRow="Rowclick"
+                     :pagination="false"
+                     rowKey="key"
+                     :data-source="tableList">
+                <!-- 额外的展开行 -->
+                <template #expandedRowRender="{  }">
+                    <BtnList :btnList="forDataBtn"/>
+                </template>
+                <template #userinfotype="{ text }">
+                    <a>{{ text === '2' ? '企业' : '个人' }}</a>
+                </template>
+                <template #status="{ text }">
+                    <a>{{ getStatusName(text) }}</a>
+                </template>
+                <template #cardtype="{ text }">
+                    <a>{{ getCardTypeName(text) }}</a>
+                </template>
+            </a-table>
+        </contextMenu>
+        <!-- 新增 -->
+        <AddCustom/>
+        <!-- 详情 -->
+        <CustomDetail :selectedRow="selectedRow"/>
+        <!-- 删除 -->
+        <DeleteCustom :selectedRow="selectedRow"/>
+        <!-- 恢复客户资料 -->
+        <RecoverCustom :selectedRow="selectedRow"/>
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+import {
+    defineComponent,
+    initData,
+    getTableColumns,
+    getTableEvent,
+    getBtnList,
+    contextMenu,
+    BtnList
+} from '@/common/export/table';
 
-import { filterCustomTable, CustomDetail, DeleteCustom, RecoverCustom, AddCustom } from '../../compoments';
+import {filterCustomTable, CustomDetail, DeleteCustom, RecoverCustom, AddCustom} from '../../compoments';
 
-import { queryTableList, getFilterTableCB, QueryCustomInfoType } from '../index';
+import {queryTableList, getFilterTableCB, QueryCustomInfoType} from '../index';
+import {getCardTypeName, getStatusName} from "@/views/information/custom/setup";
 
 export default defineComponent({
     name: 'custom-normal',
@@ -53,25 +68,27 @@ export default defineComponent({
     },
     setup() {
         // 表头数据
-        const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();
+        const {columns, registerColumn, updateColumn, filteredInfo} = getTableColumns();
         // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QueryCustomInfoType>({});
+        const {expandedRowKeys, selectedRow, Rowclick} = getTableEvent<QueryCustomInfoType>({});
         // 表格操作按钮列表
-        const { commonBtn, forDataBtn } = getBtnList('custom_info_disabled', true);
+        const {commonBtn, forDataBtn} = getBtnList('custom_info_disabled', true);
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList(3);
+        const {loading, tableList, queryTable} = queryTableList(4);
         initData(() => {
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
             registerColumn('table_pcweb_userinfo', getFilterTableCB);
         });
+
         // 查询
         function search(value: any) {
             filteredInfo.value = value;
             // 更新表信息
             updateColumn();
         }
+
         return {
             columns,
             filteredInfo,
@@ -83,6 +100,8 @@ export default defineComponent({
             loading,
             tableList,
             search,
+            getStatusName,
+            getCardTypeName,
         };
     },
 });

src/views/information/custom/list/unsubmit/index.vue

@@ -1,44 +1,59 @@
 <template>
-  <!-- 客户信息: 正常 -->
-  <div class="custom_info_unsubmit"
-       :loading="loading">
-    <filterCustomTable @search="search">
-      <BtnList :btnList="commonBtn" />
-    </filterCustomTable>
-    <contextMenu :contextMenuList="forDataBtn">
-      <a-table :columns="columns"
-               class="topTable hiddenFirstCol"
-               :pagination="false"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               rowKey="key"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{  }">
-          <BtnList :btnList="forDataBtn" />
-        </template>
-        <template #userinfotype="{ text }">
-          <a>{{ text === '2' ? '企业' : '个人' }}</a>
-        </template>
-      </a-table>
-    </contextMenu>
-    <!-- 新增 -->
-    <AddCustom />
-    <!-- 详情 -->
-    <CustomDetail :selectedRow="selectedRow" />
-    <!-- 修改 -->
-    <ModifyCustom :selectedRow="selectedRow" />
-    <!-- 停用 -->
-    <DisableCustom />
+    <!-- 客户信息: 正常 -->
+    <div class="custom_info_unsubmit"
+         :loading="loading">
+        <filterCustomTable @search="search">
+            <BtnList :btnList="commonBtn"/>
+        </filterCustomTable>
+        <contextMenu :contextMenuList="forDataBtn">
+            <a-table :columns="columns"
+                     class="topTable hiddenFirstCol"
+                     :pagination="false"
+                     :expandedRowKeys="expandedRowKeys"
+                     :customRow="Rowclick"
+                     rowKey="key"
+                     :data-source="tableList">
+                <!-- 额外的展开行 -->
+                <template #expandedRowRender="{  }">
+                    <BtnList :btnList="forDataBtn"/>
+                </template>
+                <template #userinfotype="{ text }">
+                    <a>{{ text === '2' ? '企业' : '个人' }}</a>
+                </template>
+                <template #status="{ text }">
+                    <a>{{ getStatusName(text) }}</a>
+                </template>
+                <template #cardtype="{ text }">
+                    <a>{{ getCardTypeName(text) }}</a>
+                </template>
+            </a-table>
+        </contextMenu>
+        <!-- 新增 -->
+        <AddCustom/>
+        <!-- 详情 -->
+        <CustomDetail :selectedRow="selectedRow"/>
+        <!-- 修改 -->
+        <ModifyCustom :selectedRow="selectedRow"/>
+        <!-- 停用 -->
+        <DisableCustom/>
 
-  </div>
+    </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+import {
+    defineComponent,
+    initData,
+    getTableColumns,
+    getTableEvent,
+    getBtnList,
+    contextMenu,
+    BtnList
+} from '@/common/export/table';
 
-import { filterCustomTable, CustomDetail, ModifyCustom, DisableCustom, AddCustom } from '../../compoments';
-import { queryTableList, getFilterTableCB, QueryCustomInfoType } from '../index';
+import {filterCustomTable, CustomDetail, ModifyCustom, DisableCustom, AddCustom} from '../../compoments';
+import {queryTableList, getFilterTableCB, QueryCustomInfoType} from '../index';
+import {getCardTypeName, getStatusName} from "@/views/information/custom/setup";
 
 export default defineComponent({
     name: 'custom_info_unsubmit',
@@ -53,25 +68,27 @@ export default defineComponent({
     },
     setup() {
         // 表头数据
-        const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();
+        const {columns, registerColumn, updateColumn, filteredInfo} = getTableColumns();
         // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QueryCustomInfoType>({});
+        const {expandedRowKeys, selectedRow, Rowclick} = getTableEvent<QueryCustomInfoType>({});
         // 表格操作按钮列表
-        const { commonBtn, forDataBtn } = getBtnList('custom_info_unsubmit', true);
+        const {commonBtn, forDataBtn} = getBtnList('custom_info_unsubmit', true);
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList(1);
+        const {loading, tableList, queryTable} = queryTableList(1);
         initData(() => {
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
             registerColumn('table_pcweb_userinfo', getFilterTableCB);
         });
+
         // 查询
         function search(value: any) {
             filteredInfo.value = value;
             // 更新表信息
             updateColumn();
         }
+
         return {
             columns,
             filteredInfo,
@@ -83,6 +100,8 @@ export default defineComponent({
             loading,
             tableList,
             search,
+            getStatusName,
+            getCardTypeName,
         };
     },
 });

src/views/information/custom/setup.ts

@@ -1,3 +1,5 @@
+import {getItemEnum} from "@/services/bus/allEnum";
+
 /**
  * 获取客户资料状态
  * @param state
@@ -25,4 +27,13 @@ export function getStatusName(state: number) : string{
             break
     }
     return result
-}
+}
+
+/**
+ * 设置证件类型
+ * @param type
+ */
+export function getCardTypeName(type: number): string{
+    const cardName = getItemEnum('certificatetype').find(e => e.enumitemname === type);
+    return cardName ? cardName.enumdicname : "--"
+}