页面样式修改

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

@@ -61,7 +61,7 @@
       cd.detect_date detectDate,
       cd.product_color_id productColorId,
       qd.describe_title questionTitle,
-      pt.type_name productTypeName,
+    pt.type_name productName,
       cd.maintenance_results maintenanceResults
     from tb_rst_complaint_detect cd
         LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
@@ -105,7 +105,6 @@
         AND pt.type_id = #{productTypeId,jdbcType=INTEGER}
       </if>
     </where>
-    ORDER BY cd.signclosed_create_time DESC
   </select>
   <insert id="insert" parameterType="ComplaintDetectInfo" >
     insert into tb_rst_complaint_detect (detect_id, customer_id,signclosed_id,product_id,
@@ -196,7 +195,7 @@
         detect_is_maintenance = #{detectIsMaintenance,jdbcType=TIMESTAMP},
       </if>
       <if test="maintenanceResults != null" >
-        maintenance_results = #{maintenanceResults,jdbcType=BIT}
+        maintenance_results = #{maintenanceResults,jdbcType=BIT},
       </if>
       <if test="productColorId != null" >
         product_color_id = #{productColorId,jdbcType=INTEGER}

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

@@ -74,10 +74,10 @@
         <div class="input-box">
             <span class="input-dic" style="margin-top: 0;margin-left: 0.5%;">QC检查状态：</span>
             <label for="radio-7">
-                <input type="radio" id="radio-9" name="maintenanceResults" value="1" checked/>通过
+                <input type="radio" id="radio-9" name="maintenanceResults" value="1" <#if detectInfo.maintenanceResults == 1>checked</#if>/>通过
             </label>
             <label for="radio-8" style="margin-left: 50px;">
-                <input type="radio" id="radio-10" name="maintenanceResults" value="2"/>不通过
+                <input type="radio" id="radio-10" name="maintenanceResults" value="2"<#if detectInfo.maintenanceResults == 2>checked</#if>/>不通过
             </label>
         </div>
         <div class="input-box">

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/complete_signclosed.ftl

@@ -81,7 +81,7 @@
                 <label class="form-label col-3 col-sm-3">寄回产品：</label>
                 <div class="formControls col-8 col-sm-8 text-c" id="produceSelect">
                     <div>
-                        <input type="text" oninput="selectProduct();" onpropertychange="selectProduct();" class="input-text" style="width: 717px;" id="selectProcuct" name="selectProcuct" placeholder="请输入产品名称搜索">
+                        <input type="text" oninput="selectProduct();" onpropertychange="selectProduct();" class="input-text" style="width: 100%;" id="selectProcuct" name="selectProcuct" placeholder="请输入产品名称搜索">
                     </div>
                     <table class="table table-border table-bg table-bordered">
                         <thead>