Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop

username@email.com

2024-06-26 9173f6e5b34a12c01804676d76842031e9ec6724

 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>