Home Explore Help
Sign In
hexiugang
/
iamberry-common-parent
Watch 3
Star 3
Fork 1
Files Issues 0 Pull Requests 0 Wiki
Browse Source

客诉样式

qihanjiao 6 years ago
parent
19a6b9cb65
commit
2159d233a9
41 changed files with 69 additions and 59 deletions
Split View Show Diff Stats
  1. 5 5
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl
  2. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_visit.ftl
  3. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_detail.ftl
  4. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl
  5. 4 4
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_customer.ftl
  6. 2 2
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_relation.ftl
  7. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/maintenance/complete_reorder.ftl
  8. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/report/return_statistics.ftl
  9. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/add_signclosed.ftl
  10. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/complete_signclosed.ftl
  11. 2 2
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/signclosed_list.ftl
  12. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/customer/custome_basic_detail.ftl
  13. 3 3
      watero-rst-web/src/main/webapp/WEB-INF/views/customer/customer_basic_list.ftl
  14. 4 4
      watero-rst-web/src/main/webapp/WEB-INF/views/customer/save_customer_info.ftl
  15. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/customer/update_customer_info.ftl
  16. 3 3
      watero-rst-web/src/main/webapp/WEB-INF/views/ei/ei_add_billing.ftl
  17. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/ei/ei_billing_info.ftl
  18. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/ei/ei_billing_upload.ftl
  19. 3 3
      watero-rst-web/src/main/webapp/WEB-INF/views/order/bacth/order_batch_list.ftl
  20. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/order/businessManager_order_list.ftl
  21. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl
  22. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/correct_order.ftl
  23. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/deliver_list.ftl
  24. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/deliver_statistics.ftl
  25. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/order_correct_list.ftl
  26. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/product_list.ftl
  27. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_detail.ftl
  28. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_split.ftl
  29. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/send_sms.ftl
  30. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/update_order.ftl
  31. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/order/statistics/deliver_statistics.ftl
  32. 3 3
      watero-rst-web/src/main/webapp/WEB-INF/views/order/statistics/sell_order_statistics.ftl
  33. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/product/add_product.ftl
  34. 5 0
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl
  35. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/producedAbnormalityStatistics.ftl
  36. 5 0
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/tooth_print_List.ftl
  37. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/scm/scm_add_order.ftl
  38. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/scm/scm_send_order.ftl
  39. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/scm/scm_update_order.ftl
  40. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/sys/list_admin.ftl
  41. 1 1
      wateroPF-wechat-web/src/main/webapp/WEB-INF/views/admin/statistics/salesStatistics.jsp

+ 5 - 5
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl
View File 

@@ -28,7 +28,7 @@ f<!DOCTYPE HTML>
 
         .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
 
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}
 
@@ -646,10 +646,10 @@ f<!DOCTYPE HTML>
 
           <div class="row cl" >
 
              <label class="form-label col-1 col-sm-1"></label>
 
              <div class="formControls col-2 col-sm-2">
 
-                 <input type="text" class="input-text" style="width: 156px;" value="" placeholder="进水TDS数值，最大999" id="customerInTDS" name="customerInTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
 
+                 <input type="text" class="input-text" value="" placeholder="进水TDS数值，最大999" id="customerInTDS" name="customerInTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
 
                  </div>
 
-                  <div class="formControls col-1 col-sm-1">
 
-                    <input type="text" class="input-text" style="width: 156px;" value="" placeholder="出水TDS数值，最大999" id="customerOutTDS" name="customerOutTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
 
+                  <div class="formControls col-2 col-sm-2">
 
+                    <input type="text" class="input-text" value="" placeholder="出水TDS数值，最大999" id="customerOutTDS" name="customerOutTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
 
                  </div>
 
 
            </div>
 
@@ -671,7 +671,7 @@ f<!DOCTYPE HTML>
 
              <div class="row cl" id="customerDescDiv">
 
                  <label class="form-label col-1 col-sm-1">客诉备注：</label>
 
                  <div class="col-9 col-sm-9">
 
-                     <textarea style="padding: 5px" type="text" placeholder="请输入客诉备注信息，最多支持50字" id="customerDesc" name="customerDesc" style="width: 100%;height: 80px;"></textarea>
 
+                     <textarea type="text" placeholder="请输入客诉备注信息，最多支持50字" id="customerDesc" name="customerDesc" style="padding: 5px;width: 100%;height: 80px;"></textarea>
 
                  </div>
 
               </div>

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_visit.ftl
View File 

@@ -16,7 +16,7 @@
 
     <style>
 
         .btn-primary{background-color: #32a3d8;padding: 3px 30px;}
 
         .select-box{background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
     </style>
 
 </head>
 
 <body>

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_detail.ftl
View File 

@@ -27,7 +27,7 @@
 
         .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
 
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl
View File 

@@ -27,7 +27,7 @@
 
         .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
 
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 4 - 4
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_customer.ftl
View File 

@@ -28,7 +28,7 @@
 
         .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
 
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}
 
@@ -711,10 +711,10 @@
 
             <div class="row cl" >
 
                  <label class="form-label col-1 col-sm-1"></label>
 
                 <div class="formControls col-2 col-sm-2">
 
-                    <input type="text" class="input-text" style="width: 156px;" value="${customerInfo.customerInTDS!'0'}" placeholder="进水TDS数值，最大999" id="customerInTDS" name="customerInTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
 
+                    <input type="text" class="input-text" value="${customerInfo.customerInTDS!'0'}" placeholder="进水TDS数值，最大999" id="customerInTDS" name="customerInTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
 
                 </div>
 
-                <div class="formControls col-1 col-sm-1">
 
-                    <input type="text" class="input-text" style="width: 156px;" value="${customerInfo.customerOutTDS!'0'}" placeholder="出水TDS数值，最大999" id="customerOutTDS" name="customerOutTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
 
+                <div class="formControls col-2 col-sm-2">
 
+                    <input type="text" class="input-text" value="${customerInfo.customerOutTDS!'0'}" placeholder="出水TDS数值，最大999" id="customerOutTDS" name="customerOutTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
 
                 </div>
 
             </div>

+ 2 - 2
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_relation.ftl
View File 

@@ -14,7 +14,7 @@
 
     <style>
 
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(images/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
 
         .select-box{background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .table-bg th{background-color: #e2f6ff;text-align: center;}
 
         .table-bordered td{text-align: center;}
 
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
 
@@ -353,7 +353,7 @@
 
 
                 </div>
 
             </div>-->
 
-            <div class="row cl" id="postageInformation">s
 
+            <div class="row cl" id="postageInformation">
 
                 <#--<div class="formControls col-2 col-sm-2 text-r">
 
                     <strong>邮费信息</strong>
 
                 </div>-->

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/cm/maintenance/complete_reorder.ftl
View File 

@@ -40,7 +40,7 @@
 
         .ac_results li a span {float:right}
 
         .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/cm/report/return_statistics.ftl
View File 

@@ -27,7 +27,7 @@
 
         .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
 
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/add_signclosed.ftl
View File 

@@ -28,7 +28,7 @@
 
         .check-box, .radio-box{padding-left: 0;}
 
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/complete_signclosed.ftl
View File 

@@ -27,7 +27,7 @@
 
         .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
 
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 2 - 2
watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/signclosed_list.ftl
View File 

@@ -175,7 +175,7 @@
 
                     <td class="td-manage text-c">
 
                         <a style="text-decoration:none" href="javascript:;" title="修改备注"
 
                            onclick="add_remark('修改备注','${path}/admin/signclosed/to_update_remark?signclosedId=${signclosed.signclosedId!''}','570','450');">
 
-                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe692;</i>
 
+                            <i class="Hui-iconfont">&#xe692;</i>
 
                         </a>
 
                        <#-- <a style="text-decoration:none" href="javascript:;" title="打印"
 
                            onclick="print_aftermarket(${signclosed.signclosedId!''});">
 
@@ -184,7 +184,7 @@
 
 
                             <a style="text-decoration:none" href="javascript:;" title="修改寄件人信息"
 
                                onclick="add_remark('修改寄件人信息','${path}/admin/signclosed/to_update_sender?signclosedId=${signclosed.signclosedId!''}','570','450');">
 
-                                <i class="Hui-iconfont" style="font-size: 20px;">&#xe60c;</i>
 
+                                <i class="Hui-iconfont">&#xe60c;</i>
 
                             </a><#--
 
                             <a style="text-decoration:none" href="javascript:;" title="转入品检"
 
                                onclick="into_complaint('转入品检','${path}/admin/signclosed/to_into_complaint?signclosedId=${signclosed.signclosedId!''}','770','600');">

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/customer/custome_basic_detail.ftl
View File 

@@ -27,7 +27,7 @@
 
         .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
 
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 3 - 3
watero-rst-web/src/main/webapp/WEB-INF/views/customer/customer_basic_list.ftl
View File 

@@ -24,9 +24,9 @@
 
 	</head>
 
 	<body>
 
     <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
 
-        <span class="c-gray en">&gt;</span> 客户信息管理
 
-        <span class="c-gray en">&gt;</span> 客户信息列表
 
-        <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
+        <span class="c-gray en">/</span> 客户信息管理
 
+        <span class="c-gray en">/</span> 客户信息列表
 
+        <a class="btn radius r" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
     </nav>
 
 		<div class="text-c" style="margin-top: 20px;">
 
 			<form action="${path}/admin/customerBasic/listCustomerBasic" method="post">

+ 4 - 4
watero-rst-web/src/main/webapp/WEB-INF/views/customer/save_customer_info.ftl
View File 

@@ -27,8 +27,8 @@
 
         .ac_results li a span {float:right}
 
         .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
 
 
-        .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box{background: url(${path}/common/images/cm/select-1.png)  right center no-repeat;background-size: auto 100%;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}
 
@@ -387,8 +387,8 @@
 
         <#--添加保存按钮-->
 
 
         <div  class="row cl">
 
-            <label class="form-label col-5 col-sm-5"></label>
 
-            <div class="formControls col-5 col-sm-5 skin-minimal">
 
+            <label class="form-label col-3 col-sm-3"></label>
 
+            <div class="formControls col-3 col-sm-3 skin-minimal">
 
                 <span class="c-red"><button type="button" style="cursor:pointer; float: inherit;height: 35px;margin-right: 30px;margin-bottom: 10px;margin-top: 20px;" class="my-btn-search" onclick="addCustomerBasicInfo();">确认提交</button></span>
 
             </div>
 
         </div>

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/customer/update_customer_info.ftl
View File 

@@ -28,7 +28,7 @@
 
         .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
 
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 3 - 3
watero-rst-web/src/main/webapp/WEB-INF/views/ei/ei_add_billing.ftl
View File 

@@ -12,14 +12,14 @@
 
     <style>
 
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
 
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
 
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
 
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
 
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
 
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
 
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
 
         .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
 
         .ac_results li {border:1px solid #fff}
 
         .ac_results li a span {float:right}
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/ei/ei_billing_info.ftl
View File 

@@ -27,7 +27,7 @@
 
         .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
 
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/ei/ei_billing_upload.ftl
View File 

@@ -19,7 +19,7 @@
 
         .ac_results li {border:1px solid #fff}
 
         .ac_results li a span {float:right}
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 3 - 3
watero-rst-web/src/main/webapp/WEB-INF/views/order/bacth/order_batch_list.ftl
View File 

@@ -80,16 +80,16 @@
 
 
                             <td>${(batch.batchCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</td>
 
                             <td>
 
-                                <a style="text-decoration:none;color: #00E;" href="javascript:void(0);" title="下载该批次的所有订单的物流信息" onclick="download_order('${batch.batchId!''}')">
 
+                                <a style="text-decoration:none;color: #50a2ea;" href="javascript:void(0);" title="下载该批次的所有订单的物流信息" onclick="download_order('${batch.batchId!''}')">
 
                                     下载订单
 
                                 </a>
 
 
                                 <#if batch.isBatchOrderConfirm == 0>
 
-                                    <a style="text-decoration:none;color: #00E;" href="javascript:void(0);" title="确认订单" onclick="review_order('${batch.batchId!''}')">
 
+                                    <a style="text-decoration:none;color: #50a2ea;" href="javascript:void(0);" title="确认订单" onclick="review_order('${batch.batchId!''}')">
 
                                         确认订单
 
                                     </a>
 
                                 </#if>
 
-                                <a style="text-decoration:none;color: #00E;" href="javascript:void(0);" title="分配物流"onclick="distribution_postFirm('分配物流','${path}/admin/order_batch/to_distribution_postFirm?batchId=${batch.batchId!''}','570','450');">
 
+                                <a style="text-decoration:none;color: #50a2ea;" href="javascript:void(0);" title="分配物流"onclick="distribution_postFirm('分配物流','${path}/admin/order_batch/to_distribution_postFirm?batchId=${batch.batchId!''}','570','450');">
 
                                     分配物流
 
                                 </a>
 
                             </td>

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/order/businessManager_order_list.ftl
View File 

@@ -103,7 +103,7 @@
 
             <td class="td-manage">
 
                 <a style="text-decoration:none" href="javascript:;" title="详情"
 
                    onclick="admin_add_filter('详情','${path}/admin/order/_select_orderApprovalDetails?orderId=${order.orderId!}','','550');">
 
-                    <i class="Hui-iconfont" style="font-size: 20px;">&#xe719;</i>
 
+                    <i class="Hui-iconfont">&#xe719;</i>
 
                 </a>
 
         </td>
 
         </tr>

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl
View File 

@@ -19,7 +19,7 @@
 
         .ac_results li {border:1px solid #fff}
 
         .ac_results li a span {float:right}
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

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

@@ -19,7 +19,7 @@
 
         .ac_results li {border:1px solid #fff}
 
         .ac_results li a span {float:right}
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/deliver_list.ftl
View File 

@@ -20,7 +20,7 @@
 
         .ac_results li {border:1px solid #fff}
 
         .ac_results li a span {float:right}
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/deliver_statistics.ftl
View File 

@@ -20,7 +20,7 @@
 
         .ac_results li {border:1px solid #fff}
 
         .ac_results li a span {float:right}
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/order_correct_list.ftl
View File 

@@ -27,7 +27,7 @@
 
         .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
 
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/product_list.ftl
View File 

@@ -25,7 +25,7 @@
 
         .ac_results li a span {float:right}
 
         .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

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

@@ -27,7 +27,7 @@
 
         .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
 
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_split.ftl
View File 

@@ -27,7 +27,7 @@
 
         .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
 
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/send_sms.ftl
View File 

@@ -19,7 +19,7 @@
 
         .ac_results li {border:1px solid #fff}
 
         .ac_results li a span {float:right}
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/update_order.ftl
View File 

@@ -19,7 +19,7 @@
 
         .ac_results li {border:1px solid #fff}
 
         .ac_results li a span {float:right}
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/order/statistics/deliver_statistics.ftl
View File 

@@ -20,7 +20,7 @@
 
         .ac_results li {border:1px solid #fff}
 
         .ac_results li a span {float:right}
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 3 - 3
watero-rst-web/src/main/webapp/WEB-INF/views/order/statistics/sell_order_statistics.ftl
View File 

@@ -24,9 +24,9 @@
 
 </head>
 
 <body>
 
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
 
-    <span class="c-gray en">&gt;</span> 订单管理
 
-    <span class="c-gray en">&gt;</span> 订单统计
 
-    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
+    <span class="c-gray en">/</span> 订单管理
 
+    <span class="c-gray en">/</span> 订单统计
 
+    <a class="btn radius r" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
 </nav>
 
 
 <article class="page-container" style="padding: 10px;">

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/product/add_product.ftl
View File 

@@ -19,7 +19,7 @@
 
         .ac_results li {border:1px solid #fff}
 
         .ac_results li a span {float:right}
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 5 - 0
watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl
View File 

@@ -13,6 +13,11 @@
 
         .barcodeImg{margin:10px 0px}
 
         .isprint{width: 200px;height:50px;}
 
         .background{background-color: #0a6999}
 
+        .tabBar span {background-color: #fff;cursor: pointer;display: inline-block;float: left;font-weight: bold;height: 30px;line-height: 30px;padding: 0 15px;position: relative;}
 
+        .tabCon {display: none}
 
+        .tabBar span.current{background-color: #fff;color: #50a2ea;}
 
+        .tabBar span.current:after{content: '';width: 2em;height: 2px;background: #50a2ea;position: absolute;left: 50%;bottom: 0;margin-left: -1em;}
 
+        .tabBar{border-bottom: 1px solid #ccc;}
 
     </style>
 
 </head>
 
 <body>

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/producedAbnormalityStatistics.ftl
View File 

@@ -18,7 +18,7 @@
 
 
 </head>
 
 <body>
 
-<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页 <span class="c-gray en">&gt;</span> 统计管理 <span class="c-gray en">&gt;</span> 生产统计 <a class="btn btn-success radius r mr-20" style="line-height:1.6em;margin-top:3px;background-color: #32a3d8;border: 1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a></nav>
 
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页 <span class="c-gray en">/</span> 统计管理 <span class="c-gray en">/</span> 生产统计 <a class="btn btn-success radius r mr-20" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a></nav>
 
 <div class="pd-20">
 
 	<div style="width: 780px;margin-bottom: 20px;">
 
 	<nav class="my-nav" id="tab-nav-menu">

+ 5 - 0
watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/tooth_print_List.ftl
View File 

@@ -13,6 +13,11 @@
 
         .barcodeImg{margin:10px 0px}
 
         .isprint{width: 200px;height:50px;}
 
         .background{background-color: #0a6999}
 
+        .tabBar span {background-color: #fff;cursor: pointer;display: inline-block;float: left;font-weight: bold;height: 30px;line-height: 30px;padding: 0 15px;position: relative;}
 
+        .tabCon {display: none}
 
+        .tabBar span.current{background-color: #fff;color: #50a2ea;}
 
+        .tabBar span.current:after{content: '';width: 2em;height: 2px;background: #50a2ea;position: absolute;left: 50%;bottom: 0;margin-left: -1em;}
 
+        .tabBar{border-bottom: 1px solid #ccc;}
 
     </style>
 
 </head>
 
 <body>

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/scm/scm_add_order.ftl
View File 

@@ -19,7 +19,7 @@
 
         .ac_results li {border:1px solid #fff}
 
         .ac_results li a span {float:right}
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/scm/scm_send_order.ftl
View File 

@@ -19,7 +19,7 @@
 
         .ac_results li {border:1px solid #fff}
 
         .ac_results li a span {float:right}
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/scm/scm_update_order.ftl
View File 

@@ -19,7 +19,7 @@
 
         .ac_results li {border:1px solid #fff}
 
         .ac_results li a span {float:right}
 
         .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
 
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
 
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
 
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
 
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
 
         .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/sys/list_admin.ftl
View File 

@@ -12,7 +12,7 @@
 
     <title>系统管理 - 管理员列表 - Watero-RST 1.0</title>
 
 </head>
 
 <body>
 
-<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页 <span class="c-gray en">&gt;</span> 系统管理 <span class="c-gray en">&gt;</span> 管理员列表 <a class="btn btn-success radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a></nav>
 
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页 <span class="c-gray en">/</span> 系统管理 <span class="c-gray en">/</span> 管理员列表 <a class="btn btn-success radius r" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a></nav>
 
 <div class="page-container">
 
     <#--<div class="cl pd-5 bg-1 bk-gray mt-20"> <span class="l"><a href="javascript:;" onclick="admin_add('添加管理员','admin-add.html','800','500')" class="btn btn-primary radius"><i class="Hui-iconfont">&#xe600;</i> 添加管理员</a></span></div>-->
 
      <table class="table table-border table-bordered table-hover">

+ 1 - 1
wateroPF-wechat-web/src/main/webapp/WEB-INF/views/admin/statistics/salesStatistics.jsp
View File 

@@ -29,7 +29,7 @@
 
 <title>柱状图统计</title>
 
 </head>
 
 <body>
 
-<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页 <span class="c-gray en">&gt;</span> 统计管理 <span class="c-gray en">&gt;</span> 销售统计 <a class="btn btn-success radius r mr-20" style="line-height:1.6em;margin-top:3px;background-color: #32a3d8;border: 1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a></nav>
 
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页 <span class="c-gray en">/</span> 统计管理 <span class="c-gray en">/</span> 销售统计 <a class="btn btn-success radius r mr-20" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a></nav>
 
 <div class="pd-20">
 
 	<div>
 
 		<div class="charts-box">