接口 和 请求修改

public/proto/mtp.proto

@@ -1291,3 +1291,23 @@ message ErmcpBizGroupRsp {
     optional uint64 BizGroupID = 4; // uint64 分组ID
 }
 
+// 角色设置操作请求 0 29 151
+message ManagerRoleOperateReq {
+    optional MessageHead Header = 1; // MessageHead
+    optional uint64 autoid = 2; // uint64 角色ID
+    optional uint32 operatetype = 3; // uint32 操作类型-1:新增 2:修改
+    optional uint64 areauserid = 4; // uint64 所属机构
+    optional uint64 modifierid = 5; // uint64 修改人ID
+    optional string modifyremark = 6; // string 修改备注
+    optional string rolename = 7; // string 角色名称
+    repeated MemberFuncMenu memberfuncmenus = 8; // MemberFuncMenu 机构菜单
+}
+
+// 角色设置操作响应 0 29 153
+message ManagerRoleOperateRsp {
+    optional MessageHead Header = 1; // MessageHead 消息头
+    optional int32 RetCode = 2; // int32 返回码
+    optional string RetDesc = 3; // string 描述信息
+    optional uint64 autoid = 4; // uint64 角色ID
+}
+

src/common/constants/enumsName.ts

@@ -44,3 +44,52 @@ export function getPayCurrencyTypeEnumItemName(enumdicid: number): string {
 export function getSpotContractTypeEnumItemName(enumdicid: number): string {
     return getItemEnumName('spotContractType', enumdicid)
 }
+
+
+
+/****************  页面枚举  *******************/
+/**
+ * 获取客户资料状态
+ * @param state
+ */
+export function getStatusName(state: number): string {
+    let result = "--";
+    switch (state) {
+        case 1:
+            result = "待激活";
+            break
+        case 2:
+            result = "待审核";
+            break
+        case 3:
+            result = "待复审";
+            break
+        case 4:
+            result = "正常";
+            break
+        case 5:
+            result = "审核拒绝";
+            break
+        case 6:
+            result = "注销";
+            break
+    }
+    return result
+}
+
+/**
+ * 获取现货品种状态
+ * @param type :未激活 1:正常
+ */
+export function getValidName(type: number){
+    let result = "--";
+    switch (type) {
+        case 0:
+            result = "未激活";
+            break
+        case 1:
+            result = "正常";
+            break
+    }
+    return result
+}

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

@@ -1,9 +1,16 @@
 /** ================================= 客户资料 ================================**/
 
 import APP from '@/services';
-import { BaseResponse, commonSearch_go, commonUpdate_go } from '@/services/go/index';
-import { AddUserInfoApplyReq, ModifyUserInfoApplyReq, ModifyUserInfoReq, QueryCustomInfoType } from './interface';
-import { QueryCustomInfoEnum } from './type';
+import {BaseResponse, commonSearch_go, commonUpdate_go} from '@/services/go/index';
+import {
+    AddUserInfoApplyReq,
+    DeleteUserReq,
+    ModifyUserInfoApplyReq,
+    ModifyUserInfoReq,
+    QueryCustomInfoType, UpdateUserAccountReq
+} from './interface';
+import {QueryCustomInfoEnum} from './type';
+
 /** ================================= 信息 客户资料 ================================**/
 /**
  * 查询客户资料
@@ -13,7 +20,7 @@ import { QueryCustomInfoEnum } from './type';
  */
 export function QueryCustomInfo(queryType: QueryCustomInfoEnum): Promise<QueryCustomInfoType[]> {
     const MemberUserID = APP.get('userAccount').memberuserid;
-    return commonSearch_go('/Ermcp/QueryUserInfo', { MemberUserID, queryType }).catch((err) => {
+    return commonSearch_go('/Ermcp/QueryUserInfo', {MemberUserID, queryType}).catch((err) => {
         throw new Error(`查询客户资料: ${err.message}`);
     });
 }
@@ -58,11 +65,11 @@ export function QueryModifyUserInfo(req: ModifyUserInfoReq): Promise<BaseRespons
 
 /**
  * 删除客户申请
- * @param userId 用户id  只可删除 UserState = 1 （未提交）状态的申请信息
  * @constructor
+ * @param req
  */
-export function QueryDeleteUserInfoApply(userID: number): Promise<string> {
-    return commonSearch_go('/Erms3/DeleteUserInfoApply', { userID },)
+export function QueryDeleteUserInfoApply(req: DeleteUserReq): Promise<string> {
+    return commonSearch_go('/Erms3/DeleteUserInfoApply', req,)
         .then(() => 'ok')
         .catch((err) => {
             throw new Error(`删除客户申请: ${err.message}`);
@@ -71,12 +78,11 @@ export function QueryDeleteUserInfoApply(userID: number): Promise<string> {
 
 /**
  * 更新用户状态 /User/UpdateUserAccountStatus
- * @param userID 需要修改的账户id
- * @param accountStatus 账户状态 - 4:正常 6:注销（停用）
  * @constructor
+ * @param req
  */
-export function UpdateUserAccountStatus(userID: number, accountStatus: number): Promise<BaseResponse> {
-    return commonUpdate_go('/User/UpdateUserAccountStatus', { userID, accountStatus },).catch((err) => {
+export function UpdateUserAccountStatus(req: UpdateUserAccountReq): Promise<BaseResponse> {
+    return commonUpdate_go('/User/UpdateUserAccountStatus', req,).catch((err) => {
         throw new Error(`更新用户状态: ${err.message}`);
     });
 }

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

@@ -196,4 +196,19 @@ export interface ModifyUserInfoApplyReq {
     usertype?: number;//用户类型 - 1:投资者 2:机构
     videourl?: string;//视频地址
     wechat?: string;//微信号 (加密存储)
-}
+}
+
+/**
+ * 删除客户申请
+ */
+export interface DeleteUserReq{
+    userID: number
+}
+
+/**
+ * 客户账户状态更新
+ */
+export interface UpdateUserAccountReq{
+    userID: number
+    accountStatus: number  // 账户状态 - 4:正常 6:注销（停用）
+}

src/views/business/plan/components/detail/index.vue

@@ -84,13 +84,9 @@
 <script lang="ts">
 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 {Ermcp3HedgePlan} from '@/services/go/ermcp/plan/interface';
 import {formatValue} from '@/common/methods';
 import {getPlanContractType} from '@/views/business/plan/setup';
-import {Modal} from "ant-design-vue";
 
 export default defineComponent({
     name: 'plan-detail',

src/views/information/account_info/compoments/business-detail/index.vue

@@ -70,7 +70,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 { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 

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

@@ -1,103 +1,8 @@
-import {QueryDeleteUserInfoApply, QueryModifyUserInfo, UpdateUserAccountStatus} from "@/services/go/ermcp/customInfo";
-import {ModifyUserInfoReq} from "@/services/go/ermcp/customInfo/interface";
-import {userInfoCheck} from "@/services/proto/accountinfo";
-import {UserInfoCheckMangeReq} from "@/services/proto/accountinfo/interface";
-import {message} from 'ant-design-vue';
-import {ref} from "vue";
-import {BaseResponse} from "@/services/go";
-import {getRequestResultInfo} from "@/common/methods/request";
-import {GldContractStateSign} from "@/views/information/spot-contract/setup";
-import {ModifyUserInfoSign} from "@/views/information/custom/setup";
 
-/**
- *  撤销客户资料 撤销后的数据会进入草稿(未提交)
- */
-export function cancelCustomInfo() {
-    const loading = ref<boolean>(false);
 
-    // 这里调用的是修改客户申请接口
-    function ModifyUserInfo(req: ModifyUserInfoReq): Promise<string> {
-        return QueryModifyUserInfo(req)
-            .then((res) => {
-                return Promise.resolve("撤销成功")
-            })
-            .catch((err) => {
-                return Promise.reject("撤销失败:" + err)
-            }).finally(() => {
-                loading.value = false
-            })
-    }
 
-    return {loading, ModifyUserInfo}
-}
 
-/**
- * 更新用户状态 用在停用或是启用
- * 4:正常 6:注销（停用）
- */
-export function updateUserAccount() {
-    const loading = ref<boolean>(false);
 
-    // 这里调用的是修改客户申请接口
-    function ModifyUserInfo(userID: number, accountStatus: number): Promise<string> {
-        const sign = getRequestResultInfo(ModifyUserInfoSign, accountStatus)  // 接口请求后的返回提示 这里统一进行管理
-        return UpdateUserAccountStatus(userID, accountStatus)
-            .then((res) => {
-                console.log('更新用户资料成功 accountStatus = ' + accountStatus);
-                return Promise.resolve(sign[0])
-            })
-            .catch((err) => {
-                return Promise.reject(sign[1])
-            }).finally(() => {
-                loading.value = false
-            })
-    }
 
-    return {loading, ModifyUserInfo}
-}
-
-/**
- * 审核客户资料 这里是走proto接口
- */
-export function checkCustomInfo() {
-    const loading = ref<boolean>(false);
-
-    // 这里调用的是修改客户申请接口
-    function checkCustomerInfo(req: UserInfoCheckMangeReq): Promise<string> {
-        return userInfoCheck(req)
-            .then((res) => {
-                return Promise.resolve("审核成功")
-            })
-            .catch((err) => {
-                return Promise.resolve("审核失败:" + err)
-            }).finally(() => {
-                loading.value = false
-            })
-    }
-
-    return {loading, checkCustomerInfo}
-}
-
-/**
- * 删除客户资料
- */
-export function deleteUserInfo() {
-    const loading = ref<boolean>(false);
-
-    // 这里调用的是修改客户申请接口
-    function deleteCustomerInfo(userID: number): Promise<string> {
-        return QueryDeleteUserInfoApply(userID)
-            .then((res) => {
-                return Promise.resolve("删除成功")
-            })
-            .catch((err) => {
-                return Promise.reject("删除失败:" + err)
-            }).finally(() => {
-                loading.value = false
-            })
-    }
-
-    return {loading, deleteCustomerInfo}
-}
 
 

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

@@ -1,314 +1,317 @@
 <template>
-  <!-- 新增客户资料 -->
-  <a-modal class="add-custom"
-           title="新增客户资料"
-           v-model:visible="visible"
-           @cancel="cancel"
-           centered
-           :maskClosable="false"
-           width="890px">
-    <template #footer>
-        <a-button key="submit"
-                  class="cancelBtn"
-                  @click="submit(1)">保存草稿
-        </a-button>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="submit(2)">提交审核</a-button>
-    </template>
-    <a-form class="inlineForm"
-            ref="formRef"
-            :model="formState"
-            :rules="rules">
-      <a-row :gutter="24">
-        <a-col :span="12">
-          <a-form-item label="客户类型"
-                       name="userinfotype">
-            <a-select class="typeSelect"
-                      style="width: 200px"
-                      v-model:value="formState.userinfotype"
-                      placeholder="请选择客户类型">
-              <a-select-option value="1">
-                个人
-              </a-select-option>
-              <a-select-option value="2">
-                企业
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <template v-if="!isPersonal()">
-          <a-col :span="12">
-            <a-form-item label="企业名称"
-                         name="customername">
-              <a-input class="dialogInput"
-                       v-model:value="formState.customername"
-                       style="width: 200px"
-                       placeholder="请输入企业名称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="企业简称"
-                         name="nickname">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.nickname"
-                       placeholder="请输入企业简称" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="证件类型"
-                         name="cardtype">
-              <a-select class="inlineFormSelect"
-                        v-model:value="formState.cardtype"
-                        style="width: 200px"
-                        placeholder="请选择证件类型">
-                <a-select-option :value="item.enumitemname"
-                                 v-for="item in cardTypeList"
-                                 :key="item.autoid">
-                  {{item.enumdicname}}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="法定代表人"
-                         name="legalpersonname">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.legalpersonname"
-                       placeholder="请输入法定代表人" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="证件号码"
-                         name="cardnum">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.cardnum"
-                       placeholder="请输入证件号码" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="纳税人识别号"
-                         name="taxpayernum">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.taxpayernum"
-                       placeholder="请输入纳税人识别号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="营业执照">
-              <div class="upload">
-                <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
-                          :transform-file="transformFile">
-                  <a-button class="uploadBtn">上传</a-button>
-                </a-upload>
-                <div class="look">查看附件</div>
-              </div>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="联系人"
-                         name="contactname">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.contactname"
-                       placeholder="请输入联系人" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="联系人手机号"
-                         name="mobilephone">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.mobilephone"
-                       placeholder="请输入联系人手机号" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="联系电话"
-                         name="telphone">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.telphone"
-                       placeholder="请输入联系电话" />
-            </a-form-item>
-          </a-col>
+    <!-- 新增客户资料 -->
+    <a-modal class="add-custom"
+             title="新增客户资料"
+             v-model:visible="visible"
+             @cancel="cancel"
+             centered
+             :maskClosable="false"
+             width="890px">
+        <template #footer>
+            <a-button key="submit"
+                      class="cancelBtn"
+                      @click="submit(1)">保存草稿
+            </a-button>
+            <a-button key="submit"
+                      type="primary"
+                      :loading="loading"
+                      @click="submit(2)">提交审核
+            </a-button>
         </template>
-        <template v-else>
-          <a-col :span="12">
-            <a-form-item label="姓名"
-                         name="username">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.username"
-                       placeholder="请输入姓名" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="身份证号码"
-                         name="cardnum">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.cardnum"
-                       placeholder="请输入身份证号码" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="手机号码"
-                         name="mobilephone">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.mobilephone"
-                       placeholder="请输入手机号码" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="身份证正面照"
-                         name="cardbackphotourl">
-              <div class="upload">
-                <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
-                          :transform-file="transformFile">
-                  <a-button class="uploadBtn">上传</a-button>
-                </a-upload>
-                <div class="look">查看附件</div>
-              </div>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="邮箱"
-                         name="email">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.email"
-                       placeholder="请输入邮箱" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-item label="身份证反面照"
-                         name="cardfrontphotourl">
-              <div class="upload">
-                <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
-                          :transform-file="transformFile">
-                  <a-button class="uploadBtn">上传</a-button>
-                </a-upload>
-                <div class="look">查看附件</div>
-              </div>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="联系电话"
-                         name="telphone">
-              <a-input class="dialogInput"
-                       style="width: 200px"
-                       v-model:value="formState.telphone"
-                       placeholder="请输入联系电话" />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item>
-              &nbsp;
-            </a-form-item>
-          </a-col>
-        </template>
-        <a-col :span="24">
-          <a-form-item label="通讯地址">
-            <a-select class="inlineFormSelect"
-                      style="width: 205px"
-                      v-model:value="formState.provinceid"
-                      @change="getCityList"
-                      placeholder="请选择省">
-              <a-select-option v-for="item in provinceList"
-                               :key="item.autoid"
-                               :value="item.autoid">
-                {{item.divisionname}}
-              </a-select-option>
-            </a-select>
-            <a-select class="inlineFormSelect ml9"
-                      style="width: 205px"
-                      v-model:value="formState.cityid"
-                      @change="getDistrictList"
-                      placeholder="请选择市">
-              <a-select-option v-for="item in cityList"
-                               :key="item.autoid"
-                               :value="item.autoid">
-                {{item.divisionname}}
-              </a-select-option>
-            </a-select>
-            <a-select class="inlineFormSelect ml9"
-                      v-model:value="formState.districtid"
-                      style="width: 205px"
-                      placeholder="请选择县(区)">
-              <a-select-option v-for="item in districtList"
-                               :key="item.autoid"
-                               :value="item.autoid">
-                {{item.divisionname}}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="&nbsp;"
-                       name="cardaddress">
-            <a-input class="dialogInput"
-                     style="width: 635px"
-                     v-model:value="formState.cardaddress"
-                     placeholder="请输入详细地址" />
-          </a-form-item>
-        </a-col>
-        <a-col :span="24">
-          <a-form-item label="备注"
-                       name="remark">
-            <a-input class="dialogInput"
-                     style="width: 635px"
-                     v-model:value="formState.remark"
-                     placeholder="请输入备注" />
-          </a-form-item>
-        </a-col>
-      </a-row>
-    </a-form>
-  </a-modal>
+        <a-form class="inlineForm"
+                ref="formRef"
+                :model="formState"
+                :rules="rules">
+            <a-row :gutter="24">
+                <a-col :span="12">
+                    <a-form-item label="客户类型"
+                                 name="userinfotype">
+                        <a-select class="typeSelect"
+                                  style="width: 200px"
+                                  v-model:value="formState.userinfotype"
+                                  placeholder="请选择客户类型">
+                            <a-select-option value="1">
+                                个人
+                            </a-select-option>
+                            <a-select-option value="2">
+                                企业
+                            </a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <template v-if="!isPersonal()">
+                    <a-col :span="12">
+                        <a-form-item label="企业名称"
+                                     name="customername">
+                            <a-input class="dialogInput"
+                                     v-model:value="formState.customername"
+                                     style="width: 200px"
+                                     placeholder="请输入企业名称"/>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="企业简称"
+                                     name="nickname">
+                            <a-input class="dialogInput"
+                                     style="width: 200px"
+                                     v-model:value="formState.nickname"
+                                     placeholder="请输入企业简称"/>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="证件类型"
+                                     name="cardtype">
+                            <a-select class="inlineFormSelect"
+                                      v-model:value="formState.cardtype"
+                                      style="width: 200px"
+                                      placeholder="请选择证件类型">
+                                <a-select-option :value="item.enumitemname"
+                                                 v-for="item in cardTypeList"
+                                                 :key="item.autoid">
+                                    {{ item.enumdicname }}
+                                </a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="法定代表人"
+                                     name="legalpersonname">
+                            <a-input class="dialogInput"
+                                     style="width: 200px"
+                                     v-model:value="formState.legalpersonname"
+                                     placeholder="请输入法定代表人"/>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="证件号码"
+                                     name="cardnum">
+                            <a-input class="dialogInput"
+                                     style="width: 200px"
+                                     v-model:value="formState.cardnum"
+                                     placeholder="请输入证件号码"/>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="纳税人识别号"
+                                     name="taxpayernum">
+                            <a-input class="dialogInput"
+                                     style="width: 200px"
+                                     v-model:value="formState.taxpayernum"
+                                     placeholder="请输入纳税人识别号"/>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="营业执照">
+                            <div class="upload">
+                                <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
+                                          :transform-file="transformFile">
+                                    <a-button class="uploadBtn">上传</a-button>
+                                </a-upload>
+                                <div class="look">查看附件</div>
+                            </div>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="联系人"
+                                     name="contactname">
+                            <a-input class="dialogInput"
+                                     style="width: 200px"
+                                     v-model:value="formState.contactname"
+                                     placeholder="请输入联系人"/>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="联系人手机号"
+                                     name="mobilephone">
+                            <a-input class="dialogInput"
+                                     style="width: 200px"
+                                     v-model:value="formState.mobilephone"
+                                     placeholder="请输入联系人手机号"/>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="联系电话"
+                                     name="telphone">
+                            <a-input class="dialogInput"
+                                     style="width: 200px"
+                                     v-model:value="formState.telphone"
+                                     placeholder="请输入联系电话"/>
+                        </a-form-item>
+                    </a-col>
+                </template>
+                <template v-else>
+                    <a-col :span="12">
+                        <a-form-item label="姓名"
+                                     name="username">
+                            <a-input class="dialogInput"
+                                     style="width: 200px"
+                                     v-model:value="formState.username"
+                                     placeholder="请输入姓名"/>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="身份证号码"
+                                     name="cardnum">
+                            <a-input class="dialogInput"
+                                     style="width: 200px"
+                                     v-model:value="formState.cardnum"
+                                     placeholder="请输入身份证号码"/>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="手机号码"
+                                     name="mobilephone">
+                            <a-input class="dialogInput"
+                                     style="width: 200px"
+                                     v-model:value="formState.mobilephone"
+                                     placeholder="请输入手机号码"/>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="身份证正面照"
+                                     name="cardbackphotourl">
+                            <div class="upload">
+                                <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
+                                          :transform-file="transformFile">
+                                    <a-button class="uploadBtn">上传</a-button>
+                                </a-upload>
+                                <div class="look">查看附件</div>
+                            </div>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="邮箱"
+                                     name="email">
+                            <a-input class="dialogInput"
+                                     style="width: 200px"
+                                     v-model:value="formState.email"
+                                     placeholder="请输入邮箱"/>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="24">
+                        <a-form-item label="身份证反面照"
+                                     name="cardfrontphotourl">
+                            <div class="upload">
+                                <a-upload action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
+                                          :transform-file="transformFile">
+                                    <a-button class="uploadBtn">上传</a-button>
+                                </a-upload>
+                                <div class="look">查看附件</div>
+                            </div>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item label="联系电话"
+                                     name="telphone">
+                            <a-input class="dialogInput"
+                                     style="width: 200px"
+                                     v-model:value="formState.telphone"
+                                     placeholder="请输入联系电话"/>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                        <a-form-item>
+                            &nbsp;
+                        </a-form-item>
+                    </a-col>
+                </template>
+                <a-col :span="24">
+                    <a-form-item label="通讯地址">
+                        <a-select class="inlineFormSelect"
+                                  style="width: 205px"
+                                  v-model:value="formState.provinceid"
+                                  @change="getCityList"
+                                  placeholder="请选择省">
+                            <a-select-option v-for="item in provinceList"
+                                             :key="item.autoid"
+                                             :value="item.autoid">
+                                {{ item.divisionname }}
+                            </a-select-option>
+                        </a-select>
+                        <a-select class="inlineFormSelect ml9"
+                                  style="width: 205px"
+                                  v-model:value="formState.cityid"
+                                  @change="getDistrictList"
+                                  placeholder="请选择市">
+                            <a-select-option v-for="item in cityList"
+                                             :key="item.autoid"
+                                             :value="item.autoid">
+                                {{ item.divisionname }}
+                            </a-select-option>
+                        </a-select>
+                        <a-select class="inlineFormSelect ml9"
+                                  v-model:value="formState.districtid"
+                                  style="width: 205px"
+                                  placeholder="请选择县(区)">
+                            <a-select-option v-for="item in districtList"
+                                             :key="item.autoid"
+                                             :value="item.autoid">
+                                {{ item.divisionname }}
+                            </a-select-option>
+                        </a-select>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                    <a-form-item label="&nbsp;"
+                                 name="cardaddress">
+                        <a-input class="dialogInput"
+                                 style="width: 635px"
+                                 v-model:value="formState.cardaddress"
+                                 placeholder="请输入详细地址"/>
+                    </a-form-item>
+                </a-col>
+                <a-col :span="24">
+                    <a-form-item label="备注"
+                                 name="remark">
+                        <a-input class="dialogInput"
+                                 style="width: 635px"
+                                 v-model:value="formState.remark"
+                                 placeholder="请输入备注"/>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </a-form>
+    </a-modal>
 </template>
 
 <script lang="ts">
-import { closeModal } from '@/common/setup/modal/index';
-import { initData } from '@/common/methods/index';
-import { defineComponent, ref, reactive, toRaw, UnwrapRef } from 'vue';
-import { getCardType, initFormState, handleApply, handleForm } from './setup';
-import { AllEnums } from '@/services/go/commonService/interface';
-import { FormState } from './interface';
-import { RuleObject, ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
-import { getAddress } from '@/services/go/adress';
-import {addUserInfo} from "@/views/information/custom/compoments/setup";
+import {closeModal} from '@/common/setup/modal/index';
+import {initData} from '@/common/methods/index';
+import {defineComponent, ref, reactive, toRaw, UnwrapRef} from 'vue';
+import {getCardType, handleForm} from './setup';
+import {AllEnums} from '@/services/go/commonService/interface';
+import {FormState} from './interface';
+import {ValidateErrorEntity} from 'ant-design-vue/es/form/interface';
+import {getAddress} from '@/services/go/adress';
 import {AddUserInfoApplyReq} from "@/services/go/ermcp/customInfo/interface";
 import {getUserId} from "@/services/bus/account";
+import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
+import {QueryAddUserInfoApply} from "@/services/go/ermcp/customInfo";
 
 export default defineComponent({
     name: 'add-custom',
     components: {},
     setup(name, context) {
         // 控制关闭弹窗
-        const { visible, cancel } = closeModal('custom_info_btn_add');
+        const {visible, cancel} = closeModal('custom_info_btn_add');
         const loading = ref<boolean>(false);
         // 证件类型
         const cardTypeList = ref<AllEnums[]>(getCardType());
         // 表单
-        const { formRef, formState, rules } = handleForm();
+        const {formRef, formState, rules} = handleForm();
         // 地址
-        const { cityList, districtList, provinceList, getCityList, getDistrictList } = getAddress();
+        const {cityList, districtList, provinceList, getCityList, getDistrictList} = getAddress();
+
         function isPersonal(): boolean {
             return formState.userinfotype === '1';
         }
+
         function submit(OperateType: 1 | 2) {
             formRef.value
                 .validate()
                 .then(() => {
                     const param = toRaw(formState);
-
-                    const reqParam :AddUserInfoApplyReq = {
+                    const reqParam: AddUserInfoApplyReq = {
                         customername: param.customername,   // 必填
                         userid: 1,  // 写死 必填
                         memberareaid: getUserId(),
@@ -334,21 +337,19 @@ export default defineComponent({
                         taxpayernum: param.taxpayernum, // 纳税人识别号
                         email: param.email,  // email
                     }
-
-                    addUserInfo(OperateType, reqParam, loading)
-                        .then(res => {
-                            cancel()
-                            context.emit('refresh')
-                        })
-
-                    // applyAction(param);
+                    requestResultLoadingAndInfo(QueryAddUserInfoApply, reqParam, loading, OperateType === 1 ? ['保存草稿成功', '保存草稿失败:'] : ['新增客户资料成功', '新增客户资料失败:']).then(() => {
+                        cancel();
+                        context.emit('refresh');
+                    });
                     console.log('values', formState);
                 })
                 .catch((error: ValidateErrorEntity<FormState>) => {
                     console.log('error', error);
                 });
         }
-        initData(() => {});
+
+        initData(() => {
+        });
         return {
             formState,
             rules,

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

@@ -114,9 +114,10 @@ import { closeModal } from '@/common/setup/modal/index';
 import { message, Modal } from 'ant-design-vue';
 import { ModifyUserInfoReq, QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { formatValue } from '@/common/methods';
-import { getStatusName } from '@/views/information/custom/setup';
-import { cancelCustomInfo } from '@/views/information/custom/compoments/setup';
+import { getStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
+import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
+import {QueryModifyUserInfo} from "@/services/go/ermcp/customInfo";
 
 export default defineComponent({
     name: 'custom_info_btn_cancel',
@@ -129,7 +130,7 @@ export default defineComponent({
     },
     setup(props, context) {
         const { visible, cancel } = closeModal('custom_info_btn_cancel');
-        const { loading, ModifyUserInfo } = cancelCustomInfo();
+        const loading = ref<boolean>(false);
         function submit() {
             loading.value = true;
             Modal.confirm({
@@ -139,21 +140,14 @@ export default defineComponent({
                 cancelText: '取消',
                 onOk() {
                     console.log('OK');
-                    const req: ModifyUserInfoReq = {
+                    const reqParam: ModifyUserInfoReq = {
                         userid: props.selectedRow.userid, //用户ID
                         userstate: 1, //开户状态 - 1:未提交 2: 待初审 3:初审拒绝 4:待复审 5:复审拒绝 6:测评不通过 (必填)
                     };
-                    // 撤销申请 将状态设置为未提交
-                    ModifyUserInfo(req)
-                        .then((res) => {
-                            message.success(res);
-                            // 通知上层  刷新数据
-                            context.emit('refresh');
-                            cancel();
-                        })
-                        .catch((err) => {
-                            message.error(err);
-                        });
+                    requestResultLoadingAndInfo(QueryModifyUserInfo, reqParam, loading, ['撤销成功', '撤销失败:']).then(() => {
+                        cancel();
+                        context.emit('refresh');
+                    });
                 },
                 onCancel() {
                     console.log('Cancel');
@@ -161,9 +155,6 @@ export default defineComponent({
                 },
                 class: 'test',
             });
-            // setTimeout(() => {
-            //     loading.value = false;
-            // }, 2000);
         }
 
         return {

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

@@ -1,133 +1,134 @@
 <template>
-  <!-- 审核客户资料-->
-  <a-modal class="commonModal custom_info_btn_check"
-           title="审核客户资料"
-           v-model:visible="visible"
-           @cancel="cancel"
-           centered
-           width="890px">
-    <template #footer>
-      <a-button key="submit"
-                class="cancelBtn"
-                @click="cancel">取消
-      </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @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">{{ getCardTypeEnumItemName(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>
+    <!-- 审核客户资料-->
+    <a-modal class="commonModal custom_info_btn_check"
+             title="审核客户资料"
+             v-model:visible="visible"
+             @cancel="cancel"
+             centered
+             width="890px">
+        <template #footer>
+            <a-button key="submit"
+                      class="cancelBtn"
+                      @click="cancel">取消
+            </a-button>
+            <a-button key="submit"
+                      type="primary"
+                      :loading="loading"
+                      @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">{{ getCardTypeEnumItemName(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, 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 { getStatusName } from '@/views/information/custom/setup';
-import { cancelCustomInfo, checkCustomInfo } from '@/views/information/custom/compoments/setup';
-import { UserInfoCheckMangeReq } from '@/services/proto/accountinfo/interface';
-import { getSelectedAccountId, getUserId } from '@/services/bus/account';
-import { message, Modal } from 'ant-design-vue';
-import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
+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 '@/common/constants/enumsName';
+import {UserInfoCheckMangeReq} from '@/services/proto/accountinfo/interface';
+import {getUserId} from '@/services/bus/account';
+import {Modal} from 'ant-design-vue';
+import {getCardTypeEnumItemName} from '@/common/constants/enumsName';
+import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
+import {userInfoCheck} from "@/services/proto/accountinfo";
 
 export default defineComponent({
     name: 'custom_info_btn_check',
@@ -139,14 +140,8 @@ export default defineComponent({
         },
     },
     setup(props, context) {
-        const { loading, checkCustomerInfo } = checkCustomInfo();
-        const { visible, cancel } = closeModal('custom_info_btn_check');
-        const req: UserInfoCheckMangeReq = {
-            audituserid: getUserId(),
-            userid: props.selectedRow.userid,
-            auditflag: 1,
-            remark: '',
-        };
+        const loading = ref<boolean>(false);
+        const {visible, cancel} = closeModal('custom_info_btn_check');
 
         // 审核通过
         function submit() {
@@ -156,17 +151,16 @@ export default defineComponent({
                 cancelText: '取消',
                 onOk() {
                     console.log('OK');
-                    req.auditflag = 1;
-                    req.userid = props.selectedRow.userid;
-                    checkCustomerInfo(req)
-                        .then((res) => {
-                            message.success(res);
-                            context.emit('refresh');
-                            cancel();
-                        })
-                        .catch((err) => {
-                            message.error(err);
-                        });
+                    let reqParam: UserInfoCheckMangeReq = {
+                        audituserid: getUserId(),
+                        userid: props.selectedRow.userid,
+                        auditflag: 1,
+                        remark: '',
+                    };
+                    requestResultLoadingAndInfo(userInfoCheck, reqParam, loading, ['审核成功', '审核失败:']).then(() => {
+                        cancel();
+                        context.emit('refresh');
+                    });
                 },
                 onCancel() {
                     console.log('Cancel');
@@ -182,17 +176,16 @@ export default defineComponent({
                 cancelText: '取消',
                 onOk() {
                     console.log('OK');
-                    req.auditflag = 2;
-                    req.userid = props.selectedRow.userid;
-                    checkCustomerInfo(req)
-                        .then((res) => {
-                            message.success(res);
-                            context.emit('refresh');
-                            cancel();
-                        })
-                        .catch((err) => {
-                            message.error(err);
-                        });
+                    let reqParam: UserInfoCheckMangeReq = {
+                        audituserid: getUserId(),
+                        userid: props.selectedRow.userid,
+                        auditflag: 2,
+                        remark: '',
+                    }
+                    requestResultLoadingAndInfo(userInfoCheck, reqParam, loading, ['审核拒绝成功', '审核拒绝失败:']).then(() => {
+                        cancel();
+                        context.emit('refresh');
+                    });
                 },
                 onCancel() {
                     console.log('Cancel');
@@ -216,11 +209,11 @@ export default defineComponent({
 
 <style lang="less">
 .custom_info_btn_check {
-  .upload {
-    .look {
-      margin-left: 0;
+    .upload {
+        .look {
+            margin-left: 0;
+        }
     }
-  }
 }
 </style
 >;

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

@@ -109,11 +109,12 @@
 <script lang="ts">
 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';
+import {DeleteUserReq, QueryCustomInfoType} from '@/services/go/ermcp/customInfo/interface';
 import {formatValue} from '@/common/methods';
-import {getStatusName} from '@/views/information/custom/setup';
-import {message, Modal} from 'ant-design-vue';
+import { getStatusName } from '@/common/constants/enumsName';
+import { Modal} from 'ant-design-vue';
+import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
+import {QueryDeleteUserInfoApply} from "@/services/go/ermcp/customInfo";
 
 export default defineComponent({
     name: 'recover-custom',
@@ -126,7 +127,7 @@ export default defineComponent({
     },
     setup(props, context) {
         const {visible, cancel} = closeModal('custom_info_btn_delete');
-        const {loading, deleteCustomerInfo} = deleteUserInfo();
+        const loading = ref<boolean>(false);
 
         function submit() {
             Modal.confirm({
@@ -134,15 +135,12 @@ export default defineComponent({
                 okText: '确认删除',
                 cancelText: '取消',
                 onOk() {
-                    // 删除客户资料
-                    deleteCustomerInfo(props.selectedRow.userid)
-                        .then(res => {
-                            message.success(res);
-                            // 通知上层  刷新数据
-                            context.emit('refresh');
-                            cancel();
-                        }).catch(err => {
-                        message.error(err);
+                    let reqParams: DeleteUserReq = {
+                        userID: props.selectedRow.userid
+                    }
+                    requestResultLoadingAndInfo(QueryDeleteUserInfoApply, reqParams, loading, ['删除成功', '删除失败:']).then(() => {
+                        cancel();
+                        context.emit('refresh');
                     });
                 },
                 onCancel() {

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

@@ -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 { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 

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

@@ -1,122 +1,125 @@
 <template>
-  <!-- 停用客户资料-->
-  <a-modal class="commonModal warehouse-disable"
-           title="停用客户资料"
-           v-model:visible="visible"
-           centered
-           :maskClosable="maskClosableFlag"
-           @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="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>
+    <!-- 停用客户资料-->
+    <a-modal class="commonModal warehouse-disable"
+             title="停用客户资料"
+             v-model:visible="visible"
+             centered
+             :maskClosable="maskClosableFlag"
+             @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="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, 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 {closeModal} from '@/common/setup/modal/index';
+import {QueryCustomInfoType, UpdateUserAccountReq} from "@/services/go/ermcp/customInfo/interface";
 import {formatValue} from "@/common/methods";
-import {getStatusName} from "@/views/information/custom/setup";
-import {message, Modal} from "ant-design-vue";
+import {Modal} from "ant-design-vue";
+import {getStatusName} from "@/common/constants/enumsName";
+import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
+import {UpdateUserAccountStatus} from "@/services/go/ermcp/customInfo";
 
 export default defineComponent({
     name: 'custom-disable',
@@ -128,30 +131,31 @@ export default defineComponent({
         },
     },
     setup(props, context) {
-        const { visible, cancel } = closeModal('custom_info_btn_disable');
+        const {visible, cancel} = closeModal('custom_info_btn_disable');
         const maskClosableFlag = ref<boolean>(false);
-        const  {loading, ModifyUserInfo} = updateUserAccount();
+        const loading = ref<boolean>(false);
+
         function submit() {
             Modal.confirm({
                 title: '是否确认停用客户资料',
                 okText: '确认停用',
                 cancelText: '取消',
                 onOk() {
-                    ModifyUserInfo(props.selectedRow.userid, 6)
-                        .then(res => {
-                            message.success(res)
-                            context.emit('refresh')
-                            cancel()
-                        })
-                        .catch(err => {
-                            message.error(err)
-                        })
+                    let reqParams: UpdateUserAccountReq = {
+                        userID: props.selectedRow.userid,
+                        accountStatus: 6
+                    }
+                    requestResultLoadingAndInfo(UpdateUserAccountStatus, reqParams, loading, ['停用成功', '停用失败:']).then(() => {
+                        cancel();
+                        context.emit('refresh');
+                    });
                 },
                 onCancel() {
                     console.log('Cancel');
                 },
             });
         }
+
         return {
             visible,
             cancel,

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

@@ -196,8 +196,6 @@ import { defineComponent, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { initData } from '@/common/methods/index';
 import {AddUserInfoApplyReq} from "@/services/go/ermcp/customInfo/interface";
-import {getUserId} from "@/services/bus/account";
-import {addUserInfo, modifyUserInfo} from "@/views/information/custom/compoments/setup";
 
 export default defineComponent({
     name: 'modify-custom',

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

@@ -115,11 +115,12 @@
 <script lang="ts">
 import {defineComponent, PropType, ref} from 'vue';
 import {closeModal} from '@/common/setup/modal/index';
-import {QueryCustomInfoType} from "@/services/go/ermcp/customInfo/interface";
+import {QueryCustomInfoType, UpdateUserAccountReq} 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";
+import { getStatusName } from '@/common/constants/enumsName';
 import {message, Modal} from "ant-design-vue";
+import {requestResultLoadingAndInfo} from "@/common/methods/request/resultInfo";
+import {UpdateUserAccountStatus} from "@/services/go/ermcp/customInfo";
 
 export default defineComponent({
     name: 'modify-custom',
@@ -132,7 +133,7 @@ export default defineComponent({
     },
     setup(props, context) {
         const {visible, cancel} = closeModal('custom_info_btn_recover');
-        const {loading, ModifyUserInfo} = updateUserAccount();
+        const loading = ref<boolean>(false);
         // 恢复方法
         function recover(){
             Modal.confirm({
@@ -140,15 +141,14 @@ export default defineComponent({
                 okText: '确认恢复',
                 cancelText: '取消',
                 onOk() {
-                    ModifyUserInfo(props.selectedRow.userid, 4)
-                        .then(res => {
-                            message.success(res)
-                            context.emit('refresh')
-                            cancel()
-                        })
-                        .catch(err => {
-                            message.error(err)
-                        })
+                    let reqParams: UpdateUserAccountReq = {
+                        userID: props.selectedRow.userid,
+                        accountStatus: 4
+                    }
+                    requestResultLoadingAndInfo(UpdateUserAccountStatus, reqParams, loading, ['恢复成功', '恢复失败:']).then(() => {
+                        cancel();
+                        context.emit('refresh');
+                    });
                 },
                 onCancel() {
                     console.log('Cancel');

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

@@ -1,122 +1,10 @@
 import {
-    QueryAddUserInfoApply,
-    QueryDeleteUserInfoApply,
-    QueryModifyUserInfo, QueryModifyUserInfoApply,
-    UpdateUserAccountStatus
+    QueryModifyUserInfoApply,
 } from "@/services/go/ermcp/customInfo";
-import {AddUserInfoApplyReq, ModifyUserInfoApplyReq, ModifyUserInfoReq} from "@/services/go/ermcp/customInfo/interface";
-import {userInfoCheck} from "@/services/proto/accountinfo";
-import {UserInfoCheckMangeReq} from "@/services/proto/accountinfo/interface";
-import {message} from 'ant-design-vue';
-import {Ref, ref} from "vue";
-import {BaseResponse} from "@/services/go";
+import {ModifyUserInfoApplyReq} from "@/services/go/ermcp/customInfo/interface";
+import {Ref} from "vue";
 import {commonResultInfo, getRequestResultInfo} from "@/common/methods/request";
-import {GldContractStateSign} from "@/views/information/spot-contract/setup";
-import {addCustomInfoSign, ChangeCustomInfoSign, ModifyUserInfoSign} from "@/views/information/custom/setup";
-import {deletePlanSign} from "@/views/business/plan/setup";
-import {oldHedgePlanReq} from "@/services/proto/hedgeplan";
-
-/**
- *  撤销客户资料 撤销后的数据会进入草稿(未提交)
- */
-export function cancelCustomInfo() {
-    const loading = ref<boolean>(false);
-
-    // 这里调用的是修改客户申请接口
-    function ModifyUserInfo(req: ModifyUserInfoReq): Promise<string> {
-        return QueryModifyUserInfo(req)
-            .then((res) => {
-                return Promise.resolve("撤销成功")
-            })
-            .catch((err) => {
-                return Promise.reject("撤销失败:" + err)
-            }).finally(() => {
-                loading.value = false
-            })
-    }
-
-    return {loading, ModifyUserInfo}
-}
-
-/**
- * 更新用户状态 用在停用或是启用
- * 4:正常 6:注销（停用）
- */
-export function updateUserAccount() {
-    const loading = ref<boolean>(false);
-
-    // 这里调用的是修改客户申请接口
-    function ModifyUserInfo(userID: number, accountStatus: number): Promise<string> {
-        const sign = getRequestResultInfo(ModifyUserInfoSign, accountStatus)  // 接口请求后的返回提示 这里统一进行管理
-        return UpdateUserAccountStatus(userID, accountStatus)
-            .then((res) => {
-                console.log('更新用户资料成功 accountStatus = ' + accountStatus);
-                return Promise.resolve(sign[0])
-            })
-            .catch((err) => {
-                return Promise.reject(sign[1])
-            }).finally(() => {
-                loading.value = false
-            })
-    }
-
-    return {loading, ModifyUserInfo}
-}
-
-/**
- * 审核客户资料 这里是走proto接口
- */
-export function checkCustomInfo() {
-    const loading = ref<boolean>(false);
-
-    // 这里调用的是修改客户申请接口
-    function checkCustomerInfo(req: UserInfoCheckMangeReq): Promise<string> {
-        return userInfoCheck(req)
-            .then((res) => {
-                return Promise.resolve("审核成功")
-            })
-            .catch((err) => {
-                return Promise.resolve("审核失败:" + err)
-            }).finally(() => {
-                loading.value = false
-            })
-    }
-
-    return {loading, checkCustomerInfo}
-}
-
-/**
- * 删除客户资料
- */
-export function deleteUserInfo() {
-    const loading = ref<boolean>(false);
-
-    // 这里调用的是修改客户申请接口
-    function deleteCustomerInfo(userID: number): Promise<string> {
-        return QueryDeleteUserInfoApply(userID)
-            .then((res) => {
-                return Promise.resolve("删除成功")
-            })
-            .catch((err) => {
-                return Promise.reject("删除失败:" + err)
-            }).finally(() => {
-                loading.value = false
-            })
-    }
-
-    return {loading, deleteCustomerInfo}
-}
-
-/**
- * 新增用户申请
- * @param type: 2新 增, type: 1保存草稿
- */
-export function addUserInfo(type: number, userInfoApply: AddUserInfoApplyReq, loading: Ref<boolean>): Promise<string>{
-    loading.value = true;
-    const sign = getRequestResultInfo(addCustomInfoSign, type)  // 接口请求后的返回提示 这里统一进行管理
-    const result = QueryAddUserInfoApply(userInfoApply)
-    return commonResultInfo(result, sign, loading)
-}
+import {ChangeCustomInfoSign} from "@/views/information/custom/setup";
 
 /**
  * 修改用户申请

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

@@ -51,7 +51,7 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 
 import { filterCustomTable, CustomDetail, ModifyCustom, DisableCustom, AddCustom, Cancel, Check } from '../../compoments';
 import { queryTableList, QueryCustomInfoType } from '../index';
-import { getStatusName } from '@/views/information/custom/setup';
+import { getStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 
 export default defineComponent({

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

@@ -46,7 +46,7 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 
 import { filterCustomTable, CustomDetail, ModifyCustom, DisableCustom, AddCustom } from '../../compoments';
 import { queryTableList, QueryCustomInfoType } from '../index';
-import { getStatusName } from '@/views/information/custom/setup';
+import { getStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 
 export default defineComponent({

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

@@ -48,7 +48,7 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 import { filterCustomTable, CustomDetail, DeleteCustom, RecoverCustom, AddCustom } from '../../compoments';
 
 import { queryTableList, QueryCustomInfoType } from '../index';
-import { getStatusName } from '@/views/information/custom/setup';
+import { getStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 
 export default defineComponent({

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

@@ -48,7 +48,7 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 
 import { filterCustomTable, CustomDetail, ModifyCustom, DisableCustom, AddCustom, DeleteCustom } from '../../compoments';
 import { queryTableList, QueryCustomInfoType } from '../index';
-import { getStatusName } from '@/views/information/custom/setup';
+import { getStatusName } from '@/common/constants/enumsName';
 import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 
 export default defineComponent({

src/views/information/custom/setup.ts

@@ -1,47 +1,10 @@
 import { ResultInfo } from "@/common/methods/request/interface";
 
-/**
- * 获取客户资料状态
- * @param state
- */
-export function getStatusName(state: number): string {
-    let result = "--";
-    switch (state) {
-        case 1:
-            result = "待激活";
-            break
-        case 2:
-            result = "待审核";
-            break
-        case 3:
-            result = "待复审";
-            break
-        case 4:
-            result = "正常";
-            break
-        case 5:
-            result = "审核拒绝";
-            break
-        case 6:
-            result = "注销";
-            break
-    }
-    return result
-}
+
 
 /************** 接口相关提示 **************** /
  *
  */
-// 更新用户状态 4:正常 6:注销（停用）
-export const ModifyUserInfoSign = new Map<number, ResultInfo>([
-    [4, ['恢复成功', '恢复失败:']],
-    [6, ['停用成功', '停用失败:']],
-])
-
-export const addCustomInfoSign = new Map<number, ResultInfo>([
-    [2, ['新增客户资料成功', '新增客户资料失败:']],
-    [1, ['保存草稿成功', '保存草稿失败:']],
-])
 
 export const ChangeCustomInfoSign = new Map<number, ResultInfo>([
     [1, ['修改客户资料草稿成功', '修改客户资料草稿失败:']],

src/views/information/goods/components/disable/index.vue

@@ -146,10 +146,8 @@
 <script lang="ts">
 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';
+import { getStatusName } from '@/common/constants/enumsName';
 import { Modal } from 'ant-design-vue';
 import { stopDeliveryGoods } from '@/views/information/goods/components/setup';
 import { ErmcpDeliveryGoodsDetailEx } from '@/services/go/ermcp/goodsInfo/interface';

src/views/information/goods/components/recover/index.vue

@@ -117,7 +117,7 @@ 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 { getStatusName } from '@/common/constants/enumsName';
 import {updateUserAccount} from "@/views/information/custom/compoments/setup";
 import {Modal} from "ant-design-vue";
 

src/views/information/spot-contract/components/detail/index.vue

@@ -205,7 +205,7 @@ import { defineComponent, PropType, reactive, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
-import { getStatusName } from '@/views/information/custom/setup';
+import { getStatusName } from '@/common/constants/enumsName';
 import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
 import { formatValue, formatTime } from '@/common/methods/format';
 import { v4 as uuidv4 } from 'uuid';

src/views/manage/business-review/components/settlementAudit/index.vue

@@ -101,7 +101,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 { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { QryBussinessJsRsp } from '@/services/go/ermcp/business-review/interface';
 import { Modal } from 'ant-design-vue';

src/views/manage/business-review/components/settlementCancel/index.vue

@@ -101,7 +101,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 { getStatusName } from '@/common/constants/enumsName';
 import {formatValue, formatTime} from '@/common/methods';
 import {QryBussinessJsRsp} from "@/services/go/ermcp/business-review/interface";
 import {getContractTypeName, getPriceTypeName} from "@/views/information/spot-contract/setup";

src/views/manage/business-review/components/settlementDetail/index.vue

@@ -91,7 +91,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 { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
 import { QryBusinessDjRsp, QryBussinessJsRsp } from '@/services/go/ermcp/business-review/interface';

src/views/manage/business-review/components/somepriceAudit/index.vue

@@ -108,7 +108,7 @@
 import { defineComponent, PropType, ref, toRaw } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
-import { getStatusName } from '@/views/information/custom/setup';
+import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { getPriceTypeName } from '@/views/business/purchase/setup';
 import { Modal } from 'ant-design-vue';

src/views/manage/business-review/components/somepriceCancel/index.vue

@@ -105,7 +105,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 { getStatusName } from '@/common/constants/enumsName';
 import {formatValue, formatTime} from '@/common/methods';
 import {getPriceTypeName} from "@/views/information/spot-contract/setup";
 import {QryBusinessDjRsp} from "@/services/go/ermcp/business-review/interface";

src/views/manage/business-review/components/somepriceDetail/index.vue

@@ -98,7 +98,7 @@
 <script lang="ts">
 import {defineComponent, PropType, reactive, ref, watchEffect} from 'vue';
 import {closeModal} from '@/common/setup/modal/index';
-import {getStatusName} from '@/views/information/custom/setup';
+import { getStatusName } from '@/common/constants/enumsName';
 import {formatValue, formatTime} from '@/common/methods';
 import {QryBusinessDjRsp} from "@/services/go/ermcp/business-review/interface";
 import {getPriceTypeName} from "@/views/business/purchase/setup";

src/views/manage/finance-review/components/fundsAudit/index.vue

@@ -33,7 +33,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 { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { QryBussinessKxRsp } from '@/services/go/ermcp/finance-review/interface';
 import { Modal } from 'ant-design-vue';

src/views/manage/finance-review/components/fundsCancel/index.vue

@@ -29,7 +29,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 { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import {Modal} from "ant-design-vue";
 import {ContractOperateApplyReq} from "@/services/proto/contract/interface";

src/views/manage/finance-review/components/fundsDetail/index.vue

@@ -76,7 +76,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 { getStatusName } from '@/views/information/custom/setup';
+import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { QryBussinessKxRsp } from '@/services/go/ermcp/finance-review/interface';
 import { kxtypeName } from '@/views/manage/finance-review/setup';

src/views/manage/finance-review/components/invoiceAudit/index.vue

@@ -95,7 +95,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 { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { QryBussinessFpRsp } from '@/services/go/ermcp/finance-review/interface';
 import { invoiceStatusName } from '@/views/manage/finance-review/setup';

src/views/manage/finance-review/components/invoiceCancel/index.vue

@@ -91,7 +91,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 { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { QryBussinessFpRsp } from '@/services/go/ermcp/finance-review/interface';
 import { invoiceStatusName } from '@/views/manage/finance-review/setup';

src/views/manage/finance-review/components/invoiceDetail/index.vue

@@ -89,7 +89,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 { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { QryBussinessFpRsp } from '@/services/go/ermcp/finance-review/interface';
 import { invoiceStatusName } from '@/views/manage/finance-review/setup';

src/views/manage/inventory-review/components/checkinAudit/index.vue

@@ -151,7 +151,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 { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/interface';
 import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';

src/views/manage/inventory-review/components/checkinCancel/index.vue

@@ -147,7 +147,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 { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/interface';
 import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';

src/views/manage/inventory-review/components/checkinDetail/index.vue

@@ -142,7 +142,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 { getStatusName } from '@/views/information/custom/setup';
+import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/interface';
 import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';

src/views/manage/inventory-review/components/checkoutAudit/index.vue

@@ -145,7 +145,7 @@
 <script lang="ts">
 import { defineComponent, PropType, reactive, ref, watchEffect } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
-import { getStatusName } from '@/views/information/custom/setup';
+import { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';
 import { getContractTypeName } from '@/views/information/spot-contract/setup';

src/views/manage/inventory-review/components/checkoutCancel/index.vue

@@ -147,7 +147,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 { getStatusName } from '@/common/constants/enumsName';
 import { formatValue, formatTime } from '@/common/methods';
 import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/interface';
 import { Modal } from 'ant-design-vue';

src/views/manage/inventory-review/components/checkoutDetail/index.vue

@@ -134,14 +134,11 @@
 <script lang="ts">
 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 { formatValue, formatTime } from '@/common/methods';
+import { formatValue } from '@/common/methods';
 import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/interface';
 import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';
 import { getApplyStatusName } from '@/views/manage/business-review/setup';
-import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
+import {getGoodsUnitEnumItemName, getStatusName} from '@/common/constants/enumsName';
 import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
 
 export default defineComponent({