Forráskód Böngészése

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

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java
wangxiaoming 7 éve
szülő
commit
d09db98a6f

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

@@ -156,7 +156,7 @@
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>签收日期:</label>
                 <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -0.9%">
-                    <input type="text" style="width: 150px;margin-left: 10px;" class="input-text my-input-date" placeholder="签收日期" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" id="signclosed_date" name="signclosed_date" readonly="readonly"/>
+                    <input type="text" style="width: 150px;margin-left: 10px;" class="input-text my-input-date Wdate" placeholder="签收日期" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" id="signclosed_date" name="signclosed_date" readonly="readonly"/>
                 </div>
             </div>
 

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

@@ -57,8 +57,8 @@
             <tr class="text-c">
                 <th width="100">签收类型</th>
                 <th width="160">物流</th>
-                <th width="90">寄件人姓名</th>
-                <th width="100">寄件人电话</th>
+                <th width="120">寄件人姓名</th>
+                <th width="120">寄件人电话</th>
                 <th width="200">退换产品</th>
                 <th width="200">签收产品</th>
                 <th width="130">退货地区</th>
@@ -67,7 +67,7 @@
                 <th width="150">客服备注</th>
                 <th width="150">返厂日期</th>
                 <th width="100">处理状态</th>
-                <th width="120">是否转入QC</th>
+                <th width="130">是否转入QC</th>
                 <th width="130">物件状态</th>
                 <th width="100">备注</th>
                 <th width="50">操作</th>

+ 44 - 20
watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/update_sender.ftl

@@ -24,19 +24,34 @@
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         .huanhang{ float:left}
+
+        .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;}
+        #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;}
     </style>
     <meta name="keywords" content="${path}">
     <meta name="description" content="H-ui.admin v3.0,是一款由国人开发的轻量级扁平化网站后台模板,完全免费开源的网站后台管理系统模版,适合中小型CMS后台系统。">
 </head>
 <body>
 <article class="page-container">
-    <form class="form form-horizontal" id="form-admin-add">
+    <form class="form form-horizontal" id="form-admin-add"  style="    margin-left: 7%;">
         <div >
+
             <div class="row cl">
-                <label class=" col-3 col-sm-3" style="color: #0000cc;">原寄送信息</label>
+                <label class="form-label col-3">
+                    <div class="tit-2">原寄送信息</div>
+                </label>
+                <div class="formControls col-9">
+                </div>
             </div>
+
+            <#--<div class="row cl">-->
+                <#--<label class=" col-3 col-sm-3" style="color: #0000cc;">原寄送信息</label>-->
+            <#--</div>-->
             <div class="row cl">
-                <label class=" col-4 col-sm-4 huanhang" style="text-align: right;">寄件人姓名:</label>
+                <label class=" col-3 col-sm-3 huanhang" style="text-align: right;">寄件人姓名:</label>
                 <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
                         <span>
                             ${complaintSignclosedInfo.signclosedSendName!''}
@@ -44,7 +59,7 @@
                 </div>
             </div>
             <div class="row cl" style="position: relative;">
-                <label class="form-label col-4 col-sm-4 huanhang" style="text-align: right;">寄件人电话:</label>
+                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">寄件人电话:</label>
                 <div class="formControls col-4 col-sm-4 skin-minimal huanhang">
                         <span>
                         ${complaintSignclosedInfo.signclosedSendTel!''}
@@ -52,7 +67,7 @@
                 </div>
             </div>
             <div class="row cl" style="position: relative;">
-                <label class="form-label col-4 col-sm-4 huanhang" style="text-align: right;">物流公司:</label>
+                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">物流公司:</label>
                 <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
                         <span>
                             <#if complaintSignclosedInfo.signclosedLogistics??>
@@ -75,7 +90,7 @@
             </div>
 
             <div class="row cl" style="position: relative;">
-                <label class="form-label col-4 col-sm-4 huanhang" style="text-align: right;">物流单号:</label>
+                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">物流单号:</label>
                 <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
                         <span>
                         <#if complaintSignclosedInfo.signclosedLogisticsNumber??>
@@ -86,25 +101,34 @@
             </div>
         </div>
         <div>
-            <div class="row cl" style="position: relative;">
-                <label class="form-label col-3 col-sm-3" style="color: #0000cc;">现寄送信息</label>
+
+            <div class="row cl">
+                <label class="form-label col-3">
+                    <div class="tit-2">原寄送信息</div>
+                </label>
+                <div class="formControls col-9">
+                </div>
             </div>
+
+            <#--<div class="row cl" style="position: relative;">-->
+                <#--<label class="form-label col-3 col-sm-3" style="color: #0000cc;">现寄送信息</label>-->
+            <#--</div>-->
             <div class="row cl">
-                <label class="form-label col-4 col-sm-4 huanhang" style="text-align: right;"><span class="c-red">*</span>寄件人姓名:</label>
-                <div class="formControls col-4 col-sm-4 skin-minimal huanhang">
-                    <input type="text" style="width: 150px;" class="input-text" placeholder="寄件方姓名/公司名称" id="signclosedSendName" name="signclosedSendName">
+                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>寄件人姓名:</label>
+                <div class="formControls col-6 col-sm-6 skin-minimal huanhang">
+                    <input type="text" style="" class="input-text" placeholder="寄件方姓名/公司名称" id="signclosedSendName" name="signclosedSendName">
                 </div>
             </div>
             <div class="row cl">
-                <label class="form-label col-4 col-sm-4 huanhang" style="text-align: right;"><span class="c-red">*</span>寄件人电话:</label>
-                <div class="formControls col-4 col-sm-4 skin-minimal huanhang">
-                    <input type="text" style="width: 150px;" class="input-text" placeholder="寄件方联系电话" id="signclosedSendTel" name="signclosedSendTel">
+                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>寄件人电话:</label>
+                <div class="formControls col-6 col-sm-6 skin-minimal huanhang">
+                    <input type="text" style="" class="input-text" placeholder="寄件方联系电话" id="signclosedSendTel" name="signclosedSendTel">
                 </div>
             </div>
             <div class="row cl" style="position: relative;">
-                <label class="form-label col-4 col-sm-4 huanhang" style="text-align: right;"><span class="c-red">*</span>物流信息:</label>
-                <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
-                        <select name="signclosedLogistics" class="my-select" style="width: 150px;margin-left: 0px;">
+                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>物流信息:</label>
+                <div class="formControls col-6 col-sm-6 skin-minimal huanhang">
+                        <select name="signclosedLogistics" class="my-select" style="width: 228px;margin-left: 0px;">
                             <option value="">请选择物流公司</option>
                             <option value="sto">申通快递</option>
                             <option value="yto">圆通快递</option>
@@ -126,9 +150,9 @@
             </div>
 
             <div class="row cl" style="position: relative;">
-                <label class="form-label col-4 col-sm-4 huanhang" style="text-align: right;"><span class="c-red">*</span>物流信息:</label>
-                <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
-                    <input type="text" style="width: 150px;" class="input-text" placeholder="物流单号" id="signclosedLogisticsNumber" name="signclosedLogisticsNumber">
+                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>物流信息:</label>
+                <div class="formControls col-6 col-sm-6 skin-minimal huanhang">
+                    <input type="text" style="" class="input-text" placeholder="物流单号" id="signclosedLogisticsNumber" name="signclosedLogisticsNumber">
                 </div>
             </div>
         </div>