commit

src/common/constants/buttonType.ts

@@ -0,0 +1,18 @@
+export interface ButtonType {
+    detail: string; // 详情
+    add: string; // 新增
+
+    custom_info_btn_add: string; // 客户资料 添加
+    custom_info_btn_modify: string; // 客户资料 修改
+    custom_info_btn_disable: string; // 客户资料 停用
+    custom_info_btn_recover: string; // 客户资料 恢复
+    custom_info_btn_delete: string; // 客户资料 删除
+
+    spot_contract_btn_add: string; // 现货合同 添加
+    spot_contract_btn_resubmit: string; // 现货合同 重新提交
+    spot_contract_btn_modify: string; // 现货合同 修改
+    spot_contract_btn_delete: string; // 现货合同 删除
+    spot_contract_btn_finish: string; // 现货合同 正常完结
+    spot_contract_btn_check: string; // 现货合同 审核
+    spot_contract_btn_cancel: string; // 现货合同 撤销
+}

src/common/constants/modalName.ts

@@ -0,0 +1,9 @@
+/* ========================================  弹窗名 ========================================== */
+// 注意弹窗名与按钮名字一样，都是由服务返回，前端自己写一份与服务一样的名字
+import { ButtonType } from './buttonType';
+
+export interface ModalName extends ButtonType {
+    notice: string; // 消息
+    logout: string; // 退出登录
+    drawer: string; // 下单通用界面
+}

src/common/setup/buttonPermission/index.ts

@@ -1,7 +1,7 @@
 // 按钮权限
 import { MenuItem } from '@/common/components/contextMenu/interface';
+import { ModalName } from '@/common/constants/modalName';
 import { openModal } from '@/common/setup/modal/index';
-import { ModalName } from '@/common/setup/modal/interface';
 import { OperationTabMenu } from '@/services/go/commonService/interface';
 import { inject, Ref } from 'vue';
 import { BtnType, MenuType } from './interface';

src/common/setup/contextMenu/index.ts

@@ -0,0 +1,42 @@
+import { MenuItem } from "@/common/components/contextMenu/interface";
+import { ModalName } from '@/common/constants/modalName';
+import { OperationTabMenu } from '@/services/go/commonService/interface';
+import { sessionStorageUtil } from "@/utils/storage";
+import { inject, onUnmounted, Ref, ref } from "vue";
+import { MenuType } from "../buttonPermission/interface";
+import { openModal } from "../modal";
+
+export function getBtnList(menuType: keyof MenuType) {
+    // 获取 数据
+    const permissionData = inject('thirdMenuList') as Ref<OperationTabMenu[]>;
+    const name = 'permissionData'
+    // 存入sessionStorageUtil 是为了处理页面刷新的情况（这个时候重新从服务获取数据，但页面已经先加载了，vue 中的 依赖注入在异步中不能建立通信）
+    const data: OperationTabMenu[] = permissionData.value.length ? permissionData.value : sessionStorageUtil.getItem(name)
+    sessionStorageUtil.setItem(name, permissionData.value)
+
+    const commonBtn = ref<MenuItem[]>([]); // 通用按钮列表，不用选中数据才显示
+    const forDataBtn = ref<MenuItem[]>([]); // 针对数据按钮列表，选中某条数据才显示
+
+    const list = data.find((e) => e.code === menuType);
+    if (list && list.children) {
+        list.children.forEach(e => {
+            const { code, type, title } = e;
+            if (type === 2) { // 按钮类型
+                const { openAction } = openModal(code as keyof ModalName);
+                const item = { lable: title, callback: openAction }
+                const commonName = ['新增'] // 目前通用的按钮只要新增，需要添加其它的时候需要往这里添加
+                if (commonName.includes(title)) { // 
+                    commonBtn.value.push(item)
+                } else {
+                    forDataBtn.value.push(item)
+                }
+            }
+        })
+    } else {
+        console.warn(`menuType: ${menuType}未找到`)
+    }
+    onUnmounted(() => {
+        sessionStorageUtil.removeItem(name)
+    });
+    return { commonBtn, forDataBtn }
+}

src/common/setup/contextMenu/interface.ts

@@ -0,0 +1,5 @@
+
+export interface PermisionList {
+    code: string;   // 服务配置权限按钮 对应的 code
+    fn: Function;   // 按钮名称
+}

src/common/setup/modal/interface.ts

@@ -5,10 +5,10 @@ export interface ModalName {
     drawer: string; // 下单通用界面
 
     addCustomInfo: string; // 新增客户资料
-    modifyCustomInfo: string; // 修改客户资料
-    disableCustomInfo: string; // 停用客户资料
-    deleteCustomInfo: string; // 删除客户资料
-    recoverCustomInfo: string; // 恢复客户资料
+    custom_info_btn_modify: string; // 修改客户资料
+    custom_info_btn_disable: string; // 停用客户资料
+    custom_info_btn_delete: string; // 删除客户资料
+    custom_info_btn_recover: string; // 恢复客户资料
     customDetail: string; // 客户资料详情
 
     addSpotContract: string; // 新增现货合同

src/common/setup/modal/modal.ts

@@ -1,5 +1,5 @@
+import { ModalName } from '@/common/constants/modalName';
 import { inject, provide, ref, watchEffect } from 'vue';
-import { ModalName } from './interface';
 
 // 控制弹窗
 
@@ -39,6 +39,7 @@ export function openModal(modelName: keyof ModalName) {
      * @param value 弹窗名
      */
     function openAction() {
+        console.log('弹窗组件名', modelName);
         name.value = true;
     }
     return { openAction }

src/common/setup/router/index.ts

@@ -1,43 +0,0 @@
-import { OperationTabMenu } from '@/services/go/commonService/interface';
-import APP from '@/services';
-import { provide, ref, unref } from 'vue';
-import { Router, useRouter } from 'vue-router';
-
-// 处理 动态路由
-function mateRouter(router: Router) {
-    const menuList = APP.getRef('menus');
-    const list = unref(menuList);
-    const pathArr = router.currentRoute.value.fullPath.split('/');
-    let result: OperationTabMenu[] = [];
-    if (pathArr.length > 1) {
-        if (list.length && list[0].children && list[0].children.length) {
-            const path = pathArr[1];
-            for (let i = 0; i < list.length; i++) {
-                for (let j = 0; j < list[i].children.length; j++) {
-                    if (path === list[i].children[j].code) {
-                        result = list[i].children[j].children;
-                        break;
-                    }
-                }
-            }
-        }
-    }
-    return result;
-}
-
-export function handleRouterMenu() {
-    const router = useRouter();
-    const list = ref<OperationTabMenu[]>([]);
-    // 获取动态路由
-    function getMenuList() {
-        list.value = mateRouter(router);
-    }
-    // 切换路由
-    function selectMenu(item: any) {
-        console.log('item', item);
-
-        router.push({ name: item.code });
-    }
-    provide('thirdMenuList', list);
-    return { list, selectMenu, getMenuList };
-}

src/router/index.ts

@@ -194,7 +194,7 @@ const routes: Array<RouteRecordRaw> = [
             {
                 path: '/purchase',
                 name: 'purchase',
-                component: () => import('@/views/business/purchase/index.vue'),
+                component: Main,
                 meta: {
                     requireAuth: true,
                 },
@@ -229,7 +229,7 @@ const routes: Array<RouteRecordRaw> = [
             {
                 path: '/sell',
                 name: 'sell',
-                component: () => import('@/views/business/sell/index.vue'),
+                component: Main,
                 meta: {
                     requireAuth: true,
                 },
@@ -264,7 +264,7 @@ const routes: Array<RouteRecordRaw> = [
             {
                 path: '/exposure',
                 name: 'exposure',
-                component: () => import('@/views/business/exposure/index.vue'),
+                component: Main,
                 meta: {
                     requireAuth: true,
                 },
@@ -307,7 +307,7 @@ const routes: Array<RouteRecordRaw> = [
             {
                 path: '/plan',
                 name: 'plan',
-                component: () => import('@/views/business/plan/index.vue'),
+                component: Main,
                 meta: {
                     requireAuth: true,
                 },
@@ -341,9 +341,9 @@ const routes: Array<RouteRecordRaw> = [
             },
 
             {
-                path: '_review',
+                path: 'review',
                 name: 'business_review',
-                component: () => import('@/views/manage/business-review/index.vue'),
+                component: Main,
                 meta: {
                     requireAuth: true,
                 },
@@ -351,7 +351,7 @@ const routes: Array<RouteRecordRaw> = [
             {
                 path: '/finance_review',
                 name: 'finance_review',
-                component: () => import('@/views/manage/finance-review/index.vue'),
+                component: Main,
                 meta: {
                     requireAuth: true,
                 },
@@ -359,7 +359,7 @@ const routes: Array<RouteRecordRaw> = [
             {
                 path: '/inventory_review',
                 name: 'inventory_review',
-                component: () => import('@/views/manage/inventory-review/index.vue'),
+                component: Main,
                 meta: {
                     requireAuth: true,
                 },

src/views/business/exposure/index.vue

@@ -1,34 +0,0 @@
-<template>
-    <!-- 采购 -->
-    <div class="exposure">
-        <firstMenu :list="list" :value="'title'" @selectMenu="selectMenu" />
-        <router-view />
-    </div>
-</template>
-
-<script lang="ts">
-    import { defineComponent } from 'vue';
-    import firstMenu from '@/common/components/firstMenu/index.vue';
-    import { handleRouterMenu } from '@/common/setup/router/index';
-    import { initData } from '@/common/methods';
-
-    export default defineComponent({
-        name: 'exposure',
-        components: {
-            firstMenu,
-        },
-        setup() {
-            const { list, selectMenu, getMenuList } = handleRouterMenu();
-            initData(() => {
-                getMenuList();
-                console.log('list', list);
-            });
-            return { list, selectMenu };
-        },
-    });
-</script>
-
-<style lang="less">
-    .sexposure {
-    }</style
->;

src/views/business/plan/index.vue

@@ -1,34 +0,0 @@
-<template>
-    <!-- 采购 -->
-    <div class="plan">
-        <firstMenu :list="list" :value="'title'" @selectMenu="selectMenu" />
-        <router-view />
-    </div>
-</template>
-
-<script lang="ts">
-    import { defineComponent } from 'vue';
-    import firstMenu from '@/common/components/firstMenu/index.vue';
-    import { handleRouterMenu } from '@/common/setup/router/index';
-    import { initData } from '@/common/methods';
-
-    export default defineComponent({
-        name: 'plan',
-        components: {
-            firstMenu,
-        },
-        setup() {
-            const { list, selectMenu, getMenuList } = handleRouterMenu();
-            initData(() => {
-                getMenuList();
-                console.log('list', list);
-            });
-            return { list, selectMenu };
-        },
-    });
-</script>
-
-<style lang="less">
-    .splan {
-    }</style
->;

src/views/business/purchase/index.vue

@@ -1,34 +0,0 @@
-<template>
-    <!-- 采购 -->
-    <div class="purchase">
-        <firstMenu :list="list" :value="'title'" @selectMenu="selectMenu" />
-        <router-view />
-    </div>
-</template>
-
-<script lang="ts">
-    import { defineComponent } from 'vue';
-    import firstMenu from '@/common/components/firstMenu/index.vue';
-    import { handleRouterMenu } from '@/common/setup/router/index';
-    import { initData } from '@/common/methods';
-
-    export default defineComponent({
-        name: 'purchase',
-        components: {
-            firstMenu,
-        },
-        setup() {
-            const { list, selectMenu, getMenuList } = handleRouterMenu();
-            initData(() => {
-                getMenuList();
-                console.log('list', list);
-            });
-            return { list, selectMenu };
-        },
-    });
-</script>
-
-<style lang="less">
-    .spurchase {
-    }</style
->;

src/views/business/purchase/setup.ts

@@ -1,13 +1,12 @@
-import { QueryPurchase } from '@/services/go/ermcp/purchase';
-import { Ermcp3SellBuyContract, SellBuyContractReq } from '@/services/go/ermcp/purchase/interface';
-import { ref, Ref } from '@vue/reactivity';
-import APP from '@/services';
-import { getUserId } from '@/services/bus/account';
+// import { QueryPurchase } from '@/services/go/ermcp/purchase';
+import { MenuItem } from '@/common/components/contextMenu/interface';
 import { initData } from '@/common/methods';
 import { ColumnType, getTableHead } from '@/common/methods/table';
-import { detailButton, permissionButton, handlePermission } from '@/common/setup/buttonPermission/index';
-import { MenuItem } from '@/common/components/contextMenu/interface';
-import { openModal } from '@/common/setup/modal/index';
+import { handlePermission } from '@/common/setup/buttonPermission/index';
+import APP from '@/services';
+import { getUserId } from '@/services/bus/account';
+import { Ermcp3SellBuyContract, SellBuyContractReq } from '@/services/go/ermcp/purchase/interface';
+import { ref } from '@vue/reactivity';
 import { watchEffect } from 'vue';
 // 采购数据获取和表头数据整理
 export function handlePurchase() {
@@ -23,9 +22,9 @@ export function handlePurchase() {
             querytype: 1, // 查询类型 1-全部 2-待点价 3-履约结算 4-已完成
             userid: getUserId(), // 用户ID
         };
-        QueryPurchase(req).then((res) => {
-            customList.value = res;
-        });
+        // QueryPurchase(req).then((res) => {
+        //     customList.value = res;
+        // });
     }
 
     // ========================获取表头========================
@@ -61,10 +60,17 @@ export function btnAndComp() {
     // 配置右键菜单列表
     const contextMenuList = ref<MenuItem[]>([]);
     // 打开新增页的弹窗 返回打开弹窗的方法
+<<<<<<< HEAD
     const { openAction: addAction } = openModal('addCustomInfo');
     // 创建详情页并写入右键菜单列表(每个页面都有,写死)
     // detailButton('customDetail', contextMenuList);
     // 通过code跟弹窗建立联系 返回写入右键的方法
+=======
+    // const { openAction: addAction } = openModal('addCustomInfo');
+    // // 创建详情页并写入右键菜单列表(每个页面都有,写死)
+    // detailButton('customDetail', contextMenuList);
+    // // 通过code跟弹窗建立联系 返回写入右键的方法
+>>>>>>> 6ee5515fe134a733dad62c180d2dd58b4398ff60
     // const { action: deleteAction } = permissionButton('purchase_pending_someprice', '点价登记', contextMenuList);
 
     const stop = watchEffect(() => {
@@ -73,7 +79,7 @@ export function btnAndComp() {
     });
     return {
         stop,
-        addAction,
+        // addAction,
         hasPermission,
         contextMenuList,
     };

src/views/business/sell/index.vue

@@ -1,35 +0,0 @@
-<template>
-  <!-- 销售-->
-  <div class="sell">
-    <firstMenu :list="list"
-               :value="'title'"
-               @selectMenu="selectMenu" />
-    <router-view />
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import firstMenu from '@/common/components/firstMenu/index.vue';
-import { handleRouterMenu } from '@/common/setup/router/index';
-import { initData } from '@/common/methods';
-export default defineComponent({
-    name: 'sell',
-    components: {
-        firstMenu,
-    },
-    setup() {
-        const { list, selectMenu, getMenuList } = handleRouterMenu();
-        initData(() => {
-            getMenuList();
-            console.log('list', list);
-        });
-        return { list, selectMenu };
-    },
-});
-</script>
-
-<style lang="less">
-.sell {
-}
-</style>;

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

@@ -193,7 +193,7 @@ export default defineComponent({
     name: 'add-custom',
     components: {},
     setup() {
-        const { visible, cancel } = closeModal('addCustomInfo');
+        const { visible, cancel } = closeModal('custom_info_btn_add');
         const loading = ref<boolean>(false);
         function submit() {
             loading.value = true;

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

@@ -1,40 +1,48 @@
 <template>
-    <!-- 恢复客户资料-->
-    <a-modal class="recover-custom" title="恢复客户资料" v-model:visible="visible" @cancel="cancel" width="890px">
-        <template #footer>
-            <a-button key="submit" type="primary" :loading="loading" @click="submit">完成</a-button>
-        </template>
-    </a-modal>
+  <!-- 恢复客户资料-->
+  <a-modal class="recover-custom"
+           title="恢复客户资料"
+           v-model:visible="visible"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">完成</a-button>
+    </template>
+  </a-modal>
 </template>
 
 <script lang="ts">
-    import { defineComponent, ref } from 'vue';
-    import { closeModal } from '@/common/setup/modal/index';
+import { defineComponent, ref } from 'vue';
+import { closeModal } from '@/common/setup/modal/index';
 
-    export default defineComponent({
-        name: 'recover-custom',
-        components: {},
-        setup() {
-            const { visible, cancel } = closeModal('deleteCustomInfo');
-            const loading = ref<boolean>(false);
-            function submit() {
-                loading.value = true;
-                setTimeout(() => {
-                    loading.value = false;
-                    cancel();
-                }, 2000);
-            }
-            return {
-                visible,
-                cancel,
-                submit,
-                loading,
-            };
-        },
-    });
+export default defineComponent({
+    name: 'recover-custom',
+    components: {},
+    setup() {
+        const { visible, cancel } = closeModal('custom_info_btn_delete');
+        const loading = ref<boolean>(false);
+        function submit() {
+            loading.value = true;
+            setTimeout(() => {
+                loading.value = false;
+                cancel();
+            }, 2000);
+        }
+        return {
+            visible,
+            cancel,
+            submit,
+            loading,
+        };
+    },
+});
 </script>
 
 <style lang="less">
-    .recover-custom {
-    }</style
+.recover-custom {
+}
+</style
 >;

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

@@ -1,142 +1,151 @@
 <template>
-    <!-- 客户资料详情-->
-    <a-modal class="add-custom custom-detail" title="客户资料详情" v-model:visible="visible" @cancel="cancel" width="890px">
-        <template #footer>
-            <a-button key="submit" type="primary" :loading="loading" @click="submit">关闭</a-button>
-        </template>
-        <a-form class="inlineForm" :form="form" @submit="handleSearch">
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="客户类型">
-                        <span class="white">企业</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="企业名称">
-                        <span class="white">深圳市前海矿业有限公司</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="企业简称">
-                        <span class="white">前海矿业</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="证件类型">
-                        <span class="white">营业执照</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="法定代表人">
-                        <span class="white">李顺利</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="证件号码">
-                        <span class="white">4328648236492432</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="纳税人识别号">
-                        <span class="white">57465736DR46456</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="营业执照">
-                        <div class="upload">
-                            <a class="blue">查看附件</a>
-                        </div>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="联系人">
-                        <span class="white">王平</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="联系人手机号">
-                        <span class="white">13745653421</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="联系电话">
-                        <span class="white">0755-34342544</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="状态">
-                        <span class="green">正常</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="24">
-                    <a-form-item label="通讯地址">
-                        <span class="white">广东省深圳市南山区前海街道路平路1324号</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="24">
-                    <a-form-item label="备注">
-                        <span class="white">深圳市前海矿业有限公司</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-        </a-form>
-    </a-modal>
+  <!-- 客户资料详情-->
+  <a-modal class="add-custom custom-detail"
+           title="客户资料详情"
+           v-model:visible="visible"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">关闭</a-button>
+    </template>
+    <a-form class="inlineForm"
+            :form="form"
+            @submit="handleSearch">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="客户类型">
+            <span class="white">企业</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="企业名称">
+            <span class="white">深圳市前海矿业有限公司</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="企业简称">
+            <span class="white">前海矿业</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="证件类型">
+            <span class="white">营业执照</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="法定代表人">
+            <span class="white">李顺利</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="证件号码">
+            <span class="white">4328648236492432</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="纳税人识别号">
+            <span class="white">57465736DR46456</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="营业执照">
+            <div class="upload">
+              <a class="blue">查看附件</a>
+            </div>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="联系人">
+            <span class="white">王平</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="联系人手机号">
+            <span class="white">13745653421</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="联系电话">
+            <span class="white">0755-34342544</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="状态">
+            <span class="green">正常</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <a-form-item label="通讯地址">
+            <span class="white">广东省深圳市南山区前海街道路平路1324号</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <a-form-item label="备注">
+            <span class="white">深圳市前海矿业有限公司</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
 </template>
 
 <script lang="ts">
-    import { defineComponent, ref } from 'vue';
-    import { closeModal } from '@/common/setup/modal/index';
+import { defineComponent, ref } from 'vue';
+import { closeModal } from '@/common/setup/modal/index';
 
-    export default defineComponent({
-        name: 'custom-detail',
-        components: {},
-        setup() {
-            const { visible, cancel } = closeModal('customDetail');
-            const loading = ref<boolean>(false);
-            function submit() {
-                loading.value = true;
-                setTimeout(() => {
-                    loading.value = false;
-                    cancel();
-                }, 2000);
-            }
-            return {
-                visible,
-                cancel,
-                submit,
-                loading,
-            };
-        },
-    });
+export default defineComponent({
+    name: 'custom-detail',
+    components: {},
+    setup() {
+        const { visible, cancel } = closeModal('detail');
+        const loading = ref<boolean>(false);
+        function submit() {
+            loading.value = true;
+            setTimeout(() => {
+                loading.value = false;
+                cancel();
+            }, 2000);
+        }
+        return {
+            visible,
+            cancel,
+            submit,
+            loading,
+        };
+    },
+});
 </script>
 
 <style lang="less">
-    .custom-detail {
-        .ant-form.inlineForm {
-            margin-top: 20px;
-        }
-        .white {
-            color: @m-white0;
-        }
-        .blue {
-            color: @m-blue0;
-        }
-        .green {
-            color: @m-green0;
-        }
+.custom-detail {
+    .ant-form.inlineForm {
+        margin-top: 20px;
+    }
+    .white {
+        color: @m-white0;
+    }
+    .blue {
+        color: @m-blue0;
+    }
+    .green {
+        color: @m-green0;
     }
+}
 </style>;

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

@@ -1,129 +1,140 @@
 <template>
-    <!-- 停用客户资料-->
-    <a-modal class="commonModal warehouse-disable" title="停用客户资料" v-model:visible="visible" @cancel="cancel" width="890px">
-        <template #footer>
-            <a-button key="submit" class="cancelBtn" @click="cancel">取消</a-button>
-            <a-button key="submit" type="primary" :loading="loading" @click="submit">确认停用</a-button>
-        </template>
-        <a-form class="inlineForm" :form="form" @submit="handleSearch">
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="客户类型">
-                        <span class="white">企业</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="企业名称">
-                        <span class="white">深圳市前海矿业有限公司</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="企业简称">
-                        <span class="white">前海矿业</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="证件类型">
-                        <span class="white">营业执照</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="法定代表人">
-                        <span class="white">李顺利</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="证件号码">
-                        <span class="white">4328648236492432</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="纳税人识别号">
-                        <span class="white">57465736DR46456</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="营业执照">
-                        <a class="blue">查看附件</a>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="联系人">
-                        <span class="white">王平</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="联系人手机号">
-                        <span class="white">13745653421</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="联系电话">
-                        <span class="white">0755-34342544</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="状态">
-                        <span class="green">正常</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="24">
-                    <a-form-item label="通讯地址">
-                        <span class="white">广东省深圳市南山区前海街道路平路1324号</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="24">
-                    <a-form-item label="备注">
-                        <span class="white">无</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-        </a-form>
-    </a-modal>
+  <!-- 停用客户资料-->
+  <a-modal class="commonModal warehouse-disable"
+           title="停用客户资料"
+           v-model:visible="visible"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                class="cancelBtn"
+                @click="cancel">取消</a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">确认停用</a-button>
+    </template>
+    <a-form class="inlineForm"
+            :form="form"
+            @submit="handleSearch">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="客户类型">
+            <span class="white">企业</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="企业名称">
+            <span class="white">深圳市前海矿业有限公司</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="企业简称">
+            <span class="white">前海矿业</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="证件类型">
+            <span class="white">营业执照</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="法定代表人">
+            <span class="white">李顺利</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="证件号码">
+            <span class="white">4328648236492432</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="纳税人识别号">
+            <span class="white">57465736DR46456</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="营业执照">
+            <a class="blue">查看附件</a>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="联系人">
+            <span class="white">王平</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="联系人手机号">
+            <span class="white">13745653421</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="联系电话">
+            <span class="white">0755-34342544</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="状态">
+            <span class="green">正常</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <a-form-item label="通讯地址">
+            <span class="white">广东省深圳市南山区前海街道路平路1324号</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <a-form-item label="备注">
+            <span class="white">无</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
 </template>
 
 <script lang="ts">
-    import { defineComponent, ref } from 'vue';
-    import { closeModal } from '@/common/setup/modal/index';
+import { defineComponent, ref } from 'vue';
+import { closeModal } from '@/common/setup/modal/index';
 
-    export default defineComponent({
-        name: 'custom-disable',
-        components: {},
-        setup() {
-            const { visible, cancel } = closeModal('disableCustomInfo');
-            const loading = ref<boolean>(false);
-            function submit() {
-                loading.value = true;
-                setTimeout(() => {
-                    loading.value = false;
-                    cancel();
-                }, 2000);
-            }
-            return {
-                visible,
-                cancel,
-                submit,
-                loading,
-            };
-        },
-    });
+export default defineComponent({
+    name: 'custom-disable',
+    components: {},
+    setup() {
+        const { visible, cancel } = closeModal('custom_info_btn_disable');
+        const loading = ref<boolean>(false);
+        function submit() {
+            loading.value = true;
+            setTimeout(() => {
+                loading.value = false;
+                cancel();
+            }, 2000);
+        }
+        return {
+            visible,
+            cancel,
+            submit,
+            loading,
+        };
+    },
+});
 </script>
 
 <style lang="less">
-    .arehouse-disable {
-    }
+.arehouse-disable {
+}
 </style>

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

@@ -1,6 +1,11 @@
 <template>
+<<<<<<< HEAD
   <!-- 修改客户资料 -->
   <a-modal class="commonModal modify-custom"
+=======
+  <!-- 修改客户资料-->
+  <a-modal class="modify-custom"
+>>>>>>> 6ee5515fe134a733dad62c180d2dd58b4398ff60
            title="修改客户资料"
            v-model:visible="visible"
            @cancel="cancel"
@@ -11,6 +16,7 @@
                 :loading="loading"
                 @click="submit">完成</a-button>
     </template>
+<<<<<<< HEAD
     <a-form class="inlineForm"
             :form="form"
             @submit="handleSearch">
@@ -181,19 +187,28 @@
         </a-col>
       </a-row>
     </a-form>
+=======
+>>>>>>> 6ee5515fe134a733dad62c180d2dd58b4398ff60
   </a-modal>
 </template>
 
 <script lang="ts">
 import { defineComponent, ref } from 'vue';
 import { closeModal } from '@/common/setup/modal/index';
+<<<<<<< HEAD
 import { initData } from '@/common/methods/index';
+=======
+>>>>>>> 6ee5515fe134a733dad62c180d2dd58b4398ff60
 
 export default defineComponent({
     name: 'modify-custom',
     components: {},
     setup() {
+<<<<<<< HEAD
         const { visible, cancel } = closeModal('modifyCustomInfo');
+=======
+        const { visible, cancel } = closeModal('custom_info_btn_modify');
+>>>>>>> 6ee5515fe134a733dad62c180d2dd58b4398ff60
         const loading = ref<boolean>(false);
         function submit() {
             loading.value = true;
@@ -202,7 +217,10 @@ export default defineComponent({
                 cancel();
             }, 2000);
         }
+<<<<<<< HEAD
         initData(() => {});
+=======
+>>>>>>> 6ee5515fe134a733dad62c180d2dd58b4398ff60
         return {
             visible,
             cancel,
@@ -215,6 +233,7 @@ export default defineComponent({
 
 <style lang="less">
 .modify-custom {
+<<<<<<< HEAD
   .upload {
       display: inline-flex;
       .ant-btn.uploadBtn {
@@ -239,6 +258,8 @@ export default defineComponent({
           cursor: pointer;
       }
   }
+=======
+>>>>>>> 6ee5515fe134a733dad62c180d2dd58b4398ff60
 }
 </style
 >;

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

@@ -1,40 +1,48 @@
 <template>
-    <!-- 修改客户资料-->
-    <a-modal class="modify-custom" title="修改客户资料" v-model:visible="visible" @cancel="cancel" width="890px">
-        <template #footer>
-            <a-button key="submit" type="primary" :loading="loading" @click="submit">完成</a-button>
-        </template>
-    </a-modal>
+  <!-- 修改客户资料-->
+  <a-modal class="modify-custom"
+           title="修改客户资料"
+           v-model:visible="visible"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">完成</a-button>
+    </template>
+  </a-modal>
 </template>
 
 <script lang="ts">
-    import { defineComponent, ref } from 'vue';
-    import { closeModal } from '@/common/setup/modal/index';
+import { defineComponent, ref } from 'vue';
+import { closeModal } from '@/common/setup/modal/index';
 
-    export default defineComponent({
-        name: 'modify-custom',
-        components: {},
-        setup() {
-            const { visible, cancel } = closeModal('recoverCustomInfo');
-            const loading = ref<boolean>(false);
-            function submit() {
-                loading.value = true;
-                setTimeout(() => {
-                    loading.value = false;
-                    cancel();
-                }, 2000);
-            }
-            return {
-                visible,
-                cancel,
-                submit,
-                loading,
-            };
-        },
-    });
+export default defineComponent({
+    name: 'modify-custom',
+    components: {},
+    setup() {
+        const { visible, cancel } = closeModal('custom_info_btn_recover');
+        const loading = ref<boolean>(false);
+        function submit() {
+            loading.value = true;
+            setTimeout(() => {
+                loading.value = false;
+                cancel();
+            }, 2000);
+        }
+        return {
+            visible,
+            cancel,
+            submit,
+            loading,
+        };
+    },
+});
 </script>
 
 <style lang="less">
-    .modify-custom {
-    }</style
+.modify-custom {
+}
+</style
 >;

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

@@ -1,80 +1,79 @@
 <template>
-    <!-- 客户信息: 正常 -->
-    <div class="custom-normal" :loading="loading">
-        <filterCustomTable @search="search">
-            <a-button class="operBtn" v-if="hasPermission('custom_info_btn_add')" @click="addAction">新增</a-button>
-        </filterCustomTable>
-        <contextMenu :contextMenuList="contextMenuList" :tableList="customList">
-            <a-table :columns="columns" class="topTable" :pagination="false" rowKey="key" :data-source="customList">
-                <template #userinfotype="{ text }">
-                    <a>{{ text === '2' ? '企业' : '个人' }}</a>
-                </template>
-            </a-table>
-        </contextMenu>
-        <!-- 新增 -->
-        <AddCustom />
-        <!-- 详情 -->
-        <CustomDetail />
-        <!-- 修改 -->
-        <ModifyCustom />
-        <!-- 停用 -->
-        <DisableCustom />
-    </div>
+  <!-- 客户信息: 正常 -->
+  <div class="custom-normal"
+       :loading="loading">
+    <filterCustomTable @search="search">
+      <a-button class="operBtn"
+                v-for="item in commonBtn"
+                :key="item.lable"
+                @click="item.callback">{{item.lable}}</a-button>
+    </filterCustomTable>
+    <contextMenu :contextMenuList="forDataBtn"
+                 :tableList="customList">
+      <a-table :columns="columns"
+               class="topTable"
+               :pagination="false"
+               rowKey="key"
+               :data-source="customList">
+        <template #userinfotype="{ text }">
+          <a>{{ text === '2' ? '企业' : '个人' }}</a>
+        </template>
+      </a-table>
+    </contextMenu>
+    <!-- 新增 -->
+    <AddCustom />
+    <!-- 详情 -->
+    <CustomDetail />
+    <!-- 修改 -->
+    <ModifyCustom />
+    <!-- 停用 -->
+    <DisableCustom />
+  </div>
 </template>
 
 <script lang="ts">
-    import { defineComponent, onUnmounted, Ref, ref, watchEffect } from 'vue';
+import { defineComponent, onUnmounted, Ref, ref, watchEffect } from 'vue';
 
-    import { initData } from '@/common/methods/index';
-    import filterCustomTable from '@/views/information/custom/compoments/filterTable/index.vue';
-    import { MenuItem } from '@/common/components/contextMenu/interface';
-    import contextMenu from '@/common/components/contextMenu/index.vue';
-    import { getCustomList } from '../setup';
-    import { openModal } from '@/common/setup/modal/index';
-    import CustomDetail from '@/views/information/custom/compoments/detail/index.vue';
-    import ModifyCustom from '@/views/information/custom/compoments/modify/index.vue';
-    import DisableCustom from '@/views/information/custom/compoments/disable/index.vue';
-    import AddCustom from '@/views/information/custom/compoments/add/index.vue';
-    import { detailButton, permissionButton, handlePermission } from '@/common/setup/buttonPermission/index';
+import { initData } from '@/common/methods/index';
+import filterCustomTable from '@/views/information/custom/compoments/filterTable/index.vue';
+import { MenuItem } from '@/common/components/contextMenu/interface';
+import contextMenu from '@/common/components/contextMenu/index.vue';
+import { getCustomList } from '../setup';
+import { openModal } from '@/common/setup/modal/index';
+import CustomDetail from '@/views/information/custom/compoments/detail/index.vue';
+import ModifyCustom from '@/views/information/custom/compoments/modify/index.vue';
+import DisableCustom from '@/views/information/custom/compoments/disable/index.vue';
+import AddCustom from '@/views/information/custom/compoments/add/index.vue';
+import { detailButton, permissionButton, handlePermission } from '@/common/setup/buttonPermission/index';
+import { getBtnList } from '@/common/setup/contextMenu/index';
 
-    export default defineComponent({
-        name: 'custom-normal',
-        components: {
-            filterCustomTable,
-            contextMenu,
-            CustomDetail,
-            ModifyCustom,
-            DisableCustom,
-            AddCustom,
-        },
-        setup() {
-            const { customList, actionQuery, columns, getColumns, search, loading } = getCustomList();
-            const { hasPermission } = handlePermission('custom_info_normal');
-            const contextMenuList = ref<MenuItem[]>([]);
+export default defineComponent({
+    name: 'custom-normal',
+    components: {
+        filterCustomTable,
+        contextMenu,
+        CustomDetail,
+        ModifyCustom,
+        DisableCustom,
+        AddCustom,
+    },
+    setup() {
+        const { customList, actionQuery, columns, getColumns, search, loading } = getCustomList();
+        const { hasPermission } = handlePermission('custom_info_normal');
+        const { commonBtn, forDataBtn } = getBtnList('custom_info_normal');
 
-            const { openAction: addAction } = openModal('addCustomInfo');
+        // const { openAction: addAction } = openModal('custom_info_btn_add');
 
-            detailButton('customDetail', contextMenuList);
-            const { action: modifyAction } = permissionButton('modifyCustomInfo', '修改', contextMenuList);
-            const { action: disableAction } = permissionButton('disableCustomInfo', '停用', contextMenuList);
-
-            const stop = watchEffect(() => {
-                hasPermission('custom_info_btn_modify') && modifyAction();
-                hasPermission('custom_info_btn_disable') && disableAction();
-            });
-            onUnmounted(() => {
-                stop();
-            });
-            initData(() => {
-                actionQuery(3);
-                getColumns();
-            });
-            return { customList, columns, search, loading, contextMenuList, hasPermission, addAction };
-        },
-    });
+        initData(() => {
+            actionQuery(3);
+            getColumns();
+        });
+        return { customList, columns, search, loading, commonBtn, forDataBtn, hasPermission };
+    },
+});
 </script>
 
 <style lang="less">
-    .custom-normal {
-    }
+.custom-normal {
+}
 </style>

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

@@ -1,80 +1,89 @@
 <template>
-    <!-- 客户信息: 停用 -->
-    <div class="custom-normal" :loading="loading">
-        <filterCustomTable @search="search">
-            <a-button class="operBtn" v-if="hasPermission('custom_info_btn_add')" @click="addAction">新增</a-button>
-        </filterCustomTable>
-        <contextMenu :contextMenuList="contextMenuList" :tableList="customList">
-            <a-table :columns="columns" class="topTable" :pagination="false" rowKey="key" :data-source="customList">
-                <template #userinfotype="{ text }">
-                    <a>{{ text === '2' ? '企业' : '个人' }}</a>
-                </template>
-            </a-table>
-        </contextMenu>
-        <!-- 新增 -->
-        <AddCustom />
-        <!-- 详情 -->
-        <CustomDetail />
-        <!-- 删除 -->
-        <DeleteCustom />
-        <!-- 恢复客户资料 -->@/common/methods
-        <RecoverCustom />
-    </div>
+  <!-- 客户信息: 停用 -->
+  <div class="custom-normal"
+       :loading="loading">
+    <filterCustomTable @search="search">
+      <a-button class="operBtn"
+                v-if="hasPermission('custom_info_btn_add')"
+                @click="addAction">新增</a-button>
+    </filterCustomTable>
+    <contextMenu :contextMenuList="contextMenuList"
+                 :tableList="customList">
+      <a-table :columns="columns"
+               class="topTable"
+               :pagination="false"
+               rowKey="key"
+               :data-source="customList">
+        <template #userinfotype="{ text }">
+          <a>{{ text === '2' ? '企业' : '个人' }}</a>
+        </template>
+      </a-table>
+    </contextMenu>
+    <!-- 新增 -->
+    <AddCustom />
+    <!-- 详情 -->
+    <CustomDetail />
+    <!-- 删除 -->
+    <DeleteCustom />
+    <!-- 恢复客户资料 -->@/common/methods
+    <RecoverCustom />
+  </div>
 </template>
 
 <script lang="ts">
-    import { defineComponent, onUnmounted, Ref, ref, watchEffect } from 'vue';
+import { defineComponent, onUnmounted, Ref, ref, watchEffect } from 'vue';
 
-    import { initData } from '@/common/methods/index';
-    import filterCustomTable from '@/views/information/custom/compoments/filterTable/index.vue';
-    import { MenuItem } from '@/common/components/contextMenu/interface';
-    import contextMenu from '@/common/components/contextMenu/index.vue';
-    import { getCustomList } from '../setup';
-    import { openModal } from '@/common/setup/modal/index';
-    import CustomDetail from '@/views/information/custom/compoments/detail/index.vue';
-    import DeleteCustom from '@/views/information/custom/compoments/delete/index.vue';
-    import RecoverCustom from '@/views/information/custom/compoments/recover/index.vue';
-    import AddCustom from '@/views/information/custom/compoments/add/index.vue';
-    import { detailButton, permissionButton, handlePermission } from '@/common/setup/buttonPermission/index';
+import { initData } from '@/common/methods/index';
+import filterCustomTable from '@/views/information/custom/compoments/filterTable/index.vue';
+import { MenuItem } from '@/common/components/contextMenu/interface';
+import contextMenu from '@/common/components/contextMenu/index.vue';
+import { getCustomList } from '../setup';
+import { openModal } from '@/common/setup/modal/index';
+import CustomDetail from '@/views/information/custom/compoments/detail/index.vue';
+import DeleteCustom from '@/views/information/custom/compoments/delete/index.vue';
+import RecoverCustom from '@/views/information/custom/compoments/recover/index.vue';
+import AddCustom from '@/views/information/custom/compoments/add/index.vue';
+import { detailButton, permissionButton, handlePermission } from '@/common/setup/buttonPermission/index';
 
-    export default defineComponent({
-        name: 'custom-normal',
-        components: {
-            filterCustomTable,
-            contextMenu,
-            CustomDetail,
-            DeleteCustom,
-            RecoverCustom,
-            AddCustom,
-        },
-        setup() {
-            const { customList, actionQuery, columns, getColumns, search, loading } = getCustomList();
-            const { hasPermission } = handlePermission('custom_info_normal');
-            const contextMenuList = ref<MenuItem[]>([]);
+export default defineComponent({
+    name: 'custom-normal',
+    components: {
+        filterCustomTable,
+        contextMenu,
+        CustomDetail,
+        DeleteCustom,
+        RecoverCustom,
+        AddCustom,
+    },
+    setup() {
+        const { customList, actionQuery, columns, getColumns, search, loading } = getCustomList();
+        const { hasPermission } = handlePermission('custom_info_normal');
+        const contextMenuList = ref<MenuItem[]>([]);
 
-            const { openAction: addAction } = openModal('addCustomInfo');
+        const { openAction: addAction } = openModal('custom_info_btn_add');
 
-            detailButton('customDetail', contextMenuList);
-            const { action: deleteAction } = permissionButton('deleteCustomInfo', '删除', contextMenuList);
-            const { action: recoverAction } = permissionButton('recoverCustomInfo', '恢复', contextMenuList);
+        detailButton('detail', contextMenuList);
+        const { action: deleteAction } = permissionButton('custom_info_btn_delete', '删除', contextMenuList);
+        const { action: recoverAction } = permissionButton('custom_info_btn_recover', '恢复', contextMenuList);
 
-            const stop = watchEffect(() => {
-                hasPermission('custom_info_btn_recover') && recoverAction();
-                hasPermission('custom_info_btn_delete') && deleteAction();
-            });
-            onUnmounted(() => {
-                stop();
-            });
-            initData(() => {
-                actionQuery(4);
-                getColumns();
-            });
-            return { customList, columns, search, loading, contextMenuList, hasPermission, addAction };
-        },
-    });
+        const stop = watchEffect(() => {
+            hasPermission('custom_info_btn_recover') && recoverAction();
+            hasPermission('custom_info_btn_delete') && deleteAction();
+        });
+        onUnmounted(() => {
+            stop();
+        });
+        initData(() => {
+            actionQuery(4);
+            getColumns();
+        });
+        return { customList, columns, search, loading, contextMenuList, hasPermission, addAction };
+    },
+});
 </script>
 
 <style lang="less">
-    .custom-normal {
-    }</style
+.custom-normal {
+}
+</style
 >;

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

@@ -200,7 +200,7 @@ export default defineComponent({
       MinusOutlined,
     },
     setup() {
-        const { visible, cancel } = closeModal('addGoods');
+        const { visible, cancel } = closeModal('spot_contract_btn_add');
         const loading = ref<boolean>(false);
         const columns = [
           {

src/views/information/goods/list/spot-variety/index.vue

@@ -1,71 +1,73 @@
 <template>
-    <!-- 现货品种 -->
-    <div class="spot-variety">
-        <filterCustomTable @search="search">
-            <a-button class="operBtn" @click="addAction">新增</a-button>
-        </filterCustomTable>
-        <div class="spotTableCont">
-            <div class="leftSpot">
-                <leftMenu></leftMenu>
-            </div>
-            <div class="rightCont">
-                <rightSpot></rightSpot>
-            </div>
-        </div>
-        <!-- 新增商品 -->
-        <AddGoods />
+  <!-- 现货品种 -->
+  <div class="spot-variety">
+    <filterCustomTable @search="search">
+      <a-button class="operBtn"
+                @click="addAction">新增</a-button>
+    </filterCustomTable>
+    <div class="spotTableCont">
+      <div class="leftSpot">
+        <leftMenu></leftMenu>
+      </div>
+      <div class="rightCont">
+        <rightSpot></rightSpot>
+      </div>
     </div>
+    <!-- 新增商品 -->
+    <AddGoods />
+  </div>
 </template>
 
 <script lang="ts">
-    import { defineComponent } from 'vue';
+import { defineComponent } from 'vue';
 
-    import filterCustomTable from '@/views/information/goods/components/filterTable/index.vue';
-    import leftMenu from '@/views/information/goods/components/leftMenu/index.vue';
-    import rightSpot from '@/views/information/goods/components/rightSpot/index.vue';
-    import { openModal } from '@/common/setup/modal/index';
-    import { initData } from '@/common/methods/index';
-    import AddGoods from '@/views/information/goods/components/add/index.vue';
+import filterCustomTable from '@/views/information/goods/components/filterTable/index.vue';
+import leftMenu from '@/views/information/goods/components/leftMenu/index.vue';
+import rightSpot from '@/views/information/goods/components/rightSpot/index.vue';
+import { openModal } from '@/common/setup/modal/index';
+import { initData } from '@/common/methods/index';
+import AddGoods from '@/views/information/goods/components/add/index.vue';
 
-    export default defineComponent({
-        name: 'spot-variety',
-        components: {
-            filterCustomTable,
-            leftMenu,
-            rightSpot,
-            AddGoods,
-        },
-        setup() {
-            const { openAction: addAction } = openModal('addGoods');
-            initData(() => {
-                // 加载数据在这里
-            });
-            return { addAction };
-        },
-    });
+export default defineComponent({
+    name: 'spot-variety',
+    components: {
+        filterCustomTable,
+        leftMenu,
+        rightSpot,
+        AddGoods,
+    },
+    setup() {
+        const { openAction: addAction } = openModal('spot_contract_btn_add');
+        initData(() => {
+            // 加载数据在这里
+        });
+        return { addAction };
+    },
+});
 </script>
 
 <style lang="less">
-    .spot-variety {
+.spot-variety {
+    width: 100%;
+    height: 100%;
+    .flex;
+    flex-direction: column;
+    .spotTableCont {
         width: 100%;
-        height: 100%;
-        .flex;
-        flex-direction: column;
-        .spotTableCont {
-            width: 100%;
-            height: calc(100% - 45px);
-            overflow-y: auto;
-            .inlineflex;
-            .leftSpot {
-                width: 180px;
-                height: 100%;
-                background: @m-black4;
-            }
-            .rightCont {
-                flex: 1;
-                height: 100%;
-                background: @m-black2;
-            }
+        height: calc(100% - 45px);
+        overflow-y: auto;
+        .inlineflex;
+        .leftSpot {
+            width: 180px;
+            height: 100%;
+            background: @m-black4;
         }
-    }</style
+        .rightCont {
+            flex: 1;
+            height: 100%;
+            background: @m-black2;
+        }
+    }
+}
+</style
 >;

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

@@ -23,7 +23,7 @@ export default defineComponent({
     name: 'add-spot-contract',
     components: {},
     setup() {
-        const { visible, cancel } = closeModal('addSpotContract');
+        const { visible, cancel } = closeModal('spot_contract_btn_add');
         const loading = ref<boolean>(false);
         function submit() {
             loading.value = true;

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

@@ -23,7 +23,7 @@ export default defineComponent({
     name: 'spot-contract-detail',
     components: {},
     setup() {
-        const { visible, cancel } = closeModal('spotContractCancel');
+        const { visible, cancel } = closeModal('spot_contract_btn_cancel');
         const loading = ref<boolean>(false);
         function submit() {
             loading.value = true;

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

@@ -23,7 +23,7 @@ export default defineComponent({
     name: 'spot-contract-detail',
     components: {},
     setup() {
-        const { visible, cancel } = closeModal('spotContractCheck');
+        const { visible, cancel } = closeModal('spot_contract_btn_check');
         const loading = ref<boolean>(false);
         function submit() {
             loading.value = true;

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

@@ -22,7 +22,7 @@ export default defineComponent({
     name: 'delete-spot-contract',
     components: {},
     setup() {
-        const { visible, cancel } = closeModal('deleteSpotContract');
+        const { visible, cancel } = closeModal('spot_contract_btn_delete');
         const loading = ref<boolean>(false);
         function submit() {
             loading.value = true;

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

@@ -114,7 +114,7 @@ export default defineComponent({
     name: 'spot-contract-detail',
     components: {},
     setup() {
-        const { visible, cancel } = closeModal('spotContractDetail');
+        const { visible, cancel } = closeModal('detail');
         const loading = ref<boolean>(false);
         function submit() {
             loading.value = true;

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

@@ -23,7 +23,7 @@ export default defineComponent({
     name: 'spot-contract-detail',
     components: {},
     setup() {
-        const { visible, cancel } = closeModal('spotContractFinish');
+        const { visible, cancel } = closeModal('spot_contract_btn_finish');
         const loading = ref<boolean>(false);
         function submit() {
             loading.value = true;

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

@@ -22,7 +22,7 @@ export default defineComponent({
     name: 'modify-spot-contract',
     components: {},
     setup() {
-        const { visible, cancel } = closeModal('modifySpotContract');
+        const { visible, cancel } = closeModal('spot_contract_btn_modify');
         const loading = ref<boolean>(false);
         function submit() {
             loading.value = true;

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

@@ -22,7 +22,7 @@ export default defineComponent({
     name: 'resubmit-spot-contract',
     components: {},
     setup() {
-        const { visible, cancel } = closeModal('resubmitSpotContract');
+        const { visible, cancel } = closeModal('spot_contract_btn_resubmit');
         const loading = ref<boolean>(false);
         function submit() {
             loading.value = true;

src/views/information/spot-contract/list/checkpending/index.vue

@@ -56,19 +56,20 @@ export default defineComponent({
         const contextMenuList = ref<MenuItem[]>([]);
         const { spotContractList, actionQuery, columns, getColumns, search, loading } = getCustomList();
         const { hasPermission } = handlePermission('spot_contract_checkpending');
-        const { openAction: addAction } = openModal('addSpotContract');
+        function addAction() {}
+        // const { openAction: addAction } = openModal('addSpotContract');
 
-        detailButton('spotContractDetail', contextMenuList);
-        const { action: checkAction } = permissionButton('spotContractCheck', '审核', contextMenuList);
-        const { action: cancelAction } = permissionButton('spotContractCancel', '撤销', contextMenuList);
+        // detailButton('spotContractDetail', contextMenuList);
+        // const { action: checkAction } = permissionButton('spotContractCheck', '审核', contextMenuList);
+        // const { action: cancelAction } = permissionButton('spotContractCancel', '撤销', contextMenuList);
 
-        const stop = watchEffect(() => {
-            hasPermission('spot_contract_btn_check') && checkAction();
-            hasPermission('spot_contract_btn_cancel') && cancelAction();
-        });
-        onUnmounted(() => {
-            stop();
-        });
+        // const stop = watchEffect(() => {
+        //     hasPermission('spot_contract_btn_check') && checkAction();
+        //     hasPermission('spot_contract_btn_cancel') && cancelAction();
+        // });
+        // onUnmounted(() => {
+        //     stop();
+        // });
         initData(() => {
             actionQuery(2);
             getColumns();

src/views/information/spot-contract/list/finished/index.vue

@@ -51,9 +51,10 @@ export default defineComponent({
         const contextMenuList = ref<MenuItem[]>([]);
         const { spotContractList, actionQuery, columns, getColumns, search, loading } = getCustomList();
         const { hasPermission } = handlePermission('spot_contract_finished');
-        const { openAction: addAction } = openModal('addSpotContract');
+        function addAction() {}
+        // const { openAction: addAction } = openModal('addSpotContract');
 
-        detailButton('spotContractDetail', contextMenuList);
+        // detailButton('spotContractDetail', contextMenuList);
 
         initData(() => {
             actionQuery(4);

src/views/information/spot-contract/list/performance/index.vue

@@ -52,17 +52,18 @@ export default defineComponent({
         const contextMenuList = ref<MenuItem[]>([]);
         const { spotContractList, actionQuery, columns, getColumns, search, loading } = getCustomList();
         const { hasPermission } = handlePermission('spot_contract_performance');
-        const { openAction: addAction } = openModal('addSpotContract');
+        function addAction() {}
+        // const { openAction: addAction } = openModal('addSpotContract');
 
-        detailButton('spotContractDetail', contextMenuList);
-        const { action: checkAction } = permissionButton('spotContractFinish', '正常完结', contextMenuList);
+        // detailButton('spotContractDetail', contextMenuList);
+        // const { action: checkAction } = permissionButton('spotContractFinish', '正常完结', contextMenuList);
 
-        const stop = watchEffect(() => {
-            hasPermission('spot_contract_btn_finish') && checkAction();
-        });
-        onUnmounted(() => {
-            stop();
-        });
+        // const stop = watchEffect(() => {
+        //     hasPermission('spot_contract_btn_finish') && checkAction();
+        // });
+        // onUnmounted(() => {
+        //     stop();
+        // });
         initData(() => {
             actionQuery(3);
             getColumns();

src/views/information/spot-contract/list/unsubmitted/index.vue

@@ -62,17 +62,17 @@ export default defineComponent({
         const contextMenuList = ref<MenuItem[]>([]);
         const { spotContractList, actionQuery, columns, getColumns, search, loading } = getCustomList();
         const { hasPermission } = handlePermission('spot_contract_unsubmitted');
-        const { openAction: addAction } = openModal('addSpotContract');
+        const { openAction: addAction } = openModal('spot_contract_btn_add');
 
-        detailButton('spotContractDetail', contextMenuList);
-        const { action: modifyAction } = permissionButton('modifySpotContract', '修改', contextMenuList);
-        const { action: deleteAction } = permissionButton('deleteSpotContract', '删除', contextMenuList);
-        const { action: resubmitAction } = permissionButton('resubmitSpotContract', '重新提交', contextMenuList);
-        const stop = watchEffect(() => {
-            hasPermission('spot_contract_btn_modify') && modifyAction();
-            hasPermission('spot_contract_btn_delete') && deleteAction();
-            hasPermission('spot_contract_btn_resubmit') && resubmitAction();
-        });
+        detailButton('detail', contextMenuList);
+        // const { action: modifyAction } = permissionButton('modifySpotContract', '修改', contextMenuList);
+        // const { action: deleteAction } = permissionButton('deleteSpotContract', '删除', contextMenuList);
+        // const { action: resubmitAction } = permissionButton('resubmitSpotContract', '重新提交', contextMenuList);
+        // const stop = watchEffect(() => {
+        //     hasPermission('spot_contract_btn_modify') && modifyAction();
+        //     hasPermission('spot_contract_btn_delete') && deleteAction();
+        //     hasPermission('spot_contract_btn_resubmit') && resubmitAction();
+        // });
         onUnmounted(() => {
             stop();
         });

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

@@ -1,143 +1,171 @@
 <template>
-    <!-- 新增仓库信息 -->
-    <a-modal class="add-warehouse" title="新增仓库信息" v-model:visible="visible" @cancel="cancel" width="890px">
-        <template #footer>
-            <a-button key="submit" type="primary" :loading="loading" @click="submit">完成</a-button>
-        </template>
-        <a-form class="inlineForm" :form="form" @submit="handleSearch">
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="仓库类型">
-                        <a-select class="typeSelect" style="width: 200px" placeholder="请选择仓库类型">
-                            <a-select-option value="1">
-                                仓库一
-                            </a-select-option>
-                            <a-select-option value="2">
-                                仓库二
-                            </a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="仓库名称">
-                        <a-input class="dialogInput" style="width: 200px" placeholder="请输入仓库名称" />
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="仓库简称">
-                        <a-input class="dialogInput" style="width: 200px" placeholder="请输入仓库简称" />
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="联系人">
-                        <a-input class="dialogInput" style="width: 200px" placeholder="请输入联系人" />
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="24">
-                    <a-form-item label="联系电话">
-                        <a-input class="dialogInput" style="width: 200px" placeholder="请输入联系电话" />
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="24">
-                    <a-form-item label="所在地区">
-                        <a-select class="inlineFormSelect" style="width: 205px" placeholder="请选择省">
-                            <a-select-option value="1">
-                                广东省
-                            </a-select-option>
-                            <a-select-option value="2">
-                                湖南省
-                            </a-select-option>
-                        </a-select>
-                        <a-select class="inlineFormSelect" style="width: 205px" placeholder="请选择市">
-                            <a-select-option value="1">
-                                深圳市
-                            </a-select-option>
-                            <a-select-option value="2">
-                                岳阳市
-                            </a-select-option>
-                        </a-select>
-                        <a-select class="inlineFormSelect" style="width: 205px" placeholder="请选择县(区)">
-                            <a-select-option value="1">
-                                区一
-                            </a-select-option>
-                            <a-select-option value="2">
-                                区二
-                            </a-select-option>
-                        </a-select>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="24">
-                    <a-form-item label="详细地址">
-                        <a-input class="dialogInput" style="width: 635px" placeholder="请输入详细地址" />
-                    </a-form-item>
-                </a-col>
-            </a-row>
-        </a-form>
-    </a-modal>
+  <!-- 新增仓库信息 -->
+  <a-modal class="add-warehouse"
+           title="新增仓库信息"
+           v-model:visible="visible"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">完成</a-button>
+    </template>
+    <a-form class="inlineForm"
+            :form="form"
+            @submit="handleSearch">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="仓库类型">
+            <a-select class="typeSelect"
+                      style="width: 200px"
+                      placeholder="请选择仓库类型">
+              <a-select-option value="1">
+                仓库一
+              </a-select-option>
+              <a-select-option value="2">
+                仓库二
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="仓库名称">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入仓库名称" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="仓库简称">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入仓库简称" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="联系人">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入联系人" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <a-form-item label="联系电话">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     placeholder="请输入联系电话" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <a-form-item label="所在地区">
+            <a-select class="inlineFormSelect"
+                      style="width: 205px"
+                      placeholder="请选择省">
+              <a-select-option value="1">
+                广东省
+              </a-select-option>
+              <a-select-option value="2">
+                湖南省
+              </a-select-option>
+            </a-select>
+            <a-select class="inlineFormSelect"
+                      style="width: 205px"
+                      placeholder="请选择市">
+              <a-select-option value="1">
+                深圳市
+              </a-select-option>
+              <a-select-option value="2">
+                岳阳市
+              </a-select-option>
+            </a-select>
+            <a-select class="inlineFormSelect"
+                      style="width: 205px"
+                      placeholder="请选择县(区)">
+              <a-select-option value="1">
+                区一
+              </a-select-option>
+              <a-select-option value="2">
+                区二
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <a-form-item label="详细地址">
+            <a-input class="dialogInput"
+                     style="width: 635px"
+                     placeholder="请输入详细地址" />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
 </template>
 
 <script lang="ts">
-    import { defineComponent, ref } from 'vue';
-    import { closeModal } from '@/common/setup/modal/index';
-    import { initData } from '@/common/methods/index';
+import { defineComponent, ref } from 'vue';
+import { closeModal } from '@/common/setup/modal/index';
+import { initData } from '@/common/methods/index';
 
-    export default defineComponent({
-        name: 'add-warehouse',
-        components: {},
-        setup() {
-            const { visible, cancel } = closeModal('addCustomInfo');
-            const loading = ref<boolean>(false);
-            function submit() {
-                loading.value = true;
-                setTimeout(() => {
-                    loading.value = false;
-                    cancel();
-                }, 2000);
-            }
-            initData(() => {});
-            return {
-                visible,
-                cancel,
-                submit,
-                loading,
-            };
-        },
-    });
+export default defineComponent({
+    name: 'add-warehouse',
+    components: {},
+    setup() {
+        const { visible, cancel } = closeModal('custom_info_btn_add');
+        const loading = ref<boolean>(false);
+        function submit() {
+            loading.value = true;
+            setTimeout(() => {
+                loading.value = false;
+                cancel();
+            }, 2000);
+        }
+        initData(() => {});
+        return {
+            visible,
+            cancel,
+            submit,
+            loading,
+        };
+    },
+});
 </script>
 
 <style lang="less">
-    .add-warehouse {
-    }
-    .upload {
-        display: inline-flex;
-        .ant-btn.uploadBtn {
-            width: 60px;
-            height: 30px;
-            background: @m-blue0;
-            border: 0;
-            padding: 0;
-            text-align: center;
-            font-size: 14px;
-            color: @m-white0;
-            .rounded-corners(3px);
-            &:hover {
-                background: rgba(@m-blue0, 0);
-                color: rgba(@m-white0, 0.8);
-            }
-        }
-        .look {
-            color: @m-blue0;
-            font-size: 14px;
-            margin-left: 10px;
-            cursor: pointer;
+.add-warehouse {
+}
+.upload {
+    display: inline-flex;
+    .ant-btn.uploadBtn {
+        width: 60px;
+        height: 30px;
+        background: @m-blue0;
+        border: 0;
+        padding: 0;
+        text-align: center;
+        font-size: 14px;
+        color: @m-white0;
+        .rounded-corners(3px);
+        &:hover {
+            background: rgba(@m-blue0, 0);
+            color: rgba(@m-white0, 0.8);
         }
-    }</style
+    }
+    .look {
+        color: @m-blue0;
+        font-size: 14px;
+        margin-left: 10px;
+        cursor: pointer;
+    }
+}
+</style
 >;

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

@@ -1,91 +1,103 @@
 <template>
-    <!-- 停用仓库信息-->
-    <a-modal class="commonModal warehouse-disable" title="停用仓库信息" v-model:visible="visible" @cancel="cancel" width="890px">
-        <template #footer>
-            <a-button key="submit" class="cancelBtn" @click="cancel">取消</a-button>
-            <a-button key="submit" type="primary" :loading="loading" @click="submit">确认停用</a-button>
-        </template>
-        <a-form class="inlineForm" :form="form" @submit="handleSearch">
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="仓库类型">
-                        <span class="white">自有库</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="仓库名称">
-                        <span class="white">深圳市南储公司2号库房</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="仓库简称">
-                        <span class="white">南储深圳2号库</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="联系人">
-                        <span class="white">王平</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="联系电话">
-                        <span class="white">13832676234</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="状态">
-                        <span class="green">正常</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-            <a-row :gutter="24">
-                <a-col :span="12">
-                    <a-form-item label="所在地区">
-                        <span class="white">广东省深圳市南山区</span>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="12">
-                    <a-form-item label="详细地址">
-                        <span class="white">深南大道1290号仓库</span>
-                    </a-form-item>
-                </a-col>
-            </a-row>
-        </a-form>
-    </a-modal>
+  <!-- 停用仓库信息-->
+  <a-modal class="commonModal warehouse-disable"
+           title="停用仓库信息"
+           v-model:visible="visible"
+           @cancel="cancel"
+           width="890px">
+    <template #footer>
+      <a-button key="submit"
+                class="cancelBtn"
+                @click="cancel">取消</a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">确认停用</a-button>
+    </template>
+    <a-form class="inlineForm"
+            :form="form"
+            @submit="handleSearch">
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="仓库类型">
+            <span class="white">自有库</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="仓库名称">
+            <span class="white">深圳市南储公司2号库房</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="仓库简称">
+            <span class="white">南储深圳2号库</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="联系人">
+            <span class="white">王平</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="联系电话">
+            <span class="white">13832676234</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="状态">
+            <span class="green">正常</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12">
+          <a-form-item label="所在地区">
+            <span class="white">广东省深圳市南山区</span>
+          </a-form-item>
+        </a-col>
+        <a-col :span="12">
+          <a-form-item label="详细地址">
+            <span class="white">深南大道1290号仓库</span>
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
 </template>
 
 <script lang="ts">
-    import { defineComponent, ref } from 'vue';
-    import { closeModal } from '@/common/setup/modal/index';
+import { defineComponent, ref } from 'vue';
+import { closeModal } from '@/common/setup/modal/index';
 
-    export default defineComponent({
-        name: 'custom-disable',
-        components: {},
-        setup() {
-            const { visible, cancel } = closeModal('disableCustomInfo');
-            const loading = ref<boolean>(false);
-            function submit() {
-                loading.value = true;
-                setTimeout(() => {
-                    loading.value = false;
-                    cancel();
-                }, 2000);
-            }
-            return {
-                visible,
-                cancel,
-                submit,
-                loading,
-            };
-        },
-    });
+export default defineComponent({
+    name: 'custom-disable',
+    components: {},
+    setup() {
+        const { visible, cancel } = closeModal('custom_info_btn_disable');
+        const loading = ref<boolean>(false);
+        function submit() {
+            loading.value = true;
+            setTimeout(() => {
+                loading.value = false;
+                cancel();
+            }, 2000);
+        }
+        return {
+            visible,
+            cancel,
+            submit,
+            loading,
+        };
+    },
+});
 </script>
 
 <style lang="less">
-    .warehouse-disable {
-    }</style
+.warehouse-disable {
+}
+</style
 >;