打印机页面修改

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

@@ -146,7 +146,7 @@
         cs.signclosed_send_name = #{signclosedSendName}
       </if>
       <if test="signclosedSendTel != null and signclosedSendTel != ''" >
-        AND cs.signclosed_send_tel = #{signclosedSendTel}
+        AND cs.signclosed_send_tel like CONCAT('%',#{signclosedSendTel},'%')
       </if>
       <if test="signclosedLogisticsNumber != null and signclosedLogisticsNumber != ''" >
         AND cs.signclosed_logistics_number = #{signclosedLogisticsNumber}
@@ -167,6 +167,7 @@
         AND cs.signclosed_is_quality = #{signclosedIsQuality}
       </if>
     </where>
+    order by cs.signclosed_create_time DESC
   </select>
 
   <insert id="insert" parameterType="ComplaintSignclosedInfo" useGeneratedKeys="true" keyProperty="signclosedId" >

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

@@ -93,12 +93,12 @@
             </div>
         </div>
         <div class="input-box">
-            <span class="input-dic spanhidth">检测日期</span>
+            <span class="input-dic spanhidth">检测日期：</span>
             <input class="my-input-date" type="text" style="width: 76%;"  name="detect_date" id="detectDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/>
         </div>
 
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">检测结果</span>
+            <span class="input-dic" style="margin-top: 0">检测结果：</span>
             <label for="radio-3">
                 <input type="radio" id="radio-3" name="detectState" value="3" checked/>检测通过
             </label>
@@ -133,7 +133,7 @@
         </div>
 
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">是否维修</span>
+            <span class="input-dic" style="margin-top: 0">是否维修：</span>
             <label for="radio-5">
                 <input type="radio" id="radio-5" name="detectIsMaintenance" value="1" checked/>需要维修
             </label>
@@ -142,7 +142,7 @@
             </label>
         </div>
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">是否已转入</span>
+            <span class="input-dic" style="margin-top: 0">是否已转入：</span>
             <label for="radio-7">
                 <input type="radio" id="radio-7" name="detectRevolutionProduced" value="1" checked/>已转入维修
             </label>
@@ -152,10 +152,10 @@
         </div>
 
         <div class="input-box">
-            <span class="input-dic spanhidth">备注</span>
+            <span class="input-dic spanhidth">备注：</span>
             <textarea rows="3" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！"></textarea>
         </div>
-        <div>
+        <div style="margin-left: 35%;">
            <button type="button" class="my-btn-submit" onclick="add();">确认提交</button>
         </div>
     </form>

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

@@ -31,7 +31,7 @@
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">检测结果</span>
+            <span class="input-dic" style="margin-top: 0">检测结果：</span>
             <label for="radio-3">
                 <input type="radio" id="radio-3" name="detectState" value="3" checked/>检测通过
             </label>
@@ -66,7 +66,7 @@
         </div>
 
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">是否需要转入生产部门</span>
+            <span class="input-dic" style="margin-top: 0">是否需要转入生产部门：</span>
             <label for="radio-5">
                 <input type="radio" id="radio-5" name="detectIsMaintenance" onclick="show()" value="1" checked/>需要转入生产部门
             </label>
@@ -75,30 +75,30 @@
             </label>
         </div>
         <div class="input-box" id="revolutionProducedId">
-            <span class="input-dic" style="margin-top: 0">立即转入生产部门</span>
-            <label for="radio-7">
-                <input type="radio" id="radio-7" name="detectRevolutionProduced" value="2" checked/>立即转入
+            <span class="input-dic" style="margin-top: 0">立即转入生产部门：</span>
+            <label for="radio-7" style="margin-left: 4.5%;">
+                <input type="radio"  id="radio-7" name="detectRevolutionProduced" value="2" checked/>立即转入
             </label>
-            <label for="radio-8" style="margin-left: 50px;">
+            <label for="radio-8" style="margin-left: 20.2%;">
                 <input type="radio" id="radio-8" name="detectRevolutionProduced" value="1"/>以后转入
             </label>
         </div>
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">QC检查状态</span>
-            <label for="radio-7">
+            <span class="input-dic" style="margin-top: 0">QC检查状态：</span>
+            <label for="radio-7" style="margin-left: 10.3%;">
                 <input type="radio" id="radio-9" name="maintenanceResults" value="1" checked/>通过
             </label>
-            <label for="radio-8" style="margin-left: 50px;">
+            <label for="radio-8" style="margin-left: 25.5%;">
                 <input type="radio" id="radio-10" name="maintenanceResults" value="2"/>不通过
             </label>
         </div>
         <div class="input-box">
-            <span class="input-dic spanhidth">备注</span>
+            <span class="input-dic spanhidth">备注：</span>
             <textarea rows="3" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注内容，便于以后复查。如果转入生产，则生产部门同事可查看！">${detectInfo.detectDesc!''}</textarea>
         </div>
         <div>
             <input type="hidden" value="${detectId!''}" id="detectId" name="detectId">
-           <button type="button" class="my-btn-submit" onclick="add();">确认提交</button>
+           <button type="button" style="margin-left: 35%;" class="my-btn-submit" onclick="add();">确认提交</button>
         </div>
     </form>
 </article>