pts修改

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

@@ -511,7 +511,7 @@
                     <input type="text" class="input-text trim_input" placeholder="客户报价" id="relationCustomerCosts" name="relationCustomerCosts" value="">
                   </div>
             </div>
-            <div class="row cl" id="sendAddressInfo" id="sendInformationTitle">
+            <div class="row cl"  id="sendInformationTitle">
                  <label class="form-label col-1 col-sm-1">
                      <div class="tit-2">寄回信息</div>
                  </label>

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

@@ -368,7 +368,7 @@
                     </div>
                 </div>
             </div>
-            <div class="row cl">
+            <div class="row cl" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-10 col-sm-10">
                     <ul class="time-line-list" id="processResultStatus">
@@ -566,7 +566,7 @@
                             <input type="text" class="input-text trim_input" placeholder="客户报价" id="relationCustomerCosts" name="relationCustomerCosts" value="${customerCommon.relationCustomerCosts!''}">
                             </div>
                             </div>
-                    <div class="row cl" id="sendAddressInfo" id="sendInformationTitle">
+                    <div class="row cl" id="sendInformationTitle">
                           <label class="form-label col-1 col-sm-1">
                           <div class="tit-2">寄回信息</div>
                         </label>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_list.ftl

@@ -148,14 +148,15 @@
                            onclick="add_remark('修改备注','${path}/admin/detect/to_add_remark?detectItemId=${detect.detectItemId!''}','570','450');">
                             <i class="Hui-iconfont">&#xe6df;</i>
                         </a>-->
+                        <a style="text-decoration:none" href="javascript:;" title="修改检测信息"
+                           onclick="update_info('${path}/admin/detect/to_update_complete?detectItemId=${detect.detectItemId!''}');">
+                           <i class="Hui-iconfont">&#xe60c;</i>
+                        </a>
                         <a style="text-decoration:none" href="javascript:;" title="删除"
                            onclick="detele(${detect.detectItemId!''});">
                             <i class="Hui-iconfont">&#xe609;</i>
                         </a>
-                            <a style="text-decoration:none" href="javascript:;" title="修改检测信息"
-                               onclick="update_info('${path}/admin/detect/to_update_complete?detectItemId=${detect.detectItemId!''}');">
-                                <i class="Hui-iconfont">&#xe60c;</i>
-                            </a>
+
                         <#--<#if detect.signclosedId??>
                             <#if detect.detectState == 1>
                                 <a style="text-decoration:none" href="javascript:;" title="查看仓储进度"

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl

@@ -181,9 +181,9 @@
                 $("#qrcodeImg").attr('src',machineQrcode);*/
                 /* if (machineProduceType == 1) {//净水机模板*/
                 $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                        '<span style="position: absolute;left: 10px;font-size: 14px;">'+produceName+'</span>' +
-                        '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
-                        '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;">S／N</span>' +
+                        '<span style="position: absolute;left: 10px;font-size: 14px;">桌面净水机</span>' +
+                        '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                        '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
                         '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
                         '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
                         '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
@@ -355,9 +355,9 @@
 
             /*if(machineProduceType == 1){//净水机模板*/
             $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                    '<span style="position: absolute;left: 10px;font-size: 14px;">'+produceName+'</span>' +
-                    '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
-                    '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;">S／N</span>' +
+                    '<span style="position: absolute;left: 10px;font-size: 14px;">桌面净水机</span>' +
+                    '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                    '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
                     '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
                     '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
                     '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +

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

@@ -500,6 +500,8 @@ function initProcessResult(type,allCustomerInfoType){
                 $("#sendAddressByPhone").show();
                 $("#updateProduct").hide(); //换新产品
                 $("#postageAccount").show();    //邮费转账账户
+                $("#sendInformationTitle").show();
+                $("#sendAddressSmsHtml").show();
                 visitByType(2); //需要回访
                 //$("#salesChannelsSelect").show();  //展示销售公司
                 if(customerInfoType == 1){
@@ -528,6 +530,8 @@ function initProcessResult(type,allCustomerInfoType){
                 $("#sendAddressByPhone").show();
                 $("#updateProduct").hide();//维修产品
                 $("#postageAccount").show();    //邮费转账账户
+                $("#sendInformationTitle").show();
+                $("#sendAddressSmsHtml").show();
                 visitByType(2); //需要回访
                 //$("#salesChannelsSelect").show();  //展示销售公司
                 if(customerInfoType == 1){
@@ -588,6 +592,8 @@ function initProcessResult(type,allCustomerInfoType){
                 $("#sendAddressByPhone").show();
                 $("#updateProduct").hide();
                 $("#postageAccount").show();    //邮费转账账户
+                $("#sendInformationTitle").show();
+                $("#sendAddressSmsHtml").show();
                 visitByType(2); //需要回访
                 //$("#salesChannelsSelect").show();  //展示销售公司
                 if(customerInfoType == 1){
@@ -617,6 +623,8 @@ function initProcessResult(type,allCustomerInfoType){
                 $("#sendAddressByPhone").show();
                 $("#updateProduct").hide();
                 $("#postageAccount").show();    //邮费转账账户
+                $("#sendInformationTitle").show();
+                $("#sendAddressSmsHtml").show();
                 visitByType(2); //需要回访
                 //$("#salesChannelsSelect").show();  //展示销售公司
                 if(customerInfoType == 1){