update

src/common/methods/table/interface.ts

@@ -16,7 +16,8 @@
 		render?: Function;
 		customRender?: Function;
 	}
-	export interface TableKey {table_pcweb_userinfo:string, // 客户资料
+	export interface TableKey {table_pcweb_delivery:string, // 现货合同
+table_pcweb_userinfo:string, // 客户资料
 table_pcweb_warehouse:string, // 仓库信息
 table_pcweb_purchase_pointprice:string, // 采购_待点价
 table_pcweb_purchase_settle:string, // 采购_履约交收
@@ -42,6 +43,9 @@ table_pcweb_fincial_aduit_fp:string, // 业务审核-发票
 table_pcweb_fincial_aduit_kx:string, // 财务审核-款项
 table_pcweb_stock_aduit_in:string, // 库存审核-入库
 table_pcweb_stock_aduit_out:string, // 库存审核-出库
+table_pcweb_manager_warehouse_manager:string, // 库存管理-库存管理
+table_pcweb_manager_warehouse_manager_in:string, // 库存管理-入库明细
+table_pcweb_manager_warehouse_manager_out:string, // 库存管理-出库明细
 table_pcweb_stock_manage_current:string, // 库存管理-当前库存
 table_pcweb_stock_manage_applylog:string, // 库存管理-当前库存
 table_pcweb_hedging_plan:string, // 业务-套保计划
@@ -71,11 +75,12 @@ table_pcweb_financial_statement_brand_details:string, // 报表-财务报表-品
 table_pcweb_futures_statement_account_details:string, // 报表-期货报表-账户明细
 table_pcweb_inventory_commodity_report_brand_details:string, // 报表-库存（商品）报表-品牌明细
 table_pcweb_inventory_commodity_report_warehouse_details:string, // 报表-库存（商品）报表-仓库明细
-table_pcweb_delivery:string, // 现货合同
 table_pcweb_inventory_warehouse_report_warehouse_details:string, // 报表-库存（仓库）报表-仓库明细
 table_pcweb_inventory_summary_profit_and_loss_details:string, // 报表-汇总损益报表-损益明细
 table_pcweb_qhj_recharge_review:string, // 铂金宝-充值提现审核-充值审核
 table_pcweb_qhj_withdrawal_review:string, // 铂金宝-充值提现审核-提现审核
+table_pcweb_qhj_pickup_query:string, // 铂金宝-提货查询
+table_pcweb_qhj_fixed_investment_price_query:string, // 铂金宝-定投价查询
 table_pcweb_qhj_fixed_investment_plan_query:string, // 铂金宝-定投查询-定投计划查询
 table_pcweb_qhj_fixed_investment_flow_query:string, // 铂金宝-定投查询-定投流水查询
 table_pcweb_qhj_fixed_financing_information:string, // 铂金宝-融资信息
@@ -93,8 +98,6 @@ table_pcweb_spot_trade_warehouse_sale_float:string, // 现货贸易-仓单预售
 table_pcweb_spot_trade_warehouse_price_trading_hall_sale:string, // 现货贸易-仓单贸易-买卖大厅
 table_pcweb_spot_trade_warehouse_price_trading_hall_buy:string, // 现货贸易-仓单贸易-买卖大厅
 table_pcweb_spot_trade_warehouse_float_trading_hall_sale:string, // 现货贸易-仓单贸易-买卖大厅
-table_pcweb_qhj_pickup_query:string, // 铂金宝-提货查询
-table_pcweb_qhj_fixed_investment_price_query:string, // 铂金宝-定投价查询
 table_pcweb_spot_trade_warehouse_float_trading_hall_buy:string, // 现货贸易-仓单贸易-买卖大厅
 table_pcweb_spot_trade_warehouse_presale_price_trading_hall_sale:string, // 现货贸易-仓单预售-买卖大厅
 table_pcweb_spot_trade_warehouse_presale_price_trading_hall_buy:string, // 现货贸易-仓单预售-买卖大厅
@@ -116,5 +119,7 @@ table_pcweb_spot_trade_bottom_commodity_contract_settlement:string, // 底部栏
 table_pcweb_spot_trade_bottom_performance_info_buy:string, // 底部栏-履约信息
 table_pcweb_spot_trade_bottom_performance_info_sale:string, // 底部栏-履约信息
 table_pcweb_spot_trade_bottom_funding_info_summary:string, // 底部栏-资金信息
-table_pcweb_spot_trade_bottom_funding_info_log:string, // 底部栏-资金信息 
+table_pcweb_spot_trade_bottom_funding_info_log:string, // 底部栏-资金信息
+table_pcweb_financing_manage_bottom_apply_order:string, // 底部栏-融资管理
+table_pcweb_financing_manage_bottom_contract:string, // 底部栏-融资管理 
  }

src/services/go/wrtrade/index.ts

@@ -13,15 +13,11 @@ import {
     QueryOrderQuoteReq,
     QueryPerformancePlanReq,
     QueryWrBuybackDetailReq,
-    QueryWrFactorTypeInfoReq,
-    QueryWrFinanceBuyApplyReq,
-    QueryWrGoodsInfoReq,
+    QueryWrFactorTypeInfoReq, QueryWrGoodsInfoReq,
     QueryWrMarketTradeConfigReq,
     QueryWrOrderDetailReq,
     QueryWrPerformancePlanStepReq,
-    QueryWrPositionReq, QueryWrScfContractInterestReq,
-    QueryWrScfContractReq,
-    QueryWrSpecialMatchOrderReq,
+    QueryWrPositionReq, QueryWrScfContractInterestReq, QueryWrSpecialMatchOrderReq,
     QueryWrStandardFactoryItemReq,
     QueryWrTradeDetailReq, WrBuybackDetail,
     WrFactorTypeInfo,
@@ -227,8 +223,10 @@ export function queryWrPerformancePlanStep(req: QueryWrPerformancePlanStepReq):
 /**
  * 查询仓单贸易融资合同  /WrTrade2/QueryWrScfContract  融资管理 - 合同
  */
-export function queryWrScfContract(req: QueryWrScfContractReq): Promise<WrScfContract[]> {
-    return commonSearch_go('/WrTrade2/QueryWrScfContract', req).catch((err) => {
+export function queryWrScfContract(scfcontractid?: number): Promise<WrScfContract[]> {
+    const userid = getUsrId()
+    const param = scfcontractid ? { scfcontractid, userid } : { userid }
+    return commonSearch_go('/WrTrade2/QueryWrScfContract', param).catch((err) => {
         throw new Error(`查询仓单贸易融资合同: ${err}`);
     });
 }
@@ -236,8 +234,9 @@ export function queryWrScfContract(req: QueryWrScfContractReq): Promise<WrScfCon
 /**
  * 查询融资购买申请 /WrTrade2/QueryWrFinanceBuyApply 融资管理 - 申请单
  */
-export function queryWrFinanceBuyApply(req: QueryWrFinanceBuyApplyReq): Promise<WrFinanceBuyApply[]> {
-    return commonSearch_go('/WrTrade2/QueryWrFinanceBuyApply', req).catch((err) => {
+export function queryWrFinanceBuyApply(): Promise<WrFinanceBuyApply[]> {
+    const userid = getUsrId()
+    return commonSearch_go('/WrTrade2/QueryWrFinanceBuyApply', { userid }).catch((err) => {
         throw new Error(`查询融资购买申请: ${err}`);
     });
 }

src/utils/eventBus/index.ts

@@ -3,6 +3,7 @@ interface EnentNames {
     loadComplete: string; //加载状态名
     spotTrade: string;  // 挂牌成功，通知报价大厅更新数据
     moneyChangedNtf_UI: string; // /接收到资金变化通知 UI 成 使用
+    financing_manager: string; // 融资摘牌
 }
 
 /** 一个事件只能存储一个回调 */
@@ -12,7 +13,6 @@ interface EnentNamesOnlyOneValue {
     loadAddressList: string; //加载地址列表
     loadMylieList: string; //加载闲置列表
 
-
     custOfflineNtf: string; //接收到账户离线通知
     userLogout: string; //接收到用户登出应答
     posChangedNtf: string; //接收到头寸变化通知

src/views/market/spot_trade/components/buy-sell-market/components/financing_delisting/index.vue

@@ -171,7 +171,7 @@
 </template>
 
 <script lang="ts">
-import { defineAsyncComponent, defineComponent, PropType, ref } from 'vue';
+import { defineAsyncComponent, defineComponent, onMounted, PropType, ref } from 'vue';
 import Drawer from '@/common/components/drawer/index.vue';
 import { WrOrderQuote, WrOrderQuoteDetail } from '@/services/go/wrtrade/interface';
 import { getAccountTypeList } from '@/services/bus/account';
@@ -186,6 +186,7 @@ import { validateAction } from '@/common/setup/form';
 import { handleNumAndMoney, getWrPosition, selecedFinance } from './setup';
 import { handleIs } from '../../setup';
 import { getCanUseMoney } from '@/services/bus/account';
+import Bus from '@/utils/eventBus/index';
 
 export default defineComponent({
     name: ModalEnum.spot_trade_warehouse_delisting,
@@ -272,6 +273,7 @@ export default defineComponent({
             //         param.BuyOrSell = 0;
             //     }
             //     requestResultLoadingAndInfo(HdWRDealOrder, param, loading, ['摘牌成功', '摘牌失败:']).then(() => {
+            // Bus.$emit('financing_manager', true);
             //         cancel(true);
             //     });
             // });

src/views/order/financing_manager/components/financing_manager_apply_order/components/cancel/index.vue

@@ -7,14 +7,9 @@
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
 import Drawer from '@/common/components/drawer/index.vue';
-import { WrPerformancePlan, WrPosition } from '@/services/go/wrtrade/interface';
+import { WrFinanceBuyApply } from '@/services/go/wrtrade/interface';
 import { ModalEnum } from '@/common/constants/modalNameEnum';
 import { _closeModal } from '@/common/setup/modal/modal';
-import { PerformanceActivateReq, PerformanceDelayApplyReq } from '@/services/proto/performance/interface';
-import { getAccount_longType, getSelectedAccountId, getUserId } from '@/services/bus/account';
-import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { performanceActivate, performanceContractedApply } from '@/services/proto/performance';
-import { BuyOrSell } from '@/common/constants/enumCommon';
 import { Modal } from 'ant-design-vue';
 
 export default defineComponent({
@@ -23,13 +18,9 @@ export default defineComponent({
     emits: ['cancel', 'update'],
     props: {
         selectedRow: {
-            type: Object as PropType<WrPerformancePlan>,
+            type: Object as PropType<WrFinanceBuyApply>,
             default: {},
         },
-        buyOrSell: {
-            type: Number as PropType<BuyOrSell>,
-            default: BuyOrSell.buy,
-        },
     },
     setup(props, context) {
         const { visible, cancel } = _closeModal(context);

src/views/order/financing_manager/components/financing_manager_apply_order/index.vue

@@ -34,15 +34,11 @@
 <script lang="ts">
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
-import { QueryPerformancePlan, queryWrTradeDetail } from '@/services/go/wrtrade';
-import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
+import { queryWrFinanceBuyApply } from '@/services/go/wrtrade';
+import { WrFinanceBuyApply } from '@/services/go/wrtrade/interface';
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
-import { queryAmountLog } from '@/services/go/TaAccount';
-import { QueryAmountLogReq } from '@/services/go/TaAccount/interface';
-import { getSelectedAccountId } from '@/services/bus/account';
-import { getOperateTypeEnumItemName, getOperateTypeName } from '@/common/constants/enumsName';
 import { formatTime } from '@/common/methods';
 import Bus from '@/utils/eventBus/index';
 import { expandIcon } from '@/common/setup/table/clolumn';
@@ -55,27 +51,23 @@ export default defineComponent({
     },
     setup() {
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<WrPerformancePlan>();
+        const { loading, tableList, queryTable } = queryTableList<WrFinanceBuyApply>();
         // 获取列表数据
         const queryTableAction = () => {
-            const param: QueryAmountLogReq = {
-                accountID: getSelectedAccountId().toString(),
-            };
-
-            queryTable(queryAmountLog, param);
+            queryTable(queryWrFinanceBuyApply);
         };
         // 表格通用逻辑
         const param: ComposeOrderTableParam = {
             queryFn: queryTableAction,
-            tableName: 'table_pcweb_spot_trade_bottom_funding_info_log',
+            tableName: 'table_pcweb_financing_manage_bottom_apply_order',
             recordList: getRecordItemTab(),
         };
-        // 资金变化，重新加载数据
-        Bus.$on('moneyChangedNtf_UI', () => {
+        // 融资摘牌成功，重新加载数据
+        Bus.$on('financing_manager', () => {
             queryTableAction();
         });
         return {
-            ...handleComposeOrderTable<WrPerformancePlan>(param),
+            ...handleComposeOrderTable<WrFinanceBuyApply>(param),
             loading,
             tableList,
             formatTime,

src/views/order/financing_manager/components/financing_manager_contract/components/buyback/index.vue

@@ -87,15 +87,9 @@
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
 import Drawer from '@/common/components/drawer/index.vue';
-import { WrPerformancePlan, WrPosition } from '@/services/go/wrtrade/interface';
+import { WrScfContract } from '@/services/go/wrtrade/interface';
 import { ModalEnum } from '@/common/constants/modalNameEnum';
 import { _closeModal } from '@/common/setup/modal/modal';
-import { performanceManualConfirm } from '@/services/proto/performance';
-import { PerformanceManualConfirmReq } from '@/services/proto/performance/interface';
-import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { HdWRDealOrder } from '@/services/proto/warehousetrade';
-import { BuyOrSell } from '@/common/constants/enumCommon';
-import * as Long from 'long';
 import { handleForm } from './setup';
 import { validateAction } from '@/common/setup/form';
 import { FormState } from './interface';
@@ -106,7 +100,7 @@ export default defineComponent({
     emits: ['cancel', 'update'],
     props: {
         selectedRow: {
-            type: Object as PropType<WrPerformancePlan>,
+            type: Object as PropType<WrScfContract>,
             default: {},
         },
     },

src/views/order/financing_manager/components/financing_manager_contract/components/pay/index.vue

@@ -52,15 +52,9 @@
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
 import Drawer from '@/common/components/drawer/index.vue';
-import { WrPerformancePlan, WrPosition } from '@/services/go/wrtrade/interface';
+import { WrScfContract } from '@/services/go/wrtrade/interface';
 import { ModalEnum } from '@/common/constants/modalNameEnum';
 import { _closeModal } from '@/common/setup/modal/modal';
-import { performanceManualConfirm } from '@/services/proto/performance';
-import { PerformanceManualConfirmReq } from '@/services/proto/performance/interface';
-import { requestResultLoadingAndInfo } from '@/common/methods/request/resultInfo';
-import { HdWRDealOrder } from '@/services/proto/warehousetrade';
-import { BuyOrSell } from '@/common/constants/enumCommon';
-import * as Long from 'long';
 
 export default defineComponent({
     name: ModalEnum.financing_manager_contract_pay_arrears,
@@ -68,25 +62,21 @@ export default defineComponent({
     emits: ['cancel', 'update'],
     props: {
         selectedRow: {
-            type: Object as PropType<WrPerformancePlan>,
+            type: Object as PropType<WrScfContract>,
             default: {},
         },
-        buyOrSell: {
-            type: Number as PropType<BuyOrSell>,
-            default: BuyOrSell.buy,
-        },
     },
     setup(props, context) {
         const { visible, cancel } = _closeModal(context);
         const loading = ref<boolean>(false);
         function submit() {
-            const param: PerformanceManualConfirmReq = {
-                PerformancePlanStepID: Long.fromString(props.selectedRow.curstepid),
-                PerformanceExecuteSide: 1,
-            };
-            requestResultLoadingAndInfo(performanceManualConfirm, param, loading, ['付款成功', '付款失败:']).then(() => {
-                cancel(true);
-            });
+            // const param: PerformanceManualConfirmReq = {
+            //     PerformancePlanStepID: Long.fromString(props.selectedRow.curstepid),
+            //     PerformanceExecuteSide: 1,
+            // };
+            // requestResultLoadingAndInfo(performanceManualConfirm, param, loading, ['付款成功', '付款失败:']).then(() => {
+            //     cancel(true);
+            // });
         }
 
         return {

src/views/order/financing_manager/components/financing_manager_contract/index.vue

@@ -34,17 +34,12 @@
 <script lang="ts">
 import { enumOrderComponents } from '@/common/constants/enumOrderComponents';
 import { queryTableList, BtnList, defineAsyncComponent, defineComponent, ModalEnum } from '@/common/export/commonTable';
-import { QueryPerformancePlan, queryWrTradeDetail } from '@/services/go/wrtrade';
-import { QueryPerformancePlanReq, WrPerformancePlan } from '@/services/go/wrtrade/interface';
+import { queryWrScfContract } from '@/services/go/wrtrade';
+import { WrScfContract } from '@/services/go/wrtrade/interface';
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
-import { queryAmountLog } from '@/services/go/TaAccount';
-import { QueryAmountLogReq } from '@/services/go/TaAccount/interface';
-import { getSelectedAccountId } from '@/services/bus/account';
-import { getOperateTypeEnumItemName, getOperateTypeName } from '@/common/constants/enumsName';
 import { formatTime } from '@/common/methods';
-import Bus from '@/utils/eventBus/index';
 import { expandIcon } from '@/common/setup/table/clolumn';
 
 export default defineComponent({
@@ -56,27 +51,19 @@ export default defineComponent({
     },
     setup() {
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<WrPerformancePlan>();
+        const { loading, tableList, queryTable } = queryTableList<WrScfContract>();
         // 获取列表数据
         const queryTableAction = () => {
-            const param: QueryAmountLogReq = {
-                accountID: getSelectedAccountId().toString(),
-            };
-
-            queryTable(queryAmountLog, param);
+            queryTable(queryWrScfContract);
         };
         // 表格通用逻辑
         const param: ComposeOrderTableParam = {
             queryFn: queryTableAction,
-            tableName: 'table_pcweb_spot_trade_bottom_funding_info_log',
+            tableName: 'table_pcweb_financing_manage_bottom_contract',
             recordList: getRecordItemTab(),
         };
-        // 资金变化，重新加载数据
-        Bus.$on('moneyChangedNtf_UI', () => {
-            queryTableAction();
-        });
         return {
-            ...handleComposeOrderTable<WrPerformancePlan>(param),
+            ...handleComposeOrderTable<WrScfContract>(param),
             loading,
             tableList,
             formatTime,