[feat] 物料审核修改清除修改实例formData,物料select.html 仓库部门改为入库部门。

ruoyi-admin/src/main/resources/templates/erp/material/select.html

@@ -54,59 +54,28 @@
                 singleSelect: true, // 单选
                 url: prefix + "/list",
                 modalName: "物料信息",
-                columns: [{
+                columns: [
-                    checkbox: true
+                    {checkbox: true},
-                },
+                    {title: '主键ID',field: 'id',visible: false},
-                {
+                    {title: '料号',field: 'materialNo',},
-                    field: 'id',
+                    {title: '图片',field:'photoUrl',
-                    title: '主键ID',
+                        formatter: function(value, row, index) {return $.table.imageView(value);}
-                    visible: false
+                    },
-                },
+                    {title: '物料名称',field: 'materialName',},
-                {
+                    {title: '物料类型',field: 'materialType',
-                    field: 'materialNo',
+                        formatter: function(value, row, index) {return $.table.selectCategoryLabel(materialTypeDatas, value);}
-                    title: '料号'
+                    },
-                },
+                    {title: '品牌', field: 'brand',},
-                {
+                    {title: '单位',field: 'unit',formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}},
-                    title: '图片',
+                    {title: '描述',field: 'describe',},
-                    field:'photoUrl',
+                    {title: '入库部门',field:'warehouseDept', formatter:function(value, row, index){
-                    formatter: function(value, row, index) {
+                           return $.table.selectDictLabel(warehouseDeptDatas, value);
-                        return $.table.imageView(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);

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()) {

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()) {

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}]];

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()) {