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

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

@@ -15,15 +15,19 @@
         #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(images/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
         .select-box{background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size: auto 100%;}
         .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
-        .table-bg th{background-color: #e2f6ff;}
+        .table-bg th{background-color: #e2f6ff;text-align: center;}
+        .table-bordered td{text-align: center;}
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 20px;background-color: #32a3d8;color: #fff;}
 
         .clearfix:after{content:"\20";display:block;height:0;clear:both;visibility:hidden}.clearfix{zoom:1}
-        .tabBar {border-bottom: 2px solid #222}
-        .tabBar span {background-color: #e8e8e8;cursor: pointer;display: inline-block;float: left;font-weight: bold;height: 30px;line-height: 30px;padding: 0 15px}
-        .tabBar span.current{background-color: #222;color: #fff}
+        .tabBar span {background-color: #fff;cursor: pointer;display: inline-block;float: left;font-weight: bold;height: 30px;line-height: 30px;padding: 0 15px;position: relative;}
         .tabCon {display: none}
+        .tabBar span.current{background-color: #fff;color: #50a2ea;}
+        .tabBar span.current:after{content: '';width: 2em;height: 2px;background: #50a2ea;position: absolute;left: 50%;bottom: 0;margin-left: -1em;}
+        .tabBar{border-bottom: 1px solid #ccc;}
+        .table-bg thead th{background: #f7fafd;}
+        .td-manage>a{color: #50a2ea;}
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/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(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
@@ -64,7 +68,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-12 col-sm-12">
                     <table class="table table-border table-bg table-bordered" >
                         <thead>
                         <tr>
@@ -84,9 +88,9 @@
                                 <td>${(sendbackInfo.sendbackLogisticsNo)!''}</td>
                                 <td>${(sendbackInfo.sendbackName)!''}<br>${(sendbackInfo.sendbackTel)!''}</td>
                                 <td>
-                                    <#if sendbackInfo.sendbackStatus == 1>未配送</#if>
+                                    <#if sendbackInfo.sendbackStatus == 1><span class="c-warning">未配送</span></#if>
                                     <#if sendbackInfo.sendbackStatus == 2>配送中</#if>
-                                    <#if sendbackInfo.sendbackStatus == 3>已签收</#if>
+                                    <#if sendbackInfo.sendbackStatus == 3><span class="c-success">已签收</span></#if>
                                 </td>
                                 <td>
                                     <#if sendbackInfo.listSendbackItem?? &&  (sendbackInfo.listSendbackItem?size > 0) >
@@ -103,7 +107,7 @@
                         </#if>
                         </tbody>
                     </table>
-                    <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;" id="" name="" onclick="showSendbackDiv();">增加寄回物流</button>
+                    <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;display: block;margin: 20px auto;" id="" name="" onclick="showSendbackDiv();">添加寄回信息</button>
                 </div>
             </div>
 
@@ -111,12 +115,12 @@
                 <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-12 col-sm-12">
             <div class="row cl">
                 <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-12 col-sm-12">
                     <div class="radio-box">
                         <input type="radio" id="tel-b1" name="sendbackStatus" value="1">
                         <label for="tel-b1">未寄回</label>
@@ -222,12 +226,12 @@
                 <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-12 col-sm-12">
             <div class="row cl">
                 <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-12 col-sm-12">
                     <div class="radio-box">
                         <input type="radio" id="tel-c1" name="sendbackStatuss" value="1">
                         <label for="tel-c1">未寄回</label>
@@ -238,7 +242,7 @@
                     </div>
                     <div class="radio-box">
                         <input type="radio" id="tel-c3" name="sendbackStatuss" value="3">
-                        <label for="tel-c3">已签收</label>
+                        <label class="c-success">已签收</label>
                     </div>
                 </div>
             </div>
@@ -348,7 +352,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-12 col-sm-12">
                 <table class="table table-border table-bg table-bordered" >
                     <thead>
                     <tr>
@@ -394,13 +398,13 @@
             <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-12 col-sm-12">
             <div >
                 <div class="row cl">
                     <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-12 col-sm-12">
                         <div class="radio-box">
                             <input type="radio" id="tel-66" name="postageStatus" checked value="1">
                             <label for="tel-66">未申请</label>
@@ -458,13 +462,13 @@
                  <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-12 col-sm-12">
             <div>
                 <div class="row cl">
                     <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-12 col-sm-12 skin-minimal">
                         <div class="radio-box">
                             <input type="radio" id="tel-666" name="postageStatuss" value="1">
                             <label for="tel-666">未申请</label>
@@ -558,7 +562,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-12 col-sm-12">
                         <table class="table table-border table-bg table-bordered" >
                             <thead>
                             <tr>
@@ -604,7 +608,7 @@
                                     </#if>
                                 </td>
                                     <td>${informationInfo.feeDesc!''}</td>
-                                    <td><a onclick="deleteInformationInfo(${(informationInfo.feeId)!});">删除</a>&nbsp;&nbsp;<a onclick="getInformationInfo(${(informationInfo.feeId)!});">修改</a></td>
+                                    <td style="color: #50a2ea;"><a onclick="deleteInformationInfo(${(informationInfo.feeId)!});">删除</a>&nbsp;&nbsp;<a onclick="getInformationInfo(${(informationInfo.feeId)!});">修改</a></td>
                                 </tr>
                                 </#list>
                             <#else>
@@ -612,20 +616,20 @@
                             </#if>
                             </tbody>
                         </table>
-                        <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;" id="" name="" onclick="showInformationInfoDiv();">录入收费信息</button>
+                        <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;display: block;margin: 20px auto;" id="" name="" onclick="showInformationInfoDiv();">录入收费信息</button>
                     </div>
                 </div>
                 <div class="row cl" id="addInformationInfoId" style="display: none;">
                     <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-12 col-sm-12">
                         <div >
                             <div class="row cl">
                                 <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-12 col-sm-12">
                                     <div class="radio-box">
                                         <input type="radio" id="tel-333" name="feeStatus" checked value="1">
                                         <label for="tel-333">待付款</label>
@@ -698,13 +702,13 @@
                     <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-12 col-sm-12">
                         <div >
                             <div class="row cl">
                                 <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-12 col-sm-12">
                                     <div class="radio-box">
                                         <input type="radio" id="tel-333s" name="feeStatuss" checked value="1">
                                         <label for="tel-333s">待付款</label>
@@ -777,7 +781,7 @@
             </div>
         <div <#if procMethod.procMethodIsBack == 1>class="tabCon"</#if>style="display: none;">
                 <div class="row cl" id="detectDiv">
-                    <div class="formControls col-10 col-sm-10">
+                    <div class="formControls col-12 col-sm-12">
                         <table class="table table-border table-bg table-bordered" >
                             <thead>
                             <tr>
@@ -881,13 +885,13 @@
                     </div>
                 </div>
                 <div class="row cl" id="updateDetect" style="display: none;">
-                    <div class="formControls col-10 col-sm-10">
+                    <div class="formControls col-12 col-sm-12">
                         <div >
                             <div class="row cl" id="updateDetect_1" style="display: none;">
                                 <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-12 col-sm-12">
                                     <div class="radio-box">
                                         <input type="radio" id="tel-001" name="detectProcessingResults_1" checked value="1">
                                         <label for="tel-001">付费维修</label>
@@ -914,7 +918,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-12 col-sm-12">
                                     <div class="radio-box">
                                         <input type="radio" id="tel-002" name="detectProcessingResults_2" checked value="2">
                                         <label for="tel-002">免费维修</label>
@@ -960,7 +964,7 @@
                     </div>
             </div>
                 <div class="row cl" id="getDetect" style="display: none;">
-                    <div class="formControls col-10 col-sm-10">
+                    <div class="formControls col-12 col-sm-12">
                             <div class="row cl" >
                                 <div class="formControls col-2 col-sm-2 text-r">
                                     <strong>检测ID：</strong>
@@ -1058,7 +1062,7 @@
         </div>
         <div <#if procMethod.procMethodIsBack == 1>class="tabCon"</#if>style="display: none;">
                 <div class="row cl" id="signclosedDiv">
-                    <div class="formControls col-10 col-sm-10">
+                    <div class="formControls col-12 col-sm-12">
                         <table class="table table-border table-bordered table-bg table-hover table-sort">
                             <thead>
                             <tr class="text-c">
@@ -1138,7 +1142,7 @@
                 <div class="formControls col-2 col-sm-2 text-r">
                     <strong>QC进度</strong>
                 </div>
-                <div class="formControls col-10 col-sm-10">
+                <div class="formControls col-12 col-sm-12">
                     <table class="table table-border table-bg table-bordered">
                         <tbody class="text-c" id="detect_table"><tr>
                             <th>工厂检测现象</th><th>故障分类</th><th>故障原因</th><th>判定结果</th><th>故障指向</th><th>原因分析</th><th>生产维修</th>
@@ -1152,7 +1156,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-12 col-sm-12">
                     <table class="table table-border table-bg table-bordered">
                         <tbody class="text-c" id="maintenance_table"><tr>
                             <th>是否可返修</th><th>返修内容</th><th>返修日期</th>

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

@@ -9,6 +9,10 @@
 <#include "/base/add_base.ftl">
     <title>添加检测记录 - H-ui.filter v2.4</title>
     <style>
+        .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;font-size: 16px;padding-left: 10px;color: #50a2ea;display: inline-block;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 50%;height: 6px;width: 6px;border-radius: 6px;margin-top: -3px; background-color: #32a3d8;}
         .my-title{font-weight: 500;padding-left: 15px;position: relative;}
         .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
         .my-input{padding: 8px 5px;width: 80%;border:1px solid rgba(0,0,0,.1);}
@@ -19,7 +23,7 @@
         .add-list>li{margin: 10px 0;}
         .my-textarea{padding: 5px 10px;width: 77%;border:1px solid rgba(0,0,0,.1);margin-left: 12.5%;}
         .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
-        .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
+        .my-btn-submit{padding: 10px 20px;width: 158px; background-color: #50a2ea;color: #fff;border: 1px solid #50a2ea;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select {
             border: 1px solid rgba(0,0,0,.1);
             padding: 6px 50px 6px 15px;
@@ -29,6 +33,7 @@
             background: url(/common/images/pts/select-11.png) right center no-repeat;
             background-size: auto 100%;
         }
+        .check-box, .radio-box{padding-left: 0;}
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/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(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         .huanhang{ float:left}
@@ -41,10 +46,16 @@
 <body>
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
-
         <div class="row cl">
-            <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>所属公司：</label>
-            <div class="formControls col-7 col-sm-7">
+            <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="form-label col-3 col-sm-3" style="padding-right: 10px;"><span class="c-red">*</span>所属公司：</label>
+            <div class="formControls col-9 col-sm-9" style="padding-left: 5px;">
             <#if companyInfoList?? &&  (companyInfoList?size > 0) >
                 <#list companyInfoList as companyInfo>
                     <div class="radio-box">
@@ -58,13 +69,13 @@
 
         <div class="input-box">
             <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;"><span class="c-red">*</span>客诉编号：</label>
-            <div class="formControls col-xs-8 col-sm-8 skin-minimal" style="margin: 10px 0px;">
-                <input class="my-input" type="text" style="width: 78.5%;"  name="customerId" id="customerId" placeholder="请输入客诉编号，如没有请留空"/>
+            <div class="formControls col-xs-9 col-sm-9 skin-minimal" style="margin: 10px 0px;padding-left: 0;">
+                <input class="my-input" type="text" style="width:510px;"  name="customerId" id="customerId" placeholder="请输入客诉编号，如没有请留空"/>
             </div>
         </div>
         <div class="input-box">
             <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;"><span class="c-red">*</span>检测产品：</label>
-            <div class="formControls col-8 col-sm-8 huanhang" style="margin: 10px 0px 10px -10px;">
+            <div class="formControls col-9 col-sm-9 huanhang" style="margin: 10px 0px 10px 0;padding-left: 0;">
                 <select id="productId" name="productId" class="my-select" style="width: 158px;">
                     <#if (productList?size > 0)>
                             <#list productList as product>
@@ -186,15 +197,15 @@
         </div>
 -->
         <div class="input-box" >
-            <label class="form-label col-3 col-sm-3 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-xs-9 col-sm-9">
                 <div class="radio-box">
-                    <textarea rows="3" style="width: 186%;margin-left: -15%;margin-top: 5%;" cols="20" name="detectItemDesc" id="detectItemDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！"></textarea>
+                    <textarea rows="3" style="width: 500px;margin-left: -15px;margin-top: 8px;" cols="20" name="detectItemDesc" id="detectItemDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！"></textarea>
                 </div>
             </div>
         </div>
-        <div style="margin-left: 35%;">
-            <button type="button" class="my-btn-submit" onclick="add();">确认提交</button>
+        <div class="input-box" style="margin-left: 30%">
+            <button type="button" class="my-btn-submit" onclick="add();" style="margin-top: 50px;">确认提交</button>
         </div>
     </form>
 </article>

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

@@ -231,7 +231,7 @@
                     <td class="text-c" width="100"><div  title="${detect.detectNalysis!}">${detect.detectNalysis!'-'}</div></td>
                     <td class="text-c" width="100"><div  title="${detect.detectContent!}">${detect.detectContent!'-'}</div></td>
                     <td class="text-c" width="100"><#if detect.detectOffer??>${detect.detectOffer/100}<#else>-</#if></td>
-                    <td class="text-c" width="100"><span class="label txt2" title="${detect.questionTitle!}" >${detect.questionTitle!'-'}</span><br><#if detect.questionTitle??><#if detect.questionTitle != ""><a href="#" onclick="getDescribeInfo(${detect.customerId!});" style="color : #50a2ea;">查看详情</a></#if></#if></td>
+                    <td class="text-c" width="100"><span class="txt2" title="${detect.questionTitle!}" >${detect.questionTitle!'-'}</span><br><#if detect.questionTitle??><#if detect.questionTitle != ""><a href="#" onclick="getDescribeInfo(${detect.customerId!});" style="color : #50a2ea;">查看详情</a></#if></#if></td>
                     <td class="text-c" width="100">${detect.detectDesc!'-'}</td>
                     <td class="text-c" width="100">${detect.detectCustomerDesc!'-'}</td>
                     <td class="text-c" width="100">${(detect.detectDate?string("yyyy-MM-dd"))!'-'}</td>
@@ -283,7 +283,7 @@
                                     <i class="Hui-iconfont">维修完成</i><br>
                                 </a>
                             </#if>
-                            <a style="text-decoration:none" href="javascript:;" title="打印维修卡"
+                            <a style="text-decoration:none;color : #50a2ea;" href="javascript:;" title="打印维修卡"
                                onclick="printPageMaintenance(${detect.detectId!''});">
                                 <i class="Hui-iconfont">打印维修卡</i><br>
                             </a>

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

@@ -36,8 +36,8 @@
             <label class="col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>是否故障：</label>
             <div class=" col-xs-9 col-sm-9 huanhang" >
                 <div class="radio-box">
-                    <input type="radio" id="radio-3" name="isMaintenance" value="2"
-                          <#if detectInfo.isMaintenance??><#if detectInfo.isMaintenance == 2>checked</#if><#else>checked</#if>/><label for="radio-3">无故障</label>
+                    <input type="radio" id="radio-3" name="isMaintenance" value="2" checked
+                          <#if detectInfo.isMaintenance??><#if detectInfo.isMaintenance == 2>checked</#if></#if>/><label for="radio-3">无故障</label>
                 </div>
                 <div class="radio-box">
                     <input type="radio" id="radio-4" name="isMaintenance" value="1"
@@ -49,8 +49,8 @@
             <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>是否可翻新：</label>
             <div class=" col-xs-9 col-sm-9  huanhang" >
                 <div class="radio-box" style="margin: 10px 0px;">
-                    <input type="radio" id="radio-7" name="detectRenovation" value="1"
-                          <#if detectInfo.detectRenovation??><#if detectInfo.detectRenovation == 1>checked</#if><#else>checked</#if>/><label for="radio-7">可翻新</label>
+                    <input type="radio" id="radio-7" name="detectRenovation" value="1"  checked
+                          <#if detectInfo.detectRenovation??><#if detectInfo.detectRenovation == 1>checked</#if></#if>/><label for="radio-7">可翻新</label>
                 </div>
                 <div class="radio-box">
                     <input type="radio" id="radio-8" name="detectRenovation" value="2"
@@ -61,43 +61,51 @@
        <div class="input-box" >
             <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>检测现象：</label>
             <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-                <textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectPhenomenon" id="detectPhenomenon" class="my-textarea" placeholder="请输入工厂的检测现象">${detectInfo.detectPhenomenon!''}</textarea>
+                <#--<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectPhenomenon" id="detectPhenomenon" class="my-textarea" placeholder="请输入工厂的检测现象">${detectInfo.detectPhenomenon!''}</textarea>-->
+                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectPhenomenon!''}" name="detectPhenomenon" id="detectPhenomenon"  placeholder="请输入检测现象"/>
             </div>
         </div>
         <div class="input-box">
             <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>故障分类：</label>
             <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-                <textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectClassification" id="detectClassification" class="my-textarea" placeholder="请输入故障分类">${detectInfo.detectClassification!''}</textarea>
+                <#--<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectClassification" id="detectClassification" class="my-textarea" placeholder="请输入故障分类">${detectInfo.detectClassification!''}</textarea>-->
+                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectClassification!''}" name="detectClassification" id="detectClassification"  placeholder="请输入故障分类"/>
             </div>
         </div>
         <div class="input-box">
             <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>故障原因：</label>
             <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-                <textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectFailureCause" id="detectFailureCause" class="my-textarea" placeholder="请输入故障原因">${detectInfo.detectFailureCause!''}</textarea>
+                <#--<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectFailureCause" id="detectFailureCause" class="my-textarea" placeholder="请输入故障原因">${detectInfo.detectFailureCause!''}</textarea>-->
+                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectFailureCause!''}" name="detectFailureCause" id="detectFailureCause"  placeholder="请输入故障原因"/>
             </div>
         </div>
         <div class="input-box">
             <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>判定结果：</label>
             <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-                <textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectResults" id="detectResults" class="my-textarea" placeholder="请输入判定结果">${detectInfo.detectResults!''}</textarea>
+                <#--<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectResults" id="detectResults" class="my-textarea" placeholder="请输入判定结果">${detectInfo.detectResults!''}</textarea>-->
+                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectResults!''}" name="detectResults" id="detectResults"  placeholder="请输入判定结果"/>
             </div>
         </div>
         <div class="input-box">
             <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>故障指向：</label>
             <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-                <textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectPoint" id="detectPoint" class="my-textarea" placeholder="请输入故障指向">${detectInfo.detectPoint!''}</textarea>
+                <#--<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectPoint" id="detectPoint" class="my-textarea" placeholder="请输入故障指向">${detectInfo.detectPoint!''}</textarea>-->
+                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectPoint!''}" name="detectPoint" id="detectPoint"  placeholder="请输入故障指向"/>
             </div>
         </div>
         <div class="input-box">
             <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>原因分析：</label>
             <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-                <textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectNalysis" id="detectNalysis" class="my-textarea" placeholder="请输入原因分析">${detectInfo.detectNalysis!''}</textarea>
+                <#--<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectNalysis" id="detectNalysis" class="my-textarea" placeholder="请输入原因分析">${detectInfo.detectNalysis!''}</textarea>-->
+                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectNalysis!''}" name="detectNalysis" id="detectNalysis"  placeholder="请输入原因分析"/>
             </div>
         </div>
         <div class="input-box">
             <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>检测内容：</label>
             <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-                <textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectContent" id="detectContent" class="my-textarea" placeholder="请输入检测内容">${detectInfo.detectContent!''}</textarea>
+                <#--<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectContent" id="detectContent" class="my-textarea" placeholder="请输入检测内容">${detectInfo.detectContent!''}</textarea>-->
+                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectContent!''}" name="detectContent" id="detectContent"  placeholder="请输入检测内容"/>
+
             </div>
         </div>
         <div class="input-box">

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -230,41 +230,41 @@
                     </td>
                     <td class="operating_td" style="min-width: 100px;">
                         <a class="confirm_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="确认订单" alt="确认订单" onclick="confirm_one(${order.salesId!''})">
-                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe615;</i>
+                            <i class="Hui-iconfont">&#xe615;</i>
                         </a>
                         <a class="edit_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="修改订单" alt="修改订单" onclick="sales_order_update(${order.salesId!''})">
-                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe6df;</i>
+                            <i class="Hui-iconfont">&#xe6df;</i>
                         </a>
                         <a class="allocation_logistics_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="分配物流" onclick="distribution_express(${order.salesId!''})">
-                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe669;</i>
+                            <i class="Hui-iconfont">&#xe669;</i>
                         </a>
 
                         <a class="split_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="拆分订单" onclick="split_order(${order.salesId!''})">
-                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe6ea;</i>
+                            <i class="Hui-iconfont">&#xe6ea;</i>
                         </a>
 
                         <a class="notice_distribution_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="通知配货" onclick="chooseWarehouse(${order.salesId})">
-                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe62f;</i>
+                            <i class="Hui-iconfont">&#xe62f;</i>
                         </a>
                         <a class="manual_ship_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="手动发货" onclick="distribution_postFirm('手动发货','${path}/admin/await_send/to_manual_delivery?salesId=${order.salesId}','570','450');">
-                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe642;</i>
+                            <i class="Hui-iconfont">&#xe642;</i>
                         </a>
                         <a class="order_details_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="订单详情" alt="订单详情" onclick="sales_order_detail(${order.salesId!''})">
-                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe695;</i>
+                            <i class="Hui-iconfont">&#xe695;</i>
                         </a>
                         <a class="invalid_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="作废订单" onclick="invalidation_order(${order.salesId!''})">
-                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe631;</i>
+                            <i class="Hui-iconfont">&#xe631;</i>
                         </a>
                         <a class="del_order_target" style="text-decoration:none;display: none" href="javascript:void(0);" title="删除订单" onclick="delSalesOrder(${order.salesId!''})">
-                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe609;</i>
+                            <i class="Hui-iconfont">&#xe609;</i>
                         </a>
                         <a style="text-decoration:none" href="javascript:;" title="修改备注"
                            onclick="distribution_postFirm('修改备注','${path}/admin/salesOrder/to_update_order_remark?salesId=${order.salesId!''}','570','450');">
-                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe60c;</i>
+                            <i class="Hui-iconfont">&#xe60c;</i>
                         </a>
                         <a style="text-decoration:none" href="javascript:;" title="更正订单"
                            onclick="acorrect_order(${order.salesId!''});">
-                            <i class="Hui-iconfont" style="font-size: 20px;">&#xe6f7;</i>
+                            <i class="Hui-iconfont" >&#xe6f7;</i>
                         </a>
                         <#if order.procTypeId??>
                             <#if order.procTypeId != '3'>