liujiankang 7 лет назад
Родитель
Сommit
0001cb948b

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

@@ -287,7 +287,7 @@
                         if(value.colorList != null) {
                             if (value.colorList.length > 0) {
                                 $.each(value.colorList, function (i, value) {
-                                    colorTable = colorTable + '<td id="tdColorId' + value.colorId + '"><input type="checkbox" value="' + value.colorId + '" name="alreadyColorName" datatype="*">' + value.colorName + ''
+                                    colorTable = colorTable + '<td id="tdColorId' + value.colorId + '" style="border: 1px solid #DCDCDC;"><input type="checkbox" value="' + value.colorId + '" name="alreadyColorName" datatype="*">' + value.colorName + ''
                                             + '<input type="text" style="width: 50px;margin-left: 10px;" class="input-text" oninput="generateInput(' + value.colorId + ')" onpropertychange="generateInput(' + value.colorId + ')"  placeholder="数量" id="alreadyColorId' + value.colorId + '" name="alreadyColorId' + value.colorId + '"><br>' +
                                             '</td>'
                                 });
@@ -309,7 +309,7 @@
                         }else{
                             fittingsTable = '暂无配件,请先添加配件';
                         }
-                        var productTable = '<tr>'
+                        var productTable = '<tr">'
                                 +'<td>'+value.productName+'</td>'
                                 +'<td><table border="0">'+colorTable+'</table></td>'
                                 +'<td>'+fittingsTable+'</td>'
@@ -443,7 +443,7 @@
                 if (data.returnCode == 200) {
                     layer.msg('添加成功',{icon: 1,time:1000},function () {
                         location.replace(location.href);
-                        window.location.href= "${path}/admin/signclosed/select_signclosed_list;
+                        window.location.href= "${path}/admin/signclosed/select_signclosed_list";
                     });
                 } else if(data.returnCode == 501) {
                     layer.msg('机器编号未填写',{icon: 5,time:1000});

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

@@ -31,85 +31,105 @@
 <body>
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
-        <div class="row cl">
-            <label class=" col-3 col-sm-3" style="color: #0000cc;">原寄送信息</label>
-        </div>
-        <div class="row cl">
-            <label class=" col-3 col-sm-3 huanhang">寄件人姓名:</label>
-            <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
-                    <span>
-                        ${complaintSignclosedInfo.signclosedSendName!''}
-                    </span>
+        <div >
+            <div class="row cl">
+                <label class=" col-3 col-sm-3" style="color: #0000cc;">原寄送信息</label>
             </div>
-        </div>
-        <div class="row cl" style="position: relative;">
-            <label class="form-label col-3 col-sm-3 huanhang">寄件人电话:</label>
-            <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
-                    <span>
-                    ${complaintSignclosedInfo.signclosedSendTel!''}
-                    </span>
+            <div class="row cl">
+                <label class=" col-4 col-sm-4 huanhang" style="text-align: right;">寄件人姓名:</label>
+                <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
+                        <span>
+                            ${complaintSignclosedInfo.signclosedSendName!''}
+                        </span>
+                </div>
             </div>
-        </div>
-        <div class="row cl" style="position: relative;">
-            <label class="form-label col-3 col-sm-3 huanhang">物流公司:</label>
-            <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
-                    <span>
-                        <#if complaintSignclosedInfo.signclosedLogistics??>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "sto">申通快递</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "yto">圆通快递</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "sf">顺丰快递</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "ems">邮政EMS</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "zto">中通快递</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "zjs">宅急送</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "yunda">韵达快递</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "pick">上门提货</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "htky">汇通快递</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "ttkdex">天天快递</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "jd">京东快递</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "01">其他</#if>
-                        <#if complaintSignclosedInfo.signclosedLogistics == "02">上门送货</#if>
-                        ${complaintSignclosedInfo.signclosedLogisticsNumber!''}
+            <div class="row cl" style="position: relative;">
+                <label class="form-label col-4 col-sm-4 huanhang" style="text-align: right;">寄件人电话:</label>
+                <div class="formControls col-4 col-sm-4 skin-minimal huanhang">
+                        <span>
+                        ${complaintSignclosedInfo.signclosedSendTel!''}
+                        </span>
+                </div>
+            </div>
+            <div class="row cl" style="position: relative;">
+                <label class="form-label col-4 col-sm-4 huanhang" style="text-align: right;">物流公司:</label>
+                <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
+                        <span>
+                            <#if complaintSignclosedInfo.signclosedLogistics??>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "sto">申通快递</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "yto">圆通快递</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "sf">顺丰快递</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "ems">邮政EMS</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "zto">中通快递</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "zjs">宅急送</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "yunda">韵达快递</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "pick">上门提货</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "htky">汇通快递</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "ttkdex">天天快递</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "jd">京东快递</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "01">其他</#if>
+                            <#if complaintSignclosedInfo.signclosedLogistics == "02">上门送货</#if>
+                            </#if>
+                        </span>
+                </div>
+            </div>
+
+            <div class="row cl" style="position: relative;">
+                <label class="form-label col-4 col-sm-4 huanhang" style="text-align: right;">物流单号:</label>
+                <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
+                        <span>
+                        <#if complaintSignclosedInfo.signclosedLogisticsNumber??>
+                            ${complaintSignclosedInfo.signclosedLogisticsNumber!''}
                         </#if>
-                    </span>
+                        </span>
+                </div>
             </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-3 col-sm-3 huanhang"><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">
+        <div>
+            <div class="row cl" style="position: relative;">
+                <label class="form-label col-3 col-sm-3" style="color: #0000cc;">现寄送信息</label>
             </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-3 col-sm-3 huanhang"><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">
+            <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">
+                </div>
             </div>
-        </div>
-        <div class="row cl" style="position: relative;">
-            <label class="form-label col-3 col-sm-3 huanhang"><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;">
-                        <option value="">请选择物流公司</option>
-                        <option value="sto">申通快递</option>
-                        <option value="yto">圆通快递</option>
-                        <option value="sf">顺丰快递</option>
-                        <option value="ems">邮政EMS</option>
-                        <option value="zto">中通快递</option>
-                        <option value="zjs">宅急送</option>
-                        <option value="yunda">韵达快递</option>
-                        <option value="cces">cces快递</option>
-                        <option value="pick">上门提货</option>
-                        <option value="htky">汇通快递</option>
-                        <option value="ttkdex">天天快递</option>
-                        <option value="stars">星晨急便</option>
-                        <option value="jd">京东快递</option>
-                        <option value="01">其他</option>
-                        <option value="02">上门送货</option>
-                    </select>
-                <input type="text" style="width: 150px;margin-top: 15px;" class="input-text" placeholder="物流单号" id="signclosedLogisticsNumber" name="signclosedLogisticsNumber">
+            <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">
+                </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;">
+                            <option value="">请选择物流公司</option>
+                            <option value="sto">申通快递</option>
+                            <option value="yto">圆通快递</option>
+                            <option value="sf">顺丰快递</option>
+                            <option value="ems">邮政EMS</option>
+                            <option value="zto">中通快递</option>
+                            <option value="zjs">宅急送</option>
+                            <option value="yunda">韵达快递</option>
+                            <option value="cces">cces快递</option>
+                            <option value="pick">上门提货</option>
+                            <option value="htky">汇通快递</option>
+                            <option value="ttkdex">天天快递</option>
+                            <option value="stars">星晨急便</option>
+                            <option value="jd">京东快递</option>
+                            <option value="01">其他</option>
+                            <option value="02">上门送货</option>
+                        </select>
+                </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">
+                    <input type="text" style="width: 150px;" class="input-text" placeholder="物流单号" id="signclosedLogisticsNumber" name="signclosedLogisticsNumber">
+                </div>
             </div>
         </div>
         <div style="text-align:center;">