From cdd507c631978198fc3a42d47da32c432cce99a1 Mon Sep 17 00:00:00 2001
From: cjb <646858191@qq.com>
Date: Fri, 1 Aug 2025 15:13:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/replabatt/settlement.vue | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/views/order/replabatt/settlement.vue b/src/views/order/replabatt/settlement.vue
index 78c8475..8ef9df6 100644
--- a/src/views/order/replabatt/settlement.vue
+++ b/src/views/order/replabatt/settlement.vue
@@ -404,6 +404,7 @@
 
   let payqs = reactive<any>({
 		//wuid:'',                                    //公司编码, 
+    orderTimeEnd:'',
     ccode:'',                                   //公司编码
 		description:'',											        //订单总描述 公司名称+日期
 		total:0,												            //支付金额，单位：分
@@ -451,7 +452,7 @@
   //是否失效
   let issx = ref(false) 
   function payment(type?:number) {
-    if(dzarr.value.length > 0){
+   // if(dzarr.value.length > 0){
 
       //失效时间
       let sxtime:any = new Date().getTime()
@@ -467,8 +468,8 @@
       payqs.timeExp = `${sxyear}-${sxmoth}-${sxdate} ${sxhhour}:${sxminute}:${sxSeconds}`
 
       //payqs.ccode = queryParams.ccode
-      payqs.total = totalAmount
-      payqs.attach.orderNo = orderNo.value
+      //payqs.total = totalAmount
+      //payqs.attach.orderNo = orderNo.value
 
       //payqs.attach.tradercode = queryParams.ccode
       let dateTime = new Date()
@@ -479,6 +480,9 @@
       let ddms = `${cname.value}支付${year}年${moth}月订单`
       payqs.description = ddms
       payqs.attach.description = ddms
+
+      payqs.ccode = queryParams.companyCode
+      payqs.orderTimeEnd = queryParams.orderTimeEnd
       if(type == 1){
         payqs.attach = JSON.stringify(payqs.attach)
       }else{
@@ -547,12 +551,12 @@
       //     type: 'success',
       //     message: '支付成功'
       //   })
-    }else{
-      ElMessage({
-        type: 'warning',
-        message: '请选择订单'
-      })
-    }
+    // }else{
+    //   ElMessage({
+    //     type: 'warning',
+    //     message: '请选择订单'
+    //   })
+    // }
   }