From f0267aad8cd6f1c6cf11f8a94de9d4fcb5199212 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Fri, 5 Jul 2024 19:45:02 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E7=89=A9=E6=96=99=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=85=E9=99=A4=E4=BF=AE=E6=94=B9=E5=AE=9E?=
 =?UTF-8?q?=E4=BE=8BformData,=E7=89=A9=E6=96=99select.html=20=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E9=83=A8=E9=97=A8=E6=94=B9=E4=B8=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/erp/material/select.html        | 73 ++++++-------------
 .../erp/material/taskGcjlVerify.html          |  7 +-
 .../erp/material/taskGczgVerify.html          |  5 --
 .../erp/material/taskModifyApply.html         |  4 -
 .../erp/material/taskYfzjVerify.html          |  4 -
 5 files changed, 22 insertions(+), 71 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/select.html b/ruoyi-admin/src/main/resources/templates/erp/material/select.html
index af414705..88592cbd 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/select.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/select.html
@@ -54,59 +54,28 @@
                 singleSelect: true, // 单选
                 url: prefix + "/list",
                 modalName: "物料信息",
-                columns: [{
-                    checkbox: true
-                },
-                {
-                    field: 'id',
-                    title: '主键ID',
-                    visible: false
-                },
-                {
-                    field: 'materialNo',
-                    title: '料号'
-                },
-                {
-                    title: '图片',
-                    field:'photoUrl',
-                    formatter: function(value, row, index) {
-                        return $.table.imageView(value);
+                columns: [
+                    {checkbox: true},
+                    {title: '主键ID',field: 'id',visible: false},
+                    {title: '料号',field: 'materialNo',},
+                    {title: '图片',field:'photoUrl',
+                        formatter: function(value, row, index) {return $.table.imageView(value);}
+                    },
+                    {title: '物料名称',field: 'materialName',},
+                    {title: '物料类型',field: 'materialType',
+                        formatter: function(value, row, index) {return $.table.selectCategoryLabel(materialTypeDatas, value);}
+                    },
+                    {title: '品牌', field: 'brand',},
+                    {title: '单位',field: 'unit',formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}},
+                    {title: '描述',field: 'describe',},
+                    {title: '入库部门',field:'warehouseDept', formatter:function(value, row, index){
+                           return $.table.selectDictLabel(warehouseDeptDatas, value);
+                        }
+                    },
+                    {title: '加工方法',field: 'processMethod',formatter: function(value, row, index) {
+                           return $.table.selectDictLabel(processMethodDatas, value);
+                        }
                     }
-                },
-                {
-                    field: 'materialName',
-                    title: '物料名称'
-                },
-                {
-                    field: 'materialType',
-                    title: '物料类型',
-                    formatter: function(value, row, index) {
-                        return $.table.selectCategoryLabel(materialTypeDatas, value);
-                    }
-                },
-                {
-                    field: 'brand',
-                    title: '品牌'
-                },
-                {
-                    field: 'unit',
-                    title: '单位',
-                    formatter: function(value, row, index) {
-                        return $.table.selectDictLabel(sysUnitClassDatas, value);
-                    }
-                },
-                {
-                    field: 'describe',
-                    title: '描述'
-                },
-                    {field:'warehouseDept', title: '仓库部门',},
-                {
-                    field: 'processMethod',
-                    title: '加工方法',
-                    formatter: function(value, row, index) {
-                       return $.table.selectDictLabel(processMethodDatas, value);
-                    }
-                }
                 ]
             };
             $.table.init(options);
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html
index 60c584c7..1ba80b15 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html
@@ -149,7 +149,6 @@
 <script th:src="@{/ajax/libs/vue/vue.js}"></script>
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
 <script type="text/javascript">
-    var erpMaterial = [[${formData}]];
     new Vue({
         el: '#app',
         data: function() {
@@ -254,15 +253,11 @@
             },
         }
     });
-
     var prefix = ctx + "erp/material";
     $("#form-gcjl-edit").validate({focusCleanup: true});
     function submitHandler() {
         if ($.validate.form()) {
-            $("#selectMaterialType").removeAttr("disabled");
-            $("#selectProcessMethod").removeAttr("disabled");
-            $("#selectUnit").removeAttr("disabled");
-            $("#selectWarehouseDept").removeAttr("disabled");
+
             var materialType = $('#selectMaterialType').select2('val');
             $('#materialType').val(materialType);
             if ($('textarea[name="comment"]').val()) {
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html
index 47fd80a9..11108ab1 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html
@@ -253,15 +253,10 @@
             },
         }
     });
-    var erpMaterial = [[${formData}]];
     var prefix = ctx + "erp/material";
     $("#form-edit").validate({focusCleanup: true});
     function submitHandler() {
         if ($.validate.form()) {
-            $("#selectMaterialType").removeAttr("disabled");
-            $("#selectProcessMethod").removeAttr("disabled");
-            $("#selectUnit").removeAttr("disabled");
-            $("#selectWarehouseDept").removeAttr("disabled");
             var materialType = $('#selectMaterialType').select2('val');
             $('#materialType').val(materialType);
             if ($('textarea[name="comment"]').val()) {
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html
index d659c9d5..4ffcb404 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html
@@ -268,10 +268,6 @@
     });
     function submitHandler() {
         if ($.validate.form()) {
-            $("#selectMaterialType").removeAttr("disabled");
-            $("#selectProcessMethod").removeAttr("disabled");
-            $("#selectUnit").removeAttr("disabled");
-            $("#selectWarehouseDept").removeAttr("disabled");
             var materialType = $('#selectMaterialType').select2('val');
             $('#materialType').val(materialType);
             var taskId = [[${taskId}]];
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html
index df58b3a0..e0be1cee 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html
@@ -258,10 +258,6 @@
     $("#form-edit").validate({focusCleanup: true});
     function submitHandler() {
         if ($.validate.form()) {
-            $("#selectMaterialType").removeAttr("disabled");
-            $("#selectProcessMethod").removeAttr("disabled");
-            $("#selectUnit").removeAttr("disabled");
-            $("#selectWarehouseDept").removeAttr("disabled");
             var materialType = $('#selectMaterialType').select2('val');
             $('#materialType').val(materialType);
             if ($('textarea[name="comment"]').val()) {