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 | 63 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 11 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 7a9b825..1a8c3e3 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
@@ -42,7 +42,7 @@
<script type="text/html" id="LAY-app-CoreCmsOrder-pagebar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" lay-event="payOrderArray"><i class="layui-icon layui-icon-cart"></i>鎵归噺鏀粯</button>
+ <!-- <button class="layui-btn layui-btn-sm" lay-event="payOrderArray"><i class="layui-icon layui-icon-cart"></i>鎵归噺鏀粯</button> -->
<button class="layui-btn layui-btn-sm" lay-event="shipOrderArray"><i class="layui-icon layui-icon-templeate-1"></i>鍚堝苟鍙戣揣</button>
<button class="layui-btn layui-btn-sm" lay-event="batchCancelOrder"><i class="layui-icon layui-icon-close"></i>鍙栨秷璁㈠崟</button>
<button class="layui-btn layui-btn-sm" lay-event="batchDeleteOrder"><i class="layui-icon layui-icon-delete"></i>鎵归噺鍒犻櫎</button>
@@ -295,7 +295,7 @@
},
{ field: 'orderAmount', title: '璁㈠崟鎬婚', width: 120, align: 'center', templet: '#orderAmount', totalRow: true },
{
- field: 'item', title: '璐у搧', align: 'center', width: 330, templet: "#orderItems"
+ field: 'item', title: '璐у搧', align: 'center', width: 550, templet: "#orderItems"
},
{
field: 'orderAmount',
@@ -317,7 +317,7 @@
align: 'center',
width: 80,
templet: function (data) {
- var html = '<a class="layui-btn layui-btn-warm layui-btn-xs" lay-active="shoppingPrintCloud" data-id="' + data.orderId + '" class="cursor">鎵撳皬绁ㄥ崟</a><br>';
+ var html = '';// '<a class="layui-btn layui-btn-warm layui-btn-xs" lay-active="shoppingPrintCloud" data-id="' + data.orderId + '" class="cursor">鎵撳皬绁ㄥ崟</a><br>';
html += '<a class="layui-btn layui-btn-primary layui-btn-xs" lay-active="shoppingPrint" data-id="' + data.orderId + '" class="cursor">鎵撹喘鐗╁崟</a><br>';
html += '<a class="layui-btn layui-btn-primary layui-btn-xs" lay-active="distributionPrint" data-id="' + data.orderId + '" class="cursor">鎵撻厤閫佸崟</a><br>';
html += '<a class="layui-btn layui-btn-primary layui-btn-xs" lay-active="unionPrint" data-id="' + data.orderId + '" class="cursor">鎵撹仈鍚堝崟</a><br>';
@@ -378,7 +378,10 @@
templet: function (data) {
for (var i = 0; i < d.data.shipStatus.length; i++) {
if (data.shipStatus == d.data.shipStatus[i].value) {
- return d.data.shipStatus[i].description;
+ if(d.data.shipStatus[i].description == "宸插彂璐�")
+ return "鈭�"
+
+ return d.data.shipStatus[i].description;
}
}
return "";
@@ -391,7 +394,9 @@
templet: function (data) {
for (var i = 0; i < d.data.confirmStatus.length; i++) {
if (data.confirmStatus == d.data.confirmStatus[i].value) {
- return d.data.confirmStatus[i].description;
+ if(d.data.confirmStatus[i].description == "宸茬‘璁ゆ敹璐�")
+ return "鈭�"
+ return d.data.confirmStatus[i].description;
}
}
return "";
@@ -917,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();
@@ -950,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);
@@ -1084,6 +1111,7 @@
//鐩戝惉鎻愪氦
form.on('submit(LAY-app-CoreCmsOrder-shipForm-submit)',
function (data) {
+
var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
var keys = Object.keys(field);
@@ -1300,24 +1328,32 @@
<div class="order-min-table">
<table class="layui-table" lay-size="sm">
<colgroup>
+
+ <col width="500">
<col width="40">
- <col width="200">
+ <col width="300">
<col width="40">
<col width="40">
<col width="40">
</colgroup>
<thead>
<tr>
- <th colspan="2" style="width: 200px;">璐у搧</th>
- <th style="width: 40px;">鏁伴噺</th>
- <th style="width: 40px;">鍗曚环</th>
- <th style="width: 40px;">浼樻儬</th>
- <th style="width: 40px;">鍚堣</th>
+ <th colspan="1" style="width: 400px;">鍟嗗搧鍚嶇О</th>
+ <th colspan="2" style="width: 300px;">璐у搧</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>
{{# layui.each(d.items, function(index, item){ }}
+
<tr lay-tips="{{item.name}}">
+ <td >
+ {{item.name}}
+ </td>
<td>
<a href="javascript:void(0);" onclick="layui.coreHelper.viewImage('{{item.imageUrl}}')"><image style="max-width: 30px; max-height: 30px;" src="{{item.imageUrl}}" /></a>
</td>
@@ -1326,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