commit 买方支付

src/services/go/wrtrade/index.ts

@@ -9,13 +9,13 @@ import {
     QueryFilterItemReq, QueryFtDeliveryGoodsReq, QueryHoldLBReq, QueryOrderQuoteDetailReq,
     QueryOrderQuoteReq, QueryPerformancePlanReq, QueryWrFactorTypeInfoReq,
     QueryWrGoodsInfoReq, QueryWrMarketTradeConfigReq,
-    QueryWrOrderDetailReq,
+    QueryWrOrderDetailReq, QueryWrPerformancePlanStepReq,
     QueryWrPositionReq, QueryWrSpecialMatchOrderReq, QueryWrStandardFactoryItemReq,
     QueryWrTradeDetailReq, WrFactorTypeInfo, WrFAProductDetail, WrFilterItem, WrFtDeliveryGoods,
     WrGoodsInfo, WrHoldLB, WrMarketTradeConfig,
     WrOrderDetail,
     WrOrderQuote,
-    WrOrderQuoteDetail, WrPerformancePlan,
+    WrOrderQuoteDetail, WrPerformancePlan, WrPerformancePlanStep,
     WrPosition, WrSpecialMatchOrder, WrStandardFactoryItemEx,
     WrTradeDetail
 } from "@/services/go/wrtrade/interface";
@@ -191,7 +191,14 @@ export function queryWrTradeDetail(req: QueryWrTradeDetailReq): Promise<WrTradeD
     });
 }
 
-
+/**
+ * 查询履约信息详情 /WrTrade2/QueryWrPerformancePlanStep
+ */
+export function queryWrPerformancePlanStep(req: QueryWrPerformancePlanStepReq): Promise<WrPerformancePlanStep> {
+    return commonSearch_go('/WrTrade2/QueryWrPerformancePlanStep', req).catch((err) => {
+        throw new Error(`查询履约信息详情: ${err}`);
+    });
+}
 
 
 

src/services/go/wrtrade/interface.ts

@@ -613,4 +613,63 @@ export interface WrStandardFactoryItemEx {
     itemlst: WrStandardFactoryItem[]//  要素项列表
     itemtypename: string            //  要素项类型名称
     wrstandardid: number            //  品类
+}
+
+/**
+ * 查询履约信息详情
+ */
+export interface QueryWrPerformancePlanStepReq {
+    planid: number
+    curstepid?: number
+}
+
+/**
+ * 查询履约信息返回
+ */
+export interface WrPerformancePlanStep {
+    delaydays	:number;//延期申请天数
+    deliverygoodscode	:string;//品种代码
+    deliverygoodsid	:number;//品种ID
+    deliverygoodsname	:string;//品种名称
+    endtime	:string;//结束日期
+    enumdicname	:string;//单位名称
+    executeside	:number;//步骤执行方 - 1:买方 2:卖方
+    handlestatus	:number;//处理状态 - 1:开始 2:结束 3:冻结请求 4:冻结返回成功 5:冻结返回失败 6:扣款请求 7:扣款返回成功 8:扣款返回失败 9:仓单转移请求 1number;
+//:仓单转移返回成功 11:仓单转移返回失败 12:加钱请求 13:加钱返回成功 14:加钱返回失败 15:解冻仓单头寸请求 16:解冻仓单头寸返回成功 17:解冻仓单头寸返回失败 18:解冻库位请求 19:解冻库位返回成功 2number;
+//:解冻库位返回失败
+    isauto	:number;//是否自动 - number;
+//:不自动 1:自动
+    islastreceivestep	:number;//是否最后收款步骤 - number;
+//:不是 1:是 （暂时不用，由服务自己判断是否为最后一步付款或收款)
+    minivalue	:number;//现货商品最小变动值
+    optioncompare	:string;//选择项比较串【{选择项ID}＋{冒号}+选择项值 } ，逗号分隔，头尾加逗号】-- 所有选择项拼接，用于比较
+    overdays	:number;//超期天数 = 当前时间(数据库时间) - 结束日期
+    performancestepid	:string;//履约步骤ID(131+Unix秒时间戳(1number;
+//位)+xxxxxx)
+    planid	:string;//所属履约计划ID
+    realamount	:number;//实际完成金额
+    relatedorderid	:string;//关联单号
+    remaindays	:number;//剩余天数
+    remark	:string;//错误备注
+    starttime	:string;//开始日期
+    stepamount	:number;//步骤金额
+    stepdays	:number;//距离上一步天数(分钟)
+    stepindex	:number;//步骤序号
+    steplanchtype	:number;//步骤启动类型 - 1:系统自动 2:手动
+    stepremark	:string;//步骤备注
+    stepstatus	:number;//步骤状态 - 1:待开始 2:进行中 3:已完成 4:延期(进行中) 5:失败 6:自动完成 7:超时关闭
+    steptypeid	:number;//履约步骤类型ID - 1:买方支付 2:卖方收款 3:买方自提 4:卖方发货 5:买方确认货 6:卖方发票 7:买方确认票 8:仓单转移 9:释放卖方冻结 1number;
+//:货款溢短 11:生成合同[中江] 12:运费 9number;
+//:确认支付 91. 确认放行 92买方支付(直接扣款) 用于-1模板“
+    steptypename	:string;//步骤名称
+    stepvalue	:number;//步骤值
+    warehouseid	:number;//仓库ID
+    warehousename	:string;//仓库名称
+    wrfactortypeid	:string;//仓单要素类型ID(212+Unix秒时间戳(1number;
+//位)+xxxxxx)
+    wrfactortypename	:string;//仓单要素类型名称(选择项要素的名称合并显示，逗号分隔)
+    wrstandardcode	:string;//现货商品代码
+    wrstandardid	:number;//现货商品ID
+    wrstandardname	:string;//商品名称
+    wrtypename	:string;//商品
 }

src/services/proto/performance/index.ts

@@ -11,7 +11,7 @@ import {
 import {HeadEnum} from "@/services/socket/protobuf/protoHeader";
 
 /**
- * 履约手动确认
+ * 履约手动确认 （支付 发票 发货）
  * @param param
  */
 export const performanceManualConfirm = (param: PerformanceManualConfirmReq): Promise<any> => {

src/services/proto/performance/interface.ts

@@ -29,11 +29,11 @@ export interface  PerformanceDelayApplyRsp {
 // 履约手动确认请求 0 20 3
 export interface  PerformanceManualConfirmReq {
     PerformancePlanStepID: number // uint64 履约计划步骤ID
-    OverShortAmount: number // double 溢短金额
-    PerformanceExecuteSide: number // uint32 履约步骤执行方 1买方 2 卖方
-    StepRemark: string// string 步骤备注
-    OverShortQty: number // double 溢短数量
-    ExpressFee: number // double 运费金额
+    OverShortAmount?: number // double 溢短金额
+    PerformanceExecuteSide?: number // uint32 履约步骤执行方 1买方 2 卖方
+    StepRemark?: string// string 步骤备注
+    OverShortQty?: number // double 溢短数量
+    ExpressFee?: number // double 运费金额
 }
 // 履约手动确认应答 0 20 4
 export interface  PerformanceManualConfirmRsp {

src/services/proto/warehousetrade/index.ts

@@ -97,5 +97,3 @@ export const WROutConfirm = (param: WROutConfirmReq): Promise<any> => {
 export const WROutCancel = (param: WROutCancelReq): Promise<any> => {
     return protoMiddleware<WROutCancelReq>(param, 'WROutCancelReq', 'WROutCancelRsp', HeadEnum.tradeMode17)
 }
-
-

src/views/order/performance_information/components/performance_information_buy_performance/components/pay/index.vue

@@ -26,7 +26,7 @@
             </a-col>
             <a-col :span="24">
               <a-form-item label="履约总金额">
-                <span class="white">1000.00元（已冻结履约金额200.00元）</span>
+                <span class="white">{{selectedRow.amount.toFixed(2)}}</span>
               </a-form-item>
             </a-col>
             <a-col :span="24">
@@ -41,7 +41,7 @@
             </a-col>
             <a-col :span="24">
               <a-form-item label="剩余款">
-                <span class="white">1000.00</span>
+                <span class="white">{{selectedRow.unpaidamount.toFixed(2)}}</span>
               </a-form-item>
             </a-col>
           </a-row>
@@ -66,9 +66,13 @@
 <script lang="ts">
 import { defineComponent, PropType, ref } from 'vue';
 import Drawer from '@/common/components/drawer/index.vue';
-import { WrPosition } from '@/services/go/wrtrade/interface';
+import {WrPerformancePlan, WrPosition} 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";
 
 export default defineComponent({
     name: ModalEnum.performance_information_buy_performance_pay,
@@ -76,7 +80,7 @@ export default defineComponent({
     emits: ['cancel', 'update'],
     props: {
         selectedRow: {
-            type: Object as PropType<WrPosition>,
+            type: Object as PropType<WrPerformancePlan>,
             default: {},
         },
     },
@@ -84,7 +88,16 @@ export default defineComponent({
         const { visible, cancel } = _closeModal(context);
         const loading = ref<boolean>(false);
         console.log('selectedRow', props.selectedRow);
-        function submit() {}
+        function submit() {
+            const param: PerformanceManualConfirmReq = {
+                PerformancePlanStepID: props.selectedRow.curstepid,
+                PerformanceExecuteSide: 1
+            }
+            debugger
+            requestResultLoadingAndInfo(performanceManualConfirm, param, loading, ['付款成功', '付款失败:']).then(() => {
+                cancel(true);
+            });
+        }
         return {
             visible,
             cancel,