li.shaoyi 4 سال پیش
والد
کامیت
ce512591a2

+ 5 - 56
src/common/components/tableButton/index.vue

@@ -8,79 +8,28 @@
 
 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
-import { useRoute } from 'vue-router';
-import { OperationTabMenuAuth } from '@/services/go/commonService/interface';
-import { BtnClassName, BtnListType } from './interface';
-
-/**
- * 获取class 名
- * @param val
- * @returns
- */
-const getClassName = (val: string): BtnClassName => {
-    let result: BtnClassName = 'btnDeafault';
-    const btnDanger = ['disable', 'cancle', 'cancel', 'delete', 'logout', 'locked', 'refuse'];
-    const operBtn = ['add', 'modify', 'reset', 'credit', 'payment', 'confirm_withdrawal', 'complete_stocking', 'upload_logistics', 'buy', 'listed', 'delisting', 'receipt', 'confirm_pickup'];
-    const map = new Map<BtnClassName, string[]>([
-        ['btnDanger', btnDanger],
-        ['operBtn', operBtn],
-    ]);
-    for (const [key, value] of map) {
-        for (const item of value) {
-            if (val.includes(item)) {
-                result = key;
-                break;
-            }
-        }
-    }
-    return result;
-};
+import { BtnListType } from './interface';
 
 export default defineComponent({
     name: 'mtpTableButton',
     emits: ['click'],
     props: {
-        code: {
-            type: Array as PropType<string[]>,
-            required: true,
+        buttons: {
+            type: Array as PropType<BtnListType[]>,
+            default: [],
         },
         record: {
-            default: {},
             type: Object,
+            default: {},
         },
     },
     setup(props, context) {
-        const route = useRoute();
-        const auth = route.meta.auth as OperationTabMenuAuth[];
-
-        // 根据code权限获取按钮列表
-        const buttons = props.code.reduce((prev, cur) => {
-            if (cur === 'detail') {
-                prev.push({
-                    lable: '详情',
-                    code: 'detail',
-                    className: getClassName(''),
-                });
-            } else {
-                const item = auth.find((val) => val.code === cur);
-                if (item) {
-                    prev.push({
-                        lable: item.label,
-                        code: item.code,
-                        className: getClassName(item.code),
-                    });
-                }
-            }
-            return prev;
-        }, [] as BtnListType[]);
-
         // 调用父级点击事件
         const onClick = (item: BtnListType) => {
             context.emit('click', item, props.record);
         };
 
         return {
-            buttons,
             onClick,
         };
     },

+ 13 - 13
src/common/constants/modalNameEnum.ts

@@ -113,7 +113,7 @@ export enum ModalEnum {
 
 	warehouse_info_btn_recover = 'warehouse_info_btn_recover', // 恢复
 
-	account_info_business_btn_add = 'account_info_business_btn_add', // 新增
+	account_info_business_btn_add = 'account_spot_add', // 新增
 
 	account_info_trade_btn_add = 'account_info_trade_btn_add', // 新增
 
@@ -211,9 +211,9 @@ export enum ModalEnum {
 
 	spot_contract_btn_finish = 'spot_contract_btn_finish', // 正常完结
 
-	account_info_business_btn_modify = 'account_info_business_btn_modify', // 修改
+	account_info_business_btn_modify = 'account_spot_modify', // 修改
 
-	account_info_business_btn_locked = 'account_info_business_btn_locked', // 锁定
+	account_info_business_btn_locked = 'account_spot_locked', // 锁定
 
 	account_info_business_btn_unlocked = 'account_info_business_btn_unlocked', // 解锁
 
@@ -223,33 +223,33 @@ export enum ModalEnum {
 
 	account_info_manager_btn_child_add = 'account_info_manager_btn_child_add', // 新增
 
-	account_info_business_btn_reset = 'account_info_business_btn_reset', // 重置密码
+	account_info_business_btn_reset = 'account_spot_resetpwd', // 重置密码
 
 	account_info_futures_btn_child_add = 'account_info_futures_btn_child_add', // 新增
 
-	account_info_business_btn_cancel = 'account_info_business_btn_cancel', // 注销
+	account_info_business_btn_cancel = 'account_spot_cancel', // 注销
 
 	account_info_futures_btn_modify = 'account_info_futures_btn_modify', // 修改
 
 	purchase_pending_someprice = 'purchase_pending_someprice', // 点价登记
 
-	purchase_pending_settlement = 'purchase_pending_settlement', // 交收登记
+	purchase_pending_settlement = 'purchase_performance_settlement', // 交收登记
 
-	purchase_pending_funds = 'purchase_pending_funds', // 款项登记
+	purchase_pending_funds = 'purchase_performance_funds', // 款项登记
 
-	purchase_pending_invoice = 'purchase_pending_invoice', // 发票登记
+	purchase_pending_invoice = 'purchase_performance_invoice', // 发票登记
 
-	purchase_pending_storage = 'purchase_pending_storage', // 入库登记
+	purchase_pending_storage = 'purchase_performance_storage', // 入库登记
 
 	sell_pending_someprice = 'sell_pending_someprice', // 点价登记
 
-	sell_pending_settlement = 'sell_pending_settlement', // 交收登记
+	sell_pending_settlement = 'sell_performance_settlement', // 交收登记
 
-	sell_pending_funds = 'sell_pending_funds', // 款项登记
+	sell_pending_funds = 'sell_performance_funds', // 款项登记
 
-	sell_pending_invoice = 'sell_pending_invoice', // 发票登记
+	sell_pending_invoice = 'sell_performance_invoice', // 发票登记
 
-	sell_pending_storage = 'sell_pending_storage', // 出库登记
+	sell_pending_storage = 'sell_performance_storage', // 出库登记
 
 	plan_uncommitted_modify = 'plan_uncommitted_modify', // 修改
 

+ 1 - 2
src/common/export/table.ts

@@ -1,7 +1,6 @@
 // 通用表格需要的导入的数据
 
 import BtnList from '@/common/components/buttonList/index.vue';
-import MtpTableButton from '@/common/components/tableButton/index.vue';
 import contextMenu from '@/common/components/contextMenu/index.vue';
 import { initData } from '@/common/methods';
 import { getBtnList, getTableColumns, getTableEvent, queryTableList, _getBtnList } from '@/common/setup/table/index';
@@ -10,6 +9,6 @@ import { defineComponent } from 'vue';
 export {
     defineComponent, initData,
     getTableColumns, getTableEvent, getBtnList, _getBtnList, queryTableList,
-    contextMenu, BtnList, MtpTableButton
+    contextMenu, BtnList
 };
 

+ 37 - 5
src/common/setup/table/button.ts

@@ -1,15 +1,12 @@
-/*!
- * 待确认是否废弃------------------------------------------------------
- */
-
 import { BtnClassName, BtnListType } from '@/common/components/btnList/interface';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { ModalName } from '@/common/constants/modalName';
-import { OperationTabMenu } from '@/services/go/commonService/interface';
+import { OperationTabMenu, OperationTabMenuAuth } from '@/services/go/commonService/interface';
 import { sessionStorageUtil } from "@/utils/storage";
 import { inject, ref, Ref, toRaw, unref } from 'vue';
 import { openModal } from "../modal";
 import { ButtonListKey } from './interface';
+import { useRoute } from 'vue-router';
 
 /**
  * 获取class 名
@@ -257,4 +254,39 @@ export function getButtonList(menuType: EnumRouterName, hasDetail: boolean) {
         result.push(item)
     }
     return result
+}
+
+
+
+
+// ↑上面方法待确认后废弃删除↑
+
+
+/**
+ * 根据code权限获取按钮列表
+ */
+export function getTableButton(codes: string[]): BtnListType[] {
+    const route = useRoute();
+    const auth = route.meta.auth as OperationTabMenuAuth[];
+
+    // 根据code权限获取按钮列表
+    return codes.reduce((result, code) => {
+        if (code === 'detail') {
+            result.push({
+                lable: '详情',
+                code: 'detail',
+                className: getClassName(''),
+            });
+        } else {
+            const item = auth.find((val) => val.code === code);
+            if (item) {
+                result.push({
+                    lable: item.label,
+                    code: item.code,
+                    className: getClassName(item.code),
+                });
+            }
+        }
+        return result;
+    }, [] as BtnListType[]);
 }

+ 46 - 77
src/views/business/purchase/list/all/index.vue

@@ -1,69 +1,42 @@
 <template>
-  <!-- 采购: 全部-->
-  <div class="purchase-all"
-       :loading="loading">
-    <filterCustomTable @search="updateColumn">
-      <BtnList :btnList="firstBtn"
-               @click="openComponent" />
-    </filterCustomTable>
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="secondBtn"
-                 :record="record"
-                 class="btn-list-sticky"
-                 @click="openComponent" />
-      </template>
-      <template #contracctstatus="{ record }">
-        <a>{{
-                getContractStatusName(record.contracctstatus) }}</a>
-      </template>
-      <template #pricedqty="{ text, record }">
-        <span>{{ handleEnumdic(text, record) }}</span>
-      </template>
-      <template #unsureqty="{ text, record }">
-        <span>{{ handleEnumdic(text, record) }}</span>
-      </template>
-      <template #qty="{ text, record }">
-        <span>{{ handleEnumdic(text, record) }}</span>
-      </template>
-      <template #unpricedqty="{ text, record }">
-        <span>{{ handleEnumdic(text, record) }}</span>
-      </template>
-        <template #deliverystartdate,deliveryenddate="{ record }">
-            <span>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
-                        formatTime(record.deliveryenddate, "d"))  }}</span>
-        </template>
-        <template #startdate,enddate="{ record }">
-            <span>{{ formatValue(formatTime(record.startdate, "d") + '--' +
-                        formatTime(record.enddate, "d"))  }}</span>
-        </template>
-
-
-
-    </a-table>
-    <!-- 右键 -->
-    <contextMenu :contextMenu="contextMenu"
-                 @cancel="closeContext"
-                 :list="secondBtn">
-    </contextMenu>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </div>
+    <!-- 采购: 全部-->
+    <div class="purchase-all" :loading="loading">
+        <filterCustomTable @search="updateColumn"></filterCustomTable>
+        <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
+            </template>
+            <template #contracctstatus="{ record }">
+                <a>{{ getContractStatusName(record.contracctstatus) }}</a>
+            </template>
+            <template #pricedqty="{ text, record }">
+                <span>{{ handleEnumdic(text, record) }}</span>
+            </template>
+            <template #unsureqty="{ text, record }">
+                <span>{{ handleEnumdic(text, record) }}</span>
+            </template>
+            <template #qty="{ text, record }">
+                <span>{{ handleEnumdic(text, record) }}</span>
+            </template>
+            <template #unpricedqty="{ text, record }">
+                <span>{{ handleEnumdic(text, record) }}</span>
+            </template>
+            <template #deliverystartdate,deliveryenddate="{ record }">
+                <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
+            </template>
+            <template #startdate,enddate="{ record }">
+                <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
+            </template>
+        </a-table>
+        <!-- 右键 -->
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
+        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
+    </div>
 </template>
 
 <script lang="ts">
-import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
+import { queryTableList, MtpTableButton, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
 
 import { Ermcp3SellBuyContract } from '../index';
 import { filterCustomTable } from '../../components';
@@ -71,7 +44,8 @@ import { QueryPurchase } from '@/services/go/ermcp/purchase';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { getContractStatusName } from '@/common/constants/enumsName';
 import { handleEnumdic } from '../setup';
-import {formatTime, formatValue} from "@/common/methods";
+import { formatTime, formatValue } from '@/common/methods';
+import { getTableButton } from '@/common/setup/table/button';
 
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 const Settlement = defineAsyncComponent(() => import('../../components/settlement/index.vue')); //交收登记
@@ -86,19 +60,16 @@ export default defineComponent({
         contextMenu,
         filterCustomTable,
         Detail,
-        BtnList,
+        MtpTableButton,
         [ModalEnum.detail]: Detail,
-        [ModalEnum.purchase_pending_settlement]: Settlement,
-        [ModalEnum.purchase_pending_funds]: Funds,
-        [ModalEnum.purchase_pending_invoice]: Invoice,
-        [ModalEnum.purchase_pending_storage]: Storage,
-        [ModalEnum.purchase_pending_someprice]: SomePrice,
     },
     setup() {
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<Ermcp3SellBuyContract>();
+
         // 获取列表数据
         const queryTableAction = () => queryTable(QueryPurchase, { querytype: 1 });
+
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
@@ -107,6 +78,9 @@ export default defineComponent({
             tableFilterKey: ['accountname', 'contractno', 'deliverygoodsname', 'convertfactor', 'goodsname'],
             isDetail: true,
         };
+
+        const buttons = getTableButton([ModalEnum.detail]);
+
         return {
             ...handleComposeTable<Ermcp3SellBuyContract>(param),
             tableList,
@@ -114,14 +88,9 @@ export default defineComponent({
             getContractStatusName,
             handleEnumdic,
             formatTime,
-            formatValue
+            formatValue,
+            buttons,
         };
     },
 });
-</script>
-
-<style lang="less">
-.purchase-history {
-}
-</style
->;
+</script>

+ 11 - 17
src/views/business/purchase/list/pending/index.vue

@@ -1,13 +1,12 @@
 <template>
+    <div style="background: red; color: #fff; padding: 5px 0">待修改-套保交易-purchase_pending_trade</div>
     <!-- 采购: 待点价-->
     <div class="purchase-peddding" :loading="loading">
-        <filterCustomTable @search="updateColumn">
-            <BtnList :btnList="firstBtn" @click="openComponent" />
-        </filterCustomTable>
+        <filterCustomTable @search="updateColumn"></filterCustomTable>
         <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
             <!-- 额外的展开行 -->
             <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :code="[ModalEnum.purchase_pending_someprice, ModalEnum.detail]" :record="record" @click="openComponent" />
+                <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
             </template>
             <template #pricedqty="{ text, record }">
                 <span>{{ handleEnumdic(text, record) }}</span>
@@ -21,13 +20,12 @@
             <template #unpricedqty="{ text, record }">
                 <span>{{ handleEnumdic(text, record) }}</span>
             </template>
-            <template #unpayamount="{ text, record }">
+            <template #unpayamount="{ record }">
                 <span>{{ record.unpayamount.toFixed(2) }}</span>
             </template>
-            <template #daikaiamount="{ text, record }">
+            <template #daikaiamount="{ record }">
                 <span>{{ record.daikaiamount.toFixed(2) }}</span>
             </template>
-
             <template #deliverystartdate,deliveryenddate="{ record }">
                 <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
             </template>
@@ -36,13 +34,13 @@
             </template>
         </a-table>
         <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="secondBtn"> </contextMenu>
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
         <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
     </div>
 </template>
 
 <script lang="ts">
-import { queryTableList, BtnList, MtpTableButton, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
+import { queryTableList, MtpTableButton, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
 
 import { Ermcp3SellBuyContract } from '../index';
 import { filterCustomTable } from '../../components';
@@ -50,6 +48,7 @@ import { QueryPurchase } from '@/services/go/ermcp/purchase';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { handleEnumdic } from '../setup';
 import { formatTime, formatValue } from '@/common/methods';
+import { getTableButton } from '@/common/setup/table/button';
 
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 const SomePrice = defineAsyncComponent(() => import('../../components/someprice/index.vue')); //采购点价登记
@@ -59,7 +58,6 @@ export default defineComponent({
     components: {
         contextMenu,
         filterCustomTable,
-        BtnList,
         MtpTableButton,
         [ModalEnum.detail]: Detail,
         [ModalEnum.purchase_pending_someprice]: SomePrice,
@@ -78,6 +76,8 @@ export default defineComponent({
             isDetail: true,
         };
 
+        const buttons = getTableButton([ModalEnum.purchase_pending_someprice, 'purchase_pending_trade', ModalEnum.detail]);
+
         return {
             ...handleComposeTable<Ermcp3SellBuyContract>(param),
             tableList,
@@ -85,14 +85,8 @@ export default defineComponent({
             handleEnumdic,
             formatTime,
             formatValue,
-            ModalEnum,
+            buttons,
         };
     },
 });
 </script>
-
-<style lang="less">
-.spot-contract-peddding {
-}
-</style
->;

+ 14 - 15
src/views/business/purchase/list/performance/index.vue

@@ -1,13 +1,12 @@
 <template>
+    <div style="background: red; color: #fff; padding: 5px 0">待修改-完结合同-purchase_performance_ending</div>
     <!-- 采购: 履约交收-->
     <div class="purchase-performance" :loading="loading">
-        <filterCustomTable @search="updateColumn">
-            <BtnList :btnList="firstBtn" @click="openComponent" />
-        </filterCustomTable>
+        <filterCustomTable @search="updateColumn"></filterCustomTable>
         <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
             <!-- 额外的展开行 -->
             <template #expandedRowRender="{ record }">
-                <BtnList :btnList="secondBtn" :record="record" class="btn-list-sticky" @click="openComponent" />
+                <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
             </template>
             <template #pricedqty="{ text, record }">
                 <span>{{ handleEnumdic(text, record) }}</span>
@@ -29,20 +28,20 @@
             </template>
         </a-table>
         <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="secondBtn"> </contextMenu>
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
         <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
     </div>
 </template>
 
 <script lang="ts">
-import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
-
+import { queryTableList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, handleComposeTable, ComposeTableParam, MtpTableButton } from '@/common/export/commonTable';
 import { filterCustomTable } from '../../components';
 import { QueryPurchase } from '@/services/go/ermcp/purchase';
 import { Ermcp3SellBuyContract } from '@/views/business/sell/list';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { handleEnumdic } from '../setup';
 import { formatTime, formatValue } from '@/common/methods';
+import { getTableButton } from '@/common/setup/table/button';
 
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 const Settlement = defineAsyncComponent(() => import('../../components/settlement/index.vue')); //交收登记
@@ -55,7 +54,7 @@ export default defineComponent({
     components: {
         contextMenu,
         filterCustomTable,
-        BtnList,
+        MtpTableButton,
         [ModalEnum.detail]: Detail,
         [ModalEnum.purchase_pending_settlement]: Settlement,
         [ModalEnum.purchase_pending_funds]: Funds,
@@ -65,8 +64,10 @@ export default defineComponent({
     setup() {
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<Ermcp3SellBuyContract>();
+
         // 获取列表数据
         const queryTableAction = () => queryTable(QueryPurchase, { querytype: 3 });
+
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
@@ -75,6 +76,9 @@ export default defineComponent({
             tableFilterKey: ['accountname', 'contractno', 'deliverygoodsname', 'convertfactor', 'goodsname'],
             isDetail: true,
         };
+
+        const buttons = getTableButton([ModalEnum.purchase_pending_settlement, ModalEnum.purchase_pending_funds, ModalEnum.purchase_pending_invoice, ModalEnum.purchase_pending_storage, 'purchase_performance_ending', ModalEnum.detail]);
+
         return {
             ...handleComposeTable<Ermcp3SellBuyContract>(param),
             tableList,
@@ -82,13 +86,8 @@ export default defineComponent({
             handleEnumdic,
             formatTime,
             formatValue,
+            buttons,
         };
     },
 });
-</script>
-
-<style lang="less">
-.purchase-history {
-}
-</style
->;
+</script>

+ 45 - 67
src/views/business/sell/list/all/index.vue

@@ -1,73 +1,50 @@
 <template>
-  <!-- 销售:全部-->
-  <div class="sell-all"
-       :loading="loading">
-    <filterCustomTable @search="updateColumn">
-      <BtnList :btnList="firstBtn"
-               @click="openComponent" />
-    </filterCustomTable>
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="secondBtn"
-                 :record="record"
-                 class="btn-list-sticky"
-                 @click="openComponent" />
-      </template>
-      <template #contracctstatus="{ record }">
-        <a>{{
-                getContractStatusName(record.contracctstatus) }}</a>
-      </template>
-      <template #pricedqty="{ text, record }">
-        <span>{{ handleEnumdic(text, record) }}</span>
-      </template>
-      <template #unsureqty="{ text, record }">
-        <span>{{ handleEnumdic(text, record) }}</span>
-      </template>
-      <template #qty="{ text, record }">
-        <span>{{ handleEnumdic(text, record) }}</span>
-      </template>
-      <template #unpricedqty="{ text, record }">
-        <span>{{ handleEnumdic(text, record) }}</span>
-      </template>
-        <template #deliverystartdate,deliveryenddate="{ record }">
-            <span>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
-                        formatTime(record.deliveryenddate, "d"))  }}</span>
-        </template>
-        <template #startdate,enddate="{ record }">
-            <span>{{ formatValue(formatTime(record.startdate, "d") + '--' +
-                        formatTime(record.enddate, "d"))  }}</span>
-        </template>
-    </a-table>
-    <!-- 右键 -->
-    <contextMenu :contextMenu="contextMenu"
-                 @cancel="closeContext"
-                 :list="secondBtn">
-    </contextMenu>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </div>
+    <!-- 销售:全部-->
+    <div class="sell-all" :loading="loading">
+        <filterCustomTable @search="updateColumn"></filterCustomTable>
+        <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
+            </template>
+            <template #contracctstatus="{ record }">
+                <a>{{ getContractStatusName(record.contracctstatus) }}</a>
+            </template>
+            <template #pricedqty="{ text, record }">
+                <span>{{ handleEnumdic(text, record) }}</span>
+            </template>
+            <template #unsureqty="{ text, record }">
+                <span>{{ handleEnumdic(text, record) }}</span>
+            </template>
+            <template #qty="{ text, record }">
+                <span>{{ handleEnumdic(text, record) }}</span>
+            </template>
+            <template #unpricedqty="{ text, record }">
+                <span>{{ handleEnumdic(text, record) }}</span>
+            </template>
+            <template #deliverystartdate,deliveryenddate="{ record }">
+                <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
+            </template>
+            <template #startdate,enddate="{ record }">
+                <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
+            </template>
+        </a-table>
+        <!-- 右键 -->
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
+        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
+    </div>
 </template>
 
 <script lang="ts">
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
+import { queryTableList, MtpTableButton, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
 import { QueryWareHouse } from '@/services/go/ermcp/sell';
 import { Ermcp3SellBuyContract } from '@/views/business/purchase/list';
 import { filterCustomTable } from '../../components';
 import { getContractStatusName } from '@/common/constants/enumsName';
 import { handleEnumdic } from '../setup';
-import {formatTime, formatValue} from "@/common/methods";
+import { formatTime, formatValue } from '@/common/methods';
+import { getTableButton } from '@/common/setup/table/button';
 
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 const Settlement = defineAsyncComponent(() => import('../../components/settlement/index.vue')); //交收登记
@@ -81,19 +58,16 @@ export default defineComponent({
     components: {
         contextMenu,
         filterCustomTable,
-        BtnList,
+        MtpTableButton,
         [ModalEnum.detail]: Detail,
-        [ModalEnum.purchase_pending_settlement]: Settlement,
-        [ModalEnum.purchase_pending_funds]: Funds,
-        [ModalEnum.purchase_pending_invoice]: Invoice,
-        [ModalEnum.purchase_pending_storage]: Storage,
-        [ModalEnum.purchase_pending_someprice]: SomePrice,
     },
     setup() {
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<Ermcp3SellBuyContract>();
+
         // 获取列表数据
         const queryTableAction = () => queryTable(QueryWareHouse, { querytype: 1 });
+
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
@@ -102,6 +76,9 @@ export default defineComponent({
             tableFilterKey: ['accountname', 'contractno', 'deliverygoodsname', 'convertfactor', 'goodsname'],
             isDetail: true,
         };
+
+        const buttons = getTableButton([ModalEnum.detail]);
+
         return {
             ...handleComposeTable<Ermcp3SellBuyContract>(param),
             tableList,
@@ -109,7 +86,8 @@ export default defineComponent({
             getContractStatusName,
             handleEnumdic,
             formatTime,
-            formatValue
+            formatValue,
+            buttons,
         };
     },
 });

+ 42 - 66
src/views/business/sell/list/pending/index.vue

@@ -1,69 +1,48 @@
 <template>
-  <!-- 销售: 待点价-->
-  <div class="sell-peddding"
-       :loading="loading">
-    <filterCustomTable @search="updateColumn">
-      <BtnList :btnList="firstBtn"
-               @click="openComponent" />
-    </filterCustomTable>
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="secondBtn"
-                 class="btn-list-sticky"
-                 :record="record"
-                 @click="openComponent" />
-      </template>
-      <template #pricedqty="{ text, record }">
-        <span>{{ handleEnumdic(text, record) }}</span>
-      </template>
-      <template #unsureqty="{ text, record }">
-        <span>{{ handleEnumdic(text, record) }}</span>
-      </template>
-      <template #qty="{ text, record }">
-        <span>{{ handleEnumdic(text, record) }}</span>
-      </template>
-      <template #unpricedqty="{ text, record }">
-        <span>{{ handleEnumdic(text, record) }}</span>
-      </template>
-        <template #deliverystartdate,deliveryenddate="{ record }">
-            <span>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
-                        formatTime(record.deliveryenddate, "d"))  }}</span>
-        </template>
-        <template #startdate,enddate="{ record }">
-            <span>{{ formatValue(formatTime(record.startdate, "d") + '--' +
-                        formatTime(record.enddate, "d"))  }}</span>
-        </template>
-    </a-table>
-    <!-- 右键 -->
-    <contextMenu :contextMenu="contextMenu"
-                 @cancel="closeContext"
-                 :list="secondBtn">
-    </contextMenu>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </div>
+    <div style="background: red; color: #fff; padding: 5px 0">待修改-套保交易-sell_pending_trade</div>
+    <!-- 销售: 待点价-->
+    <div class="sell-peddding" :loading="loading">
+        <filterCustomTable @search="updateColumn"></filterCustomTable>
+        <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
+            </template>
+            <template #pricedqty="{ text, record }">
+                <span>{{ handleEnumdic(text, record) }}</span>
+            </template>
+            <template #unsureqty="{ text, record }">
+                <span>{{ handleEnumdic(text, record) }}</span>
+            </template>
+            <template #qty="{ text, record }">
+                <span>{{ handleEnumdic(text, record) }}</span>
+            </template>
+            <template #unpricedqty="{ text, record }">
+                <span>{{ handleEnumdic(text, record) }}</span>
+            </template>
+            <template #deliverystartdate,deliveryenddate="{ record }">
+                <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
+            </template>
+            <template #startdate,enddate="{ record }">
+                <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
+            </template>
+        </a-table>
+        <!-- 右键 -->
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
+        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
+    </div>
 </template>
 
 <script lang="ts">
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
+import { queryTableList, MtpTableButton, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
 import { QueryWareHouse } from '@/services/go/ermcp/sell';
 import { Ermcp3SellBuyContract } from '@/views/business/purchase/list';
 import { handleEnumdic } from '../setup';
-
 import { filterCustomTable } from '../../components';
-import {formatTime, formatValue} from "@/common/methods";
+import { formatTime, formatValue } from '@/common/methods';
+import { getTableButton } from '@/common/setup/table/button';
+
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 const SomePrice = defineAsyncComponent(() => import('../../components/someprice/index.vue')); //采购点价登记
 
@@ -72,7 +51,7 @@ export default defineComponent({
     components: {
         contextMenu,
         filterCustomTable,
-        BtnList,
+        MtpTableButton,
         [ModalEnum.detail]: Detail,
         [ModalEnum.sell_pending_someprice]: SomePrice,
     },
@@ -90,20 +69,17 @@ export default defineComponent({
             isDetail: true,
         };
 
+        const buttons = getTableButton([ModalEnum.sell_pending_someprice, 'sell_pending_trade', ModalEnum.detail]);
+
         return {
             ...handleComposeTable<Ermcp3SellBuyContract>(param),
             tableList,
             loading,
             handleEnumdic,
             formatTime,
-            formatValue
+            formatValue,
+            buttons,
         };
     },
 });
-</script>
-
-<style lang="less">
-.sell-peddding {
-}
-</style
->;
+</script>

+ 45 - 65
src/views/business/sell/list/performance/index.vue

@@ -1,68 +1,48 @@
 <template>
-  <!-- 销售: 履约交收-->
-  <div class="sell_performance"
-       :loading="loading">
-    <filterCustomTable @search="updateColumn">
-      <BtnList :btnList="firstBtn"
-               @click="openComponent" />
-    </filterCustomTable>
-    <a-table :columns="columns"
-             class="srcollYTable"
-             :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-             :pagination="false"
-             :loading="loading"
-             :expandedRowKeys="expandedRowKeys"
-             :customRow="Rowclick"
-             rowKey="key"
-             :data-source="tableList">
-      <!-- 额外的展开行 -->
-      <template #expandedRowRender="{ record }">
-        <BtnList :btnList="secondBtn"
-                 class="btn-list-sticky"
-                 :record="record"
-                 @click="openComponent" />
-      </template>
-      <template #pricedqty="{ text, record }">
-        <span>{{ handleEnumdic(text, record) }}</span>
-      </template>
-      <template #unsureqty="{ text, record }">
-        <span>{{ handleEnumdic(text, record) }}</span>
-      </template>
-      <template #qty="{ text, record }">
-        <span>{{ handleEnumdic(text, record) }}</span>
-      </template>
-      <template #unpricedqty="{ text, record }">
-        <span>{{ handleEnumdic(text, record) }}</span>
-      </template>
-        <template #deliverystartdate,deliveryenddate="{ record }">
-            <span>{{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
-                        formatTime(record.deliveryenddate, "d"))  }}</span>
-        </template>
-        <template #startdate,enddate="{ record }">
-            <span>{{ formatValue(formatTime(record.startdate, "d") + '--' +
-                        formatTime(record.enddate, "d"))  }}</span>
-        </template>
-    </a-table>
-    <!-- 右键 -->
-    <contextMenu :contextMenu="contextMenu"
-                 @cancel="closeContext"
-                 :list="secondBtn">
-    </contextMenu>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedRow"
-               @cancel="closeComponent"></component>
-  </div>
+    <div style="background: red; color: #fff; padding: 5px 0">待修改-完结合同-sell_performance_ending</div>
+    <!-- 销售: 履约交收-->
+    <div class="sell_performance" :loading="loading">
+        <filterCustomTable @search="updateColumn"></filterCustomTable>
+        <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :loading="loading" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+            <!-- 额外的展开行 -->
+            <template #expandedRowRender="{ record }">
+                <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
+            </template>
+            <template #pricedqty="{ text, record }">
+                <span>{{ handleEnumdic(text, record) }}</span>
+            </template>
+            <template #unsureqty="{ text, record }">
+                <span>{{ handleEnumdic(text, record) }}</span>
+            </template>
+            <template #qty="{ text, record }">
+                <span>{{ handleEnumdic(text, record) }}</span>
+            </template>
+            <template #unpricedqty="{ text, record }">
+                <span>{{ handleEnumdic(text, record) }}</span>
+            </template>
+            <template #deliverystartdate,deliveryenddate="{ record }">
+                <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
+            </template>
+            <template #startdate,enddate="{ record }">
+                <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
+            </template>
+        </a-table>
+        <!-- 右键 -->
+        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="buttons"> </contextMenu>
+        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
+    </div>
 </template>
 
 <script lang="ts">
 import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { queryTableList, BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
+import { queryTableList, MtpTableButton, contextMenu, defineAsyncComponent, defineComponent, ModalEnum, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
 import { QueryWareHouse } from '@/services/go/ermcp/sell';
 import { Ermcp3SellBuyContract } from '@/views/business/purchase/list';
 import { handleEnumdic } from '../setup';
 import { filterCustomTable } from '../../components';
-import {formatTime, formatValue} from "@/common/methods";
+import { formatTime, formatValue } from '@/common/methods';
+import { getTableButton } from '@/common/setup/table/button';
+
 const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
 const Settlement = defineAsyncComponent(() => import('../../components/settlement/index.vue')); //交收登记
 const Funds = defineAsyncComponent(() => import('../../components/funds/index.vue')); // 款项登记
@@ -74,7 +54,7 @@ export default defineComponent({
     components: {
         contextMenu,
         filterCustomTable,
-        BtnList,
+        MtpTableButton,
         [ModalEnum.detail]: Detail,
         [ModalEnum.sell_pending_settlement]: Settlement,
         [ModalEnum.sell_pending_funds]: Funds,
@@ -84,8 +64,10 @@ export default defineComponent({
     setup() {
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<Ermcp3SellBuyContract>();
+
         // 获取列表数据
         const queryTableAction = () => queryTable(QueryWareHouse, { querytype: 3 });
+
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
@@ -94,20 +76,18 @@ export default defineComponent({
             tableFilterKey: ['accountname', 'contractno', 'deliverygoodsname', 'convertfactor', 'goodsname'],
             isDetail: true,
         };
+
+        const buttons = getTableButton([ModalEnum.sell_pending_settlement, ModalEnum.sell_pending_funds, ModalEnum.sell_pending_invoice, ModalEnum.sell_pending_storage, 'purchase_performance_ending', ModalEnum.detail]);
+
         return {
             ...handleComposeTable<Ermcp3SellBuyContract>(param),
             tableList,
             loading,
             handleEnumdic,
             formatTime,
-            formatValue
+            formatValue,
+            buttons,
         };
     },
 });
-</script>
-
-<style lang="less">
-.sell_performance {
-}
-</style
->;
+</script>

+ 55 - 69
src/views/information/account_info/list/account_info_business/index.vue

@@ -1,73 +1,54 @@
 <template>
-  <!-- 业务账户 -->
-  <div class="account_info_business account_info_container"
-       :loading="loading">
-    <filterCustomTable @search="search"></filterCustomTable>
-    <div class="tltLeft">
-      <span class="blue">
-        <svg class="icon svg-icon"
-             aria-hidden="true">
-          <use xlink:href="#icon-shuzhuangtu"></use>
-        </svg>
-        {{getUserName()}}
-      </span>
+    <!-- 业务账户 -->
+    <div class="account_info_business account_info_container" :loading="loading">
+        <filterCustomTable @search="search"></filterCustomTable>
+        <div class="tltLeft">
+            <span class="blue">
+                <svg class="icon svg-icon" aria-hidden="true">
+                    <use xlink:href="#icon-shuzhuangtu"></use>
+                </svg>
+                {{ getUserName() }}
+            </span>
+        </div>
+        <div class="a-collapse-container">
+            <a-collapse class="spotCollapse" v-for="(item, i) in tableList" :key="i + '11'" :bordered="false">
+                <template #expandIcon="props">
+                    <svg class="icon svg-icon" aria-hidden="true" v-if="props.isActive == 0">
+                        <use xlink:href="#icon-shouqi1"></use>
+                    </svg>
+                    <svg class="icon svg-icon" aria-hidden="true" v-else>
+                        <use xlink:href="#icon-shouqi2"></use>
+                    </svg>
+                </template>
+                <a-collapse-panel>
+                    <template #header>
+                        <a-row class="headRow">
+                            <a-col :span="12">{{ item.rolename }}({{ item.userlist.length }})</a-col>
+                            <a-col :span="12">
+                                <mtp-table-button :buttons="firstBtn" :record="item" @click="openComponent" />
+                            </a-col>
+                        </a-row>
+                    </template>
+                    <a-collapse class="busyCollapse" v-for="(sub, j) in item.userlist" :key="j + '11'" :bordered="false">
+                        <a-collapse-panel :show-arrow="false">
+                            <template #header>
+                                <a-row class="contRow">
+                                    <a-col :span="12">{{ sub.loginname }}-{{ sub.logincode }}</a-col>
+                                    <a-col :span="12">{{ getLoginStatusEnumItemName(sub.loginstatus) }}</a-col>
+                                </a-row>
+                            </template>
+                            <mtp-table-button :buttons="secondBtn" :record="sub" @click="openComponent" />
+                        </a-collapse-panel>
+                    </a-collapse>
+                </a-collapse-panel>
+            </a-collapse>
+        </div>
+        <component :is="componentId" v-if="componentId" :selectedRow="selectedData" @cancel="closeComponent"></component>
     </div>
-    <div class="a-collapse-container">
-      <a-collapse class="spotCollapse"
-                  v-for="(item, i) in tableList"
-                  :key="i + '11'"
-                  :bordered="false">
-        <template #expandIcon="props">
-          <svg class="icon svg-icon"
-               aria-hidden="true"
-               v-if="props.isActive == 0">
-            <use xlink:href="#icon-shouqi1"></use>
-          </svg>
-          <svg class="icon svg-icon"
-               aria-hidden="true"
-               v-else>
-            <use xlink:href="#icon-shouqi2"></use>
-          </svg>
-        </template>
-        <a-collapse-panel>
-          <template #header>
-            <a-row class="headRow">
-              <a-col :span="12">{{item.rolename}}({{item.userlist.length}})</a-col>
-              <a-col :span="12">
-                <BtnList :btnList="firstBtn"
-                         :record="item"
-                         @click="openComponent" />
-              </a-col>
-            </a-row>
-          </template>
-          <a-collapse class="busyCollapse"
-                      v-for="(sub, j) in item.userlist"
-                      :key="j + '11'"
-                      :bordered="false">
-            <a-collapse-panel :show-arrow="false">
-              <template #header>
-                <a-row class="contRow">
-                  <a-col :span="12">{{sub.loginname}}-{{sub.logincode}}</a-col>
-                  <a-col :span="12">{{getLoginStatusEnumItemName(sub.loginstatus)}}</a-col>
-                </a-row>
-              </template>
-              <BtnList :btnList="sub.btnList"
-                       :record="sub"
-                       @click="openComponent" />
-            </a-collapse-panel>
-          </a-collapse>
-        </a-collapse-panel>
-      </a-collapse>
-    </div>
-    <component :is="componentId"
-               v-if="componentId"
-               :selectedRow="selectedData"
-               @cancel="closeComponent"></component>
-  </div>
 </template>
 
 <script lang="ts">
-import { BtnList, contextMenu, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
+import { contextMenu, defineAsyncComponent, defineComponent, ModalEnum, MtpTableButton } from '@/common/export/commonTable';
 import { initData, _getBtnList } from '@/common/export/table';
 import filterCustomTable from '@/views/information/goods/components/filterTable/index.vue';
 import { handlerManagerList } from '@/common/setup/user';
@@ -78,8 +59,7 @@ import { getUserName } from '@/services/bus/user';
 import { _handleTableList } from '../setup';
 import { ref } from 'vue';
 import { handleModalComponent } from '@/common/setup/asyncComponent';
-import { getBtnList_ } from '@/common/setup/table/button';
-import { EnumRouterName } from '@/common/constants/enumRouterName';
+import { getTableButton } from '@/common/setup/table/button';
 
 const Add = defineAsyncComponent(() => import('../../compoments/add-business/index.vue'));
 const Modify = defineAsyncComponent(() => import('../../compoments/modify-business/index.vue'));
@@ -93,7 +73,7 @@ export default defineComponent({
     name: 'account_info_business',
     components: {
         contextMenu,
-        BtnList,
+        MtpTableButton,
         filterCustomTable,
         [ModalEnum.detail]: Detail,
         [ModalEnum.account_info_business_btn_modify]: Modify,
@@ -107,18 +87,24 @@ export default defineComponent({
         // 加载状态
         const loading = ref<boolean>(false);
         const { tableList, queryTable } = handlerManagerList(loading, 1);
-        const [firstBtn, secondBtn] = getBtnList_(EnumRouterName.account_info_business, true).value;
+
+        const firstBtn = getTableButton([ModalEnum.account_info_business_btn_add]);
+        const secondBtn = getTableButton([ModalEnum.account_info_business_btn_modify, ModalEnum.account_info_business_btn_reset, ModalEnum.account_info_business_btn_locked, ModalEnum.account_info_business_btn_cancel, ModalEnum.detail]);
+
         // 处理根据状态显示对应按钮
         function handleBtnAction() {
             _handleTableList(queryTable, tableList, secondBtn);
         }
+
         // 弹窗选中的数据
         const selectedData = ref<ErmcpLoginUserEx>();
+
         // 控制异步组件
         const { componentId, closeComponent, openComponent } = handleModalComponent(handleBtnAction, selectedData);
         initData(() => {
             handleBtnAction();
         });
+
         // 查询
         function search(value: any) {}
         return {

+ 53 - 92
src/views/information/account_info/list/account_info_futures/index.vue

@@ -1,97 +1,58 @@
 <template>
-  <!-- 期货账户 -->
-  <div class="account_info_futures account_info_container"
-       :loading="loading">
-    <filterCustomTable @search="search"></filterCustomTable>
-    <div class="tltLeft">
-      <span class="blue">
-        <svg class="icon svg-icon"
-             aria-hidden="true">
-          <use xlink:href="#icon-shuzhuangtu" />
-        </svg>
-        {{getUserName()}}
-      </span>
-      <BtnList :btnList="firstBtn" />
+    <div style="background: red; color: #fff; padding: 5px 0">待修改</div>
+    <!-- 期货账户 -->
+    <div class="account_info_futures account_info_container" :loading="loading">
+        <filterCustomTable @search="search"></filterCustomTable>
+        <div class="tltLeft">
+            <span class="blue">
+                <svg class="icon svg-icon" aria-hidden="true">
+                    <use xlink:href="#icon-shuzhuangtu" />
+                </svg>
+                {{ getUserName() }}
+            </span>
+            <BtnList :btnList="firstBtn" />
+        </div>
+        <div class="a-collapse-container">
+            <a-collapse class="spotCollapse" v-for="(item, i) in tableList" :key="i + '11'" :bordered="false">
+                <template #expandIcon="props">
+                    <svg class="icon svg-icon" aria-hidden="true" v-if="props.isActive == 0">
+                        <use xlink:href="#icon-shouqi1" />
+                    </svg>
+                    <svg class="icon svg-icon" aria-hidden="true" v-else>
+                        <use xlink:href="#icon-shouqi2" />
+                    </svg>
+                </template>
+                <a-collapse-panel>
+                    <template #header>
+                        <a-row class="headRow">
+                            <a-col :span="12"> {{ item.mainAcc.accountname }} {{ '-' + item.mainAcc.hedgeaccountcode }} ({{ item.subacclist.length }}){{ item.mainAcc.fcname }} </a-col>
+                            <a-col :span="12">
+                                <BtnList :btnList="secondBtn" @onClick="secondeClick(item)" />
+                            </a-col>
+                        </a-row>
+                    </template>
+                    <a-collapse class="futureCollapse" accordion :bordered="false">
+                        <a-collapse-panel :show-arrow="false" v-for="(sub, i) in item.subacclist" :key="i + '11'">
+                            <template #header>
+                                <a-row class="contRow">
+                                    <a-col :span="12">{{ sub.accountname }}-{{ sub.accountid }}</a-col>
+                                    <a-col :span="12">{{ getTaAccountStatus(sub.tradestatus) }}</a-col>
+                                </a-row>
+                            </template>
+                            <BtnList :btnList="getBtnList(sub.tradestatus)" @onClick="thirdClick(item, sub)" />
+                        </a-collapse-panel>
+                    </a-collapse>
+                </a-collapse-panel>
+            </a-collapse>
+        </div>
+        <Add @refresh="queryTable" />
+        <AddChild :selectedData="firstData" :userList="userList" :marginList="marginList" :feeList="feeList" @updateTrader="queryUserList" @refresh="queryTable" />
+        <Modify :selectedData="firstData" @refresh="queryTable" />
+        <ModifyChild @refresh="queryTable" :userList="userList" :marginList="marginList" :feeList="feeList" :secondeData="secondeData" :selectedData="firstData" />
+        <Detail :selectedData="firstData" :secondeData="secondeData" :userList="userList" :marginList="marginList" :feeList="feeList" />
+        <Cancel @refresh="queryTable" :userList="userList" :marginList="marginList" :feeList="feeList" :secondeData="secondeData" :selectedData="firstData" />
+        <Credit @refresh="queryTable" :selectedData="firstData" :secondeData="secondeData" />
     </div>
-    <div class="a-collapse-container">
-      <a-collapse class="spotCollapse"
-                  v-for="(item, i) in tableList"
-                  :key="i + '11'"
-                  :bordered="false">
-        <template #expandIcon="props">
-          <svg class="icon svg-icon"
-               aria-hidden="true"
-               v-if="props.isActive == 0">
-            <use xlink:href="#icon-shouqi1" />
-          </svg>
-          <svg class="icon svg-icon"
-               aria-hidden="true"
-               v-else>
-            <use xlink:href="#icon-shouqi2" />
-          </svg>
-        </template>
-        <a-collapse-panel>
-          <template #header>
-            <a-row class="headRow">
-              <a-col :span="12">
-                {{item.mainAcc.accountname}} {{ '-' + item.mainAcc.hedgeaccountcode}}
-                ({{item.subacclist.length}}){{item.mainAcc.fcname}}
-              </a-col>
-              <a-col :span="12">
-                <BtnList :btnList="secondBtn"
-                         @onClick="secondeClick(item)" />
-              </a-col>
-            </a-row>
-          </template>
-          <a-collapse class="futureCollapse"
-                      accordion
-                      :bordered="false">
-            <a-collapse-panel :show-arrow="false"
-                              v-for="(sub, i) in item.subacclist"
-                              :key="i + '11'">
-              <template #header>
-                <a-row class="contRow">
-                  <a-col :span="12">{{sub.accountname}}-{{sub.accountid}}</a-col>
-                  <a-col :span="12">{{getTaAccountStatus(sub.tradestatus)}}</a-col>
-                </a-row>
-              </template>
-              <BtnList :btnList="getBtnList(sub.tradestatus)"
-                       @onClick="thirdClick(item, sub)" />
-            </a-collapse-panel>
-          </a-collapse>
-        </a-collapse-panel>
-      </a-collapse>
-    </div>
-    <Add @refresh="queryTable" />
-    <AddChild :selectedData="firstData"
-              :userList="userList"
-              :marginList="marginList"
-              :feeList="feeList"
-              @updateTrader="queryUserList"
-              @refresh="queryTable" />
-    <Modify :selectedData="firstData"
-            @refresh="queryTable" />
-    <ModifyChild @refresh="queryTable"
-                 :userList="userList"
-                 :marginList="marginList"
-                 :feeList="feeList"
-                 :secondeData="secondeData"
-                 :selectedData="firstData" />
-    <Detail :selectedData="firstData"
-            :secondeData="secondeData"
-            :userList="userList"
-            :marginList="marginList"
-            :feeList="feeList" />
-    <Cancel @refresh="queryTable"
-            :userList="userList"
-            :marginList="marginList"
-            :feeList="feeList"
-            :secondeData="secondeData"
-            :selectedData="firstData" />
-    <Credit @refresh="queryTable"
-            :selectedData="firstData"
-            :secondeData="secondeData" />
-  </div>
 </template>
 
 <script lang="ts">

+ 55 - 78
src/views/information/account_info/list/account_info_manager/index.vue

@@ -1,83 +1,60 @@
 <template>
-  <!-- 管理账户 -->
-  <div class="account_info_manager account_info_container"
-       :loading="loading">
-    <filterCustomTable @search="search"></filterCustomTable>
-    <div class="tltLeft">
-      <span class="blue">
-        <svg class="icon svg-icon"
-             aria-hidden="true">
-          <use xlink:href="#icon-shuzhuangtu"></use>
-        </svg>
-        {{getUserName()}}
-      </span>
-      <BtnList :btnList="firstBtn" />
+    <div style="background: red; color: #fff; padding: 5px 0">待修改</div>
+    <!-- 管理账户 -->
+    <div class="account_info_manager account_info_container" :loading="loading">
+        <filterCustomTable @search="search"></filterCustomTable>
+        <div class="tltLeft">
+            <span class="blue">
+                <svg class="icon svg-icon" aria-hidden="true">
+                    <use xlink:href="#icon-shuzhuangtu"></use>
+                </svg>
+                {{ getUserName() }}
+            </span>
+            <BtnList :btnList="firstBtn" />
+        </div>
+        <div class="a-collapse-container">
+            <a-collapse class="spotCollapse" v-for="(item, i) in tableList" :key="i + '11'" :bordered="false">
+                <template #expandIcon="props">
+                    <svg class="icon svg-icon" aria-hidden="true" v-if="props.isActive == 0">
+                        <use xlink:href="#icon-shouqi1"></use>
+                    </svg>
+                    <svg class="icon svg-icon" aria-hidden="true" v-else>
+                        <use xlink:href="#icon-shouqi2"></use>
+                    </svg>
+                </template>
+                <a-collapse-panel>
+                    <template #header>
+                        <a-row class="headRow">
+                            <a-col :span="12">{{ item.rolename }}({{ item.userlist.length }})</a-col>
+                            <a-col :span="12">
+                                <BtnList :selectedData="item" :btnList="secondBtn" @onClick="openAction" />
+                            </a-col>
+                        </a-row>
+                    </template>
+                    <a-collapse class="busyCollapse" v-for="(sub, i) in item.userlist" :key="i + '11'" :bordered="false">
+                        <a-collapse-panel :show-arrow="false">
+                            <template #header>
+                                <a-row class="contRow">
+                                    <a-col :span="12">{{ sub.loginname }}-{{ sub.logincode }}</a-col>
+                                    <a-col :span="12">{{ getLoginStatusEnumItemName(sub.loginstatus) }}</a-col>
+                                </a-row>
+                            </template>
+                            <BtnList :btnList="sub.btnList" :selectedData="sub" @onClick="moreOptenAction" />
+                        </a-collapse-panel>
+                    </a-collapse>
+                </a-collapse-panel>
+            </a-collapse>
+        </div>
+        <Add @refresh="handleBtnAction" :selectedData="addModelData" :tableList="tableList" />
+        <Modify :tableList="tableList" @refresh="handleBtnAction" :selectedData="moreModelData" />
+        <Cancel @refresh="handleBtnAction" :selectedData="moreModelData" />
+        <Locked @refresh="handleBtnAction" :selectedData="moreModelData" />
+        <Unlocked @refresh="handleBtnAction" :selectedData="moreModelData" />
+        <Reset @refresh="handleBtnAction" :selectedData="moreModelData" />
+        <Detail :selectedData="moreModelData" />
+        <AddPermission @refresh="handleBtnAction" />
+        <Permission />
     </div>
-    <div class="a-collapse-container">
-      <a-collapse class="spotCollapse"
-                  v-for="(item, i) in tableList"
-                  :key="i + '11'"
-                  :bordered="false">
-        <template #expandIcon="props">
-          <svg class="icon svg-icon"
-               aria-hidden="true"
-               v-if="props.isActive == 0">
-            <use xlink:href="#icon-shouqi1"></use>
-          </svg>
-          <svg class="icon svg-icon"
-               aria-hidden="true"
-               v-else>
-            <use xlink:href="#icon-shouqi2"></use>
-          </svg>
-        </template>
-        <a-collapse-panel>
-          <template #header>
-            <a-row class="headRow">
-              <a-col :span="12">{{item.rolename}}({{item.userlist.length}})</a-col>
-              <a-col :span="12">
-                <BtnList :selectedData="item"
-                         :btnList="secondBtn"
-                         @onClick="openAction" />
-              </a-col>
-            </a-row>
-          </template>
-          <a-collapse class="busyCollapse"
-                      v-for="(sub, i) in item.userlist"
-                      :key="i + '11'"
-                      :bordered="false">
-            <a-collapse-panel :show-arrow="false">
-              <template #header>
-                <a-row class="contRow">
-                  <a-col :span="12">{{sub.loginname}}-{{sub.logincode}}</a-col>
-                  <a-col :span="12">{{getLoginStatusEnumItemName(sub.loginstatus)}}</a-col>
-                </a-row>
-              </template>
-              <BtnList :btnList="sub.btnList"
-                       :selectedData="sub"
-                       @onClick="moreOptenAction" />
-            </a-collapse-panel>
-          </a-collapse>
-        </a-collapse-panel>
-      </a-collapse>
-    </div>
-    <Add @refresh="handleBtnAction"
-         :selectedData="addModelData"
-         :tableList="tableList" />
-    <Modify :tableList="tableList"
-            @refresh="handleBtnAction"
-            :selectedData="moreModelData" />
-    <Cancel @refresh="handleBtnAction"
-            :selectedData="moreModelData" />
-    <Locked @refresh="handleBtnAction"
-            :selectedData="moreModelData" />
-    <Unlocked @refresh="handleBtnAction"
-              :selectedData="moreModelData" />
-    <Reset @refresh="handleBtnAction"
-           :selectedData="moreModelData" />
-    <Detail :selectedData="moreModelData" />
-    <AddPermission @refresh="handleBtnAction" />
-    <Permission />
-  </div>
 </template>
 
 <script lang="ts">

+ 55 - 95
src/views/information/account_info/list/account_info_trade/index.vue

@@ -1,100 +1,60 @@
 <template>
-  <!-- 交易账户 -->
-  <div class="account_info_trade account_info_container"
-       :loading="loading">
-    <filterCustomTable @search="search"></filterCustomTable>
-    <div class="tltLeft">
-      <span class="blue">
-        <svg class="icon svg-icon"
-             aria-hidden="true">
-          <use xlink:href="#icon-shuzhuangtu"></use>
-        </svg>
-        {{getUserName()}}
-      </span>
-      <BtnList :btnList="firstBtn" />
+    <div style="background: red; color: #fff; padding: 5px 0">待修改</div>
+    <!-- 交易账户 -->
+    <div class="account_info_trade account_info_container" :loading="loading">
+        <filterCustomTable @search="search"></filterCustomTable>
+        <div class="tltLeft">
+            <span class="blue">
+                <svg class="icon svg-icon" aria-hidden="true">
+                    <use xlink:href="#icon-shuzhuangtu"></use>
+                </svg>
+                {{ getUserName() }}
+            </span>
+            <BtnList :btnList="firstBtn" />
+        </div>
+        <div class="a-collapse-container">
+            <a-collapse class="spotCollapse" v-for="(item, i) in tableList" :key="i + '11'" :bordered="false">
+                <template #expandIcon="props">
+                    <svg class="icon svg-icon" aria-hidden="true" v-if="props.isActive == 0">
+                        <use xlink:href="#icon-shouqi1"></use>
+                    </svg>
+                    <svg class="icon svg-icon" aria-hidden="true" v-else>
+                        <use xlink:href="#icon-shouqi2"></use>
+                    </svg>
+                </template>
+                <a-collapse-panel>
+                    <template #header>
+                        <a-row class="headRow">
+                            <a-col :span="12"> {{ item.rolename }}({{ item.userlist.length }}) </a-col>
+                            <a-col :span="12">
+                                <BtnList :btnList="secondBtn" @onClick="btnClick(item)" />
+                            </a-col>
+                        </a-row>
+                    </template>
+                    <a-collapse class="busyCollapse" v-for="(sub, i) in item.userlist" :key="i + '11'" :bordered="false">
+                        <a-collapse-panel :show-arrow="false">
+                            <template #header>
+                                <a-row class="contRow">
+                                    <a-col :span="12">{{ sub.loginname }}-{{ sub.logincode }}</a-col>
+                                    <a-col :span="12">{{ getRoleTypeName(sub.loginstatus) }}</a-col>
+                                </a-row>
+                            </template>
+                            <BtnList :btnList="sub.btnList" @onClick="btnClick(item, sub)" />
+                        </a-collapse-panel>
+                    </a-collapse>
+                </a-collapse-panel>
+            </a-collapse>
+        </div>
+        <Add @refresh="handleBtnAction" />
+        <AddChild @refresh="handleBtnAction" :accountList="accountList" :selectedData="firstBtnData" />
+        <Modify @refresh="handleBtnAction" :selectedData="firstBtnData" />
+        <Locked @refresh="handleBtnAction" :firstBtnData="firstBtnData" :accountList="accountList" :tableList="tableList" :selectedData="secondBtnData" />
+        <Unlocked @refresh="handleBtnAction" :firstBtnData="firstBtnData" :accountList="accountList" :tableList="tableList" :selectedData="secondBtnData" />
+        <Cancel @refresh="handleBtnAction" :accountList="accountList" :firstBtnData="firstBtnData" :tableList="tableList" :selectedData="secondBtnData" />
+        <Reset @refresh="handleBtnAction" :accountList="accountList" :tableList="tableList" :selectedData="secondBtnData" />
+        <Detail :selectedData="secondBtnData" :accountList="accountList" :firstBtnData="firstBtnData" :tableList="tableList" />
+        <ModifyChild @refresh="handleBtnAction" :accountList="accountList" :firstBtnData="firstBtnData" :tableList="tableList" :selectedData="secondBtnData" />
     </div>
-    <div class="a-collapse-container">
-      <a-collapse class="spotCollapse"
-                  v-for="(item, i) in tableList"
-                  :key="i + '11'"
-                  :bordered="false">
-        <template #expandIcon="props">
-          <svg class="icon svg-icon"
-               aria-hidden="true"
-               v-if="props.isActive == 0">
-            <use xlink:href="#icon-shouqi1"></use>
-          </svg>
-          <svg class="icon svg-icon"
-               aria-hidden="true"
-               v-else>
-            <use xlink:href="#icon-shouqi2"></use>
-          </svg>
-        </template>
-        <a-collapse-panel>
-          <template #header>
-            <a-row class="headRow">
-              <a-col :span="12">
-                {{item.rolename}}({{item.userlist.length}})
-              </a-col>
-              <a-col :span="12">
-                <BtnList :btnList="secondBtn"
-                         @onClick="btnClick(item)" />
-              </a-col>
-            </a-row>
-          </template>
-          <a-collapse class="busyCollapse"
-                      v-for="(sub, i) in item.userlist"
-                      :key="i + '11'"
-                      :bordered="false">
-            <a-collapse-panel :show-arrow="false">
-              <template #header>
-                <a-row class="contRow">
-                  <a-col :span="12">{{sub.loginname}}-{{sub.logincode}}</a-col>
-                  <a-col :span="12">{{getRoleTypeName(sub.loginstatus)}}</a-col>
-                </a-row>
-              </template>
-              <BtnList :btnList="sub.btnList"
-                       @onClick="btnClick(item, sub)" />
-            </a-collapse-panel>
-          </a-collapse>
-        </a-collapse-panel>
-      </a-collapse>
-    </div>
-    <Add @refresh="handleBtnAction" />
-    <AddChild @refresh="handleBtnAction"
-              :accountList="accountList"
-              :selectedData="firstBtnData" />
-    <Modify @refresh="handleBtnAction"
-            :selectedData="firstBtnData" />
-    <Locked @refresh="handleBtnAction"
-            :firstBtnData="firstBtnData"
-            :accountList="accountList"
-            :tableList="tableList"
-            :selectedData="secondBtnData" />
-    <Unlocked @refresh="handleBtnAction"
-              :firstBtnData="firstBtnData"
-              :accountList="accountList"
-              :tableList="tableList"
-              :selectedData="secondBtnData" />
-    <Cancel @refresh="handleBtnAction"
-            :accountList="accountList"
-            :firstBtnData="firstBtnData"
-            :tableList="tableList"
-            :selectedData="secondBtnData" />
-    <Reset @refresh="handleBtnAction"
-           :accountList="accountList"
-           :tableList="tableList"
-           :selectedData="secondBtnData" />
-    <Detail :selectedData="secondBtnData"
-            :accountList="accountList"
-            :firstBtnData="firstBtnData"
-            :tableList="tableList" />
-    <ModifyChild @refresh="handleBtnAction"
-                 :accountList="accountList"
-                 :firstBtnData="firstBtnData"
-                 :tableList="tableList"
-                 :selectedData="secondBtnData" />
-  </div>
 </template>
 
 <script lang="ts">

+ 1 - 0
src/views/information/custom/list/checkpending/index.vue

@@ -1,4 +1,5 @@
 <template>
+    <div style="background: red; color: #fff; padding: 5px 0">待修改</div>
     <!-- 客户信息: 正常 -->
     <div class="custom_info_checkpending" :loading="loading">
         <filterCustomTable @search="updateColumn">

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

@@ -1,4 +1,5 @@
 <template>
+    <div style="background: red; color: #fff; padding: 5px 0">待修改</div>
     <!-- 客户信息: 正常 -->
     <div class="custom-normal" :loading="loading">
         <filterCustomTable @search="updateColumn">
@@ -34,7 +35,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList, MtpTableButton } from '@/common/export/table';
+import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
 
 import { filterCustomTable } from '../../compoments';
 import { queryTableList, QueryCustomInfoType } from '../index';
@@ -50,7 +51,6 @@ export default defineComponent({
         filterCustomTable,
         contextMenu,
         BtnList,
-        MtpTableButton,
         Middle,
     },
     setup() {

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

@@ -1,45 +1,36 @@
 <template>
-  <!-- 客户信息: 停用 -->
-  <div class="custom-normal"
-       :loading="loading">
-    <filterCustomTable @search="search">
-      <BtnList :btnList="commonBtn" />
-    </filterCustomTable>
-    <contextMenu :contextMenuList="forDataBtn">
-      <a-table :columns="columns"
-               class="srcollYTable"
-               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               :pagination="false"
-               rowKey="key"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{  }">
-          <BtnList :btnList="forDataBtn" />
-        </template>
-        <template v-if="isPingAnOem()"
-                  #index="{ index }">
-          <span>{{ index + 1 }}</span>
-        </template>
-        <template #userinfotype="{ text }">
-          <a>{{ text === 2 ? '企业' : '个人' }}</a>
-        </template>
-        <!-- 客户名称 -->
-        <template #customername="{ record }">
-          <a>{{ record.userinfotype === 2 ? record.customername :  record.username }}</a>
-        </template>
-        <template #status="{ text }">
-          <a>{{ getStatusName(text) }}</a>
-        </template>
-        <template #cardtype="{ text }">
-          <a>{{ getCardTypeEnumItemName(text) }}</a>
-        </template>
-      </a-table>
-    </contextMenu>
-    <Middle :selectedRow="selectedRow"
-            @refresh="queryTable" />
-  </div>
+    <div style="background: red; color: #fff; padding: 5px 0">待修改</div>
+    <!-- 客户信息: 停用 -->
+    <div class="custom-normal" :loading="loading">
+        <filterCustomTable @search="search">
+            <BtnList :btnList="commonBtn" />
+        </filterCustomTable>
+        <contextMenu :contextMenuList="forDataBtn">
+            <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" :pagination="false" rowKey="key" :data-source="tableList">
+                <!-- 额外的展开行 -->
+                <template #expandedRowRender="{}">
+                    <BtnList :btnList="forDataBtn" />
+                </template>
+                <template v-if="isPingAnOem()" #index="{ index }">
+                    <span>{{ index + 1 }}</span>
+                </template>
+                <template #userinfotype="{ text }">
+                    <a>{{ text === 2 ? '企业' : '个人' }}</a>
+                </template>
+                <!-- 客户名称 -->
+                <template #customername="{ record }">
+                    <a>{{ record.userinfotype === 2 ? record.customername : record.username }}</a>
+                </template>
+                <template #status="{ text }">
+                    <a>{{ getStatusName(text) }}</a>
+                </template>
+                <template #cardtype="{ text }">
+                    <a>{{ getCardTypeEnumItemName(text) }}</a>
+                </template>
+            </a-table>
+        </contextMenu>
+        <Middle :selectedRow="selectedRow" @refresh="queryTable" />
+    </div>
 </template>
 
 <script lang="ts">

+ 32 - 47
src/views/information/warehouse-info/list/normal-use/index.vue

@@ -1,51 +1,36 @@
 <template>
-  <!-- 仓库信息: 正常 -->
-  <div class="warehouse-info-normal"
-       :loading="loading">
-    <filterCustomTable @search="updateColumn">
-      <BtnList :btnList="commonBtn" />
-    </filterCustomTable>
-    <contextMenu :contextMenuList="forDataBtn">
-      <a-table :columns="columns"
-               class="srcollYTable"
-               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-               :pagination="false"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               rowKey="key"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{ record }">
-          <BtnList :selectedData="record"
-                   class="btn-list-sticky"
-                   :btnList="forDataBtn"
-                   @onClick="btnClick" />
-        </template>
-        <template v-if="isPingAnOem()"
-                  #index="{ index }">
-          <span>{{ index + 1 }}</span>
-        </template>
-        <template #warehousetype="{ text }">
-          <span>{{ getWareHouseTypeName(text) }}</span>
-        </template>
-        <template #warehousestatus="{ text }">
-          <span>{{ gerWareHouseStatusName(text) }}</span>
-        </template>
-      </a-table>
-    </contextMenu>
-    <!-- 新增仓库信息 -->
-    <Add :selectedRow="selectedRow"
-         @refresh="queryTable" />
-    <!-- 停用仓库信息 -->
-    <Disable :selectedRow="selectedRow"
-             @refresh="queryTable" />
-    <!-- 仓库信息详情 -->
-    <Detail :selectedRow="selectedRow"
-            @refresh="queryTable" />
-    <!-- 修改仓息库信 -->
-    <Modify :selectedRow="selectedRow"
-            @refresh="queryTable" />
-  </div>
+    <div style="background: red; color: #fff; padding: 5px 0">待修改</div>
+    <!-- 仓库信息: 正常 -->
+    <div class="warehouse-info-normal" :loading="loading">
+        <filterCustomTable @search="updateColumn">
+            <BtnList :btnList="commonBtn" />
+        </filterCustomTable>
+        <contextMenu :contextMenuList="forDataBtn">
+            <a-table :columns="columns" class="srcollYTable" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList">
+                <!-- 额外的展开行 -->
+                <template #expandedRowRender="{ record }">
+                    <BtnList :selectedData="record" class="btn-list-sticky" :btnList="forDataBtn" @onClick="btnClick" />
+                </template>
+                <template v-if="isPingAnOem()" #index="{ index }">
+                    <span>{{ index + 1 }}</span>
+                </template>
+                <template #warehousetype="{ text }">
+                    <span>{{ getWareHouseTypeName(text) }}</span>
+                </template>
+                <template #warehousestatus="{ text }">
+                    <span>{{ gerWareHouseStatusName(text) }}</span>
+                </template>
+            </a-table>
+        </contextMenu>
+        <!-- 新增仓库信息 -->
+        <Add :selectedRow="selectedRow" @refresh="queryTable" />
+        <!-- 停用仓库信息 -->
+        <Disable :selectedRow="selectedRow" @refresh="queryTable" />
+        <!-- 仓库信息详情 -->
+        <Detail :selectedRow="selectedRow" @refresh="queryTable" />
+        <!-- 修改仓息库信 -->
+        <Modify :selectedRow="selectedRow" @refresh="queryTable" />
+    </div>
 </template>
 
 <script lang="ts">

+ 28 - 37
src/views/information/warehouse-info/list/stop-use/index.vue

@@ -1,41 +1,32 @@
 <template>
-  <!-- 仓库信息: 停用 -->
-  <div class="warehouse-info-stop">
-    <filterCustomTable @search="updateColumn">
-      <BtnList :btnList="commonBtn" />
-    </filterCustomTable>
-    <contextMenu :contextMenuList="forDataBtn">
-      <a-table :columns="columns"
-               class="topTable"
-               :pagination="false"
-               :expandedRowKeys="expandedRowKeys"
-               :customRow="Rowclick"
-               rowKey="key"
-               :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }"
-               :data-source="tableList">
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{  }">
-          <BtnList :btnList="forDataBtn" />
-        </template>
-        <template v-if="isPingAnOem()"
-                  #index="{ index }">
-          <span>{{ index + 1 }}</span>
-        </template>
-        <template #warehousetype="{ text }">
-          <span>{{ getWareHouseTypeName(text) }}</span>
-        </template>
-        <template #warehousestatus="{ text }">
-          <span>{{ gerWareHouseStatusName(text) }}</span>
-        </template>
-      </a-table>
-    </contextMenu>
-    <!-- 恢复仓库信息 -->
-    <Recover :selectedRow="selectedRow"
-             @refresh="queryTable" />
-    <!-- 仓库信息详情 -->
-    <Detail :selectedRow="selectedRow"
-            @refresh="queryTable" />
-  </div>
+    <div style="background: red; color: #fff; padding: 5px 0">待修改</div>
+    <!-- 仓库信息: 停用 -->
+    <div class="warehouse-info-stop">
+        <filterCustomTable @search="updateColumn">
+            <BtnList :btnList="commonBtn" />
+        </filterCustomTable>
+        <contextMenu :contextMenuList="forDataBtn">
+            <a-table :columns="columns" class="topTable" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }" :data-source="tableList">
+                <!-- 额外的展开行 -->
+                <template #expandedRowRender="{}">
+                    <BtnList :btnList="forDataBtn" />
+                </template>
+                <template v-if="isPingAnOem()" #index="{ index }">
+                    <span>{{ index + 1 }}</span>
+                </template>
+                <template #warehousetype="{ text }">
+                    <span>{{ getWareHouseTypeName(text) }}</span>
+                </template>
+                <template #warehousestatus="{ text }">
+                    <span>{{ gerWareHouseStatusName(text) }}</span>
+                </template>
+            </a-table>
+        </contextMenu>
+        <!-- 恢复仓库信息 -->
+        <Recover :selectedRow="selectedRow" @refresh="queryTable" />
+        <!-- 仓库信息详情 -->
+        <Detail :selectedRow="selectedRow" @refresh="queryTable" />
+    </div>
 </template>
 
 <script lang="ts">