审批系统修改

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/correct_order.ftl

@@ -263,6 +263,9 @@
                 layer.alert("备注长度过长");
                 return;
             }
+        }else {
+            layer.alert("请输入备注信息");
+            return;
         }
         if(nums <= 0){
             layer.alert("订单项总数量不能为0");

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_detail.ftl

@@ -345,7 +345,7 @@
             </#if>
             </table>
         </#if>
-         <button type="button" style="cursor:pointer;height: 35px;margin-top: 10px;"onClick="javascript :history.back(-1);" class="my-btn-search"><<返回</button>
+         <#--<button type="button" style="cursor:pointer;height: 35px;margin-top: 10px;"onClick="" class="my-btn-search"><<返回</button>-->
     </form>
     </div>
 </article>
@@ -384,6 +384,7 @@
     function openLogistics(title, url, w, h) {
         layer_show(title,url,w,h);
     }
+
 </script>
 </body>
 </html>