update

src/assets/styles/index.css

@@ -204,7 +204,7 @@
     padding      : 0 8px;
     border-right : 1px solid var(--m-black9);
     border-bottom: 1px solid var(--m-black9);
-    font-size    : 16px;
+    font-size    : 14px;
     color        : var(--m-white1);
 }
 

src/assets/styles/mixin.less

@@ -379,7 +379,7 @@
                     padding         : 0 8px;
                     border-right    : 1px solid @m-black9;
                     border-bottom   : 1px solid @m-black9;
-                    font-size       : 16px;
+                    font-size       : 14px;
                     color           : @m-white1;
                     // white-space: nowrap;
                     // text-overflow: ellipsis;

src/common/components/tableButton/index.vue

@@ -11,7 +11,7 @@ import { defineComponent, PropType } from 'vue';
 import { BtnListType } from './interface';
 
 export default defineComponent({
-    name: 'mtpTableButton',
+    name: 'MtpTableButton',
     emits: ['click'],
     props: {
         buttons: {

src/router/index.ts

@@ -122,51 +122,6 @@ const routes: Array<RouteRecordRaw> = [
                 ],
             },
             {
-                path: '/spot_contract',
-                name: 'spot_contract',
-                component: Main,
-                meta: {
-                    requireAuth: true,
-                },
-                redirect: (to) => {
-                    return { name: 'spot_contract_unsubmitted' };
-                },
-                children: [
-                    {
-                        path: '/spot_contract/spot_contract_unsubmitted',
-                        name: 'spot_contract_unsubmitted',
-                        component: () => import('@/views/information/spot-contract/list/unsubmitted/index.vue'),
-                        meta: {
-                            requireAuth: true,
-                        },
-                    },
-                    {
-                        path: '/spot_contract/spot_contract_checkpending',
-                        name: 'spot_contract_checkpending',
-                        component: () => import('@/views/information/spot-contract/list/checkpending/index.vue'),
-                        meta: {
-                            requireAuth: true,
-                        },
-                    },
-                    {
-                        path: '/spot_contract/spot_contract_performance',
-                        name: 'spot_contract_performance',
-                        component: () => import('@/views/information/spot-contract/list/performance/index.vue'),
-                        meta: {
-                            requireAuth: true,
-                        },
-                    },
-                    {
-                        path: '/spot_contract/spot_contract_finished',
-                        name: 'spot_contract_finished',
-                        component: () => import('@/views/information/spot-contract/list/finished/index.vue'),
-                        meta: {
-                            requireAuth: true,
-                        },
-                    },
-                ],
-            },
-            {
                 path: '/account_info',
                 name: 'account_info',
                 component: Main,

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

@@ -49,7 +49,16 @@ export default defineComponent({
         const { loading, tableList, queryTable } = queryTableList<Ermcp3HedgePlan>();
 
         // 获取列表数据
-        const queryTableAction = () => queryTable(QueryHedgePlan, routeName === 'plan_checkpending' ? '1' : '2');
+        const queryTableAction = () => {
+            switch (routeName) {
+                case 'plan_checkpending':
+                    queryTable(QueryHedgePlan, '1');
+                    break;
+                case 'plan_performance':
+                    queryTable(QueryHedgePlan, '2');
+                    break;
+            }
+        };
 
         // 表格通用逻辑
         const param: ComposeTableParam = {

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

@@ -6,7 +6,7 @@
             <!-- 额外的展开行 -->
             <!-- 额外的展开行 -->
             <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="secondBtn" :record="record" @click="openComponent" />
+                <mtp-table-button class="btn-list-sticky" :buttons="buttons" :record="record" @click="openComponent" />
             </template>
             <template #biztype="{ text }">
                 <a>{{ getBizTypeName(text) }}</a>
@@ -45,7 +45,7 @@
             </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>
@@ -60,6 +60,7 @@ import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
 import { QuerySpotContract } from '@/services/go/ermcp/spot-contract';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { getTableButton } from '@/common/setup/table/button';
+import { useRoute } from 'vue-router';
 
 export default defineComponent({
     name: EnumRouterName.spot_contract_checkpending,
@@ -67,17 +68,28 @@ export default defineComponent({
         filterCustomTable,
         contextMenu,
         detail: defineAsyncComponent(() => import('../../components/detail/index.vue')),
-        contract_checkpending_check: defineAsyncComponent(() => import('../../components/check/index.vue')), // 审核
-        contract_checkpending_cancel: defineAsyncComponent(() => import('../../components/cancel/index.vue')), // 撤销
+        check: defineAsyncComponent(() => import('../../components/check/index.vue')), // 审核
+        cancel: defineAsyncComponent(() => import('../../components/cancel/index.vue')), // 撤销
         MtpTableButton,
     },
     setup() {
+        const { name: routeName } = useRoute();
+        // 权限按钮
+        const buttons = getTableButton();
+
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList<Ermcp3ContractRsp>();
 
         // 获取列表数据
         const queryTableAction = () => {
-            queryTable(QuerySpotContract, { querytype: 2 });
+            switch (routeName) {
+                case 'contract_checkpending':
+                    queryTable(QuerySpotContract, { querytype: 2 });
+                    break;
+                case 'contract_performance':
+                    queryTable(QuerySpotContract, { querytype: 3 });
+                    break;
+            }
             // 获取 业务账户
             queryBusinessManager();
         };
@@ -92,9 +104,6 @@ export default defineComponent({
             isDetail: true,
         };
 
-        // 权限按钮
-        const secondBtn = getTableButton(['contract_checkpending_check', 'contract_checkpending_cancel', 'detail']);
-
         return {
             ...handleComposeTable<Ermcp3ContractRsp>(param),
             loading,
@@ -108,7 +117,7 @@ export default defineComponent({
             formatValue,
             findManagerName,
             handleEnumdic,
-            secondBtn,
+            buttons,
         };
     },
 });

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

@@ -1,141 +0,0 @@
-<template>
-    <!-- 现货合同: 已完成-->
-    <div class="spot-contract-done">
-        <filterCustomTable @search="updateColumn" :loading="loading">
-            <BtnList :btnList="firstBtn" @click="openComponent" />
-        </filterCustomTable>
-        <a-table
-            :columns="columns"
-            class="topTable"
-            :pagination="false"
-            :expandedRowKeys="expandedRowKeys"
-            :customRow="Rowclick"
-            rowKey="key"
-            :data-source="tableList"
-            :scroll="{ x: 'calc(100% - 160px)', y: 'calc(100vh - 163px)' }"
-        >
-            <!-- 额外的展开行 -->
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <BtnList
-                    :btnList="secondBtn"
-                    class="btn-list-sticky"
-                    :record="record"
-                    @click="openComponent"
-                />
-            </template>
-            <template #biztype="{ text }">
-                <a>{{ getBizTypeName(text) }}</a>
-            </template>
-
-            <template #pricetype="{ text }">
-                <a>{{ getPriceTypeName(text) }}</a>
-            </template>
-
-            <template #contracctstatus="{ text }">
-                <a>{{ getContractStatusName(text) }}</a>
-            </template>
-
-            <template #contracttype="{ text }">
-                <a>{{ getContractTypeName(text) }}</a>
-            </template>
-            <!-- 对手方 -->
-            <template #negative="{ record }">
-                <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
-            </template>
-            <template #startdate="{ record }">
-                <a>{{ formatValue(formatTime(record.startdate, "d") + '--' + formatTime(record.enddate, "d")) }}</a>
-            </template>
-            <!-- 交收期 -->
-            <template #deliverystartdate="{ record }">
-                <span>
-                    {{ formatValue(formatTime(record.deliverystartdate, "d") + '--' +
-                    formatTime(record.deliveryenddate, "d")) }}
-                </span>
-            </template>
-
-            <!-- 业务员 -->
-            <template #saleuserid="{ record }">
-                <span>{{ findManagerName(record.saleuserid) }}</span>
-            </template>
-
-            <!-- 跟单员 -->
-            <template #meruserid="{ record }">
-                <span>{{ findManagerName(record.meruserid) }}</span>
-            </template>
-            <!-- 合同量 -->
-            <template #qty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="secondBtn"></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 { queryBusinessManager, findManagerName, tableFilterCB, handleEnumdic } from '../setup';
-
-import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
-import { formatTime, formatValue } from '@/common/methods';
-
-import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
-import { QuerySpotContract } from '@/services/go/ermcp/spot-contract';
-import { EnumRouterName } from '@/common/constants/enumRouterName';
-
-const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
-
-export default defineComponent({
-    name: EnumRouterName.spot_contract_finished,
-    components: {
-        contextMenu,
-        BtnList,
-        [ModalEnum.detail]: Detail,
-    },
-    setup() {
-        // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<Ermcp3ContractRsp>();
-        // 获取列表数据
-        const queryTableAction = () => {
-            queryTable(QuerySpotContract, { querytype: 4 });
-            // 获取 业务账户
-            queryBusinessManager();
-        };
-        // 表格通用逻辑
-        const param: ComposeTableParam = {
-            queryFn: queryTableAction,
-            menuType: EnumRouterName.spot_contract_finished,
-            tableName: 'table_pcweb_delivery',
-            tableFilterKey: ['contracttype', 'pricetype', 'contractno'],
-            tableFilterCB,
-            isDetail: true,
-        };
-
-        return {
-            ...handleComposeTable<Ermcp3ContractRsp>(param),
-            loading,
-            tableList,
-            getBizTypeName,
-            getPriceTypeName,
-            getContractStatusName,
-            getContractTypeName,
-            formatTime,
-            formatValue,
-            findManagerName,
-            handleEnumdic,
-        };
-    },
-});
-</script>
-
-<style lang="less">
-.spot-contract-done {
-}
-</style>;

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

@@ -1,117 +0,0 @@
-<template>
-    <!-- 现货合同: 履约中-->
-    <div class="spot-contract-performance">
-        <filterCustomTable @search="updateColumn" :loading="loading"></filterCustomTable>
-        <a-table :columns="columns" class="topTable" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList" :scroll="{ x: 'calc(100% - 160px)', y: 'calc(100vh - 163px)' }">
-            <!-- 额外的展开行 -->
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="secondBtn" :record="record" @click="openComponent" />
-            </template>
-            <template #biztype="{ text }">
-                <a>{{ getBizTypeName(text) }}</a>
-            </template>
-            <template #pricetype="{ text }">
-                <a>{{ getPriceTypeName(text) }}</a>
-            </template>
-            <template #contracctstatus="{ text }">
-                <a>{{ getContractStatusName(text) }}</a>
-            </template>
-            <template #contracttype="{ text }">
-                <a>{{ getContractTypeName(text) }}</a>
-            </template>
-            <!-- 对手方 -->
-            <template #negative="{ record }">
-                <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
-            </template>
-            <!-- 点假期 -->
-            <template #startdate="{ record }">
-                <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
-            </template>
-            <!-- 交收期 -->
-            <template #deliverystartdate="{ record }">
-                <span>
-                    {{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}
-                </span>
-            </template>
-            <!-- 业务员 -->
-            <template #saleuserid="{ record }">
-                <span>{{ findManagerName(record.saleuserid) }}</span>
-            </template>
-            <!-- 跟单员 -->
-            <template #meruserid="{ record }">
-                <span>{{ findManagerName(record.meruserid) }}</span>
-            </template>
-            <!-- 合同量 -->
-            <template #qty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="secondBtn"></contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-    </div>
-</template>
-
-<script lang="ts">
-import { queryTableList, MtpTableButton, contextMenu, defineAsyncComponent, defineComponent, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
-import { filterCustomTable } from '../../components';
-
-import { queryBusinessManager, findManagerName, tableFilterCB, handleEnumdic } from '../setup';
-import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
-import { QuerySpotContract } from '@/services/go/ermcp/spot-contract';
-
-import { getBizTypeName, getContractStatusName, getContractTypeName, getPriceTypeName } from '@/common/constants/enumsName';
-import { formatTime, formatValue } from '@/common/methods';
-import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { getTableButton } from '@/common/setup/table/button';
-
-export default defineComponent({
-    name: EnumRouterName.spot_contract_performance,
-    components: {
-        filterCustomTable,
-        contextMenu,
-        detail: defineAsyncComponent(() => import('../../components/detail/index.vue')),
-        MtpTableButton,
-    },
-    setup() {
-        // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<Ermcp3ContractRsp>();
-
-        // 获取列表数据
-        const queryTableAction = () => {
-            queryTable(QuerySpotContract, { querytype: 3 });
-            // 获取 业务账户
-            queryBusinessManager();
-        };
-
-        // 表格通用逻辑
-        const param: ComposeTableParam = {
-            queryFn: queryTableAction,
-            menuType: EnumRouterName.spot_contract_performance,
-            tableName: 'table_pcweb_delivery',
-            tableFilterKey: ['contracttype', 'pricetype', 'contractno'],
-            tableFilterCB,
-            isDetail: true,
-        };
-
-        const secondBtn = getTableButton(['detail']);
-
-        return {
-            ...handleComposeTable<Ermcp3ContractRsp>(param),
-            loading,
-            tableList,
-            queryTable,
-            getBizTypeName,
-            getPriceTypeName,
-            getContractStatusName,
-            getContractTypeName,
-            formatTime,
-            formatValue,
-            findManagerName,
-            handleEnumdic,
-            secondBtn,
-        };
-    },
-});
-</script>

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

@@ -1,127 +0,0 @@
-<template>
-    <!-- 现货合同: 未提交-->
-    <div class="spot-contract-not-commit" :loading="loading">
-        <filterCustomTable @search="updateColumn">
-            <BtnList :btnList="firstBtn" @click="openComponent" />
-        </filterCustomTable>
-        <a-table :columns="columns" class="topOrderTable" :pagination="false" :expandedRowKeys="expandedRowKeys" :customRow="Rowclick" rowKey="key" :data-source="tableList" :scroll="{ x: '100%', y: 'calc(100vh - 163px)' }">
-            <!-- 额外的展开行 -->
-            <!-- 额外的展开行 -->
-            <template #expandedRowRender="{ record }">
-                <BtnList :btnList="secondBtn" class="btn-list-sticky" :record="record" @click="openComponent" />
-            </template>
-            <template #biztype="{ text }">
-                <a>{{ getBizTypeName(text) }}</a>
-            </template>
-
-            <template #pricetype="{ text }">
-                <span>{{ getPriceTypeName(text) }}</span>
-            </template>
-
-            <template #contracctstatus="{ text }">
-                <a>{{ getContractStatusName(text) }}</a>
-            </template>
-
-            <template #contracttype="{ text }">
-                <a>{{ getContractTypeName(text) }}</a>
-            </template>
-            <!-- 对手方 -->
-            <template #negative="{ record }">
-                <a>{{ record.contracttype === 1 ? record.sellusername : record.buyusername }}</a>
-            </template>
-            <!-- 点假期 -->
-            <template #startdate="{ record }">
-                <span>{{ formatValue(formatTime(record.startdate, 'd') + '--' + formatTime(record.enddate, 'd')) }}</span>
-            </template>
-            <!-- 交收期 -->
-            <template #deliverystartdate="{ record }">
-                <span>{{ formatValue(formatTime(record.deliverystartdate, 'd') + '--' + formatTime(record.deliveryenddate, 'd')) }}</span>
-            </template>
-            <!-- 业务员 -->
-            <template #saleuserid="{ record }">
-                <span>{{ findManagerName(record.saleuserid) }}</span>
-            </template>
-
-            <!-- 跟单员 -->
-            <template #meruserid="{ record }">
-                <span>{{ findManagerName(record.meruserid) }}</span>
-            </template>
-            <!-- 合同量 -->
-            <template #qty="{ text, record }">
-                <span>{{ handleEnumdic(text, record) }}</span>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="secondBtn"> </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 { filterCustomTable } from '../../components';
-
-import { formatTime, formatValue } from '@/common/methods';
-import { queryBusinessManager, findManagerName, tableFilterCB, handleEnumdic } from '../setup';
-import { getPriceTypeName, getBizTypeName, getContractStatusName, getContractTypeName } from '@/common/constants/enumsName';
-import { Ermcp3ContractRsp } from '@/services/go/ermcp/spot-contract/interface';
-import { QuerySpotContract } from '@/services/go/ermcp/spot-contract';
-import { EnumRouterName } from '@/common/constants/enumRouterName';
-
-const Add = defineAsyncComponent(() => import('../../components/add/index.vue'));
-const Detail = defineAsyncComponent(() => import('../../components/detail/index.vue'));
-const Modify = defineAsyncComponent(() => import('../../components/modify/index.vue'));
-const Delete = defineAsyncComponent(() => import('../../components/delete/index.vue'));
-
-export default defineComponent({
-    name: EnumRouterName.spot_contract_unsubmitted,
-    components: {
-        filterCustomTable,
-        contextMenu,
-        [ModalEnum.detail]: Detail,
-        [ModalEnum.spot_contract_btn_add]: Add,
-        [ModalEnum.spot_contract_btn_modify]: Modify,
-        [ModalEnum.spot_contract_btn_delete]: Delete,
-        BtnList,
-    },
-    setup() {
-        // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<Ermcp3ContractRsp>();
-        // 获取列表数据
-        const queryTableAction = () => {
-            queryTable(QuerySpotContract, { querytype: 1 });
-            // 获取 业务账户
-            queryBusinessManager();
-        };
-        // 表格通用逻辑
-        const param: ComposeTableParam = {
-            queryFn: queryTableAction,
-            menuType: EnumRouterName.spot_contract_unsubmitted,
-            tableName: 'table_pcweb_delivery',
-            tableFilterKey: ['contracttype', 'pricetype', 'contractno'],
-            tableFilterCB,
-            isDetail: true,
-        };
-
-        return {
-            ...handleComposeTable<Ermcp3ContractRsp>(param),
-            loading,
-            tableList,
-            getBizTypeName,
-            getPriceTypeName,
-            getContractStatusName,
-            getContractTypeName,
-            formatTime,
-            formatValue,
-            findManagerName,
-            handleEnumdic,
-        };
-    },
-});
-</script>
-
-<style lang="less">
-.spot-contract-not-commit {
-}
-</style
->;

src/views/manage/business-review/list/settlement/checkpending/index.vue → src/views/manage/business-review/list/settlement/index.vue

@@ -30,12 +30,8 @@
 </template>
 
 <script lang="ts">
-import { MtpTableButton, contextMenu, defineAsyncComponent, defineComponent, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
-import { initData, getTableColumns, getTableEvent, getBtnList } from '@/common/export/table';
-
-import { SettlementDetail, SettlementAudit, SettlementCancel, Filter } from '../../../components';
-
-import { queryTableList, QryBussinessJsRsp } from '../setup';
+import { MtpTableButton, contextMenu, defineAsyncComponent, defineComponent, handleComposeTable, ComposeTableParam, queryTableList } from '@/common/export/commonTable';
+import { Filter } from '../../components';
 import { invoiceStatusName } from '@/views/manage/finance-review/setup';
 import { Column, ColumnType } from '@/common/setup/table';
 import { getPriceTypeName, getContractTypeName, getApplyStatusName } from '@/common/constants/enumsName';
@@ -43,6 +39,9 @@ import { getAnalogueName } from '@/views/information/spot-contract/setup';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { BtnListType } from '@/common/components/btnList/interface';
 import { getTableButton } from '@/common/setup/table/button';
+import { QueryBusinessJs } from '@/services/go/ermcp/business-review';
+import { QryBussinessJsRsp } from '@/services/go/ermcp/business-review/interface';
+import { useRoute } from 'vue-router';
 
 export default defineComponent({
     name: 'business-review-js',
@@ -50,16 +49,30 @@ export default defineComponent({
         contextMenu,
         Filter,
         MtpTableButton,
-        detail: defineAsyncComponent(() => import('../../../components/settlementDetail/index.vue')),
-        settlement_checkpending_check: defineAsyncComponent(() => import('../../../components/settlementAudit/index.vue')),
-        settlement_checkpending_cancel: defineAsyncComponent(() => import('../../../components/settlementCancel/index.vue')),
+        detail: defineAsyncComponent(() => import('../../components/settlementDetail/index.vue')),
+        check: defineAsyncComponent(() => import('../../components/settlementAudit/index.vue')),
+        cancel: defineAsyncComponent(() => import('../../components/settlementCancel/index.vue')),
     },
     setup() {
+        const { name: routeName } = useRoute();
+        // 权限按钮
+        const buttons = getTableButton();
+
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList({ applystatus: '1' });
+        const { loading, tableList, queryTable } = queryTableList<QryBussinessJsRsp>();
 
         // 获取列表数据
-        const queryTableAction = () => queryTable();
+        const queryTableAction = () => {
+            switch (routeName) {
+                case 'settlement_checkpending':
+                    queryTable(QueryBusinessJs, { applystatus: '1' });
+                    break;
+                case 'settlement_performance':
+                    queryTable(QueryBusinessJs, { applystatus: '2' });
+                    break;
+            }
+        };
+
         const filtrFn = (e: Column, item: ColumnType, filtered: any) => {
             if (e.columnfield === 'buyusernameOrsellusername') {
                 item.onFilter = (value: string, record: QryBussinessJsRsp) => {
@@ -98,9 +111,6 @@ export default defineComponent({
             }
         }
 
-        // 权限按钮
-        const buttons = getTableButton(['settlement_checkpending_check', 'settlement_checkpending_cancel', 'detail']);
-
         return {
             ...handleComposeTable<QryBussinessJsRsp>(param),
             handlePermissionBtn,

src/views/manage/business-review/list/settlement/performance/index.vue

@@ -1,117 +0,0 @@
-<template>
-    <div style="background: red; color: #fff; padding: 5px 0">待修改-表头</div>
-    <!-- 管理-业务审核-交收 -->
-    <div class="business-review-js" :loading="loading">
-        <Filter @search="updateColumn"></Filter>
-        <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="{ record }">
-                <mtp-table-button class="btn-list-sticky" :buttons="handlePermissionBtn(buttons, record)" :record="record" @click="openComponent" />
-            </template>
-            <template #operateapplytype="{ text }">
-                <a>{{ getPriceTypeName(text) }}</a>
-            </template>
-            <template #contracttype="{ text }">
-                <a>{{ getContractTypeName(text) }}</a>
-            </template>
-            <template #applystatus="{ text }">
-                <a>{{ getApplyStatusName(text) }}</a>
-            </template>
-            <template #buyusernameOrsellusername="{ record }">
-                <a>{{ getAnalogueName(record.contracttype, record.buyusername, record.sellusername) }}</a>
-            </template>
-            <template #addmargin||decmargin="{ record }">
-                <a>{{ record.addmargin !== 0 && record.addmargin !== undefined ? '+' + record.addmargin : record.decmargin === 0 || record.decmargin === undefined ? '' : '-' + record.decmargin }} </a>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="handlePermissionBtn(buttons, selectedRow)"> </contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-    </div>
-</template>
-
-<script lang="ts">
-import { MtpTableButton, contextMenu, defineAsyncComponent, defineComponent, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
-import { initData, getTableColumns, getTableEvent, getBtnList } from '@/common/export/table';
-
-import { SettlementDetail, SettlementAudit, SettlementCancel, Filter } from '../../../components';
-
-import { queryTableList, QryBussinessJsRsp } from '../setup';
-import { invoiceStatusName } from '@/views/manage/finance-review/setup';
-import { Column, ColumnType } from '@/common/setup/table';
-import { getPriceTypeName, getContractTypeName, getApplyStatusName } from '@/common/constants/enumsName';
-import { getAnalogueName } from '@/views/information/spot-contract/setup';
-import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { BtnListType } from '@/common/components/btnList/interface';
-import { getTableButton } from '@/common/setup/table/button';
-
-export default defineComponent({
-    name: 'business-review-js',
-    components: {
-        contextMenu,
-        Filter,
-        MtpTableButton,
-        detail: defineAsyncComponent(() => import('../../../components/settlementDetail/index.vue')),
-    },
-    setup() {
-        // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList({ applystatus: '2' });
-
-        // 获取列表数据
-        const queryTableAction = () => queryTable();
-        const filtrFn = (e: Column, item: ColumnType, filtered: any) => {
-            if (e.columnfield === 'buyusernameOrsellusername') {
-                item.onFilter = (value: string, record: QryBussinessJsRsp) => {
-                    const { contracttype, buyusername, sellusername } = record;
-                    if (contracttype === 1) {
-                        // 采购
-                        return sellusername.includes(value);
-                    } else {
-                        return buyusername.includes(value);
-                    }
-                };
-                item.filteredValue = filtered.buyusernameOrsellusername || null;
-            }
-        };
-
-        // 表格通用逻辑
-        const param: ComposeTableParam = {
-            queryFn: queryTableAction,
-            menuType: EnumRouterName.business_review_settlement,
-            tableName: 'table_pcweb_business_aduit_js',
-            tableFilterKey: ['contracttype', 'contractno', 'deliverygoodsname'],
-            tableFilterCB: filtrFn,
-            isDetail: true,
-        };
-
-        function handlePermissionBtn(btnList: BtnListType[], item: QryBussinessJsRsp) {
-            if (item) {
-                const { applystatus } = item;
-                if (applystatus === 1) {
-                    return btnList;
-                } else {
-                    return btnList.filter((e) => e.code === 'detail');
-                }
-            } else {
-                return [];
-            }
-        }
-
-        // 权限按钮
-        const buttons = getTableButton(['detail']);
-
-        return {
-            ...handleComposeTable<QryBussinessJsRsp>(param),
-            handlePermissionBtn,
-            getAnalogueName,
-            loading,
-            tableList,
-            getPriceTypeName,
-            getContractTypeName,
-            getApplyStatusName,
-            invoiceStatusName,
-            buttons,
-        };
-    },
-});
-</script>

src/views/manage/business-review/list/someprice/index.vue

@@ -30,17 +30,16 @@
 </template>
 
 <script lang="ts">
-import { MtpTableButton, contextMenu, defineAsyncComponent, defineComponent, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
-
-import { Filter, SomepriceDetail, SomepriceAudit, SomepriceCancel } from '../../components';
-import { queryTableList, QryBusinessDjRsp } from './setup';
+import { MtpTableButton, contextMenu, defineAsyncComponent, defineComponent, handleComposeTable, ComposeTableParam, queryTableList } from '@/common/export/commonTable';
+import { Filter } from '../../components';
 import { getPriceTypeName, getContractStatusName, getContractTypeName, getApplyStatusName } from '@/common/constants/enumsName';
 import { getAnalogueName } from '@/views/information/spot-contract/setup';
 import { Column, ColumnType } from '@/common/setup/table';
-import { ref } from 'vue';
 import { BtnListType } from '@/common/components/btnList/interface';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
 import { getTableButton } from '@/common/setup/table/button';
+import { QueryBusinessDj } from '@/services/go/ermcp/business-review';
+import { QryBusinessDjRsp } from '@/services/go/ermcp/business-review/interface';
 import { useRoute } from 'vue-router';
 
 export default defineComponent({
@@ -59,10 +58,20 @@ export default defineComponent({
         const buttons = getTableButton();
 
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList({ applystatus: routeName === 'someprice_checkpending' ? '1' : '2' });
+        const { loading, tableList, queryTable } = queryTableList<QryBusinessDjRsp>();
 
         // 获取列表数据
-        const queryTableAction = () => queryTable();
+        const queryTableAction = () => {
+            switch (routeName) {
+                case 'someprice_checkpending':
+                    queryTable(QueryBusinessDj, { applystatus: '1' });
+                    break;
+                case 'someprice_performance':
+                    queryTable(QueryBusinessDj, { applystatus: '2' });
+                    break;
+            }
+        };
+
         const filtrFn = (e: Column, item: ColumnType, filtered: any) => {
             if (e.columnfield === 'buyusernameOrsellusername') {
                 item.onFilter = (value: string, record: QryBusinessDjRsp) => {

src/views/manage/business-review/list/someprice/performance/index.vue

@@ -1,115 +0,0 @@
-<template>
-    <div style="background: red; color: #fff; padding: 5px 0">待修改-表头</div>
-    <!-- 管理-业务审核-点价 -->
-    <div class="business-review-dj" :loading="loading">
-        <Filter @search="updateColumn"></Filter>
-        <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 }">
-                <mtp-table-button class="btn-list-sticky" :buttons="handlePermissionBtn(buttons, record)" :record="record" @click="openComponent" />
-            </template>
-            <template #pricetype="{ text }">
-                <a>{{ getPriceTypeName(text) }}</a>
-            </template>
-            <template #applystatus="{ text }">
-                <a>{{ getApplyStatusName(text) }}</a>
-            </template>
-            <template #contracttype="{ text }">
-                <a>{{ getContractTypeName(text) }}</a>
-            </template>
-            <template #contractstatus="{ text }">
-                <a>{{ getContractStatusName(text) }}</a>
-            </template>
-            <template #buyusernameOrsellusername="{ record }">
-                <a>{{ getAnalogueName(record.contracttype, record.buyusername, record.sellusername) }}</a>
-            </template>
-        </a-table>
-        <!-- 右键 -->
-        <contextMenu :contextMenu="contextMenu" @cancel="closeContext" :list="handlePermissionBtn(buttons, selectedRow)"> </contextMenu>
-        <component :is="componentId" v-if="componentId" :selectedRow="selectedRow" @cancel="closeComponent"></component>
-    </div>
-</template>
-
-<script lang="ts">
-import { MtpTableButton, contextMenu, defineAsyncComponent, defineComponent, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
-
-import { Filter, SomepriceDetail, SomepriceAudit, SomepriceCancel } from '../../../components';
-import { queryTableList, QryBusinessDjRsp } from '../setup';
-import { getPriceTypeName, getContractStatusName, getContractTypeName, getApplyStatusName } from '@/common/constants/enumsName';
-import { getAnalogueName } from '@/views/information/spot-contract/setup';
-import { Column, ColumnType } from '@/common/setup/table';
-import { ref } from 'vue';
-import { BtnListType } from '@/common/components/btnList/interface';
-import { EnumRouterName } from '@/common/constants/enumRouterName';
-import { getTableButton } from '@/common/setup/table/button';
-
-export default defineComponent({
-    name: 'business-review-dj',
-    components: {
-        contextMenu,
-        Filter,
-        MtpTableButton,
-        detail: defineAsyncComponent(() => import('../../../components/somepriceDetail/index.vue')),
-    },
-    setup() {
-        // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList({ applystatus: '2' });
-
-        // 获取列表数据
-        const queryTableAction = () => queryTable();
-        const filtrFn = (e: Column, item: ColumnType, filtered: any) => {
-            if (e.columnfield === 'buyusernameOrsellusername') {
-                item.onFilter = (value: string, record: QryBusinessDjRsp) => {
-                    const { contracttype, buyusername, sellusername } = record;
-                    if (contracttype === 1) {
-                        // 采购
-                        return sellusername.includes(value);
-                    } else {
-                        return buyusername.includes(value);
-                    }
-                };
-                item.filteredValue = filtered.buyusernameOrsellusername || null;
-            }
-        };
-
-        // 表格通用逻辑
-        const param: ComposeTableParam = {
-            queryFn: queryTableAction,
-            menuType: EnumRouterName.business_review_someprice,
-            tableName: 'table_pcweb_business_aduit_dj',
-            tableFilterKey: ['contracttype', 'contractno', 'deliverygoodsname'],
-            tableFilterCB: filtrFn,
-            isDetail: true,
-        };
-
-        function handlePermissionBtn(btnList: BtnListType[], item: QryBusinessDjRsp) {
-            if (item) {
-                const { applystatus } = item;
-                if (applystatus === 1) {
-                    return btnList;
-                } else {
-                    return btnList.filter((e) => e.code === 'detail');
-                }
-            } else {
-                return [];
-            }
-        }
-
-        // 权限按钮
-        const buttons = getTableButton(['detail']);
-
-        return {
-            ...handleComposeTable<QryBusinessDjRsp>(param),
-            handlePermissionBtn,
-            loading,
-            tableList,
-            getPriceTypeName,
-            getApplyStatusName,
-            getContractTypeName,
-            getContractStatusName,
-            getAnalogueName,
-            buttons,
-        };
-    },
-});
-</script>

src/views/manage/finance-review/list/funds/checkpending/index.vue → src/views/manage/finance-review/list/funds/index.vue

@@ -46,9 +46,9 @@
 import { MtpTableButton, contextMenu, defineAsyncComponent, defineComponent, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
 import { initData, getTableColumns, getTableEvent, getBtnList } from '@/common/export/table';
 
-import { Filter, FundsAudit, FundsCancel, FundsDetail } from '../../../components';
+import { Filter, FundsAudit, FundsCancel, FundsDetail } from '../../components';
 
-import { queryTableList, QryBussinessKxRsp } from '../setup';
+import { queryTableList, QryBussinessKxRsp } from './setup';
 import { invoiceStatusName, operateApplyTypeName, stateName } from '@/views/manage/finance-review/setup';
 import { getContractTypeName, getApplyStatusName } from '@/common/constants/enumsName';
 import { Column, ColumnType } from '@/common/setup/table';
@@ -62,9 +62,9 @@ export default defineComponent({
         contextMenu,
         Filter,
         MtpTableButton,
-        detail: defineAsyncComponent(() => import('../../../components/fundsDetail/index.vue')),
-        funds_checkpending_check: defineAsyncComponent(() => import('../../../components/fundsAudit/index.vue')),
-        funds_checkpending_cancel: defineAsyncComponent(() => import('../../../components/fundsCancel/index.vue')),
+        detail: defineAsyncComponent(() => import('../../components/fundsDetail/index.vue')),
+        funds_checkpending_check: defineAsyncComponent(() => import('../../components/fundsAudit/index.vue')),
+        funds_checkpending_cancel: defineAsyncComponent(() => import('../../components/fundsCancel/index.vue')),
     },
     setup() {
         // 表格列表数据

src/views/manage/finance-review/list/invoice/checkpending/index.vue → src/views/manage/finance-review/list/invoice/index.vue

@@ -37,9 +37,9 @@
 <script lang="ts">
 import { MtpTableButton, contextMenu, defineAsyncComponent, defineComponent, handleComposeTable, ComposeTableParam } from '@/common/export/commonTable';
 
-import { InvoiceAudit, InvoiceCancel, InvoiceDetail, Filter } from '../../../components';
+import { InvoiceAudit, InvoiceCancel, InvoiceDetail, Filter } from '../../components';
 
-import { queryTableList, QryBussinessFpRsp } from '../setup';
+import { queryTableList, QryBussinessFpRsp } from './setup';
 import { invoiceStatusName, operateApplyTypeName } from '@/views/manage/finance-review/setup';
 import { Column, ColumnType } from '@/common/setup/table';
 import { getContractTypeName, getApplyStatusName } from '@/common/constants/enumsName';
@@ -53,9 +53,9 @@ export default defineComponent({
         contextMenu,
         Filter,
         MtpTableButton,
-        detail: defineAsyncComponent(() => import('../../../components/invoiceDetail/index.vue')),
-        invoice_checkpending_check: defineAsyncComponent(() => import('../../../components/invoiceAudit/index.vue')),
-        invoice_checkpending_cancel: defineAsyncComponent(() => import('../../../components/invoiceCancel/index.vue')),
+        detail: defineAsyncComponent(() => import('../../components/invoiceDetail/index.vue')),
+        invoice_checkpending_check: defineAsyncComponent(() => import('../../components/invoiceAudit/index.vue')),
+        invoice_checkpending_cancel: defineAsyncComponent(() => import('../../components/invoiceCancel/index.vue')),
     },
     setup() {
         // 表格列表数据