From dfa34a22aa0678fa488f5646b6f4164d235eae98 Mon Sep 17 00:00:00 2001
From: houjianhui <houjianhui1989@163.com>
Date: Thu, 22 Jun 2017 14:09:21 +0800
Subject: [PATCH 1/6] =?UTF-8?q?pom=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ils-sales-api/pom.xml     | 4 ++--
 ils-sales-backend/pom.xml | 2 +-
 ils-sales-base/pom.xml    | 2 +-
 ils-sales-web/pom.xml     | 4 ++--
 pom.xml                   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ils-sales-api/pom.xml b/ils-sales-api/pom.xml
index dc48d4a..e26bca0 100644
--- a/ils-sales-api/pom.xml
+++ b/ils-sales-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>ils-sales</artifactId>
         <groupId>com.unlcn.ils.sales</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>com.unlcn.ils.sales</groupId>
             <artifactId>ils-sales-backend</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/ils-sales-backend/pom.xml b/ils-sales-backend/pom.xml
index ebd52f1..a4f0520 100644
--- a/ils-sales-backend/pom.xml
+++ b/ils-sales-backend/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>ils-sales</artifactId>
         <groupId>com.unlcn.ils.sales</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/ils-sales-base/pom.xml b/ils-sales-base/pom.xml
index 127570e..d54cd85 100644
--- a/ils-sales-base/pom.xml
+++ b/ils-sales-base/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>ils-sales</artifactId>
         <groupId>com.unlcn.ils.sales</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ils-sales-web/pom.xml b/ils-sales-web/pom.xml
index 3666269..0a66b6e 100644
--- a/ils-sales-web/pom.xml
+++ b/ils-sales-web/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>ils-sales</artifactId>
         <groupId>com.unlcn.ils.sales</groupId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.unlcn.ils.sales</groupId>
             <artifactId>ils-sales-backend</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/pom.xml b/pom.xml
index 2eb52e1..8008319 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.unlcn.ils.sales</groupId>
     <artifactId>ils-sales</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.0</version>
+    <version>1.0.0-SNAPSHOT</version>
     <modules>
         <module>ils-sales-api</module>
         <module>ils-sales-web</module>
-- 
Gitee


From 25a72936b87800a2ce897b769f11d0172df7f881 Mon Sep 17 00:00:00 2001
From: felix <felix.quzf@gmail.com>
Date: Thu, 22 Jun 2017 15:41:19 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=EF=BC=8C=E5=8F=AA=E8=83=BD?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=BE=85=E5=AE=A1=E6=89=B9=E7=9A=84=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/webpage/network/order-list.jsp    | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/ils-sales-web/src/main/webapp/WEB-INF/webpage/network/order-list.jsp b/ils-sales-web/src/main/webapp/WEB-INF/webpage/network/order-list.jsp
index b871394..7345020 100644
--- a/ils-sales-web/src/main/webapp/WEB-INF/webpage/network/order-list.jsp
+++ b/ils-sales-web/src/main/webapp/WEB-INF/webpage/network/order-list.jsp
@@ -21,6 +21,7 @@
 </head>
 <body>
 <input type="hidden" id="rootpath" value="<%=basePath%>">
+<input type="hidden" id="path" value="<%=path%>">
 <div class="admin-main">
     <blockquote class="layui-elem-quote">
         <a href="javascript:;" class="layui-btn layui-btn-radius" id="query">
@@ -133,7 +134,7 @@
 
     {{# layui.each(d.data.orderList, function(index, item){ }}
     <tr>
-        <td><input type="checkbox" lay-skin="primary" value="{{ item.id }}"></td>
+        <td><input type="checkbox" lay-skin="primary" value="{{ item.id }}" name="{{ item.orderAuditStatusText }}"></td>
         <td>{{ item.code }}</td>
         <td>{{ item.departRegionName }}</td>
         <td>{{ item.destRegionName }}</td>
@@ -153,11 +154,14 @@
 <script type="text/javascript" src="<%=path%>/plugins/layui/layui.js"></script>
 <script>
     rootPath=document.getElementById("rootpath").value;
-
+    path=document.getElementById("path").value;
     layui.config({
         base: rootPath +'js/'
     });
     layui.use(['paging', 'form', 'baajax'], function () {
+        <%--console.log(rootPath)--%>
+        <%--console.log(path)--%>
+        <%--console.log('<%=path%>')--%>
         var $ = layui.jquery,
             paging = layui.paging(),
             //layerTips = parent.layer === undefined ? layui.layer : parent.layer, //获取父窗口的layer对象
@@ -187,6 +191,7 @@
             },
             complate: function (data) { //完成的回调
                 //alert('处理完成');
+//                console.log(data)
                 //重新渲染复选框
                 form.render('checkbox');
                 form.on('checkbox(allselector)', function (data) {
@@ -285,18 +290,25 @@
         //触发审核按钮
         $('#audit').on('click', function () {
             var ids ='' ;
-            var tem=0;
+            var tem =0;
+            var num =0;
             $('#content').children('tr').each(function() {
                 var $that = $(this);
                 var $cbx = $that.children('td').eq(0).children('input[type=checkbox]')[0].checked;
                 if($cbx) {
                     var n = $that.children('td').eq(0).children('input[type=checkbox]')[0].value;
-                    ids += n + ',';
-                    tem++;
+                    var status = $that.children('td').eq(0).children('input[type=checkbox]')[0].name;
+                    if(status == '待审批'){
+                        ids += n + ',';
+                        tem++;
+                    } else {
+                        num++;
+                        return;
+                    }
                 }
             });
-            if(tem==0){
-                layer.msg('请选择要审批的订单！');
+            if(tem==0 || num>0){
+                layer.msg('请选择待审批的订单！');
                 return;
             }
             ids = ids.substring(0,ids.length-1);
@@ -304,15 +316,18 @@
             layer.confirm('是否同意审批', {
                 btn: ['同意','拒绝'] //按钮
             }, function(){
+
                 $.get('audit',{ids:ids}, function(form) {  //调用批量删除
                     location.reload(); //刷新
                 });
             }, function(){
+
                 if(tem>1){
                     layer.msg('只能选择一条订单拒绝！');
                     return;
                 }
-
+//                var dataById = document.getElementById(ids[0]);
+//                layer.msg(dataById);
                 $.post('to-refuse', {id: ids}, function (form) {  //调用跳转到编辑页面
                     layer.open({
                         type: 1,
-- 
Gitee


From 9fc10255676da70bee7f519634893c235738f2cd Mon Sep 17 00:00:00 2001
From: houjianhui <houjianhui1989@163.com>
Date: Thu, 29 Jun 2017 15:50:27 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java
index d8dd698..7ac9a7d 100644
--- a/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java
+++ b/ils-sales-backend/src/main/java/com/unlcn/ils/sales/backend/service/OrderAuditServiceImpl.java
@@ -158,6 +158,7 @@ public class OrderAuditServiceImpl implements OrderAuditService {
                bo.setOrderCost(val.getSuggestSalePrice().toString());
                bo.setBxCost(val.getInsuranceSalePrice().toString());
                bo.setOrderSku(JSONArray.toJSONString(val.getOrderSkus()));
+               bo.setComment(val.getComment());
                bos.add(bo);
            });
            return bos;
-- 
Gitee


From 135a6313f81e35b5b8693bf87032f24ae4343740 Mon Sep 17 00:00:00 2001
From: houjianhui <houjianhui1989@163.com>
Date: Thu, 29 Jun 2017 16:07:52 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ils-sales-api/pom.xml     | 2 +-
 ils-sales-backend/pom.xml | 2 +-
 ils-sales-base/pom.xml    | 2 +-
 ils-sales-web/pom.xml     | 2 +-
 pom.xml                   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ils-sales-api/pom.xml b/ils-sales-api/pom.xml
index e26bca0..7c2ad31 100644
--- a/ils-sales-api/pom.xml
+++ b/ils-sales-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>ils-sales</artifactId>
         <groupId>com.unlcn.ils.sales</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/ils-sales-backend/pom.xml b/ils-sales-backend/pom.xml
index a4f0520..3211b7e 100644
--- a/ils-sales-backend/pom.xml
+++ b/ils-sales-backend/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>ils-sales</artifactId>
         <groupId>com.unlcn.ils.sales</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/ils-sales-base/pom.xml b/ils-sales-base/pom.xml
index d54cd85..fcf71f2 100644
--- a/ils-sales-base/pom.xml
+++ b/ils-sales-base/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>ils-sales</artifactId>
         <groupId>com.unlcn.ils.sales</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ils-sales-web/pom.xml b/ils-sales-web/pom.xml
index 0a66b6e..eee098a 100644
--- a/ils-sales-web/pom.xml
+++ b/ils-sales-web/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>ils-sales</artifactId>
         <groupId>com.unlcn.ils.sales</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.0.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 8008319..9ed5a03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.unlcn.ils.sales</groupId>
     <artifactId>ils-sales</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <modules>
         <module>ils-sales-api</module>
         <module>ils-sales-web</module>
-- 
Gitee


From 7bc49eecdc4c9ea918a5edcbd8f6a0aca9f003ed Mon Sep 17 00:00:00 2001
From: houjianhui <houjianhui1989@163.com>
Date: Thu, 29 Jun 2017 16:12:42 +0800
Subject: [PATCH 5/6] =?UTF-8?q?pom=E7=89=88=E6=9C=AC=E5=8F=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ils-sales-api/pom.xml | 2 +-
 ils-sales-web/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ils-sales-api/pom.xml b/ils-sales-api/pom.xml
index 7c2ad31..619a978 100644
--- a/ils-sales-api/pom.xml
+++ b/ils-sales-api/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>com.unlcn.ils.sales</groupId>
             <artifactId>ils-sales-backend</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/ils-sales-web/pom.xml b/ils-sales-web/pom.xml
index eee098a..c544a48 100644
--- a/ils-sales-web/pom.xml
+++ b/ils-sales-web/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.unlcn.ils.sales</groupId>
             <artifactId>ils-sales-backend</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>${parent.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-- 
Gitee


From 57df86045af77770d23ee31018e693735997c9ff Mon Sep 17 00:00:00 2001
From: houjianhui <houjianhui1989@163.com>
Date: Thu, 29 Jun 2017 16:14:58 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ils-sales-api/pom.xml     | 2 +-
 ils-sales-backend/pom.xml | 2 +-
 ils-sales-base/pom.xml    | 2 +-
 ils-sales-web/pom.xml     | 2 +-
 pom.xml                   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ils-sales-api/pom.xml b/ils-sales-api/pom.xml
index 619a978..ba5e8b2 100644
--- a/ils-sales-api/pom.xml
+++ b/ils-sales-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>ils-sales</artifactId>
         <groupId>com.unlcn.ils.sales</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/ils-sales-backend/pom.xml b/ils-sales-backend/pom.xml
index 3211b7e..2a76ee0 100644
--- a/ils-sales-backend/pom.xml
+++ b/ils-sales-backend/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>ils-sales</artifactId>
         <groupId>com.unlcn.ils.sales</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/ils-sales-base/pom.xml b/ils-sales-base/pom.xml
index fcf71f2..4968c83 100644
--- a/ils-sales-base/pom.xml
+++ b/ils-sales-base/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>ils-sales</artifactId>
         <groupId>com.unlcn.ils.sales</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ils-sales-web/pom.xml b/ils-sales-web/pom.xml
index c544a48..666d4c3 100644
--- a/ils-sales-web/pom.xml
+++ b/ils-sales-web/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>ils-sales</artifactId>
         <groupId>com.unlcn.ils.sales</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 9ed5a03..0986755 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.unlcn.ils.sales</groupId>
     <artifactId>ils-sales</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.1</version>
     <modules>
         <module>ils-sales-api</module>
         <module>ils-sales-web</module>
-- 
Gitee