From 824691c5f2e538fd83e75701f0c436ff5f4d8d2b Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Thu, 09 Jun 2022 15:20:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/订单服务单代码改造' into alpha
---
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html
index 888cad5..48bbaef 100644
--- a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html
+++ b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html
@@ -343,7 +343,9 @@
}
_this.shfs = data.mapInfo.shfs;
_this.sqtj = data.mapInfo.sqtj;
- _this.order = data.mapInfo.order;
+ if (!data.mapInfo.order && data.mapInfo.order != null) {
+ _this.order = data.mapInfo.order;
+ }
}
});
},
@@ -356,7 +358,7 @@
this.pushToSelectGoods(row);
},
pushToSelectGoods(goods) {
-
+ console.log(this.order)
//判断是否被选中
let selected = false;
for(let i = 0; i < this.order.length; i++){
--
Gitblit v1.9.1