客诉页面优化

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

@@ -200,6 +200,9 @@
       <if test="productColorId != null" >
         product_color_id = #{productColorId,jdbcType=INTEGER}
       </if>
+      <if test="detectDate != null" >
+        detect_date = #{detectDate}
+      </if>
     </set>
     <where>
       <if test="detectId != null and detectId != ''" >

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminDetectController.java

@@ -307,6 +307,11 @@ public class AdminDetectController {
         if(detectInfo.getDetectIsMaintenance() == 2){ //选择不需要转入时 detect_revolution_produced 统一改为待转入
             detectInfo.setDetectRevolutionProduced(1);
         }
+        String detectDate = request.getParameter("detect_date");
+        if(detectDate != null){
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+            detectInfo.setDetectDate(format.parse(detectDate));
+        }
         Integer num = complaintDetectInfoService.updateComplaintDetect(detectInfo);
         if (num < 1) {
             msg.setResultCode(500);
@@ -431,6 +436,11 @@ public class AdminDetectController {
             msg.setReturnCode(500);
             return msg;
         }
+        String detectDate = request.getParameter("detect_date");
+        if(detectDate != null){
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+            detectInfo.setDetectDate(format.parse(detectDate));
+        }
         Integer num = complaintDetectInfoService.updateComplaintDetectById(detectInfo);
         if (num < 1) {
             msg.setResultCode(500);

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

@@ -88,7 +88,12 @@
         <div class="input-box" style="margin-left: 17%;">
             <textarea rows="3" cols="20" name="detectAnalysis" id="detectAnalysis" class="my-textarea" placeholder="原因分析">${detectInfo.detectAnalysis!''}</textarea>
         </div>
-
+        <div class="input-box">
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">检测日期：</label>
+            <div class="formControls col-8 col-sm-8 text-c huanhang" style="margin-left: -4.5%;">
+                <input class="my-input-date" type="text" value="${detectInfo.detectDate!''}" name="detect_date" id="detectDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/>
+            </div>
+        </div>
         <div class="input-box">
             <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">是否转入生产：</label>
             <div class=" col-xs-8 col-sm-8 skin-minimal" style="margin: 10px 0px;">

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

@@ -65,7 +65,12 @@
         <div class="input-box" style="margin-left: 17%;">
             <textarea rows="3" cols="20" name="detectAnalysis" id="detectAnalysis"  class="my-textarea" placeholder="原因分析">${detectInfo.detectAnalysis!''}</textarea>
         </div>
-
+        <div class="input-box">
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">检测日期：</label>
+            <div class="formControls col-8 col-sm-8 text-c huanhang" style="margin-left: -4.5%;">
+                <input class="my-input-date" type="text" value="${detectInfo.detectDate!''}" name="detect_date" id="detectDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/>
+            </div>
+        </div>
         <div class="input-box">
             <label class="col-3 col-sm-3 huanhang" style="text-align: right;">QC检查状态：</label>
             <div class="col-xs-7 col-sm-7 skin-minimal">