修改枚举

src/common/constants/EnumKey.ts

@@ -0,0 +1,10 @@
+/**
+ * 获取枚举的key
+ */
+export interface EnumKey {
+    certificatetype: string; // 证件类型
+    loginstatus: string; // 登录状态
+    goodsunit: string; // 单位
+    warehouseinfoType: string; // 仓库类型
+    paycurrency: string; // 币种
+}

src/common/constants/enumsList.ts

@@ -0,0 +1,39 @@
+import { getItemEnumList } from "@/services/bus/allEnum";
+import { AllEnums } from "@/services/go/commonService/interface";
+
+/**
+ * 获取证件类型枚举列表
+ * @returns AllEnums[]
+ */
+export function getCardTypeEnumList(): AllEnums[] {
+    return getItemEnumList('certificatetype')
+}
+
+/**
+ *获取仓登录状态枚举列表
+ */
+export function getLoginStatusEnumList(): AllEnums[] {
+    return getItemEnumList('loginstatus')
+}
+
+/**
+ * 获取单位枚举列表
+ * @returns 
+ */
+export function getGoodsUnitEnumList(): AllEnums[] {
+    return getItemEnumList('goodsunit')
+}
+
+/**
+ *获取仓库类型枚举列表
+ */
+export function getWarehouseTypeEnumList(): AllEnums[] {
+    return getItemEnumList('warehouseinfoType')
+}
+
+/**
+ *获取币种类型枚举列表
+ */
+export function getPayCurrencyTypeEnumList(): AllEnums[] {
+    return getItemEnumList('paycurrency')
+}

src/common/constants/enumsName.ts

@@ -1,9 +1,48 @@
+import { getItemEnumName } from '@/services/bus/allEnum';
 import { CardType } from './index';
 
+
+/**
+ * 获取证件类型枚举名称
+ * @param enumdicid 
+ * @returns 
+ */
+export function getCardTypeEnumItemName(enumdicid: number): string {
+    return getItemEnumName('certificatetype', enumdicid)
+}
+
+/**
+ *获取仓登录状态枚举名称
+ */
+export function getLoginStatusEnumItemName(enumdicid: number): string {
+    return getItemEnumName('loginstatus', enumdicid)
+}
+
+/**
+ *获取单位枚举名称
+ */
+export function getGoodsUnitEnumItemName(enumdicid: number): string {
+    return getItemEnumName('goodsunit', enumdicid)
+}
+
+/**
+ *获取仓库类型枚举名称
+ */
+export function getWarehouseTypeEnumItemName(enumdicid: number): string {
+    return getItemEnumName('warehouseinfoType', enumdicid)
+}
+/**
+ *获取币种类型枚举名称
+ */
+export function getPayCurrencyTypeEnumItemName(enumdicid: number): string {
+    return getItemEnumName('paycurrency', enumdicid)
+}
+
+
 /**
  * 获取证件类型名称
  */
-export function getCardType(cardType) {
+export function getCardType(cardType: number) {
     switch (cardType) {
         case CardType.IDCARD:
             return '身份证';
@@ -53,3 +92,5 @@ export function getCardType(cardType) {
             return '非个人其他类证件';
     }
 }
+
+

src/services/bus/allEnum.ts

@@ -1,6 +1,9 @@
+import { EnumKey } from '@/common/constants/EnumKey';
 import { AllEnums } from '@/services/go/commonService/interface';
 import { localStorageUtil } from '@/utils/storage';
 
+
+
 /**
  * 是否有所有枚举数据
  * @returns 
@@ -25,10 +28,22 @@ export function setAllEnum(value: AllEnums[]) {
     localStorageUtil.setItem('allEnums', value);
 }
 
+
 /**
- * 获取具体某个枚举
+ * 获取具体某个枚举列表
  * @param enumdiccode: string; //所属枚举代码
  */
-export function getItemEnum(enumdiccode: string) {
-    return getAllEnum().filter(e => e.enumdiccode === enumdiccode)
+export function getItemEnumList(enumdiccode: keyof EnumKey): AllEnums[] {
+    return getAllEnum().filter(e => (e.enumdiccode === enumdiccode) && e.enumitemstatus === 1)
+}
+
+/**
+ * 获取某个枚举列表中具体某个id对应的枚举名字
+ * @param enumdiccode  所属枚举代码
+ * @param enumdicid 所属枚举ID
+ * @returns 
+ */
+export function getItemEnumName(enumdiccode: keyof EnumKey, enumdicid: number): string {
+    const temp = getItemEnumList(enumdiccode).find(e => e.enumdicid === enumdicid)
+    return temp ? temp.enumdicname : '--'
 }

src/views/business/plan/components/setup.ts

@@ -11,6 +11,7 @@ import { Ref } from "vue";
  * @param type
  */
 export function changeStatus(req: ErmcpHedgePlanReq, type: number, loading: Ref<boolean>): Promise<string> {
+    loading.value = true;
     const sign = getRequestResultInfo(hedgePlanSign, type)  // 接口请求后的返回提示 这里统一进行管理
     const result = hedgePlanReq(req)
     return commonResultInfo(result, sign, loading)
@@ -22,8 +23,23 @@ export function changeStatus(req: ErmcpHedgePlanReq, type: number, loading: Ref<
  * @param loading
  */
 export function cancelPlan(req: HedgePlanOperateReq, loading: Ref<boolean>): Promise<string> {
+    loading.value = true;
     const sign = getRequestResultInfo(deletePlanSign, 5)  // 接口请求后的返回提示 这里统一进行管理
     const result = oldHedgePlanReq(req)
     return commonResultInfo(result, sign, loading)
 }
 
+/**
+ * 表单
+ */
+export function handleForm() {
+
+}
+
+/**
+ * 
+ * @param contracttype 获取
+ */
+export function getContractType(contracttype: number) {
+
+}

src/views/business/plan/list/audit/index.vue

@@ -1,59 +1,48 @@
 <template>
-    <!-- 计划: 审核中-->
-    <div class="plan_uncommitted"
-         :loading="loading">
-        <Filter @search="search">
-            <BtnList :btnList="commonBtn"/>
-        </Filter>
-        <contextMenu :contextMenuList="forDataBtn">
-            <a-table :columns="columns"
-                     class="topTable hiddenFirstCol"
-                     :pagination="false"
-                     :expandedRowKeys="expandedRowKeys"
-                     :customRow="Rowclick"
-                     rowKey="key"
-                     :data-source="tableList">
-                <!-- 额外的展开行 -->
-                <template #expandedRowRender="{  }">
-                    <BtnList :btnList="forDataBtn"/>
-                </template>
+  <!-- 计划: 审核中-->
+  <div class="plan_uncommitted"
+       :loading="loading">
+    <Filter @search="search">
+      <BtnList :btnList="commonBtn" />
+    </Filter>
+    <contextMenu :contextMenuList="forDataBtn">
+      <a-table :columns="columns"
+               class="topTable hiddenFirstCol"
+               :pagination="false"
+               :expandedRowKeys="expandedRowKeys"
+               :customRow="Rowclick"
+               rowKey="key"
+               :data-source="tableList">
+        <!-- 额外的展开行 -->
+        <template #expandedRowRender="{  }">
+          <BtnList :btnList="forDataBtn" />
+        </template>
 
-                <template #contracttype="{ text }">
-                    <a>{{ getPlanContractType(text) }}</a>
-                </template>
-                <template #hedgeplanstatus="{ text }">
-                    <a>{{ getPlanStatusName(text) }}</a>
-                </template>
-                <!-- <template #warehousetype="{ text }">
-                  <span>{{ getWareHouseType(text) }}</span>
-                </template>
-                <template #warehousestatus="{ text }">
-                  <span>{{ getWareHouseStatus(text) }}</span>
-                </template> -->
-            </a-table>
-        </contextMenu>
-        <!-- 详情 -->
-        <Detail :selectedRow="selectedRow" @refresh="queryTable"/>
-        <!-- 撤销 -->
-        <Cancel :selectedRow="selectedRow" @refresh="queryTable"/>
-        <!-- 审核 -->
-        <Audit :selectedRow="selectedRow" @refresh="queryTable"/>
-    </div>
+        <template #contracttype="{ text }">
+          <a>{{ getPlanContractType(text) }}</a>
+        </template>
+        <template #hedgeplanstatus="{ text }">
+          <a>{{ getPlanStatusName(text) }}</a>
+        </template>
+      </a-table>
+    </contextMenu>
+    <!-- 详情 -->
+    <Detail :selectedRow="selectedRow"
+            @refresh="queryTable" />
+    <!-- 撤销 -->
+    <Cancel :selectedRow="selectedRow"
+            @refresh="queryTable" />
+    <!-- 审核 -->
+    <Audit :selectedRow="selectedRow"
+           @refresh="queryTable" />
+  </div>
 </template>
 
 <script lang="ts">
-import {
-    defineComponent,
-    initData,
-    getTableColumns,
-    getTableEvent,
-    getBtnList,
-    contextMenu,
-    BtnList
-} from '@/common/export/table';
-import {getFilterTableCB, queryTableList, Ermcp3HedgePlan} from '../index';
-import {Add, Detail, Filter, Recommit, Cancel, Audit} from '../../components';
-import {getPlanContractType, getPlanStatusName} from "@/views/business/plan/setup";
+import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+import { getFilterTableCB, queryTableList, Ermcp3HedgePlan } from '../index';
+import { Add, Detail, Filter, Recommit, Cancel, Audit } from '../../components';
+import { getPlanContractType, getPlanStatusName } from '@/views/business/plan/setup';
 
 export default defineComponent({
     name: 'plan_uncommitted',
@@ -69,13 +58,13 @@ export default defineComponent({
     },
     setup() {
         // 表头数据
-        const {columns, registerColumn, updateColumn, filteredInfo} = getTableColumns();
+        const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();
         // 表格事件
-        const {expandedRowKeys, selectedRow, Rowclick} = getTableEvent<Ermcp3HedgePlan>({});
+        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<Ermcp3HedgePlan>({});
         // 表格操作按钮列表
-        const {commonBtn, forDataBtn} = getBtnList('plan_audit', true);
+        const { commonBtn, forDataBtn } = getBtnList('plan_audit', true);
         // 表格列表数据
-        const {loading, tableList, queryTable} = queryTableList('1,4');
+        const { loading, tableList, queryTable } = queryTableList('1,4');
 
         // 查询
         function search(value: any) {

src/views/business/plan/list/running/index.vue

@@ -1,58 +1,47 @@
 <template>
-    <!-- 计划: 执行中-->
-    <div class="plan_running"
-         :loading="loading">
-        <Filter @search="search">
-            <BtnList :btnList="commonBtn"/>
-        </Filter>
-        <contextMenu :contextMenuList="forDataBtn">
-            <a-table :columns="columns"
-                     class="topTable hiddenFirstCol"
-                     :pagination="false"
-                     :expandedRowKeys="expandedRowKeys"
-                     :customRow="Rowclick"
-                     rowKey="key"
-                     :data-source="tableList">
-                <!-- 额外的展开行 -->
-                <template #expandedRowRender="{  }">
-                    <BtnList :btnList="forDataBtn"/>
-                </template>
-                <template #contracttype="{ text }">
-                    <a>{{ getPlanContractType(text) }}</a>
-                </template>
-                <template #hedgeplanstatus="{ text }">
-                    <a>{{ getPlanStatusName(text) }}</a>
-                </template>
-                <!-- <template #warehousetype="{ text }">
-                  <span>{{ getWareHouseType(text) }}</span>
-                </template>
-                <template #warehousestatus="{ text }">
-                  <span>{{ getWareHouseStatus(text) }}</span>
-                </template> -->
-            </a-table>
-        </contextMenu>
-        <!-- 详情 -->
-        <Detail :selectedRow="selectedRow" @refresh="queryTable"/>
-        <!-- 撤销 -->
-        <Cancel :selectedRow="selectedRow" @refresh="queryTable"/>
-        <!-- 审核 -->
-        <Audit :selectedRow="selectedRow" @refresh="queryTable"/>
-    </div>
+  <!-- 计划: 执行中-->
+  <div class="plan_running"
+       :loading="loading">
+    <Filter @search="search">
+      <BtnList :btnList="commonBtn" />
+    </Filter>
+    <contextMenu :contextMenuList="forDataBtn">
+      <a-table :columns="columns"
+               class="topTable hiddenFirstCol"
+               :pagination="false"
+               :expandedRowKeys="expandedRowKeys"
+               :customRow="Rowclick"
+               rowKey="key"
+               :data-source="tableList">
+        <!-- 额外的展开行 -->
+        <template #expandedRowRender="{  }">
+          <BtnList :btnList="forDataBtn" />
+        </template>
+        <template #contracttype="{ text }">
+          <a>{{ getPlanContractType(text) }}</a>
+        </template>
+        <template #hedgeplanstatus="{ text }">
+          <a>{{ getPlanStatusName(text) }}</a>
+        </template>
+      </a-table>
+    </contextMenu>
+    <!-- 详情 -->
+    <Detail :selectedRow="selectedRow"
+            @refresh="queryTable" />
+    <!-- 撤销 -->
+    <Cancel :selectedRow="selectedRow"
+            @refresh="queryTable" />
+    <!-- 审核 -->
+    <Audit :selectedRow="selectedRow"
+           @refresh="queryTable" />
+  </div>
 </template>
 
 <script lang="ts">
-import {
-    defineComponent,
-    initData,
-    getTableColumns,
-    getTableEvent,
-    getBtnList,
-    contextMenu,
-    BtnList
-} from '@/common/export/table';
-import {getFilterTableCB, queryTableList, Ermcp3HedgePlan} from '../index';
-import {Add, Detail, Filter, Recommit} from '../../components';
-import {getPlanContractType, getPlanStatusName} from "@/views/business/plan/setup";
+import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+import { getFilterTableCB, queryTableList, Ermcp3HedgePlan } from '../index';
+import { Add, Detail, Filter, Recommit } from '../../components';
+import { getPlanContractType, getPlanStatusName } from '@/views/business/plan/setup';
 
 export default defineComponent({
     name: 'spot-contract-peddding',
@@ -66,13 +55,13 @@ export default defineComponent({
     },
     setup() {
         // 表头数据
-        const {columns, registerColumn, updateColumn, filteredInfo} = getTableColumns();
+        const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();
         // 表格事件
-        const {expandedRowKeys, selectedRow, Rowclick} = getTableEvent<Ermcp3HedgePlan>({});
+        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<Ermcp3HedgePlan>({});
         // 表格操作按钮列表
-        const {commonBtn, forDataBtn} = getBtnList('plan_running', true);
+        const { commonBtn, forDataBtn } = getBtnList('plan_running', true);
         // 表格列表数据
-        const {loading, tableList, queryTable} = queryTableList('2');
+        const { loading, tableList, queryTable } = queryTableList('2');
 
         // 查询
         function search(value: any) {

src/views/business/plan/list/uncommitted/index.vue

@@ -1,62 +1,53 @@
 <template>
-    <!-- 计划: 未提交-->
-    <div class="plan-uncommitted"
-         :loading="loading">
-        <Filter @search="search">
-            <BtnList :btnList="commonBtn"/>
-        </Filter>
-        <contextMenu :contextMenuList="forDataBtn">
-            <a-table :columns="columns"
-                     class="topTable hiddenFirstCol"
-                     :pagination="false"
-                     :expandedRowKeys="expandedRowKeys"
-                     :customRow="Rowclick"
-                     rowKey="key"
-                     :data-source="tableList">
-                <!-- 额外的展开行 -->
-                <template #expandedRowRender="{  }">
-                    <BtnList :btnList="forDataBtn"/>
-                </template>
-                <template #contracttype="{ text }">
-                    <a>{{ getPlanContractType(text) }}</a>
-                </template>
-                <template #hedgeplanstatus="{ text }">
-                    <a>{{ getPlanStatusName(text) }}</a>
-                </template>
-                <!-- <template #warehousetype="{ text }">
-                  <span>{{ getWareHouseType(text) }}</span>
-                </template>
-                <template #warehousestatus="{ text }">
-                  <span>{{ getWareHouseStatus(text) }}</span>
-                </template> -->
-            </a-table>
-        </contextMenu>
-        <!-- 详情 -->
-        <Detail :selectedRow="selectedRow" @refresh="queryTable"/>
-        <!-- 新增 -->
-        <Add :selectedRow="selectedRow" @refresh="queryTable"/>
-        <!-- 修改 -->
-        <Modfiy :selectedRow="selectedRow" @refresh="queryTable"/>
-        <!-- 重新提交 -->
-        <Recommit :selectedRow="selectedRow" @refresh="queryTable"/>
-        <!-- 删除-->
-        <Delete :selectedRow="selectedRow" @refresh="queryTable"/>
-    </div>
+  <!-- 计划: 未提交-->
+  <div class="plan-uncommitted"
+       :loading="loading">
+    <Filter @search="search">
+      <BtnList :btnList="commonBtn" />
+    </Filter>
+    <contextMenu :contextMenuList="forDataBtn">
+      <a-table :columns="columns"
+               class="topTable hiddenFirstCol"
+               :pagination="false"
+               :expandedRowKeys="expandedRowKeys"
+               :customRow="Rowclick"
+               rowKey="key"
+               :data-source="tableList">
+        <!-- 额外的展开行 -->
+        <template #expandedRowRender="{  }">
+          <BtnList :btnList="forDataBtn" />
+        </template>
+        <template #contracttype="{ text }">
+          <a>{{ getPlanContractType(text) }}</a>
+        </template>
+        <template #hedgeplanstatus="{ text }">
+          <a>{{ getPlanStatusName(text) }}</a>
+        </template>
+      </a-table>
+    </contextMenu>
+    <!-- 详情 -->
+    <Detail :selectedRow="selectedRow"
+            @refresh="queryTable" />
+    <!-- 新增 -->
+    <Add :selectedRow="selectedRow"
+         @refresh="queryTable" />
+    <!-- 修改 -->
+    <Modfiy :selectedRow="selectedRow"
+            @refresh="queryTable" />
+    <!-- 重新提交 -->
+    <Recommit :selectedRow="selectedRow"
+              @refresh="queryTable" />
+    <!-- 删除-->
+    <Delete :selectedRow="selectedRow"
+            @refresh="queryTable" />
+  </div>
 </template>
 
 <script lang="ts">
-import {
-    defineComponent,
-    initData,
-    getTableColumns,
-    getTableEvent,
-    getBtnList,
-    contextMenu,
-    BtnList
-} from '@/common/export/table';
-import {getFilterTableCB, queryTableList, Ermcp3HedgePlan} from '../index';
-import {Add, Delete, Detail, Filter, Modfiy, Recommit} from '../../components';
-import {getPlanContractType, getPlanStatusName} from "@/views/business/plan/setup";
+import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+import { getFilterTableCB, queryTableList, Ermcp3HedgePlan } from '../index';
+import { Add, Delete, Detail, Filter, Modfiy, Recommit } from '../../components';
+import { getPlanContractType, getPlanStatusName } from '@/views/business/plan/setup';
 
 export default defineComponent({
     name: 'plan-uncommitted',
@@ -72,13 +63,13 @@ export default defineComponent({
     },
     setup() {
         // 表头数据
-        const {columns, registerColumn, updateColumn, filteredInfo} = getTableColumns();
+        const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();
         // 表格事件
-        const {expandedRowKeys, selectedRow, Rowclick} = getTableEvent<Ermcp3HedgePlan>({});
+        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<Ermcp3HedgePlan>({});
         // 表格操作按钮列表
-        const {commonBtn, forDataBtn} = getBtnList('plan_uncommitted', true);
+        const { commonBtn, forDataBtn } = getBtnList('plan_uncommitted', true);
         // 表格列表数据
-        const {loading, tableList, queryTable} = queryTableList('0,6');
+        const { loading, tableList, queryTable } = queryTableList('0,6');
 
         // 查询
         function search(value: any) {

src/views/business/purchase/list/all/index.vue

@@ -17,12 +17,6 @@
         <template #expandedRowRender="{  }">
           <BtnList :btnList="forDataBtn" />
         </template>
-        <!-- <template #warehousetype="{ text }">
-          <span>{{ getWareHouseType(text) }}</span>
-        </template>
-        <template #warehousestatus="{ text }">
-          <span>{{ getWareHouseStatus(text) }}</span>
-        </template> -->
       </a-table>
     </contextMenu>
     <!-- 详情 -->

src/views/business/purchase/list/pending/index.vue

@@ -17,12 +17,6 @@
         <template #expandedRowRender="{  }">
           <BtnList :btnList="forDataBtn" />
         </template>
-        <!-- <template #warehousetype="{ text }">
-          <span>{{ getWareHouseType(text) }}</span>
-        </template>
-        <template #warehousestatus="{ text }">
-          <span>{{ getWareHouseStatus(text) }}</span>
-        </template> -->
       </a-table>
     </contextMenu>
     <!-- 详情 -->

src/views/business/purchase/list/performance/index.vue

@@ -17,12 +17,6 @@
         <template #expandedRowRender="{  }">
           <BtnList :btnList="forDataBtn" />
         </template>
-        <!-- <template #warehousetype="{ text }">
-          <span>{{ getWareHouseType(text) }}</span>
-        </template>
-        <template #warehousestatus="{ text }">
-          <span>{{ getWareHouseStatus(text) }}</span>
-        </template> -->
       </a-table>
     </contextMenu>
     <!-- 详情 -->

src/views/business/sell/list/all/index.vue

@@ -16,12 +16,6 @@
         <template #expandedRowRender="{  }">
           <BtnList :btnList="forDataBtn" />
         </template>
-        <!-- <template #warehousetype="{ text }">
-          <span>{{ getWareHouseType(text) }}</span>
-        </template>
-        <template #warehousestatus="{ text }">
-          <span>{{ getWareHouseStatus(text) }}</span>
-        </template> -->
       </a-table>
     </contextMenu>
     <!-- 详情 -->

src/views/business/sell/list/pending/index.vue

@@ -17,12 +17,6 @@
         <template #expandedRowRender="{  }">
           <BtnList :btnList="forDataBtn" />
         </template>
-        <!-- <template #warehousetype="{ text }">
-          <span>{{ getWareHouseType(text) }}</span>
-        </template>
-        <template #warehousestatus="{ text }">
-          <span>{{ getWareHouseStatus(text) }}</span>
-        </template> -->
       </a-table>
     </contextMenu>
     <!-- 详情 -->

src/views/business/sell/list/performance/index.vue

@@ -17,12 +17,6 @@
         <template #expandedRowRender="{  }">
           <BtnList :btnList="forDataBtn" />
         </template>
-        <!-- <template #warehousetype="{ text }">
-          <span>{{ getWareHouseType(text) }}</span>
-        </template>
-        <template #warehousestatus="{ text }">
-          <span>{{ getWareHouseStatus(text) }}</span>
-        </template> -->
       </a-table>
     </contextMenu>
     <!-- 详情 -->

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

@@ -1,5 +1,5 @@
 
-import { getItemEnum } from '@/services/bus/allEnum';
+import { getCardTypeEnumList } from '@/common/constants/enumsList';
 import { QueryAddUserInfoApply } from '@/services/go/ermcp/customInfo';
 import { AddUserInfoApplyReq } from '@/services/go/ermcp/customInfo/interface';
 import { message } from 'ant-design-vue';
@@ -12,7 +12,7 @@ import { FormState } from './interface';
  */
 export function getCardType() {
     const arr = [2, 4, 18, 21];
-    return getItemEnum('certificatetype').filter(e => arr.includes(e.enumitemname))
+    return getCardTypeEnumList().filter(e => arr.includes(e.enumitemname))
 }
 
 /**

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

@@ -35,7 +35,7 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="证件类型">
-            <span class="white">{{ getCardTypeName(selectedRow.cardtype) }}</span>
+            <span class="white">{{ getCardTypeEnumItemName(selectedRow.cardtype) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
@@ -47,7 +47,7 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="证件号码">
-            <span class="white">{{ getCardTypeName(selectedRow.cardnum) }}</span>
+            <span class="white">{{ getCardTypeEnumItemName(selectedRow.cardnum) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
@@ -113,8 +113,9 @@ 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 { getCardTypeName, getStatusName } from '@/views/information/custom/setup';
+import { getStatusName } from '@/views/information/custom/setup';
 import { cancelCustomInfo } from '@/views/information/custom/compoments/setup';
+import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'custom_info_btn_cancel',
@@ -171,7 +172,7 @@ export default defineComponent({
             loading,
             formatValue,
             getStatusName,
-            getCardTypeName,
+            getCardTypeEnumItemName,
         };
     },
 });

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

@@ -1,131 +1,132 @@
 <template>
-    <!-- 审核客户资料-->
-    <a-modal class="custom_info_btn_check"
-             title="审核客户资料"
-             v-model:visible="visible"
-             @cancel="cancel"
-             width="890px">
-        <template #footer>
-            <a-button key="submit"
-                      type="primary"
-                      @click="cancel">取消
-            </a-button>
-            <a-button key="submit"
-                      type="primary"
-                      :loading="loading"
-                      @click="submit">审核通过
-            </a-button>
-            <a-button key="submit"
-                      type="primary"
-                      :loading="loading"
-                      @click="refuseSubmit">审核拒绝
-            </a-button>
-        </template>
-        <a-form class="inlineForm"
-                :form="form"
-                @submit="handleSearch">
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="客户类型">
-                        <span class="white">{{ selectedRow.userinfotype === '2' ? '企业' : '个人' }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="企业名称">
-                        <span class="white">{{ formatValue(selectedRow.customername) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="企业简称">
-                        <span class="white">{{ formatValue(selectedRow.nickname) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="证件类型">
-                        <span class="white">{{ getCardTypeName(selectedRow.cardtype) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="法定代表人">
-                        <span class="white">{{ formatValue(selectedRow.legalpersonname) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="证件号码">
-                        <span class="white">{{ formatValue(selectedRow.cardnum) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="纳税人识别号">
-                        <span class="white">{{ formatValue(selectedRow.taxpayernum) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="营业执照">
-                        <div class="upload">
-                            <div class="look">查看附件</div>
-                        </div>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="联系人">
-                        <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="联系人手机号">
-                        <span class="white">{{ formatValue(selectedRow.mobile) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="联系电话">
-                        <span class="white">{{ formatValue(selectedRow.telphone) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="状态">
-                        <span class="green">{{ formatValue(getStatusName(selectedRow.status)) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="24">
-                    <a-form-item label="通讯地址">
-                        <span class="white">{{ formatValue(selectedRow.address) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="24">
-                    <a-form-item label="备注">
-                        <span class="white">{{ formatValue(selectedRow.remark) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-        </a-form>
-    </a-modal>
+  <!-- 审核客户资料-->
+  <a-modal class="custom_info_btn_check"
+           title="审核客户资料"
+           v-model:visible="visible"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                @click="cancel">取消
+      </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">审核通过
+      </a-button>
+      <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 {getCardTypeName, 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 { 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';
 
 export default defineComponent({
     name: 'custom_info_btn_check',
@@ -137,8 +138,8 @@ export default defineComponent({
         },
     },
     setup(props, context) {
-        const {loading, checkCustomerInfo} = checkCustomInfo();
-        const {visible, cancel} = closeModal('custom_info_btn_check');
+        const { loading, checkCustomerInfo } = checkCustomInfo();
+        const { visible, cancel } = closeModal('custom_info_btn_check');
         const req: UserInfoCheckMangeReq = {
             audituserid: getUserId(),
             userid: props.selectedRow.userid,
@@ -157,14 +158,14 @@ export default defineComponent({
                     req.auditflag = 1;
                     req.userid = props.selectedRow.userid;
                     checkCustomerInfo(req)
-                        .then(res => {
-                            message.success(res)
+                        .then((res) => {
+                            message.success(res);
                             context.emit('refresh');
                             cancel();
                         })
-                        .catch(err => {
-                            message.error(err)
-                        })
+                        .catch((err) => {
+                            message.error(err);
+                        });
                 },
                 onCancel() {
                     console.log('Cancel');
@@ -183,14 +184,14 @@ export default defineComponent({
                     req.auditflag = 2;
                     req.userid = props.selectedRow.userid;
                     checkCustomerInfo(req)
-                        .then(res => {
-                            message.success(res)
+                        .then((res) => {
+                            message.success(res);
                             context.emit('refresh');
                             cancel();
                         })
-                        .catch(err => {
-                            message.error(err)
-                        })
+                        .catch((err) => {
+                            message.error(err);
+                        });
                 },
                 onCancel() {
                     console.log('Cancel');
@@ -206,7 +207,7 @@ export default defineComponent({
             refuseSubmit,
             formatValue,
             getStatusName,
-            getCardTypeName,
+            getCardTypeEnumItemName,
         };
     },
 });

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

@@ -36,7 +36,7 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="证件类型">
-            <span class="white">{{ getCardTypeName(selectedRow.cardtype) }}</span>
+            <span class="white">{{ getCardTypeEnumItemName(selectedRow.cardtype) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
@@ -113,8 +113,9 @@ 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 { getCardTypeName, getStatusName } from '@/views/information/custom/setup';
+import { getStatusName } from '@/views/information/custom/setup';
 import { formatValue, formatTime } from '@/common/methods';
+import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'custom-detail',
@@ -127,7 +128,6 @@ export default defineComponent({
     },
     setup(props) {
         console.log('props', props.selectedRow);
-
         const { visible, cancel } = closeModal('detail');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
@@ -142,7 +142,7 @@ export default defineComponent({
             formatValue,
             getStatusName,
             maskClosableFlag,
-            getCardTypeName,
+            getCardTypeEnumItemName,
         };
     },
 });

src/views/information/account_info/list/account_info_business/index.vue

@@ -39,7 +39,7 @@
                v-for="(item, i) in businesserList"
                :key="i + '11'">
           <a-col :span="12">{{item.accountname}}-{{item.logincode}}</a-col>
-          <a-col :span="12">{{getLoginStatus(item.loginstatus)}}</a-col>
+          <a-col :span="12">{{getLoginStatusEnumItemName(item.loginstatus)}}</a-col>
         </a-row>
       </a-collapse-panel>
     </a-collapse>
@@ -74,7 +74,7 @@
             <template #header>
               <a-row class="contRow">
                 <a-col :span="12">{{item.accountname}}-{{item.logincode}}</a-col>
-                <a-col :span="12">{{getLoginStatus(item.loginstatus)}}</a-col>
+                <a-col :span="12">{{getLoginStatusEnumItemName(item.loginstatus)}}</a-col>
               </a-row>
             </template>
             <BtnList :btnList="forDataBtn" />
@@ -89,7 +89,8 @@
 import { defineComponent, initData, getBtnList, contextMenu, BtnList } from '@/common/export/table';
 import filterCustomTable from '@/views/information/goods/components/filterTable/index.vue';
 import { ref } from 'vue';
-import { handleAccountManager, getLoginStatus } from '../setup';
+import { handleAccountManager } from '../setup';
+import { getLoginStatusEnumItemName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'account_info_business',
@@ -117,7 +118,7 @@ export default defineComponent({
             search,
             businesserList,
             merchandiserList,
-            getLoginStatus,
+            getLoginStatusEnumItemName,
         };
     },
 });
@@ -129,10 +130,10 @@ export default defineComponent({
         padding-left: 12px;
     }
     .btn-list {
-      .btnPrimary.ant-btn {
-        height: 26px;
-        line-height: 26px;
-      }
+        .btnPrimary.ant-btn {
+            height: 26px;
+            line-height: 26px;
+        }
     }
     .ant-collapse.spotCollapse.ant-collapse-borderless {
         padding-left: 43px;

src/views/information/account_info/list/account_info_futures/index.vue

@@ -11,7 +11,7 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 
 // import {filterCustomTable, CustomDetail, ModifyCustom, DisableCustom, AddCustom} from '../../compoments';
 // import {queryTableList, getFilterTableCB, QueryCustomInfoType} from '../index';
-import { getCardTypeName, getStatusName } from '@/views/information/custom/setup';
+import { getStatusName } from '@/views/information/custom/setup';
 
 export default defineComponent({
     name: 'account_info_futures',
@@ -54,7 +54,6 @@ export default defineComponent({
             // tableList,
             // search,
             // getStatusName,
-            // getCardTypeName,
             // queryTable,
         };
     },

src/views/information/account_info/list/account_info_manager/index.vue

@@ -11,7 +11,7 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 
 // import {filterCustomTable, CustomDetail, ModifyCustom, DisableCustom, AddCustom} from '../../compoments';
 // import {queryTableList, getFilterTableCB, QueryCustomInfoType} from '../index';
-import { getCardTypeName, getStatusName } from '@/views/information/custom/setup';
+import { getStatusName } from '@/views/information/custom/setup';
 
 export default defineComponent({
     name: 'account_info_manager',
@@ -54,7 +54,6 @@ export default defineComponent({
             // tableList,
             // search,
             // getStatusName,
-            // getCardTypeName,
             // queryTable,
         };
     },

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

@@ -1,5 +1,4 @@
 import { Column, ColumnType } from '@/common/setup/table/index';
-import { getItemEnum } from '@/services/bus/allEnum';
 import { QueryAccMgrLoginUser } from '@/services/go/ermcp/account';
 import { ErmcpLoginUser, ErmcpLoginUserEx } from '@/services/go/ermcp/account/interface';
 import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
@@ -99,13 +98,6 @@ export function getFilterTableCB(e: Column, item: ColumnType, filtered: any) {
     }
 }
 
-/**
- *获取仓登录状态
- */
-export function getLoginStatus(type: number): string {
-    const temp = getItemEnum('loginstatus').find(e => e.enumitemname === type)
-    return temp ? temp.enumdicname : '--'
-}
 
 /**
  * 获取账户状态

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

@@ -1,5 +1,5 @@
 
-import { getItemEnum } from '@/services/bus/allEnum';
+import { getCardTypeEnumList } from '@/common/constants/enumsList';
 import { QueryAddUserInfoApply } from '@/services/go/ermcp/customInfo';
 import { AddUserInfoApplyReq } from '@/services/go/ermcp/customInfo/interface';
 import { message } from 'ant-design-vue';
@@ -12,7 +12,7 @@ import { FormState } from './interface';
  */
 export function getCardType() {
     const arr = [2, 4, 18, 21];
-    return getItemEnum('certificatetype').filter(e => arr.includes(e.enumitemname))
+    return getCardTypeEnumList().filter(e => arr.includes(e.enumitemname))
 }
 
 export function handleForm() {

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

@@ -35,7 +35,7 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="证件类型">
-            <span class="white">{{ getCardTypeName(selectedRow.cardtype) }}</span>
+            <span class="white">{{ getCardTypeEnumItemName(selectedRow.cardtype) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
@@ -47,7 +47,7 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="证件号码">
-            <span class="white">{{ getCardTypeName(selectedRow.cardnum) }}</span>
+            <span class="white">{{ getCardTypeEnumItemName(selectedRow.cardnum) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
@@ -113,8 +113,9 @@ 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 { getCardTypeName, getStatusName } from '@/views/information/custom/setup';
+import { getStatusName } from '@/views/information/custom/setup';
 import { cancelCustomInfo } from '@/views/information/custom/compoments/setup';
+import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'custom_info_btn_cancel',
@@ -171,7 +172,7 @@ export default defineComponent({
             loading,
             formatValue,
             getStatusName,
-            getCardTypeName,
+            getCardTypeEnumItemName,
         };
     },
 });

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

@@ -1,131 +1,132 @@
 <template>
-    <!-- 审核客户资料-->
-    <a-modal class="custom_info_btn_check"
-             title="审核客户资料"
-             v-model:visible="visible"
-             @cancel="cancel"
-             width="890px">
-        <template #footer>
-            <a-button key="submit"
-                      type="primary"
-                      @click="cancel">取消
-            </a-button>
-            <a-button key="submit"
-                      type="primary"
-                      :loading="loading"
-                      @click="submit">审核通过
-            </a-button>
-            <a-button key="submit"
-                      type="primary"
-                      :loading="loading"
-                      @click="refuseSubmit">审核拒绝
-            </a-button>
-        </template>
-        <a-form class="inlineForm"
-                :form="form"
-                @submit="handleSearch">
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="客户类型">
-                        <span class="white">{{ selectedRow.userinfotype === '2' ? '企业' : '个人' }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="企业名称">
-                        <span class="white">{{ formatValue(selectedRow.customername) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="企业简称">
-                        <span class="white">{{ formatValue(selectedRow.nickname) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="证件类型">
-                        <span class="white">{{ getCardTypeName(selectedRow.cardtype) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="法定代表人">
-                        <span class="white">{{ formatValue(selectedRow.legalpersonname) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="证件号码">
-                        <span class="white">{{ formatValue(selectedRow.cardnum) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="纳税人识别号">
-                        <span class="white">{{ formatValue(selectedRow.taxpayernum) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="营业执照">
-                        <div class="upload">
-                            <div class="look">查看附件</div>
-                        </div>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="联系人">
-                        <span class="white">{{ formatValue(selectedRow.contactname) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="联系人手机号">
-                        <span class="white">{{ formatValue(selectedRow.mobile) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="联系电话">
-                        <span class="white">{{ formatValue(selectedRow.telphone) }}</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="状态">
-                        <span class="green">{{ formatValue(getStatusName(selectedRow.status)) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="24">
-                    <a-form-item label="通讯地址">
-                        <span class="white">{{ formatValue(selectedRow.address) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="24">
-                    <a-form-item label="备注">
-                        <span class="white">{{ formatValue(selectedRow.remark) }}</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-        </a-form>
-    </a-modal>
+  <!-- 审核客户资料-->
+  <a-modal class="custom_info_btn_check"
+           title="审核客户资料"
+           v-model:visible="visible"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                @click="cancel">取消
+      </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">审核通过
+      </a-button>
+      <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 {getCardTypeName, 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 { 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';
 
 export default defineComponent({
     name: 'custom_info_btn_check',
@@ -137,8 +138,8 @@ export default defineComponent({
         },
     },
     setup(props, context) {
-        const {loading, checkCustomerInfo} = checkCustomInfo();
-        const {visible, cancel} = closeModal('custom_info_btn_check');
+        const { loading, checkCustomerInfo } = checkCustomInfo();
+        const { visible, cancel } = closeModal('custom_info_btn_check');
         const req: UserInfoCheckMangeReq = {
             audituserid: getUserId(),
             userid: props.selectedRow.userid,
@@ -157,14 +158,14 @@ export default defineComponent({
                     req.auditflag = 1;
                     req.userid = props.selectedRow.userid;
                     checkCustomerInfo(req)
-                        .then(res => {
-                            message.success(res)
+                        .then((res) => {
+                            message.success(res);
                             context.emit('refresh');
                             cancel();
                         })
-                        .catch(err => {
-                            message.error(err)
-                        })
+                        .catch((err) => {
+                            message.error(err);
+                        });
                 },
                 onCancel() {
                     console.log('Cancel');
@@ -183,14 +184,14 @@ export default defineComponent({
                     req.auditflag = 2;
                     req.userid = props.selectedRow.userid;
                     checkCustomerInfo(req)
-                        .then(res => {
-                            message.success(res)
+                        .then((res) => {
+                            message.success(res);
                             context.emit('refresh');
                             cancel();
                         })
-                        .catch(err => {
-                            message.error(err)
-                        })
+                        .catch((err) => {
+                            message.error(err);
+                        });
                 },
                 onCancel() {
                     console.log('Cancel');
@@ -206,7 +207,7 @@ export default defineComponent({
             refuseSubmit,
             formatValue,
             getStatusName,
-            getCardTypeName,
+            getCardTypeEnumItemName,
         };
     },
 });

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

@@ -36,7 +36,7 @@
         </a-col>
         <a-col :span="12">
           <a-form-item label="证件类型">
-            <span class="white">{{ getCardTypeName(selectedRow.cardtype) }}</span>
+            <span class="white">{{ getCardTypeEnumItemName(selectedRow.cardtype) }}</span>
           </a-form-item>
         </a-col>
       </a-row>
@@ -113,8 +113,9 @@ 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 { getCardTypeName, getStatusName } from '@/views/information/custom/setup';
+import { getStatusName } from '@/views/information/custom/setup';
 import { formatValue, formatTime } from '@/common/methods';
+import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'custom-detail',
@@ -127,7 +128,6 @@ export default defineComponent({
     },
     setup(props) {
         console.log('props', props.selectedRow);
-
         const { visible, cancel } = closeModal('detail');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
@@ -142,7 +142,7 @@ export default defineComponent({
             formatValue,
             getStatusName,
             maskClosableFlag,
-            getCardTypeName,
+            getCardTypeEnumItemName,
         };
     },
 });

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

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

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

@@ -24,7 +24,7 @@
                     <a>{{ getStatusName(text) }}</a>
                 </template>
                 <template #cardtype="{ text }">
-                    <a>{{ getCardTypeName(text) }}</a>
+                    <a>{{ getCardTypeEnumItemName(text) }}</a>
                 </template>
             </a-table>
         </contextMenu>
@@ -52,7 +52,8 @@ import {
 
 import {filterCustomTable, CustomDetail, ModifyCustom, DisableCustom, AddCustom} from '../../compoments';
 import {queryTableList, getFilterTableCB, QueryCustomInfoType} from '../index';
-import {getCardTypeName, getStatusName} from "@/views/information/custom/setup";
+import { getStatusName} from "@/views/information/custom/setup";
+import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'custom-normal',
@@ -100,7 +101,7 @@ export default defineComponent({
             tableList,
             search,
             getStatusName,
-            getCardTypeName,
+            getCardTypeEnumItemName,
             queryTable
         };
     },

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

@@ -24,7 +24,7 @@
           <a>{{ getStatusName(text) }}</a>
         </template>
         <template #cardtype="{ text }">
-          <a>{{ getCardTypeName(text) }}</a>
+          <a>{{ getCardTypeEnumItemName(text) }}</a>
         </template>
       </a-table>
     </contextMenu>
@@ -48,7 +48,8 @@ import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList,
 import { filterCustomTable, CustomDetail, DeleteCustom, RecoverCustom, AddCustom } from '../../compoments';
 
 import { queryTableList, getFilterTableCB, QueryCustomInfoType } from '../index';
-import { getCardTypeName, getStatusName } from '@/views/information/custom/setup';
+import { getStatusName } from '@/views/information/custom/setup';
+import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'custom-normal',
@@ -96,7 +97,7 @@ export default defineComponent({
             tableList,
             search,
             getStatusName,
-            getCardTypeName,
+            getCardTypeEnumItemName,
             queryTable,
         };
     },

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

@@ -1,62 +1,55 @@
 <template>
-    <!-- 客户信息: 正常 -->
-    <div class="custom_info_unsubmit"
-         :loading="loading">
-        <filterCustomTable @search="search">
-            <BtnList :btnList="commonBtn"/>
-        </filterCustomTable>
-        <contextMenu :contextMenuList="forDataBtn">
-            <a-table :columns="columns"
-                     class="topTable hiddenFirstCol"
-                     :pagination="false"
-                     :expandedRowKeys="expandedRowKeys"
-                     :customRow="Rowclick"
-                     rowKey="key"
-                     :data-source="tableList">
-                <!-- 额外的展开行 -->
-                <template #expandedRowRender="{  }">
-                    <BtnList :btnList="forDataBtn"/>
-                </template>
-                <template #userinfotype="{ text }">
-                    <a>{{ text === '2' ? '企业' : '个人' }}</a>
-                </template>
-                <template #status="{ text }">
-                    <a>{{ getStatusName(text) }}</a>
-                </template>
-                <template #cardtype="{ text }">
-                    <a>{{ getCardTypeName(text) }}</a>
-                </template>
-            </a-table>
-        </contextMenu>
-        <!-- 新增 -->
-        <AddCustom/>
-        <!-- 详情 -->
-        <CustomDetail :selectedRow="selectedRow"
-                      @refresh="queryTable"/>
-        <!-- 修改 -->
-        <ModifyCustom :selectedRow="selectedRow"
-                      @refresh="queryTable"/>
-        <!-- 删除 -->
-        <DeleteCustom :selectedRow="selectedRow"
-                      @refresh="queryTable"/>
+  <!-- 客户信息: 正常 -->
+  <div class="custom_info_unsubmit"
+       :loading="loading">
+    <filterCustomTable @search="search">
+      <BtnList :btnList="commonBtn" />
+    </filterCustomTable>
+    <contextMenu :contextMenuList="forDataBtn">
+      <a-table :columns="columns"
+               class="topTable hiddenFirstCol"
+               :pagination="false"
+               :expandedRowKeys="expandedRowKeys"
+               :customRow="Rowclick"
+               rowKey="key"
+               :data-source="tableList">
+        <!-- 额外的展开行 -->
+        <template #expandedRowRender="{  }">
+          <BtnList :btnList="forDataBtn" />
+        </template>
+        <template #userinfotype="{ text }">
+          <a>{{ text === '2' ? '企业' : '个人' }}</a>
+        </template>
+        <template #status="{ text }">
+          <a>{{ getStatusName(text) }}</a>
+        </template>
+        <template #cardtype="{ text }">
+          <a>{{ getCardTypeEnumItemName(text) }}</a>
+        </template>
+      </a-table>
+    </contextMenu>
+    <!-- 新增 -->
+    <AddCustom />
+    <!-- 详情 -->
+    <CustomDetail :selectedRow="selectedRow"
+                  @refresh="queryTable" />
+    <!-- 修改 -->
+    <ModifyCustom :selectedRow="selectedRow"
+                  @refresh="queryTable" />
+    <!-- 删除 -->
+    <DeleteCustom :selectedRow="selectedRow"
+                  @refresh="queryTable" />
 
-    </div>
+  </div>
 </template>
 
 <script lang="ts">
-import {
-    defineComponent,
-    initData,
-    getTableColumns,
-    getTableEvent,
-    getBtnList,
-    contextMenu,
-    BtnList
-} from '@/common/export/table';
+import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
 
-import {filterCustomTable, CustomDetail, ModifyCustom, DisableCustom, AddCustom, DeleteCustom} from '../../compoments';
-import {queryTableList, getFilterTableCB, QueryCustomInfoType} from '../index';
-import {getCardTypeName, getStatusName} from "@/views/information/custom/setup";
+import { filterCustomTable, CustomDetail, ModifyCustom, DisableCustom, AddCustom, DeleteCustom } from '../../compoments';
+import { queryTableList, getFilterTableCB, QueryCustomInfoType } from '../index';
+import { getStatusName } from '@/views/information/custom/setup';
+import { getCardTypeEnumItemName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'custom_info_unsubmit',
@@ -72,13 +65,13 @@ export default defineComponent({
     },
     setup() {
         // 表头数据
-        const {columns, registerColumn, updateColumn, filteredInfo} = getTableColumns();
+        const { columns, registerColumn, updateColumn, filteredInfo } = getTableColumns();
         // 表格事件
-        const {expandedRowKeys, selectedRow, Rowclick} = getTableEvent<QueryCustomInfoType>({});
+        const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<QueryCustomInfoType>({});
         // 表格操作按钮列表
-        const {commonBtn, forDataBtn} = getBtnList('custom_info_unsubmit', true);
+        const { commonBtn, forDataBtn } = getBtnList('custom_info_unsubmit', true);
         // 表格列表数据
-        const {loading, tableList, queryTable} = queryTableList(1);
+        const { loading, tableList, queryTable } = queryTableList(1);
         initData(() => {
             // 获取列表数据
             queryTable();
@@ -106,7 +99,7 @@ export default defineComponent({
             search,
             DeleteCustom,
             getStatusName,
-            getCardTypeName,
+            getCardTypeEnumItemName,
             queryTable,
         };
     },

src/views/information/custom/setup.ts

@@ -1,13 +1,12 @@
-import {getItemEnum} from "@/services/bus/allEnum";
-import {ResultInfo} from "@/common/methods/request/interface";
+import { ResultInfo } from "@/common/methods/request/interface";
 
 /**
  * 获取客户资料状态
  * @param state
  */
-export function getStatusName(state: number) : string{
-    let result : string = "--";
-    switch (state){
+export function getStatusName(state: number): string {
+    let result = "--";
+    switch (state) {
         case 1:
             result = "待激活";
             break
@@ -30,15 +29,6 @@ export function getStatusName(state: number) : string{
     return result
 }
 
-/**
- * 设置证件类型
- * @param type
- */
-export function getCardTypeName(type: number): string{
-    const cardName = getItemEnum('certificatetype').find(e => e.enumitemname === type);
-    return cardName ? cardName.enumdicname : "--"
-}
-
 /************** 接口相关提示 **************** /
  *
  */

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

@@ -280,11 +280,12 @@ import { defineComponent, ref, toRaw } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { initData } from '@/common/methods/index';
 import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
-import { handleAdd, handleFromState, handleGoodsGroup, getGoodsUnit } from './setup';
-import { getGoodsUnitList } from '../../setup';
+import { handleAdd, handleFromState, handleGoodsGroup } from './setup';
 import { RuleObject, ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
 import { FormState, WRSConvertDetailEx } from './interface';
 import { validateCommon } from '@/common/setup/validate';
+import { getGoodsUnitEnumList } from '@/common/constants/enumsList';
+import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
 
 /**
  * 检验单位
@@ -312,7 +313,7 @@ export default defineComponent({
         // 下单方法
         const { loading, addAction } = handleAdd();
         // 单位列表
-        const unitList = getGoodsUnitList();
+        const unitList = getGoodsUnitEnumList();
         function submit() {
             formRef.value
                 .validate()
@@ -356,7 +357,7 @@ export default defineComponent({
         function middleChange(id: number, value: WRSConvertDetailEx) {
             const obj = goodsGroup.value.find((e) => e.groupcategroyid === id);
             if (obj) {
-                value.unitidName = getGoodsUnit(obj.agreeunit);
+                value.unitidName = getGoodsUnitEnumItemName(obj.agreeunit);
                 value.unitid = obj.agreeunit;
             }
         }

src/views/information/goods/components/add/setup.ts

@@ -1,4 +1,3 @@
-import { getItemEnum } from '@/services/bus/allEnum';
 import { QueryGoodsfGroup } from '@/services/go/ermcp/goodsInfo';
 import { Ermcp3GoodsGroup } from '@/services/go/ermcp/goodsInfo/interface';
 import { addDeliveryGoodsApply } from '@/services/proto/delivery';
@@ -118,11 +117,3 @@ export function handleGoodsGroup() {
     return { goodsGroup, getGoodsGroup }
 }
 
-/**
- * 获取合约单位
- * @returns 
- */
-export function getGoodsUnit(unit: number): string {
-    const obj = getItemEnum('goodsunit').find(e => e.enumitemname === unit);
-    return obj ? obj.enumdicname : '--'
-}

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

@@ -278,14 +278,14 @@ import { defineComponent, PropType, ref, toRaw, watchEffect } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { initData } from '@/common/methods/index';
 import { PlusOutlined, MinusOutlined } from '@ant-design/icons-vue';
-import { handleAdd, handleFromState, handleGoodsGroup, getGoodsUnit } from './setup';
-import { getGoodsUnitList } from '../../setup';
+import { handleAdd, handleFromState, handleGoodsGroup } from './setup';
 import { RuleObject, ValidateErrorEntity } from 'ant-design-vue/es/form/interface';
 import { FormState, WRSConvertDetailEx } from './interface';
 import { validateCommon } from '@/common/setup/validate';
 import { initDG } from '../../list/spot-variety/setup';
 import { ErmcpDeliveryGoodsDetailEx, ErmcpDeliveryGoods } from '@/services/go/ermcp/goodsInfo/interface';
 import { mergeTwoObj } from '@/utils/objHandle';
+import { getGoodsUnitEnumList } from '@/common/constants/enumsList';
 interface Obj {
     [props: string]: any;
 }
@@ -323,7 +323,7 @@ export default defineComponent({
         const { loading, addAction } = handleAdd();
 
         // 单位列表
-        const unitList = getGoodsUnitList();
+        const unitList = getGoodsUnitEnumList();
 
         // 表单
         const formRef = ref();

src/views/information/goods/components/modify/setup.ts

@@ -1,4 +1,3 @@
-import { getItemEnum } from '@/services/bus/allEnum';
 import { QueryGoodsfGroup } from '@/services/go/ermcp/goodsInfo';
 import { Ermcp3GoodsGroup } from '@/services/go/ermcp/goodsInfo/interface';
 import { addDeliveryGoodsApply } from '@/services/proto/delivery';
@@ -117,11 +116,3 @@ export function handleGoodsGroup() {
     return { goodsGroup, getGoodsGroup }
 }
 
-/**
- * 获取合约单位
- * @returns 
- */
-export function getGoodsUnit(unit: number): string {
-    const obj = getItemEnum('goodsunit').find(e => e.enumitemname === unit);
-    return obj ? obj.enumdicname : '--'
-}

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

@@ -7,7 +7,7 @@
                aria-hidden="true">
             <use xlink:href="#icon-shuzhuangtu"></use>
           </svg>
-          {{selctedMG.mg.middlegoodsname}}（{{getGoodsUnit(selctedMG.mg.goodsunitid)}}）
+          {{selctedMG.mg.middlegoodsname}}（{{getGoodsUnitEnumItemName(selctedMG.mg.goodsunitid)}}）
         </span>
         <span class="green ml10">{{selctedMG.mg.isvalid ? '正常' : '停用'}}</span>
       </div>
@@ -139,7 +139,6 @@
 
 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
-import { getGoodsUnit } from '@/views/information/goods/list/spot-variety/setup';
 import { initMG } from '@/views/information/goods/list/hedging-variety/setup';
 import { ErmcpDeliveryGoodsDetailEx } from '@/services/go/ermcp/goodsInfo/interface';
 import { initData } from '@/common/methods';
@@ -147,6 +146,7 @@ import HedgingModify from '../hedgingModify/index.vue';
 import HedgingDetail from '../spotDetail/index.vue';
 import { BtnList } from '@/common/export/table';
 import { getThirdMenuData, handleBtnList } from '@/common/setup/table/button';
+import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'rightHedging',
@@ -176,7 +176,7 @@ export default defineComponent({
         const { forDataBtn } = handleBtnList(list, 'goods_info_hedge_normal', true);
 
         initData(() => {});
-        return { getGoodsUnit, forDataBtn };
+        return { getGoodsUnitEnumItemName, forDataBtn };
     },
 });
 </script>
@@ -322,5 +322,4 @@ export default defineComponent({
 //         }
 //     }
 // }
-
 </style>;

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

@@ -7,7 +7,7 @@
                aria-hidden="true">
             <use xlink:href="#icon-shuzhuangtu"></use>
           </svg>
-          {{selctedDeliveryGoods.data.deliverygoodsname}}（{{getGoodsUnit(selctedDeliveryGoods.data.agreeunit)}}）
+          {{selctedDeliveryGoods.data.deliverygoodsname}}（{{getGoodsUnitEnumItemName(selctedDeliveryGoods.data.agreeunit)}}）
         </span>
         <span class="green ml10">{{selctedDeliveryGoods.data.dgstatus ? '正常' : '停用'}}</span>
       </div>
@@ -120,7 +120,7 @@
 
 <script lang="ts">
 import { defineComponent, ref, PropType } from 'vue';
-import { handleDG, getGoodsUnit, initDG } from '@/views/information/goods/list/spot-variety/setup';
+import { initDG } from '@/views/information/goods/list/spot-variety/setup';
 import { ErmcpDeliveryGoodsDetailEx } from '@/services/go/ermcp/goodsInfo/interface';
 import { initData } from '@/common/methods';
 import { openModal } from '@/common/setup/modal/index';
@@ -129,6 +129,7 @@ import Disable from '../disable/index.vue';
 import { getThirdMenuData, handleBtnList } from '@/common/setup/table/button';
 import { BtnList } from '@/common/export/table';
 import SpotDetail from '../spotDetail/index.vue';
+import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
 
 export default defineComponent({
     name: 'rightSpot',
@@ -158,7 +159,7 @@ export default defineComponent({
 
         const { forDataBtn } = handleBtnList(list, 'goods_info_spot_normal', true);
         initData(() => {});
-        return { getGoodsUnit, forDataBtn };
+        return { getGoodsUnitEnumItemName, forDataBtn };
     },
 });
 </script>
@@ -185,8 +186,8 @@ export default defineComponent({
                 margin-left: 10px;
             }
             .btnPrimary.ant-btn {
-              height: 26px;
-              line-height: 27px;
+                height: 26px;
+                line-height: 27px;
             }
         }
     }

src/views/information/goods/list/spot-variety/setup.ts

@@ -1,4 +1,3 @@
-import { getItemEnum } from '@/services/bus/allEnum';
 import { QueryDeliveryGoodsDetail } from '@/services/go/ermcp/goodsInfo';
 import { ErmcpDeliveryGoodsDetailEx, MenuList } from '@/services/go/ermcp/goodsInfo/interface';
 import { mergeObj } from '@/utils/objHandle';
@@ -104,18 +103,3 @@ export function handleDG() {
     return { loading, deliveryGoodsList, menuList, queryDG, isNormal, selctedDeliveryGoods, chooseDG }
 }
 
-/**
- * 获取合约单位
- * @returns 
- */
-export function getGoodsUnit(unit: number) {
-    return getGoodsUnitList().find(e => e.enumitemname === unit)?.enumdicname
-}
-
-/**
- * 获取现货品种单位列表
- * @returns 
- */
-export function getGoodsUnitList() {
-    return getItemEnum('goodsunit')
-}

src/views/information/goods/setup.ts

@@ -1,5 +1,4 @@
 import { getThirdMenuData } from '@/common/setup/table/button';
-import { getItemEnum } from '@/services/bus/allEnum';
 import { MenuList } from '@/services/go/ermcp/goodsInfo/interface';
 import { Ref, ref } from 'vue';
 
@@ -26,18 +25,3 @@ export function getInitMenuData(code: 'goods_info_spot' | 'goods_info_hedge'): M
     return { menuList, menuMap }
 }
 
-/**
- * 获取合约单位
- * @returns 
- */
-export function getGoodsUnit(unit: number) {
-    return getGoodsUnitList().find(e => e.enumitemname === unit)?.enumdicname
-}
-
-/**
- * 获取现货品种单位列表
- * @returns 
- */
-export function getGoodsUnitList() {
-    return getItemEnum('goodsunit')
-}

src/views/information/spot-contract/components/setup.ts

@@ -1,6 +1,7 @@
+import { getPayCurrencyTypeEnumList } from "@/common/constants/enumsList";
+import { getGoodsUnitEnumItemName } from "@/common/constants/enumsName";
 import { commonResultInfo, getRequestResultInfo } from "@/common/methods/request";
 import { validateCommon } from "@/common/setup/validate";
-import { getItemEnum } from "@/services/bus/allEnum";
 import { QueryAccMgrLoginUser } from "@/services/go/ermcp/account";
 import { ErmcpLoginUser } from "@/services/go/ermcp/account/interface";
 import { QueryCustomInfo } from "@/services/go/ermcp/customInfo";
@@ -338,10 +339,7 @@ export function handleDeliveryGoods(formState: UnwrapRef<FormState>) {
             //标仓系数
             formState.ConvertFactor = obj.convertfactor;
             // 单位
-            const unitInfo = getItemEnum('goodsunit').find(e => e.enumitemname === obj.unitid)
-            if (unitInfo) {
-                numberUnit.value = unitInfo.enumdicname
-            }
+            numberUnit.value = getGoodsUnitEnumItemName(obj.unitid)
         }
     }
 
@@ -368,7 +366,7 @@ export function handlePrice(formState: UnwrapRef<FormState>) {
         { key: 3, value: '暂定价' },
     ];
     // 币种
-    const payCurrency = getItemEnum('paycurrency')
+    const payCurrency = getPayCurrencyTypeEnumList()
     console.log('payCurrency', payCurrency);
     // 目前写死，获取枚举信息里面没有 单位名称，后期进行优化
     const payCurrencyUnit = ref<string>('元')

src/views/information/warehouse-info/compoments/add/index.vue

@@ -8,10 +8,10 @@
            @cancel="cancel"
            width="890px">
     <template #footer>
-        <a-button key="submit"
-                  type="primary"
-                  :loading="loading"
-                  @click="cancel">取消</a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="cancel">取消</a-button>
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
@@ -132,14 +132,15 @@
 </template>
 
 <script lang="ts">
-import {defineComponent, PropType, ref, toRaw} from 'vue';
+import { defineComponent, PropType, ref, toRaw } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { getAddress } from '@/services/go/adress';
-import { handleForm, getWarehouseType, FormState, warehouseApply } from '../setup';
+import { handleForm, FormState, warehouseApply } from '../setup';
 import { ValidateErrorEntity } from 'ant-design-vue/lib/form/interface';
 import { AllEnums } from '@/services/go/commonService/interface';
 import { WarehouseApplyReq } from '@/services/proto/warehouse/interface';
-import {ErmcpWareHouseInfo} from "@/services/go/ermcp/warehouse-info/interface";
+import { ErmcpWareHouseInfo } from '@/services/go/ermcp/warehouse-info/interface';
+import { getWarehouseTypeEnumList } from '@/common/constants/enumsList';
 
 export default defineComponent({
     name: 'warehouse_info_btn_add',
@@ -154,34 +155,32 @@ export default defineComponent({
         const { visible, cancel } = closeModal('warehouse_info_btn_add');
         const loading = ref<boolean>(false);
         const { cityList, districtList, provinceList, getCityList, getDistrictList } = getAddress();
-        const warehouseType = ref<AllEnums[]>(getWarehouseType());
+        const warehouseType = ref<AllEnums[]>(getWarehouseTypeEnumList());
         const { formRef, formState, rules } = handleForm();
         function submit() {
             formRef.value
                 .validate()
                 .then(() => {
-                    const param = toRaw(formState)
+                    const param = toRaw(formState);
                     const reqParam: WarehouseApplyReq = {
-                        type: 1,// int32 类型 1 新增 2 修改
+                        type: 1, // int32 类型 1 新增 2 修改
                         warehouseid: param.warehouseid, // uint64 仓库ID
                         warehousecode: param.warehousecode, // string 仓库代码
                         warehousename: param.warehousename, // string 仓库名称
-                        warehousetype: undefined === param.warehousetype ? 0 : param.warehousetype as number,  // int32 仓库类型 - 1 厂库  2 自有库  3 合作库
-                        provinceid: undefined === param.provinceid ? 0 : param.provinceid as number,  // uint64 省
-                        cityid: undefined === param.cityid ? 0 : param.cityid as number,  // uint64 市
-                        districtid: undefined === param.districtid ? 0 : param.districtid as number,  // int32 区
+                        warehousetype: undefined === param.warehousetype ? 0 : (param.warehousetype as number), // int32 仓库类型 - 1 厂库  2 自有库  3 合作库
+                        provinceid: undefined === param.provinceid ? 0 : (param.provinceid as number), // uint64 省
+                        cityid: undefined === param.cityid ? 0 : (param.cityid as number), // uint64 市
+                        districtid: undefined === param.districtid ? 0 : (param.districtid as number), // int32 区
                         address: param.address, // string 详细地址
                         contactname: param.contactname, // string 联系人
                         contactnum: param.contactnum, // string 联系电话
-                    }
+                    };
                     warehouseApply(reqParam, loading)
-                        .then(res => {
-                            cancel()
-                            context.emit("refresh")
-                        })
-                        .catch(err => {
-
+                        .then((res) => {
+                            cancel();
+                            context.emit('refresh');
                         })
+                        .catch((err) => {});
                     console.log('param', param);
                 })
                 .catch((error: ValidateErrorEntity<FormState>) => {

src/views/information/warehouse-info/compoments/modify/index.vue

@@ -136,12 +136,13 @@ import { defineComponent, PropType, ref, toRaw, watchEffect } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
 import { initData } from '@/common/methods/index';
 import { getAddress } from '@/services/go/adress';
-import { handleForm, getWarehouseType, FormState, warehouseApply } from '../setup';
+import { handleForm, FormState, warehouseApply } from '../setup';
 import { ValidateErrorEntity } from 'ant-design-vue/lib/form/interface';
 import { AllEnums } from '@/services/go/commonService/interface';
 import { WarehouseApplyReq } from '@/services/proto/warehouse/interface';
 import { ErmcpWareHouseInfo } from '@/services/go/ermcp/warehouse-info/interface';
 import { mergeTwoObj } from '@/utils/objHandle';
+import { getWarehouseTypeEnumList } from '@/common/constants/enumsList';
 
 export default defineComponent({
     name: 'warehouse_info_btn_modify',
@@ -156,7 +157,7 @@ export default defineComponent({
         const { visible, cancel } = closeModal('warehouse_info_btn_modify');
         const loading = ref<boolean>(false);
         const { cityList, districtList, provinceList, getCityList, getDistrictList } = getAddress();
-        const warehouseType = ref<AllEnums[]>(getWarehouseType());
+        const warehouseType = ref<AllEnums[]>(getWarehouseTypeEnumList());
         const { formRef, formState, rules } = handleForm();
         watchEffect(() => {
             if (props.selectedRow.warehousename) {

src/views/information/warehouse-info/compoments/setup.ts

@@ -1,7 +1,6 @@
 import { commonResultInfo, getRequestResultInfo } from "@/common/methods/request";
 import { validateCommon } from "@/common/setup/validate";
 import { getSelectedAccountId } from "@/services/bus/account";
-import { getItemEnum } from '@/services/bus/allEnum';
 import { addWarehouseApply, warehouseStateChangeReq } from "@/services/proto/warehouse";
 import { WarehouseApplyReq, WarehouseStateChangeReq } from "@/services/proto/warehouse/interface";
 import { RuleObject } from "ant-design-vue/lib/form/interface";
@@ -61,13 +60,6 @@ export function stopOrResumeWarehouse(type: wareType) {
     return { loading, changeStatus }
 }
 
-/**
- *获取仓库类型枚举
- */
-export function getWarehouseType() {
-    return getItemEnum('warehouseinfoType')
-}
-
 export interface FormState {
     type: number // int32 类型 1 新增 2 修改
     warehouseid?: number // uint64 仓库ID

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

@@ -97,7 +97,7 @@
           <a-col :span="12">
             <a-form-item label="入库数量">
               <span class="white">{{
-                                    formatValue(selectedRow.qty) + getGoodsUnit(selectedRow.unitid)
+                                    formatValue(selectedRow.qty) + getGoodsUnitEnumItemName(selectedRow.unitid)
                                 }}</span>
             </a-form-item>
           </a-col>
@@ -157,7 +157,7 @@ import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/inter
 import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';
 import { getContractTypeName } from '@/views/information/spot-contract/setup';
 import { getPriceTypeName } from '@/views/business/purchase/setup';
-import { getGoodsUnit } from '@/views/information/goods/setup';
+import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
 import { getApplyStatusName } from '@/views/manage/business-review/setup';
 import { Modal } from 'ant-design-vue';
 import { AreaInOutApplyAuditPassReq, AuditERMCPAreaInOutStockApplyReq } from '@/services/proto/warehouse/interface';
@@ -251,7 +251,7 @@ export default defineComponent({
             getContractTypeName,
             getPriceTypeName,
             InOutTypeName,
-            getGoodsUnit,
+            getGoodsUnitEnumItemName,
             getApplyStatusName,
 
             refuse,

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

@@ -93,7 +93,7 @@
           <a-col :span="12">
             <a-form-item label="入库数量">
               <span class="white">{{
-                                    formatValue(selectedRow.qty) + getGoodsUnit(selectedRow.unitid)
+                                    formatValue(selectedRow.qty) + getGoodsUnitEnumItemName(selectedRow.unitid)
                                 }}</span>
             </a-form-item>
           </a-col>
@@ -153,7 +153,7 @@ import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/inter
 import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';
 import { getContractTypeName } from '@/views/information/spot-contract/setup';
 import { getPriceTypeName } from '@/views/business/purchase/setup';
-import { getGoodsUnit } from '@/views/information/goods/setup';
+import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
 import { getApplyStatusName } from '@/views/manage/business-review/setup';
 import { Modal } from 'ant-design-vue';
 import { AuditERMCPAreaInOutStockApplyReq } from '@/services/proto/warehouse/interface';
@@ -217,7 +217,7 @@ export default defineComponent({
             getContractTypeName,
             getPriceTypeName,
             InOutTypeName,
-            getGoodsUnit,
+            getGoodsUnitEnumItemName,
             getApplyStatusName,
 
             back,

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

@@ -1,154 +1,155 @@
 <template>
-    <!-- 款项详情-->
-    <a-modal class="add-custom custom-detail"
-             title="款项详情"
-             v-model:visible="visible"
-             centered
-             :maskClosable="maskClosableFlag"
-             @cancel="cancel"
-             width="890px">
-        <template #footer>
-            <a-button key="submit"
-                      type="primary"
-                      :loading="loading.loading"
-                      @click="submit">关闭
-            </a-button>
-        </template>
-        <a-form class="inlineForm"
-                :form="form"
-                @submit="handleSearch">
-            <fieldset class="formFieldSet" v-if="isShowContractInfo(selectedRow.inouttype)">
-                <legend>合同基本信息</legend>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="合同编号">
-                            <span class="white">{{
+  <!-- 款项详情-->
+  <a-modal class="add-custom custom-detail"
+           title="款项详情"
+           v-model:visible="visible"
+           centered
+           :maskClosable="maskClosableFlag"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading.loading"
+                @click="submit">关闭
+      </a-button>
+    </template>
+    <a-form class="inlineForm"
+            :form="form"
+            @submit="handleSearch">
+      <fieldset class="formFieldSet"
+                v-if="isShowContractInfo(selectedRow.inouttype)">
+        <legend>合同基本信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="合同编号">
+              <span class="white">{{
                                     getContractTypeName(selectedRow.contracttype) + '/' + formatValue(selectedRow.contractno)
                                 }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="定价类型">
-                            <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="现货品种">
-                            <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.buyusername) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="合同签署量">
-                            <span class="white">{{ formatValue(selectedRow.contractqty) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </fieldset>
-            <fieldset class="formFieldSet">
-                <legend>登记信息</legend>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="出库类型">
-                            <span class="white">{{ InOutTypeName(selectedRow.inouttype) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="品类">
-                            <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.brandname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="入库仓库">
-                            <span class="white">{{ formatValue(selectedRow.warehousename) }}</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.qty) + getGoodsUnit(selectedRow.unitid)
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="定价类型">
+              <span class="white">{{ getPriceTypeName(selectedRow.pricetype) }}</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.sellusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="现货品种">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.buyusername) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="合同签署量">
+              <span class="white">{{ formatValue(selectedRow.contractqty) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+      <fieldset class="formFieldSet">
+        <legend>登记信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="出库类型">
+              <span class="white">{{ InOutTypeName(selectedRow.inouttype) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="品类">
+              <span class="white">{{ formatValue(selectedRow.deliverygoodsname) }}</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.brandname) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="入库仓库">
+              <span class="white">{{ formatValue(selectedRow.warehousename) }}</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.qty) + getGoodsUnitEnumItemName(selectedRow.unitid)
                                 }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="登记时间">
-                            <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="状态">
-                            <span class="white">{{ getApplyStatusName(selectedRow.applystatus) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </fieldset>
-            <fieldset class="formFieldSet">
-                <legend>审核信息</legend>
-                <a-row :gutter="24">
-                    <a-col :span="12">
-                        <a-form-item label="审核时间">
-                            <span class="white">{{ formatValue(selectedRow.audittime) }}</span>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12">
-                        <a-form-item label="审核人">
-                            <span class="white">{{ formatValue(selectedRow.auditname) }}</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.auditremark) }}</span>
-                        </a-form-item>
-                    </a-col>
-                </a-row>
-            </fieldset>
-        </a-form>
-    </a-modal>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="登记时间">
+              <span class="white">{{ formatValue(selectedRow.applytime) }}</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.applyname) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="状态">
+              <span class="white">{{ getApplyStatusName(selectedRow.applystatus) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+      <fieldset class="formFieldSet">
+        <legend>审核信息</legend>
+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-item label="审核时间">
+              <span class="white">{{ formatValue(selectedRow.audittime) }}</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="审核人">
+              <span class="white">{{ formatValue(selectedRow.auditname) }}</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.auditremark) }}</span>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </fieldset>
+    </a-form>
+  </a-modal>
 </template>
 
 <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 {getStatusName} from '@/views/information/custom/setup';
-import {formatValue, formatTime} from '@/common/methods';
-import {Ermcp3AreaStockApply} from "@/services/go/ermcp/inventory-review/interface";
-import {InOutTypeName, isShowContractInfo} from "@/views/manage/inventory-review/setup";
-import {getContractTypeName} from "@/views/information/spot-contract/setup";
-import {getPriceTypeName} from "@/views/business/purchase/setup";
-import {getGoodsUnit} from "@/views/information/goods/setup";
-import {getApplyStatusName} from "@/views/manage/business-review/setup";
+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 { formatValue, formatTime } from '@/common/methods';
+import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/interface';
+import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';
+import { getContractTypeName } from '@/views/information/spot-contract/setup';
+import { getPriceTypeName } from '@/views/business/purchase/setup';
+import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
+import { getApplyStatusName } from '@/views/manage/business-review/setup';
 
 export default defineComponent({
     name: 'finance_review_funds_detail',
@@ -160,7 +161,7 @@ export default defineComponent({
         },
     },
     setup(props) {
-        const {visible, cancel} = closeModal('detail');
+        const { visible, cancel } = closeModal('detail');
         const loading = ref<boolean>(false);
         const maskClosableFlag = ref<boolean>(false);
 
@@ -181,9 +182,8 @@ export default defineComponent({
             getContractTypeName,
             getPriceTypeName,
             InOutTypeName,
-            getGoodsUnit,
+            getGoodsUnitEnumItemName,
             getApplyStatusName,
-
         };
     },
 });

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

@@ -94,7 +94,7 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="入库数量">
-              <span class="white">{{ formatValue(selectedRow.qty) + getGoodsUnit(selectedRow.unitid) }}</span>
+              <span class="white">{{ formatValue(selectedRow.qty) + getGoodsUnitEnumItemName(selectedRow.unitid) }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
@@ -150,7 +150,7 @@ import { formatValue, formatTime } from '@/common/methods';
 import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';
 import { getContractTypeName } from '@/views/information/spot-contract/setup';
 import { getPriceTypeName } from '@/views/business/purchase/setup';
-import { getGoodsUnit } from '@/views/information/goods/setup';
+import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
 import { getApplyStatusName } from '@/views/manage/business-review/setup';
 import { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/interface';
 import { Modal } from 'ant-design-vue';
@@ -246,7 +246,7 @@ export default defineComponent({
             getContractTypeName,
             getPriceTypeName,
             InOutTypeName,
-            getGoodsUnit,
+            getGoodsUnitEnumItemName,
             getApplyStatusName,
 
             pass,

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

@@ -23,7 +23,8 @@
     <a-form class="inlineForm"
             :form="form"
             @submit="handleSearch">
-      <fieldset class="formFieldSet" v-if="isShowContractInfo(selectedRow.inouttype)">
+      <fieldset class="formFieldSet"
+                v-if="isShowContractInfo(selectedRow.inouttype)">
         <legend>合同基本信息</legend>
         <a-row :gutter="24">
           <a-col :span="12">
@@ -93,7 +94,7 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="入库数量">
-              <span class="white">{{ formatValue(selectedRow.qty) + getGoodsUnit(selectedRow.unitid) }}</span>
+              <span class="white">{{ formatValue(selectedRow.qty) + getGoodsUnitEnumItemName(selectedRow.unitid) }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
@@ -142,103 +143,101 @@
 </template>
 
 <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 {Ermcp3AreaStockApply} from "@/services/go/ermcp/inventory-review/interface";
-import {Modal} from "ant-design-vue";
-import {ContractOperateApplyReq} from "@/services/proto/contract/interface";
-import Long from "long";
-import {financeControl} from "@/views/manage/finance-review/components/setup";
-import {AuditERMCPAreaInOutStockApplyReq} from "@/services/proto/warehouse/interface";
-import {getLongTypeLoginID} from "@/services/bus/login";
-import {LongType} from "@/services/socket/login/interface";
-import moment from "moment";
-import {refuseStockControl} from "@/views/manage/inventory-review/components/setup";
-import {InOutTypeName, isShowContractInfo} from "@/views/manage/inventory-review/setup";
-import {getContractTypeName} from "@/views/information/spot-contract/setup";
-import {getPriceTypeName} from "@/views/business/purchase/setup";
-import {getGoodsUnit} from "@/views/information/goods/setup";
-import {getApplyStatusName} from "@/views/manage/business-review/setup";
+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 { Ermcp3AreaStockApply } from '@/services/go/ermcp/inventory-review/interface';
+import { Modal } from 'ant-design-vue';
+import { ContractOperateApplyReq } from '@/services/proto/contract/interface';
+import Long from 'long';
+import { financeControl } from '@/views/manage/finance-review/components/setup';
+import { AuditERMCPAreaInOutStockApplyReq } from '@/services/proto/warehouse/interface';
+import { getLongTypeLoginID } from '@/services/bus/login';
+import { LongType } from '@/services/socket/login/interface';
+import moment from 'moment';
+import { refuseStockControl } from '@/views/manage/inventory-review/components/setup';
+import { InOutTypeName, isShowContractInfo } from '@/views/manage/inventory-review/setup';
+import { getContractTypeName } from '@/views/information/spot-contract/setup';
+import { getPriceTypeName } from '@/views/business/purchase/setup';
+import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
+import { getApplyStatusName } from '@/views/manage/business-review/setup';
 
 export default defineComponent({
-  name: 'inventory_review_checkout_cancel',
-  components: {},
-  props: {
-    selectedRow: {
-      type: Object as PropType<Ermcp3AreaStockApply>,
-      default: {},
+    name: 'inventory_review_checkout_cancel',
+    components: {},
+    props: {
+        selectedRow: {
+            type: Object as PropType<Ermcp3AreaStockApply>,
+            default: {},
+        },
     },
-  },
-  setup(props, context) {
-    const {visible, cancel} = closeModal('inventory_review_checkout_cancel');
-    const loading = ref<boolean>(false);
-    const maskClosableFlag = ref<boolean>(false);
-
-    function submit() {
-      loading.value = true;
-      setTimeout(() => {
-        loading.value = false;
-        cancel();
-      }, 2000);
-    }
-    function back(){
-      Modal.confirm({
-        title: '是否确认撤销',
-        okText: '确认撤销',
-        cancelText: '取消',
-        onOk() {
-          const param: AuditERMCPAreaInOutStockApplyReq = {
-            InOutApplyID: Long.fromString(props.selectedRow.inoutapplyid), // uint64 申请ID
-            AuditID: Long.fromString( (getLongTypeLoginID() as LongType).toString()), // uint64 审核人
-            AuditRemark: '', // string 审核备注
-            AuditTradeDate: moment().format('YYYYMMDD'), // string 审核交易日(yyyyMMdd)
-            ApplyStatus: 5, // int32 审核状态:3-审核拒绝 5-已撤回
-          }
-          refuseStockControl(param, loading)
-              .then(res => {
-                context.emit('refresh');
-                cancel()
-              })
-              .catch(err => {
+    setup(props, context) {
+        const { visible, cancel } = closeModal('inventory_review_checkout_cancel');
+        const loading = ref<boolean>(false);
+        const maskClosableFlag = ref<boolean>(false);
 
-              })
-        },
-        onCancel() {
-          console.log('Cancel');
-        },
-      });
-    }
+        function submit() {
+            loading.value = true;
+            setTimeout(() => {
+                loading.value = false;
+                cancel();
+            }, 2000);
+        }
+        function back() {
+            Modal.confirm({
+                title: '是否确认撤销',
+                okText: '确认撤销',
+                cancelText: '取消',
+                onOk() {
+                    const param: AuditERMCPAreaInOutStockApplyReq = {
+                        InOutApplyID: Long.fromString(props.selectedRow.inoutapplyid), // uint64 申请ID
+                        AuditID: Long.fromString((getLongTypeLoginID() as LongType).toString()), // uint64 审核人
+                        AuditRemark: '', // string 审核备注
+                        AuditTradeDate: moment().format('YYYYMMDD'), // string 审核交易日(yyyyMMdd)
+                        ApplyStatus: 5, // int32 审核状态:3-审核拒绝 5-已撤回
+                    };
+                    refuseStockControl(param, loading)
+                        .then((res) => {
+                            context.emit('refresh');
+                            cancel();
+                        })
+                        .catch((err) => {});
+                },
+                onCancel() {
+                    console.log('Cancel');
+                },
+            });
+        }
 
-    return {
-      visible,
-      cancel,
-      submit,
-      loading,
-      formatValue,
-      getStatusName,
-      maskClosableFlag,
+        return {
+            visible,
+            cancel,
+            submit,
+            loading,
+            formatValue,
+            getStatusName,
+            maskClosableFlag,
 
-      isShowContractInfo,
-      getContractTypeName,
-      getPriceTypeName,
-      InOutTypeName,
-      getGoodsUnit,
-      getApplyStatusName,
+            isShowContractInfo,
+            getContractTypeName,
+            getPriceTypeName,
+            InOutTypeName,
+            getGoodsUnitEnumItemName,
+            getApplyStatusName,
 
-      back,
-    };
-  },
+            back,
+        };
+    },
 });
 </script>
 
 <style lang="less">
 .inventory_review_checkout_cancel {
-  .ant-form.inlineForm {
-    margin-top: 20px;
-  }
+    .ant-form.inlineForm {
+        margin-top: 20px;
+    }
 }
 </style>;

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

@@ -83,7 +83,7 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="入库数量">
-              <span class="white">{{ formatValue(selectedRow.qty) + getGoodsUnit(selectedRow.unitid) }}</span>
+              <span class="white">{{ formatValue(selectedRow.qty) + getGoodsUnitEnumItemName(selectedRow.unitid) }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
@@ -141,7 +141,7 @@ import { formatValue, formatTime } 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 { getGoodsUnit } from '@/views/information/goods/setup';
+import { getGoodsUnitEnumItemName } from '@/common/constants/enumsName';
 import { getContractTypeName, getPriceTypeName } from '@/views/information/spot-contract/setup';
 
 export default defineComponent({
@@ -175,7 +175,7 @@ export default defineComponent({
             maskClosableFlag,
             InOutTypeName,
             getApplyStatusName,
-            getGoodsUnit,
+            getGoodsUnitEnumItemName,
             isShowContractInfo,
             getContractTypeName,
             getPriceTypeName,