From 9173f6e5b34a12c01804676d76842031e9ec6724 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 26 六月 2024 11:52:16 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
index a9fff6e..1a8c3e3 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
@@ -922,6 +922,17 @@
area: ['1000px', '90%'],
id: 'LAY-popup-CoreCmsOrder-distribution',
success: function (layero, index) {
+
+ if(e.data.order.delivery?.length>0)
+ {
+ e.data.order.delivery.forEach(element => {
+ if( element.logiCode=="Distributor")
+ {
+ e.data.order.logisticsName+=`[${element.logiName} == ${element.sendDistributionAccept}] `
+ }
+ });
+ }
+
view(this.id).render('order/orders/distribution', { data: e.data }).done(function () {
form.on('submit(LAY-app-order-distributionPrint-submit)', function (data) {
LODOP = getLodop();
@@ -955,6 +966,17 @@
id: 'LAY-popup-CoreCmsOrder-union',
success: function (layero, index) {
view(this.id).render('order/orders/union', { data: e.data }).done(function () {
+
+ if(e.data.order.delivery?.length>0)
+ {
+ e.data.order.delivery.forEach(element => {
+ if( element.logiCode=="Distributor")
+ {
+ e.data.order.logisticsName+=`[${element.logiName} == ${element.sendDistributionAccept}]`
+ }
+ });
+ }
+
form.on('submit(LAY-app-order-unionPrint-submit)', function (data) {
LODOP = getLodop();
LODOP.ADD_PRINT_HTM(20, "5%", "90%", "100%", document.getElementById("printDiv").innerHTML);
@@ -1089,6 +1111,7 @@
//鐩戝惉鎻愪氦
form.on('submit(LAY-app-CoreCmsOrder-shipForm-submit)',
function (data) {
+
var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
var keys = Object.keys(field);
@@ -1317,10 +1340,11 @@
<tr>
<th colspan="1" style="width: 400px;">鍟嗗搧鍚嶇О</th>
<th colspan="2" style="width: 300px;">璐у搧</th>
- <th style="width: 40px;">鏁伴噺</th>
- <th style="width: 40px;">鍗曚环</th>
- <th style="width: 40px;">浼樻儬</th>
- <th style="width: 40px;">鍚堣</th>
+ <th style="width: 60px;">鏁伴噺</th>
+ <th style="width: 60px;">鍗曚环</th>
+ <th style="width: 60px;">鏄惁瀹氬埗</th>
+ <th style="width: 60px;">浼樻儬</th>
+ <th style="width: 80px;">鍚堣</th>
</tr>
</thead>
<tbody>
@@ -1338,6 +1362,11 @@
</td>
<td>{{item.nums}}</td>
<td>{{item.price}}</td>
+ {{#if (item.isCustomizable == true){}}
+ <td style="color: red;" >鏄�</td>
+ {{#}else{}}
+ <td >鍚�</td>
+ {{#}}}
<td>{{item.promotionAmount}}</td>
<td>{{item.amount}}</td>
</tr>
--
Gitblit v1.9.1