From e90287e43a699696d41f551f6f6a82b7cdb1a467 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 13 Feb 2023 15:19:28 +0800
Subject: [PATCH] 订单发货设置

---
 src/main/resources/templates/febs/views/modules/order/orderList.html |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index 70946d6..8027cb1 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -116,7 +116,7 @@
 <script type="text/html" id="tableToolBar">
     <div class="layui-btn-container">
 <!--        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverOne">导出待发货订单,系统自动发货</button>-->
-        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="confirmOrder">确认到货</button>
+<!--        <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="confirmOrder">确认到货</button>-->
         <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="printSelect">自定义打印</button>
         <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="goodsStatistics">统计商品份数</button>
 <!--        <button id="printSelect" type="button" class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain">自定义打印</button>-->
@@ -416,18 +416,18 @@
                                     return ''
                                 }
                             }, minWidth: 80,align:'center'},
-                    {field: 'deliveryState', title: '配送状态',
-                        templet: function (d) {
-                            if (d.deliveryState === 1) {
-                                return '<span style="color:dodgerblue;">待配送</span>'
-                            } else if (d.deliveryState === 2) {
-                                return '<span style="color:forestgreen;">配送中</span>'
-                            } else if (d.deliveryState === 3) {
-                                return '<span style="color:forestgreen;">已送达</span>'
-                            }else{
-                                return ''
-                            }
-                        }, minWidth: 80,align:'center'},
+                    // {field: 'deliveryState', title: '配送状态',
+                    //     templet: function (d) {
+                    //         if (d.deliveryState === 1) {
+                    //             return '<span style="color:dodgerblue;">待配送</span>'
+                    //         } else if (d.deliveryState === 2) {
+                    //             return '<span style="color:forestgreen;">配送中</span>'
+                    //         } else if (d.deliveryState === 3) {
+                    //             return '<span style="color:forestgreen;">已送达</span>'
+                    //         }else{
+                    //             return ''
+                    //         }
+                    //     }, minWidth: 80,align:'center'},
                         {field: 'payMethod', title: '支付方式', minWidth: 100,align:'left'},
                         {field: 'payTime', title: '支付时间', minWidth: 120,align:'left'},
                         // {field: 'wxOrderNo', title: '支付订单号', minWidth: 120,align:'left'},

--
Gitblit v1.9.1