baifenbaishop.git

			@@ -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',
			@@ -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>