From a7e3157fcc3aa28e6de1d5d37cd6eb2413505522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Sat, 23 Nov 2024 10:42:23 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=8D=95=20=E4=BF=AE=E6=94=B9=E6=9D=A5?=
 =?UTF-8?q?=E6=96=99=E5=93=81=E8=B4=A8=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A0=8F=E5=AD=97=E6=AE=B5=EF=BC=9B=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=93=81=E8=B4=A8=E6=8A=A5=E5=91=8A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=8C=E9=9A=90=E8=97=8F=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E7=8A=B6=E6=80=81=EF=BC=9B=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=9D=A5=E6=96=99=E5=BC=80=E5=A7=8B=E5=93=81=E8=B4=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=8F=90=E4=BA=A4=E5=87=BD=E6=95=B0=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality/iqcQualityOrder/iqcQualityOrder.html     | 12 ++++++------
 .../qualityOrder/makeOtherStartingQuality.html       |  2 +-
 .../quality/qualityOrder/startingQuality.html        |  6 ++++--
 .../quality/qualityReport/qualityReport.html         |  1 +
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/quality/iqcQualityOrder/iqcQualityOrder.html b/ruoyi-admin/src/main/resources/templates/quality/iqcQualityOrder/iqcQualityOrder.html
index 5a2c727f..60829957 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/iqcQualityOrder/iqcQualityOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/iqcQualityOrder/iqcQualityOrder.html
@@ -18,13 +18,17 @@
                             <label>品质单号：</label>
                             <input type="text" name="qualityOrderCode"/>
                         </li>
+                        <li>
+                            <label>入库单号：</label>
+                            <input type="text" name="inStorageCode"/>
+                        </li>
                         <li>
                             <label>料号：</label>
                             <input type="text" name="materialNo"/>
                         </li>
                         <li>
-                            <label>入库单号：</label>
-                            <input type="text" name="inStorageCode"/>
+                            <label>物料名称：</label>
+                            <input type="text" name="materialName"/>
                         </li>
                         <li>
                             <label>品质单订单类型：</label>
@@ -33,10 +37,6 @@
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </li>
-                        <li>
-                            <label>物料名称：</label>
-                            <input type="text" name="materialName"/>
-                        </li>
                         <li>
                             <label>品质单入库类型：</label>
                             <select name="qualityStorageStatus" th:with="type=${@dict.getType('quality_storage_status')}">
diff --git a/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeOtherStartingQuality.html b/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeOtherStartingQuality.html
index 3b34b351..50fa025f 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeOtherStartingQuality.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeOtherStartingQuality.html
@@ -503,7 +503,7 @@
         qualityReport.qualityOrderReportType = "1";//生产其他品质
         qualityReport.unqualifiedDataList = unqualifyList;
         // console.log(qualityReport);
-        $.operate.saveJson(reportPrefix + "/ad", JSON.stringify(qualityReport));
+        $.operate.saveJson(reportPrefix + "/add", JSON.stringify(qualityReport));
     }
 
 </script>
diff --git a/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/startingQuality.html b/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/startingQuality.html
index 390fa6de..732d7012 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/startingQuality.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/qualityOrder/startingQuality.html
@@ -3,6 +3,7 @@
 <head>
     <th:block th:include="include :: header('开始品质')" />
     <th:block th:include="include :: datetimepicker-css" />
+    <th:block th:include="include :: bootstrap-editable-css" />
     <style>
         .supplier-value {
             display: flex;
@@ -62,7 +63,7 @@
             <label class="col-sm-4 control-label">交付质检时间：</label>
             <div class="col-sm-8">
                 <div class="input-group date">
-                    <input readonly name="deliveryInspectionTime" th:value="${#dates.format(qualityOrderDetail.deliveryInspectionTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    <input disabled readonly name="deliveryInspectionTime" th:value="${#dates.format(qualityOrderDetail.deliveryInspectionTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                 </div>
             </div>
@@ -546,7 +547,8 @@
         qualityReport.qualityOrderReportType = "1";//生产其他品质
         qualityReport.unqualifiedDataList = unqualifyList;
         console.log(qualityReport);
-        $.operate.saveJson(reportPrefix + "/add", JSON.stringify(qualityReport));
+        // $.operate.saveJson(reportPrefix + "/add", JSON.stringify(qualityReport));
+        return;
     }
 </script>
 </body>
diff --git a/ruoyi-admin/src/main/resources/templates/quality/qualityReport/qualityReport.html b/ruoyi-admin/src/main/resources/templates/quality/qualityReport/qualityReport.html
index d3b8a5bd..e126db4d 100644
--- a/ruoyi-admin/src/main/resources/templates/quality/qualityReport/qualityReport.html
+++ b/ruoyi-admin/src/main/resources/templates/quality/qualityReport/qualityReport.html
@@ -170,6 +170,7 @@
                         title: '审批状态',
                         align: 'center',
                         field: 'auditStatus',
+                        visible: false,
                         formatter: function(value, row, index) {
                             return $.table.selectDictLabel(auditStatusDatas, value);
                         }