From 4f1d93d7cbddc8c774ce3a73a44c4d62f8713a9a Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Sat, 7 Sep 2024 10:33:26 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E7=9A=84=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E3=80=81=E6=96=B0=E5=A2=9E=E3=80=81=E4=BF=AE=E6=94=B9=E3=80=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E3=80=81=E5=B7=A5=E7=A8=8B=E7=BB=8F=E7=90=86?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E3=80=81=E5=B7=A5=E7=A8=8B=E4=B8=BB=E7=AE=A1?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=EF=BC=9A?=
 =?UTF-8?q?=E5=8D=8A=E6=88=90=E5=93=81=E7=B1=BB=E5=9E=8B->=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=A5=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/erp/material/add.html        | 2 +-
 .../src/main/resources/templates/erp/material/detail.html     | 2 +-
 .../src/main/resources/templates/erp/material/edit.html       | 2 +-
 .../src/main/resources/templates/erp/material/material.html   | 4 +---
 .../main/resources/templates/erp/material/taskGcjlVerify.html | 2 +-
 .../main/resources/templates/erp/material/taskGczgVerify.html | 2 +-
 .../resources/templates/erp/material/taskModifyApply.html     | 2 +-
 7 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/add.html b/ruoyi-admin/src/main/resources/templates/erp/material/add.html
index 882cc2f8..b7197463 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/add.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/add.html
@@ -32,7 +32,7 @@
                 <input type="text" id="materialType" name="materialType" hidden />
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">半成品类型：</label>
+                <label class="col-sm-3 control-label is-required">加工方式：</label>
                 <div class="col-sm-8">
                     <select  name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/detail.html b/ruoyi-admin/src/main/resources/templates/erp/material/detail.html
index 5bb3aab1..3e35a698 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/detail.html
@@ -36,7 +36,7 @@
                 <input type="text" readonly id="materialType" name="materialType" th:field="*{materialType}" hidden />
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">半成品类型：</label>
+                <label class="col-sm-3 control-label">加工方式：</label>
                 <div class="col-sm-8">
                     <select readonly name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option>
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/edit.html b/ruoyi-admin/src/main/resources/templates/erp/material/edit.html
index 5bbe1bab..700187c6 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/edit.html
@@ -33,7 +33,7 @@
                 <input type="text" id="materialType" name="materialType" th:field="*{materialType}" hidden />
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">半成品类型：</label>
+                <label class="col-sm-3 control-label is-required">加工方式：</label>
                 <div class="col-sm-8">
                     <select  name="processMethod" class="form-control m-b" th:field="*{processMethod}" th:with="type=${@dict.getType('processMethod')}" required>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option>
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/material.html b/ruoyi-admin/src/main/resources/templates/erp/material/material.html
index 630239ae..0234fb61 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/material.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/material.html
@@ -123,8 +123,6 @@
                 cancelUrl: prefix + "/cancel/{id}",
                 restoreUrl: prefix + "/restore/{id}",
                 detailUrl: prefix + "/detail/{id}",
-                pageList: [10, 25, 50],
-                pageSize: 10,
                 showColumns: true,
                 sortable: true,                                     // 是否启用排序
                 sortStable: true,
@@ -149,7 +147,7 @@
                     {title: '物料名称',field: 'materialName',},
                     {title: '描述',field: 'describe',},
                     {title: '品牌',field: 'brand',},
-                    {title: '半成品类型',field: 'processMethod',
+                    {title: '加工方式',field: 'processMethod',
                         formatter: function(value, row, index) {
                             return $.table.selectDictLabel(processMethodDatas, value);
                          }
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 1ba80b15..c85b75b6 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html
@@ -62,7 +62,7 @@
             <input type="text" id="materialType" name="materialType" th:field="*{materialType}" readonly hidden />
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label is-required">半成品类型：</label>
+            <label class="col-sm-3 control-label is-required">加工方式：</label>
             <div class="col-sm-8">
                 <select id="selectProcessMethod" name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required disabled>
                     <option value="">请选择</option>
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 11108ab1..a09b0b01 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html
@@ -62,7 +62,7 @@
             <input type="text" id="materialType" name="materialType" th:field="*{materialType}" readonly hidden />
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label is-required">半成品类型：</label>
+            <label class="col-sm-3 control-label is-required">加工方式：</label>
             <div class="col-sm-8">
                 <select id="selectProcessMethod" name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required disabled>
                     <option value="">请选择</option>
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 d58ff424..432d5400 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html
@@ -63,7 +63,7 @@
             <input type="text" id="materialType" name="materialType" th:field="*{materialType}" hidden />
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label is-required">半成品类型：</label>
+            <label class="col-sm-3 control-label is-required">加工方式：</label>
             <div class="col-sm-8">
                 <select id="selectProcessMethod" name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required>
                     <option value="">请选择</option>