Merge branch 'mtp_v6' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB into mtp_v6

src/common/methods/table/interface.ts

@@ -18,6 +18,8 @@ export interface ColumnType {
 }
 export interface TableKey {
 	table_pcweb_delivery: string, // 现货合同
+	table_pcweb_delivery_dsh: string, // 合同审核--待审核
+	table_pcweb_delivery_ysh: string, // 合同审核--已审核
 	table_pcweb_userinfo: string, // 客户资料
 	table_pcweb_warehouse: string, // 仓库信息
 	table_pcweb_purchase_pointprice: string, // 采购_待点价
@@ -39,10 +41,15 @@ export interface TableKey {
 	table_pcweb_report_fincial_invoice_day: string, // 报表-财务报表-发票-日报表
 	table_pcweb_report_fincial_month: string, // 报表-财务报表-月报表
 	table_pcweb_business_aduit_dj: string, // 业务审核-点价
+	table_pcweb_business_aduit_ydj: string, // 业务审核-点价-已完成
 	table_pcweb_business_aduit_js: string, // 业务审核-交收
+	table_pcweb_business_aduit_yjs: string, // 业务审核-交收-未审核
 	table_pcweb_fincial_aduit_fp: string, // 业务审核-发票
+	table_pcweb_fincial_aduit_yfp: string, // 业务审核-发票-已审核
 	table_pcweb_fincial_aduit_kx: string, // 财务审核-款项
+	table_pcweb_fincial_aduit_ykx: string, // 财务审核-款项-已审核
 	table_pcweb_stock_aduit_in: string, // 库存审核-入库
+	table_pcweb_stock_aduit_yin: string, // 库存审核-入库-已审核
 	table_pcweb_stock_aduit_out: string, // 库存审核-出库
 	table_pcweb_manager_warehouse_manager: string, // 库存管理-库存管理
 	table_pcweb_manager_warehouse_manager_in: string, // 库存管理-入库明细

src/services/go/ermcp/business-review/interface.ts

@@ -18,6 +18,7 @@ export interface QryBussinessJsRsp {
     applytime: string;//申请时间
     attachurl: string;//附件
     auditid: string;//审核人ID
+    auditremark:string //审核备注
     auditname: string;//审核人名称
     audittime: string;//审核时间
     buyusername: string;//采购方名称

src/services/go/ermcp/finance-review/interface.ts

@@ -16,6 +16,7 @@ export interface QryBussinessKxRsp {
     applytime: string;//申请时间
     attachurl: string;//附件
     auditid: string;//审核人ID
+    auditremark:string;//审核备注
     auditname: string;//审核人名称
     audittime: string;//审核时间
     buyusername: string;//采购方名称

src/services/go/ermcp/spot-contract/interface.ts

@@ -71,6 +71,7 @@ export interface Ermcp3ContractRsp {
     wrstandardcode: string;//品类代码
     wrstandardid: number;//品类ID
     wrstandardname: string;//品类名称
+    subjectname: string;//交易主体名称
 }
 
 /**

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

@@ -94,11 +94,23 @@ export default defineComponent({
             queryBusinessManager();
         };
 
+        // 获取表头名称
+        const getTableName = () => {
+            switch (routeName) {
+                // 现货合同待审核
+                case 'contract_checkpending':
+                    return 'table_pcweb_delivery_dsh';
+                // 现货合同已审核
+                case 'contract_performance':
+                    return 'table_pcweb_delivery_ysh';
+            }
+        };
+
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
             menuType: EnumRouterName.spot_contract_checkpending,
-            tableName: 'table_pcweb_delivery',
+            tableName: getTableName(),
             tableFilterKey: ['contracttype', 'pricetype', 'contractno'],
             tableFilterCB,
             isDetail: true,

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

@@ -73,6 +73,19 @@ export default defineComponent({
             }
         };
 
+
+        // 获取表头名称
+        const getTableName = () => {
+            switch (routeName) {
+                // 交收待审核
+                case 'settlement_checkpending':
+                    return 'table_pcweb_business_aduit_js';
+                // 交收未审核
+                case 'settlement_performance':
+                    return 'table_pcweb_business_aduit_yjs';
+            }
+        };
+
         const filtrFn = (e: Column, item: ColumnType, filtered: any) => {
             if (e.columnfield === 'buyusernameOrsellusername') {
                 item.onFilter = (value: string, record: QryBussinessJsRsp) => {
@@ -92,7 +105,7 @@ export default defineComponent({
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
             menuType: EnumRouterName.business_review_settlement,
-            tableName: 'table_pcweb_business_aduit_js',
+            tableName: getTableName(),
             tableFilterKey: ['contracttype', 'contractno', 'deliverygoodsname'],
             tableFilterCB: filtrFn,
             isDetail: true,

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

@@ -72,6 +72,18 @@ export default defineComponent({
             }
         };
 
+        // 获取表头名称
+        const getTableName = () => {
+            switch (routeName) {
+                // 业务审核
+                case 'someprice_checkpending':
+                    return 'table_pcweb_business_aduit_dj';
+                // 业务未审核
+                case 'someprice_performance':
+                    return 'table_pcweb_business_aduit_ydj';
+            }
+        };
+
         const filtrFn = (e: Column, item: ColumnType, filtered: any) => {
             if (e.columnfield === 'buyusernameOrsellusername') {
                 item.onFilter = (value: string, record: QryBusinessDjRsp) => {
@@ -91,7 +103,7 @@ export default defineComponent({
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
             menuType: EnumRouterName.business_review_someprice,
-            tableName: 'table_pcweb_business_aduit_dj',
+            tableName: getTableName(),
             tableFilterKey: ['contracttype', 'contractno', 'deliverygoodsname'],
             tableFilterCB: filtrFn,
             isDetail: true,

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

@@ -100,11 +100,24 @@ export default defineComponent({
             }
         };
 
+
+        // 获取表头名称
+        const getTableName = () => {
+            switch (routeName) {
+                // 业务审核-发票
+                case 'funds_checkpending':
+                    return 'table_pcweb_fincial_aduit_kx';
+                // 业务审核-发票-已审核
+                case 'funds_performance':
+                    return 'table_pcweb_fincial_aduit_ykx';
+            }
+        };
+
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
             menuType: EnumRouterName.finance_review_funds,
-            tableName: 'table_pcweb_fincial_aduit_kx',
+            tableName: getTableName(),
             tableFilterKey: ['contracttype', 'contractno', 'deliverygoodsname'],
             tableFilterCB: filtrFn,
             isDetail: true,

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

@@ -92,11 +92,23 @@ export default defineComponent({
             }
         };
 
+        // 获取表头名称
+        const getTableName = () => {
+            switch (routeName) {
+                // 业务审核-发票
+                case 'invoice_checkpending':
+                    return 'table_pcweb_fincial_aduit_fp';
+                // 业务审核-发票-已审核
+                case 'invoice_performance':
+                    return 'table_pcweb_fincial_aduit_yfp';
+            }
+        };
+
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
             menuType: EnumRouterName.finance_review_invoice,
-            tableName: 'table_pcweb_fincial_aduit_fp',
+            tableName: getTableName(),
             tableFilterKey: ['contracttype', 'contractno', 'deliverygoodsname'],
             tableFilterCB: filtrFn,
             isDetail: true,

src/views/manage/inventory-review/list/audit/index.vue

@@ -94,11 +94,24 @@ export default defineComponent({
             }
         };
 
+
+        // 获取表头名称
+        const getTableName = () => {
+            switch (routeName) {
+                // 入库审核待审核
+                case 'stock_checkpending':
+                    return 'table_pcweb_stock_aduit_in';
+                // 入库审核已审核
+                case 'stock_performance':
+                    return 'table_pcweb_stock_aduit_yin';
+            }
+        };
+
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
             menuType: EnumRouterName.inventory_review_checkin,
-            tableName: 'table_pcweb_stock_aduit_in',
+            tableName: getTableName(),
             tableFilterKey: ['contracttype', 'contractno', 'deliverygoodsname'],
             tableFilterCB: filtrFn,
             isDetail: true,