订单添加数据版本

packageA/orderForm/detail.js

@@ -316,6 +316,7 @@ Page({
 				"tradefield": data.tradefield, //必选
 				"pay_enterpriseid": data.pay_enterpriseid, //结算单位
 				"rebate_userate": data.accountclass.rebate_userate, //返利金使用比例
+				sa_order_v: data.sa_order_v || ""
 			};
 		return new Promise((resolve, reject) => {
 			_Http.basic({
@@ -366,7 +367,8 @@ Page({
 			"content": {
 				"sa_orderid": this.data.sa_orderid, //订单金额
 				"isused": this.data.detail.rebate_used == 1 ? 0 : 1, //是否使用
-				"rebateamount": rebatebalance > amount ? amount : rebatebalance //返利金使用金额
+				"rebateamount": rebatebalance > amount ? amount : rebatebalance, //返利金使用金额
+				"sa_order_v": this.data.detail.sa_order_v || '',
 			}
 		}, false).then(res => {
 			console.log('设置启用返利金', res)
@@ -394,7 +396,8 @@ Page({
 			"content": {
 				"sa_orderid": this.data.sa_orderid, //订单金额
 				"isused": 1, //是否使用
-				"rebateamount": value > amount ? amount : value
+				"rebateamount": value > amount ? amount : value,
+				"sa_order_v": this.data.detail.sa_order_v || '',
 			}
 		}, false).then(res => {
 			console.log('设置返利金', res)
@@ -462,7 +465,8 @@ Page({
 					"id": 20230331152503,
 					"content": {
 						isrecheck,
-						sa_orderid: that.data.sa_orderid
+						sa_orderid: that.data.sa_orderid,
+						sa_order_v: that.data.detail.sa_order_v,
 					},
 				}).then(s => {
 					console.log("预提交订单", s)
@@ -487,7 +491,8 @@ Page({
 				if (res.confirm) _Http.basic({
 					"id": 20221108153402,
 					"content": {
-						sa_orderid: that.data.sa_orderid
+						sa_orderid: that.data.sa_orderid,
+						sa_order_v: that.data.detail.sa_order_v,
 					},
 				}).then(s => {
 					console.log("提交订单", s)

packageA/orderForm/detail.wxml

@@ -58,7 +58,7 @@
 </view>
 <view style="height: 20rpx;" />
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
-    <Product slot='产品明细' id='Product' disabled="{{detail.status!='新建'}}" />
+    <Product slot='产品明细' id='Product' disabled="{{detail.status!='新建'}}" sa_order_v='{{detail.sa_order_v}}' />
     <Yl_Attachment slot='附件' id='Yl_Attachment' ownertable="sa_order" ownerid="{{detail.sa_orderid}}" disabled="{{detail.status!='新建'}}" />
     <Progress slot='订单进度' id='Progress' />
     <Consignment slot='出库单' id='Consignment' />

packageA/orderForm/modules/product/index.js

@@ -11,6 +11,9 @@ let queue = [],
 
 Component({
     properties: {
+        sa_order_v: {
+            type: String
+        },
         disabled: {
             type: Boolean
         }, //禁用
@@ -47,7 +50,6 @@ Component({
                     title: res.msg,
                     icon: "none"
                 })
-
                 res.data = res.data.map(v => {
                     if (v.attinfos.length != 0) {
                         v.attinfos = file.fileList(v.attinfos)
@@ -84,6 +86,7 @@ Component({
                 index = this.data.list.findIndex(v => v.itemid == detail.itemid),
                 data = this.data.list[index];
             if (data.qty == obj.qty && data.remarks == obj.remarks && data.needdate == obj.needdate) return;
+            detail.sa_order_v = this.data.sa_order_v;
             _Http.basic({
                 "id": 20221109093602,
                 "content": {
@@ -125,7 +128,8 @@ Component({
                             sa_orderid,
                             "sa_orderitemsids": [
                                 detail.sa_orderitemsid
-                            ]
+                            ],
+                            sa_order_v: that.data.sa_order_v
                         }
                     }).then(s => {
                         if (s.msg != '成功') return wx.showToast({
@@ -175,7 +179,6 @@ Component({
         },
         /* 处理新增产品 */
         handleSelect(detail) {
-            console.log(detail)
             let that = this;
             wx.showModal({
                 title: '提示',

packageA/orderForm/modules/product/list/index.js

@@ -53,8 +53,9 @@ Component({
 				qty: data.qty,
 				remarks: name == 'remarks' ? e.detail.value : data.remarks,
 				needdate: data.needdate || "",
-				deliverydate: data.deliverydate || ""
+				deliverydate: data.deliverydate || "",
 			})
+			//	sa_orderitems_v: data.sa_orderitems_v || ""
 		},
 		changeDate(e) {
 			let {
@@ -68,6 +69,7 @@ Component({
 				needdate: e.detail.value || "",
 				deliverydate: data.deliverydate || ""
 			})
+			//sa_orderitems_v: data.sa_orderitems_v || ""
 		},
 		deleteProduct(e) {
 			this.triggerEvent("deleteItem", e.currentTarget.dataset.item)
@@ -78,8 +80,8 @@ Component({
 				icon: "none"
 			})
 		},
-		customization(){
-			
+		customization() {
+
 		}
 	}
 })