客诉修改

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

@@ -368,7 +368,12 @@
                      </span>
                 </div>
             </div>
-
+            <div class="row cl" id="">
+                <label class="form-label col-1 col-sm-1"></label>
+                <div class="formControls col-9 col-sm-9">
+                    <span id="procMethodDesc">补充说明：</span>
+                </div>
+            </div>
 
             <div class="row cl" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
@@ -514,16 +519,16 @@
                     <table class="table table-border table-bg table-bordered">
                         <thead>
                         <tr class="text-c" id="table2">
-                            <th style="text-align: center;" width="60">产品名称</th>
+                            <th style="text-align: center;" width="80">产品名称</th>
                             <th style="text-align: center;" width="40">产品颜色</th>
-                            <th style="text-align: center;" width="30">数量</th>
+                            <th style="text-align: center;" width="20">数量</th>
                             <th style="text-align: center;" width="100">机器编号</th>
-                            <th style="text-align: center;" width="30">操作</th>
+                            <th style="text-align: center;" width="20">操作</th>
                         </tr>
                         </thead>
                         <tbody id="addBackProduct">
                         <tr id="">
-                            <td style="text-align: center;" colspan="5">选择订单后展示</td>
+                            <td class="notSelectOrder" style="text-align: center;" colspan="5">选择订单后展示</td>
                         </tr>
                         </tbody>
                     </table>
@@ -542,16 +547,16 @@
                     <table class="table table-border table-bg table-bordered">
                         <thead>
                         <tr class="text-c" id="table2">
-                            <th style="text-align: center;" width="60">产品名称</th>
+                            <th style="text-align: center;" width="80">产品名称</th>
                             <th style="text-align: center;" width="40">产品颜色</th>
-                            <th style="text-align: center;" width="30">数量</th>
+                            <th style="text-align: center;" width="20">数量</th>
                             <th style="text-align: center;" width="100">机器编号</th>
-                            <th style="text-align: center;" width="30">操作</th>
+                            <th style="text-align: center;" width="20">操作</th>
                         </tr>
                         </thead>
                         <tbody id="addSendProduct">
                         <tr id="">
-                            <td style="text-align: center;" colspan="5">选择订单后展示</td>
+                            <td  class="notSelectOrder" style="text-align: center;" colspan="5">选择订单后展示</td>
                         </tr>
                         </tbody>
                     </table>

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

@@ -357,6 +357,13 @@
                 </div>
             </div>
 
+            <div class="row cl" id="">
+                <label class="form-label col-1 col-sm-1"></label>
+                <div class="formControls col-9 col-sm-9">
+                    <span id="procMethodDesc">补充说明：${procMethod.procMethodDesc!''}</span>
+                </div>
+            </div>
+
 
             <div class="row cl" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
@@ -531,11 +538,11 @@
                     <table class="table table-border table-bg table-bordered">
                         <thead>
                         <tr class="text-c" id="table1">
-                            <th style="text-align: center;" width="60">产品名称</th>
+                            <th style="text-align: center;" width="80">产品名称</th>
                             <th style="text-align: center;" width="40">产品颜色</th>
-                            <th style="text-align: center;" width="30">数量</th>
+                            <th style="text-align: center;" width="20">数量</th>
                             <th style="text-align: center;" width="100">机器编码</th>
-                            <th style="text-align: center;" width="30">操作</th>
+                            <th style="text-align: center;" width="20">操作</th>
                         </tr>
                         </thead>
                         <tbody id="addBackProduct">
@@ -562,7 +569,7 @@
                             </#list>
                         <#else >
                         <tr>
-                            <td style="text-align: center;" colspan="5">选择订单后展示</td>
+                            <td class="notSelectOrder" style="text-align: center;" colspan="5">选择订单后展示</td>
                         </tr>
                         </#if>
                         </tbody>
@@ -582,11 +589,11 @@
                     <table class="table table-border table-bg table-bordered">
                         <thead>
                         <tr class="text-c" id="table2">
-                            <th style="text-align: center;" width="60">产品名称</th>
+                            <th style="text-align: center;" width="80">产品名称</th>
                             <th style="text-align: center;" width="40">产品颜色</th>
-                            <th style="text-align: center;" width="30">数量</th>
+                            <th style="text-align: center;" width="20">数量</th>
                             <th style="text-align: center;" width="100">机器编码</th>
-                            <th style="text-align: center;" width="30">操作</th>
+                            <th style="text-align: center;" width="20">操作</th>
                         </tr>
                         </thead>
                         <tbody id="addSendProduct">
@@ -613,7 +620,7 @@
                                 </#list>
                             <#else >
                                 <tr>
-                                    <td style="text-align: center;" colspan="5">选择订单后展示</td>
+                                    <td class="notSelectOrder"  style="text-align: center;" colspan="5">选择订单后展示</td>
                                 </tr>
                             </#if>
                         </tbody>

watero-rst-web/src/main/webapp/common/js/customer/customer.js

@@ -409,6 +409,7 @@ function initProduceType(){
  */
 function ulcProcessResult(data){
     initProcessResult(data[1].procMethodIsBack,data[1].procMethodIsSend);
+    $("#procMethodDesc").html("补充说明："+data[1].procMethodDesc);
 }
 
 /**
@@ -1711,26 +1712,36 @@ function setSelectProduct(colorIds){
                     for(var i=0;i<data.returnMsg.productColorList.length;i++){
                         var productColor = data.returnMsg.productColorList[i];
                         html += '<tr >'
-                            + '<td style="text-align: center;" >' + cufte(productColor.productName) + '</td>'
-                            + '<td style="text-align: center;" >' + cufte(productColor.colorName) + '</td>'
-                            + '<td style="text-align: center;"><input type="text" style="width: 100%;border: none;text-align: center;" class="input-text input-number input-itemNum" value="1"  placeholder="产品数量" onkeyup="keyFun($(this),999,1)" onpaste="keyFun($(this),999,1)"></td>'
-                            + '<td style="text-align: center;" >'
+                            + '<td width="80" style="text-align: center;" >' + cufte(productColor.productName) + '</td>'
+                            + '<td width="40" style="text-align: center;" >' + cufte(productColor.colorName) + '</td>'
+                            + '<td width="20" style="text-align: center;"><input type="text" style="width: 100%;border: none;text-align: center;" class="input-text input-number input-itemNum" value="1"  placeholder="产品数量" onkeyup="keyFun($(this),999,1)" onpaste="keyFun($(this),999,1)"></td>'
+                            + '<td width="100" style="text-align: center;" >'
                             + '<input type="hidden" class="input-produce-id" value="' + productColor.colorProductId + '">'
                             + '<input type="hidden" class="input-fc-id" value="' + productColor.colorId +'">'
                             + '<input type="hidden" class="input-69code" value="' + productColor.colorBar +'">'
                             + '<input type="" class="input-text input-number input-code" style="width: 100%;border: none;text-align: center;" value="" placeholder="机器编号" name="" id="item-' + productColor.colorProductId + '-' + productColor.colorId +'" number="1" "  onkeyup="keyFunString($(this),30)" onpaste="keyFunString($(this),30)" >'
                             + '</td>'
-                            + '<td style="text-align: center;" ><a href="javascript:void(0)" onclick="delColor(this)" >删除</a></td>'
+                            + '<td width="20" style="text-align: center;" ><a href="javascript:void(0)" onclick="delColor(this)" >删除</a></td>'
                             + '</tr>';
                     }
                 }else{
                     layer.msg("添加产品失败！", {icon: 5, time: 3000});
                 }
-                if(productAddType == 2){
-                    $("#addSendProduct").append(html);
-                }else if(productAddType == 1){
-                    $("#addBackProduct").append(html);
+                var notSelectOrderHtml = $("#addSendProduct").find(".notSelectOrder").html();
+                if(!isEmpty(notSelectOrderHtml)){
+                    if(productAddType == 2){
+                        $("#addSendProduct").append(html);
+                    }else if(productAddType == 1){
+                        $("#addBackProduct").append(html);
+                    }
+                }else{
+                    if(productAddType == 2){
+                        $("#addSendProduct").html(html);
+                    }else if(productAddType == 1){
+                        $("#addBackProduct").html(html);
+                    }
                 }
+
             }
         });
     }