From c2e0e15d3f7ba4ae96ae9459938e554dd42510ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Wed, 18 Sep 2024 08:33:39 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=A7=94=E5=A4=96=E5=8A=A0=E5=B7=A5=20?=
 =?UTF-8?q?=E5=A7=94=E5=A4=96=E8=AE=A1=E5=88=92=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=A7=94=E5=A4=96=E8=AE=A1=E5=88=92=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=A7=94=E5=A4=96?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/outsource_plan/detail.html         | 67 ++++---------------
 .../system/outsource_plan/outsource_plan.html | 14 +++-
 2 files changed, 24 insertions(+), 57 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_plan/detail.html b/ruoyi-admin/src/main/resources/templates/system/outsource_plan/detail.html
index 557c0997..233a610c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/outsource_plan/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/outsource_plan/detail.html
@@ -80,6 +80,8 @@
     $("#form-outsource_plan-edit").validate({
         focusCleanup: true
     });
+    var processMethodDatas = [[${@dict.getType('processMethod')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
 
     $(function() {
         var options = {
@@ -90,45 +92,25 @@
             showToggle: false,
             showColumns: false,
             sidePagination: "client",
-            columns: [{
-                checkbox: true
-            },
-                {
-                    field: 'index',
-                    align: 'center',
-                    title: "序号",
-                    formatter: function (value, row, index) {
-                        var columnIndex = $.common.sprintf("<input type='hidden' name='index' value='%s'>", $.table.serialNumber(index));
-                        return columnIndex + $.table.serialNumber(index);
-                    }
-                },
+            columns: [
                 {
                     field: 'materialNo',
                     align: 'center',
                     title: '料号',
-                    formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].materialNo' value='%s'>", index, value);
-                        return html;
-                    }
                 },
 
                 {
                     field: 'materialName',
                     align: 'center',
                     title: '物料名称',
-                    formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].materialName' value='%s'>", index, value);
-                        return html;
-                    }
                 },
 
                 {
                     field: 'materialType',
                     align: 'center',
                     title: '物料类型',
-                    formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].materialType' value='%s'>", index, value);
-                        return html;
+                    formatter: function (value, row, index) {
+                        return $.table.selectCategoryLabel(materialTypeDatas, value);
                     }
                 },
 
@@ -136,39 +118,28 @@
                     field: 'materialPhotourl',
                     align: 'center',
                     title: '物料图片',
-                    formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].materialPhotourl' value='%s'>", index, value);
-                        return html;
-                    }
                 },
 
                 {
                     field: 'description',
                     align: 'center',
                     title: '描述',
-                    formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].description' value='%s'>", index, value);
-                        return html;
-                    }
+
                 },
 
                 {
                     field: 'brand',
                     align: 'center',
                     title: '品牌',
-                    formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].brand' value='%s'>", index, value);
-                        return html;
-                    }
+
                 },
 
                 {
                     field: 'processMethod',
                     align: 'center',
                     title: '加工方式',
-                    formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].processMethod' value='%s'>", index, value);
-                        return html;
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(processMethodDatas, value);
                     }
                 },
 
@@ -176,40 +147,28 @@
                     field: 'unit',
                     align: 'center',
                     title: '单位',
-                    formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].unit' value='%s'>", index, value);
-                        return html;
-                    }
+
                 },
 
                 {
                     field: 'plannedOutsourceAmount',
                     align: 'center',
                     title: '计划委外数',
-                    formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].plannedOutsourceAmount' value='%s'>", index, value);
-                        return html;
-                    }
+
                 },
 
                 {
                     field: 'outsourceProcessType',
                     align: 'center',
                     title: '委外工序种类',
-                    formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].outsourceProcessType' value='%s'>", index, value);
-                        return html;
-                    }
+
                 },
 
                 {
                     field: 'outsourceProcessAmount',
                     align: 'center',
                     title: '委外工序合计',
-                    formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='outsourcePlanDetailList[%s].outsourceProcessAmount' value='%s'>", index, value);
-                        return html;
-                    }
+
                 },]
         };
         $.table.init(options);
diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html b/ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html
index 91724ddd..bb01fe96 100644
--- a/ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html
+++ b/ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html
@@ -24,7 +24,7 @@
                             </li>
                             <li>
                                 <label>审核状态：</label>
-                                <select name="auditStatus" th:with="type=${@dict.getType('sys_yes_no')}">
+                                <select name="auditStatus" th:with="type=${@dict.getType('auditStatus')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
@@ -59,6 +59,8 @@
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
         var detailFlag = [[${@permission.hasPermi('system:outsource_plan:detail')}]];
+        var processMethodDatas = [[${@dict.getType('processMethod')}]];
+        var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
 
         var prefix = ctx + "system/outsource_plan";
 
@@ -172,7 +174,10 @@
                     },
                     {
                         field : 'materialType',
-                        title : '物料类型'
+                        title : '物料类型',
+                        formatter: function (value, row, index) {
+                            return $.table.selectCategoryLabel(materialTypeDatas, value);
+                        }
                     },
                     {
                         field : 'description',
@@ -184,7 +189,10 @@
                     },
                     {
                         field : 'processMethod',
-                        title : '加工方式'
+                        title : '加工方式',
+                        formatter: function (value, row, index) {
+                            return $.table.selectDictLabel(processMethodDatas, value);
+                        }
                     },
                     {
                         field : 'unit',