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

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/FittingsInfoServiceImpl.java

@@ -1,10 +1,11 @@
-package com.iamberry.rst.service.cm.mapper;
+package com.iamberry.rst.service.cm;
 
 
 import com.iamberry.rst.core.cm.AwaitingSignclosedProductInfo;
 import com.iamberry.rst.core.cm.FittingsInfo;
 import com.iamberry.rst.faces.cm.AwaitingSignclosedProductInfoService;
 import com.iamberry.rst.faces.cm.FittingsInfoService;
+import com.iamberry.rst.service.cm.mapper.FittingsInfoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/closedFittingMapper.xml

@@ -42,7 +42,7 @@
   <select id="listClosedFitting" parameterType="ClosedFitting" resultType="ClosedFitting">
     select
       cf.closed_fitting_number closedFittingNumber,
-      pf.fittings_name fittingName
+      pf.fittings_name closedFittingsName
     from
       tb_rst_closed_fitting cf
     LEFT JOIN tb_rst_product_fittings pf ON cf.fittings_id = pf.fittings_id

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/sendFittingMapper.xml

@@ -22,7 +22,7 @@
   <select id="listSendFitting" parameterType="SendFitting" resultType="SendFitting">
     select
       sf.*,
-      pf.fittings_name sendProductName
+      pf.fittings_name sendFittingsName
     from tb_rst_send_fitting sf
     LEFT JOIN tb_rst_product_fittings pf ON sf.fittings_id = pf.fittings_id
     <where>

watero-rst-service/src/main/java/com/iamberry/rst/service/order/EfastOrderServiceImpl.java

@@ -194,7 +194,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
                     || order.getOrderAmount() == null || order.getOrderPayMoney() == null
                     || order.getOrderNum() == null || order.getOrderPayType() == null) {
                 logger.info("rst-取消推送此订单-->>" + order.getOrderId() + ",到百胜 有内容为空-->" + order);
-                logger.info("rst-取消推送此订单--为空判断-->>：订单是否为空："+ order==null?"为空":"不为空" + "；省份："+order.getOrderProvince() + "； 订单编号Oid" + order.getOid()+
+                logger.info("rst-取消推送此订单--为空判断-->>：订单是否为空："+ order==null?"为空":"不为空" + "；省份："+order.getOrderProvince() + "； 订单编号Oid:" + order.getOid()+
                     "； 市:"+ order.getOrderCity() + "； 地区："+ order.getOrderArea() + "； 详细地址："+ order.getOrderAddress() +"； 收件人姓名："+ order.getOrderAddressName() +
                         "； 收货人电话："+ order.getOrderAddressTel() +  "； 订单编号："+ order.getOrderId() + "； 身份证号："+ order.getOrderOpenId() + "； sku："+ order.getOrderProductBarCode() +
                         "； 产品名称："+ order.getOrderProductName() + "； 订单金额："+ order.getOrderAmount() + "； 应付金额："+ order.getOrderPayMoney() + "； 商品数量："+ order.getOrderNum() +

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

@@ -177,7 +177,7 @@
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>问题标题：</label>
                 <div class="formControls col-5 col-sm-5">
-                    <input type="text" class="input-text" style="width: 625px;" name="describeTitle" id="describeTitle">
+                    <input type="text" class="input-text" style="width: 625px;" name="describeTitle" id="describeTitle" datatype="*" errormsg="问题标题不正确！" >
                 </div>
             </div>
 
@@ -341,7 +341,7 @@
             <div class="row cl" id="recipientAddressText" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-5 col-sm-5">
-                    <textarea name="relationSendAddress" id="sendAddress" cols="" rows="2" class="textarea" placeholder="请填写详细地址，最多支持50字符" onKeyUp="$.Huitextarealength(this,50)"></textarea>
+                    <textarea name="relationSendAddress" id="sendAddress" cols="" rows="2" datatype="*" errormsg="收货地址不正确！" class="textarea" placeholder="请填写详细地址，最多支持50字符" onKeyUp="$.Huitextarealength(this,50)"></textarea>
                     <span id="addrssMsg"></span>
                 </div>
             </div>
@@ -1785,7 +1785,7 @@
                                 '         <td width="15" style="'+ fristInputStyle +' padding: 0px;width: 25px;">' +
                                 '             <input type="hidden" class="input-produce-id" value="' + color.colorProductId + '">' +
                                 '             <input type="hidden" class="input-color-id" value="' + color.colorId + '">' +
-                                '             <input type="text" class="input-text input-color-number number-input" style="width: 100%;border: none;text-align: center;" value="'+ number +'" placeholder="产品数量"  id="color-' + color.colorProductId + '-' + color.colorId + '" name="" onkeyup="keyFun($(this))" onpaste="keyFun($(this))" >' +
+                                '             <input type="text" class="input-text input-color-number number-input" style="width: 100%;border: none;text-align: center;" value="'+ number +'" placeholder="产品数量"  id="color-' + color.colorProductId + '-' + color.colorId + '" name="" onkeyup="keyFun($(this),999)" onpaste="keyFun($(this),999)" >' +
                                 '         </td>' +
                                 '     </tr>';
                         fristInputStyle = "";
@@ -1809,7 +1809,7 @@
                                 '         <td width="15" style="'+ fristInputStyle +'padding: 0px;width: 25px;">' +
                                 '             <input type="hidden" class="input-produce-id" value="' + produceFit.productId + '">' +
                                 '             <input type="hidden" class="input-fittings-id" value="' + produceFit.fittingsId +'">' +
-                                '             <input type="text" class="input-text input-fittings-number" style="width: 100%;border: none;text-align: center;" value="'+ number +'" placeholder="配件数量" id="fittings-' + produceFit.productId + '-' + produceFit.fittingsId +'" name="" onkeyup="keyFun($(this))" onpaste="keyFun($(this))" >' +
+                                '             <input type="text" class="input-text input-fittings-number" style="width: 100%;border: none;text-align: center;" value="'+ number +'" placeholder="配件数量" id="fittings-' + produceFit.productId + '-' + produceFit.fittingsId +'" name="" onkeyup="keyFun($(this),999)" onpaste="keyFun($(this),999)" >' +
                                 '         </td>' +
                                 '     </tr>';
                         fristInputStyle = "";
@@ -1901,17 +1901,13 @@
         }else{
             $("#addProduct").find(".input-color-number").each(function(){
                 var number = $(this).val();
-                if(number != null && number != ""){
-                    var colorNodeId = $(this).attr("id");
-                    $("#back-product").find("#"+colorNodeId).val(number);
-                }
+                var colorNodeId = $(this).attr("id");
+                $("#back-product").find("#"+colorNodeId).val(number);
             })
             $("#addProduct").find(".input-fittings-number").each(function(){
                 var number = $(this).val();
-                if(number != null && number != ""){
-                    var fittingsNodeId = $(this).attr("id");
-                    $("#back-product").find("#"+fittingsNodeId).val(number);
-                }
+                var fittingsNodeId = $(this).attr("id");
+                $("#back-product").find("#"+fittingsNodeId).val(number);
             })
         }
     }
@@ -1954,15 +1950,6 @@
         }
     }
 
-    /**
-     * 获取当前节点，将当前节点的val值除了数字其他的删掉
-     * @param node
-     * @param maxNumber  最大值
-     * @param minNumber  最小值
-     */
-    function keyFun(node,maxNumber,minNumber){
-
-    }
 </script>
 <script>
     $(function(){
@@ -1990,26 +1977,15 @@
             },
             callback: function (data) {//异步回调函数
                 if (data) {
-                    var index = layer.alert(data.resultMsg, function () {
+                    var index = layer.alert(data.resultMsg, function (index) {
                         if (data.resultCode == 200) {
                             location.href = "${path}/admin/customer/select_customer_list";
                         } else if(data.resultCode == 505){
-
+                            location.href = "${path}/admin/customer/select_customer_list";
                         }else {
                             layer.close(index);
                         }
                     });
-
-//                    layer.confirm(data.resultMsg, {
-//                        btn: ['重要','奇葩'] //按钮
-//                    }, function(){
-//                        layer.msg('的确很重要', {icon: 1});
-//                    }, function(){
-//                        layer.msg('也可以这样', {
-//                            time: 20000, //20s后自动关闭
-//                            btn: ['明白了', '知道了']
-//                        });
-//                    });
                 }
             }
         });
@@ -2018,11 +1994,10 @@
     /* 添加客诉的准备 */
     function addCustomerReady(){
         /* 录入电话号码和姓名到客诉基本信息里面  */
-        var name = $("#sendName").val();
-        var sendTel = $("#sendTel").val();
-        $("#customerName").val(name);
-        $("#customerTel").val(sendTel);
-
+        if(allCustomerType == 3 || allCustomerType == 4 || allCustomerType == 5 || allCustomerType == 6 || allCustomerType == 7){
+            $("#customerName").val($("#sendName").val());
+            $("#customerTel").val($("#sendTel").val());
+        }
 
         /*验证来源入口*/
         var customerSourceType = $("input:radio[name='customerSourceType']:checked").val();
@@ -2067,7 +2042,8 @@
         /*----问题描述- start --*/
         var describeContentText = UE.getEditor('describeContentText').getContent();
         if(describeContentText == null || describeContentText == ""){
-            layer.msg("未填写问题描述", {icon: 5, time: 3000});
+            //layer.msg("未填写问题描述", {icon: 5, time: 3000});
+            vailErrorMsg($("#describeTitle"),"未填写问题描述");
             return false;
         }
         $("#describeContent").val(describeContentText);
@@ -2086,7 +2062,7 @@
 
         $("#addProduct").find(".input-color-number").each(function(){
             var number = $(this).val();
-            if(number != null && number != ""){
+            if(number != null && number != "" && number != 0){
                 var product = new Object();
                 product.productId = $(this).parent().find(".input-produce-id").val();
                 product.colorId = $(this).parent().find(".input-color-id").val();
@@ -2103,7 +2079,7 @@
 
         $("#addProduct").find(".input-fittings-number").each(function(){
             var number = $(this).val();
-            if(number != null && number != ""){
+            if(number != null && number != ""  && number != 0){
                 var fittings = new Object();
                 fittings.productId = $(this).parent().find(".input-produce-id").val();
                 fittings.fittingsId = $(this).parent().find(".input-fittings-id").val();
@@ -2120,7 +2096,7 @@
 
         $("#back-product").find(".input-color-number").each(function(){
             var number = $(this).val();
-            if(number != null && number != ""){
+            if(number != null && number != ""  && number != 0){
                 //换新、维修，
                 if(allCustomerType == 3 || allCustomerType == 4){
                     var fittings = new Object();
@@ -2134,7 +2110,7 @@
 
         $("#back-product").find(".input-fittings-number").each(function(){
             var number = $(this).val();
-            if(number != null && number != ""){
+            if(number != null && number != "" && number != 0){
                 //换新、维修
                 if(allCustomerType == 3 || allCustomerType == 4){
                     var fittings = new Object();
@@ -2146,50 +2122,59 @@
             }
         })
 
+        var backErrorMsg = "请选择一个replace_error_msg寄回的产品或配件并填写一个以上的数量！"
+        var sendErrorMsg = "请选择一个replace_error_msg寄送的产品或配件并填写一个以上的数量！"
         var process = true;
         switch (allCustomerType){
             case 3:
                 process = processIsEmpty([closedProdcues,closedFittings]);
                 if(!process){
-                    layer.msg("请选择一个换新寄回的产品或配件并填写一个以上的数量！", {icon: 5, time: 3000});
+                    var msg = backErrorMsg.replace("replace_error_msg","换新");
+                    layer.msg(msg, {icon: 5, time: 3000});
                     return false;
                 }
                 process = processIsEmpty([sendProdcues,sendFittings]);
                 if(!process){
-                    layer.msg("请选择一个换新寄送的产品或配件并填写一个以上的数量！", {icon: 5, time: 3000});
+                    var msg = sendErrorMsg.replace("replace_error_msg","换新");
+                    layer.msg(msg, {icon: 5, time: 3000});
                     return false;
                 }
                 break;
             case 4:
                 process = processIsEmpty([closedProdcues,closedFittings]);
                 if(!process){
-                    layer.msg("请选择一个维修寄回的产品或配件并填写一个以上的数量！", {icon: 5, time: 3000});
+                    var msg = backErrorMsg.replace("replace_error_msg","维修");
+                    layer.msg(msg, {icon: 5, time: 3000});
                     return false;
                 }
                 process = processIsEmpty([sendProdcues,sendFittings]);
                 if(!process){
-                    layer.msg("请选择一个维修寄送的产品或配件并填写一个以上的数量！", {icon: 5, time: 3000});
+                    var msg = sendErrorMsg.replace("replace_error_msg","维修");
+                    layer.msg(msg, {icon: 5, time: 3000});
                     return false;
                 }
                 break;
             case 5:
                 process = processIsEmpty([sendProdcues,sendFittings]);
                 if(!process){
-                    layer.msg("请选择一个补发寄送的产品或配件并填写一个以上的数量！", {icon: 5, time: 3000});
+                    var msg = sendErrorMsg.replace("replace_error_msg","补发");
+                    layer.msg(msg, {icon: 5, time: 3000});
                     return false;
                 }
                 break;
             case 6:
                 process = processIsEmpty([closedProdcues,closedFittings]);
                 if(!process){
-                    layer.msg("请选择一个退货寄回的产品或配件并填写一个以上的数量！", {icon: 5, time: 3000});
+                    var msg = backErrorMsg.replace("replace_error_msg","退货");
+                    layer.msg(msg, {icon: 5, time: 3000});
                     return false;
                 }
                 break;
             case 7:
                 process = processIsEmpty([closedProdcues,closedFittings]);
                 if(!process){
-                    layer.msg("请选择一个退货寄回的产品或配件并填写一个以上的数量！", {icon: 5, time: 3000});
+                    var msg = backErrorMsg.replace("replace_error_msg","退货");
+                    layer.msg(msg, {icon: 5, time: 3000});
                     return false;
                 }
                 break;
@@ -2208,18 +2193,18 @@
         var hours = myDate.getHours();
         //如果两个时间相等，则判断可选的回访时间
         if(Date.parse(visit_date) == Date.parse(date)){
+            var msg = "该时间已超过当前时间，请重新选择回访时间!";
             if (hours > 12 && visitTimeSelect == 1) {
-                vailErrorMsg($("#datemin"),"该时间已超过当前时间，请重新选择回访时间!");
+                vailErrorMsg($("#datemin"),msg);
                 return false;
             } else if (hours > 14 && visitTimeSelect == 2) {
-                vailErrorMsg($("#datemin"),"该时间已超过当前时间，请重新选择回访时间!");
+                vailErrorMsg($("#datemin"),msg);
                 return false;
             } else if (hours > 18 && visitTimeSelect == 3) {
-                vailErrorMsg($("#datemin"),"该时间已超过当前时间，请重新选择回访时间!");
+                vailErrorMsg($("#datemin"),msg);
                 return false;
             }
         }
-
         return true;
     }
 
@@ -2251,7 +2236,6 @@
                     }
                 }
             }
-
             if(flag == 0){
                 return false;
             }

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

@@ -26,11 +26,11 @@
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>客户信息</strong>
             </div>
-            <div class="formControls col-5 col-sm-5">
+            <div class="formControls col-4 col-sm-4">
                 <input type="hidden" id="customerId" name="customerId" value="${customerId}">
                 <input type="text" id="visitName" name="visitName" class="input-text" placeholder="客户姓名" value=""/>
             </div>
-            <div class="formControls col-5 col-sm-5">
+            <div class="formControls col-4 col-sm-4">
                 <input type="text" id="visitTel" name="visitTel" class="input-text" placeholder="客户电话" value=""/>
             </div>
         </div>
@@ -38,7 +38,7 @@
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>回访日期</strong>
             </div>
-            <div class="formControls col-10 col-sm-10">
+            <div class="formControls col-8 col-sm-8">
                 <input type="text" id="visitDate" name="visitDate" class="input-text" placeholder="" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen',minDate:'%y-%M-%d' })" value="" readonly="readonly"/>
             </div>
         </div>
@@ -46,7 +46,7 @@
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>回访时间</strong>
             </div>
-            <div class="formControls col-10 col-sm-10 skin-minimal">
+            <div class="formControls col-8 col-sm-8 skin-minimal">
                 <div class="radio-box">
                     <input type="radio" name="visitTimeSelect" value="1" checked="checked">
                     <label for="time-1">09:00-12:00</label>
@@ -66,7 +66,7 @@
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>回访客服</strong>
             </div>
-            <div class="formControls col-10 col-sm-10">
+            <div class="formControls col-8 col-sm-8">
 				<span class="select-box">
 				<select class="select" name="visitAdminId" id="visitAdminId">
                     <#if adminList?? &&  (adminList?size > 0) >

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

@@ -324,7 +324,7 @@
                     }
                     if (customerCommon.sendFittings != null && customerCommon.sendFittings.length > 0) {
                         $.each(customerCommon.sendFittings,function(index,item){
-                            sendprodcue += '<span style="margin-bottom: 10px;display: inline-block;float: left;">' + this.sendProductName + '*' + this.sendFittingNumber + '</span>';
+                            sendprodcue += '<span style="margin-bottom: 10px;display: inline-block;float: left;">' + this.sendFittingsName + '*' + this.sendFittingNumber + '</span>';
                         })
                     }
                     if (customerCommon.closedProdcues != null && customerCommon.closedProdcues.length > 0) {
@@ -334,7 +334,7 @@
                     }
                     if (customerCommon.closedFittings != null && customerCommon.closedFittings.length > 0) {
                         $.each(customerCommon.closedFittings,function(index,item){
-                            closeprodcue += '<span style="margin-bottom: 10px;display: inline-block;float: left;">' + this.fittingName + '*' + this.closedFittingNumber + '</span>';
+                            closeprodcue += '<span style="margin-bottom: 10px;display: inline-block;float: left;">' + this.closedFittingsName + '*' + this.closedFittingNumber + '</span>';
                         })
                     }
                     $('#sendprodcue').html(sendprodcue+"<br/>");

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

@@ -262,7 +262,10 @@
                                     </#if>
                                 </#if>
                             </td>
-                            <td>${(customer.customerCreateTime?string("yyyy-MM-dd"))!''}</td>
+                            <td>
+                                ${(customer.customerCreateTime?string("yyyy-MM-dd"))!''}<br>
+                                ${(customer.customerCreateTime?string("HH:mm:ss"))!''}
+                            </td>
                             <td>
                                 <#if customer.customerIsSolve == 2>
                                     <a style="text-decoration:none" href="javascript:void(0);" title="已解决" onclick="updateCustomerIsSolve(${customer.customerId!''})">

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

@@ -393,7 +393,7 @@
                     }
                     if (backGoods.closedFittings != null && backGoods.closedFittings.length > 0) {
                         $.each(backGoods.closedFittings,function(index,element){
-                            backProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.fittingName + '*' + this.closedFittingNumber + '</span>';
+                            backProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.closedFittingsName + '*'  + this.closedFittingNumber + '</span>';
                         })
                     }
                     $('#backGoodsProduct').html(backProduct);

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

@@ -391,7 +391,7 @@
                     }
                     if (noreasonBack.closedFittings != null && noreasonBack.closedFittings.length > 0) {
                         $.each(noreasonBack.closedFittings,function(index,element){
-                            noreasonProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.fittingName + '*' + this.closedFittingNumber + '</span>';
+                            noreasonProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.closedFittingsName + '*'  + this.closedFittingNumber + '</span>';
                         })
                     }
                     $('#noreasonBackProduct').html(noreasonProduct);

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

@@ -247,7 +247,7 @@
                     }
                     if (reissue.sendFittings != null && reissue.sendFittings.length > 0) {
                         $.each(reissue.sendFittings,function(index,element){
-                            sendProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.sendProductName + '*' + this.sendFittingNumber + '件</span>';
+                            sendProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.sendFittingsName + '*' + this.sendFittingNumber  + '件</span>';
                         })
                     }
                     $('#sendProduct').html(sendProduct);

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

@@ -536,7 +536,7 @@
                     }
                     if (renewed.closedFittings != null && renewed.closedFittings.length > 0) {
                         $.each(renewed.closedFittings,function(index,element){
-                            renewedProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.fittingName + '*' + this.closedFittingNumber + '件</span>';
+                            renewedProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.closedFittingsName + '*' + this.closedFittingNumber + '件</span>';
                         })
                     }
                     $('#renewedProduct').html(renewedProduct);
@@ -548,7 +548,7 @@
                     }
                     if (renewed.sendFittings != null && renewed.sendFittings.length > 0) {
                         $.each(renewed.sendFittings,function(index,element){
-                            sendProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.sendProductName + '*' + this.sendFittingNumber + '件</span>';
+                            sendProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.sendFittingsName + '*' + this.sendFittingNumber + '件</span>';
                         })
                     }
                     $('#sendProduct').html(sendProduct);

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

@@ -533,7 +533,7 @@
                     }
                     if (repair.closedFittings != null && repair.closedFittings.length > 0) {
                         $.each(repair.closedFittings,function(index,element){
-                            repairProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.fittingName + '*' + this.closedFittingNumber + '件</span>';
+                            repairProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.closedFittingsName + '*'  + this.closedFittingNumber + '件</span>';
                         })
                     }
                     $('#repairProduct').html(repairProduct);
@@ -546,7 +546,7 @@
                     }
                     if (repair.sendFittings != null && repair.sendFittings.length > 0) {
                         $.each(repair.sendFittings,function(index,element){
-                            sendProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.sendProductName + '*' + this.sendFittingNumber + '件</span>';
+                            sendProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.sendFittingsName + '*' + this.sendFittingNumber  + '件</span>';
                         })
                     }
                     $('#sendProduct').html(sendProduct);

watero-rst-web/src/main/webapp/WEB-INF/views/pts/bom/bom_list.ftl

@@ -96,7 +96,7 @@
                         </tr>
                     </#list>
             <#else>
-                <tr><td colspan="10" class="td-manage text-c" >暂时没有Bom，请添加！</td></tr>
+                <tr><td colspan="11" class="td-manage text-c" >暂时没有Bom，请添加！</td></tr>
             </#if>
         </tbody>
     </table>
@@ -138,11 +138,12 @@
         //重新实例化一个编辑器，防止在上面的editor编辑器中显示上传的图片或者文件
         _editor = UE.getEditor('upload_ue',{
             initialFrameWidth : 375,
-            initialFrameHeight: 600
+            initialFrameHeight: 600,
+            isShow : false
         });
         _editor.ready(function () {
             _editor.setDisabled("attachment");//设置编辑器不可用
-            _editor.hide();//隐藏编辑器，因为不会用到这个编辑器实例，所以要隐藏
+           // _editor.hide();//隐藏编辑器，因为不会用到这个编辑器实例，所以要隐藏
             //侦听图片上传
             _editor.addListener('beforeInsertImage', function (t, arg) {
                 console.log(arg[0].src);