Sfoglia il codice sorgente

Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

liujiankang 6 anni fa
parent
commit
6128b6356e

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

@@ -12,8 +12,8 @@
     <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: #32a3d8;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 45%;height: 6px;width: 6px;border-radius: 6px;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}
@@ -36,19 +36,19 @@
         .msg-phone{height: 35px;line-height: 35px;}
         .col-sm-1{width: 150px;}
 
-        .all_down{text-decoration: underline;color: #00c;}
+        .all_down{text-decoration: underline;color: #f00;}
     </style>
     <title>添加订单 - 订单管理 - RST</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> 添加订单
+    <span class="c-gray en">/</span> 订单管理
+    <span class="c-gray en">/</span> 添加订单
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
+       style="margin-top:3px;color: #32a3d8;"
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
     <a class="btn radius r"
-       style="line-height:1.6em;margin-top:3px;margin-right: 5px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
+       style="margin-top:3px;margin-right: 5px;color: #32a3d8;"
        href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
 </nav>
 <article class="page-container" style="padding: 10px;">
@@ -73,13 +73,13 @@
                         </select>
 				    </span>
                 </div>
-                <div class="formControls col-2 col-sm-2" id="selectCustomer" style="display: none;">
-                    <input type="button" style="width: 100%;" class="btn btn-primary " onclick="add_customer()" value="选择客诉记录" >
-                </div>
             </div>
             <div class="row cl" id="salesCustomer" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
-                <div class="formControls col-2 col-sm-2" style="margin-left: 15%;width: 100%;color: #c00;">
+                <div class="formControls col-2 col-sm-2" style="margin-left: 10%;width: 100%;color: #c00;">
+                    <div class="formControls col-1 col-sm-1" id="selectCustomer" style="display: none;">
+                        <input type="button" style="color: #32a3d8;border: 1px solid #32a3d8;" class="btn" onclick="add_customer()" value="选择客诉">
+                    </div>
                     <span id="salesCustomerIdHtml"></span>
                     <input type="hidden" id="salesCustomerId" name="salesCustomerId" value="">
                 </div>
@@ -186,16 +186,16 @@
 
             <div class="row cl">
                 <label class="form-label col-3">
-                    <div class="tit-2">品信息</div>
+                    <div class="tit-2">品信息</div>
                 </label>
                 <div class="formControls col-9">
                 </div>
             </div>
 
             <div class="row cl" id="" style="">
-                <label class="form-label col-1 col-sm-1">品信息:</label>
+                <label class="form-label col-1 col-sm-1">品信息:</label>
                 <div class="formControls col-8 col-sm-8">
-                    <input type="button" class="btn btn-primary add-order-button" onclick="add_product()" value="添加品" >
+                    <input type="button" style="color: #32a3d8;border: 1px solid #32a3d8;" class="btn add-order-button" onclick="add_product()" value="添加品" >
                     <table class="table table-border table-bg table-bordered" style="margin-top: 10px;display: none" id="all_add_product">
                         <thead>
                             <tr class="text-c" id="table1">
@@ -228,7 +228,7 @@
                 </div>
 
                 <div class="formControls col-2 col-sm-2">
-                    <input type="button" style="width: 100%;" class="btn btn-primary add-order-button" onclick="calculatePrice()" value="计算商品总价" >
+                    <input type="button" style="color: #32a3d8;border: 1px solid #32a3d8;" class="btn add-order-button" onclick="calculatePrice()" value="计算产品总价" >
                 </div>
             </div>
 

BIN
watero-rst-web/src/main/webapp/common/images/cm/select-1.png


+ 7 - 1
watero-rst-web/src/main/webapp/common/js/salesOrder/salesOrder.js

@@ -132,7 +132,13 @@ function setSelectCustomer(customerId){
                 $("#salesAddressName").val(customer.customerName);
                 $("#salesAddressTel").val(customer.customerTel);
                 /* 售后订单的支付时间、支付方式默认 */
-                $("#salesPayTime").val(customer.salesTime+" 08:00:00");
+                var newDate = new Date();
+                var salesTIme = customer.salesTime;
+                if(!isEmpty(customer.salesTime)){
+                    salesTIme = newDate.getFullYear()+"-"+ (newDate.getMonth()+1) + "-" + newDate.getDate();
+                }
+                var time = " "+newDate.getHours()+":"+ newDate.getMinutes()+":" + newDate.getSeconds();
+                $("#salesPayTime").val(salesTIme + time);
                 // sc.setUlcById(0,1,11);
                  ulc.setUlcById(0,customer.customerProvinceId,customer.customerCityId,customer.customerDistrictId);
             }else{

+ 1 - 1
watero-rst-web/src/main/webapp/common/static/h-ui.admin/css/H-ui.admin.css

@@ -19,7 +19,7 @@ h4{line-height:30px}
 /*页面框架*/
 .Hui-header{position:absolute;top:0; right:0; left:0;height:44px;z-index:999; padding:0 15px}
 .Hui-aside{position: absolute;top:44px;bottom:0;left:0;padding-top:10px;width:199px;z-index:99;overflow:auto; background-color:#58d1eb;_background-color:#58d1eb;border-right: 1px solid #e5e5e5}
-.Hui-article-box{position: absolute;top:44px;right:0;bottom: 0;left:158px; overflow:hidden; z-index:1; background-color:#fff}
+.Hui-article-box{position: absolute;top:44px;right:0;bottom: 0;left:138px; overflow:hidden; z-index:1; background-color:#fff}
 	.Hui-article{position: absolute;top:34px;bottom:0;left:0; right:0;overflow:auto;z-index:1}
 .Hui-container{ padding:45px 0 0}
 .Hui-aside,.Hui-article-box,.dislpayArrow{-moz-transition: all 0.2s ease 0s;-webkit-transition: all 0.2s ease 0s;-ms-transition: all 0.2s ease 0s;-o-transition: all 0.2s ease 0s;transition: all 0.2s ease 0s}