From b25ca7527048a52ec02ffed5194d6aad67a01580 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Fri, 5 Jul 2024 16:03:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/components/FormModel/index.vue           |  4 ++--
 sgzb-ui/src/components/TableModel/index.vue          | 12 +++++++++---
 .../completeParts/component/addCompleteTools.vue     |  5 ++++-
 .../completeTools/component/addCompleteTools.vue     |  5 ++++-
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/sgzb-ui/src/components/FormModel/index.vue b/sgzb-ui/src/components/FormModel/index.vue
index 24157ff5..b2fd1e0f 100644
--- a/sgzb-ui/src/components/FormModel/index.vue
+++ b/sgzb-ui/src/components/FormModel/index.vue
@@ -115,12 +115,12 @@ export default {
     methods: {
         /* 查询按钮 */
         handleQuery() {
-            this.$emit('queryList', this.queryParams)
+            this.$emit('queryList', this.queryParams, 1)
         },
         /* 重置按钮 */
         resetQuery() {
             this.$refs.queryForm.resetFields()
-            this.$emit('queryList', this.queryParams, 'reset')
+            this.$emit('queryList', this.queryParams, 2)
         },
         /* 级联选择框的change事件 */
         casCadeChange(name, val) {
diff --git a/sgzb-ui/src/components/TableModel/index.vue b/sgzb-ui/src/components/TableModel/index.vue
index 5172a445..cc7d5aef 100644
--- a/sgzb-ui/src/components/TableModel/index.vue
+++ b/sgzb-ui/src/components/TableModel/index.vue
@@ -181,11 +181,17 @@ export default {
     },
     methods: {
         /* form 查询组件触发的自定义事件 */
-        async queryList(val, reset) {
-            if (reset) {
+        async queryList(val, type) {
+            //  type 1、查询 2、重置
+            if (type === 2) {
+                this.pageParams.pageNum = 1
                 this.pageParams.pageSize = 10
             }
-            this.pageParams.pageNum = 1
+
+            if (type === 1) {
+                this.pageParams.pageNum = 1
+            }
+
             this.pageParams = Object.assign(
                 val,
                 this.pageParams,
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue b/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue
index 11595c7e..9e16dd8e 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue
@@ -15,7 +15,6 @@
                     placeholder="请输入成套名称"
                     :disabled="isEdit"
                     v-model="addCompleteForm.completeSetName"
-                    maxlength="20"
                 />
             </el-form-item>
             <el-form-item
@@ -126,6 +125,10 @@ export default {
                         trigger: 'blur',
                         message: '请输入成套名称',
                     },
+                    {
+                        max: 40,
+                        message: '长度不能超过40个字符',
+                    },
                 ],
                 // mainDevice: [
                 //     {
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue b/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue
index 5aef0017..6ad2fee0 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue
@@ -15,7 +15,6 @@
                     placeholder="请输入成套名称"
                     :disabled="isEdit"
                     v-model="addCompleteForm.completeSetName"
-                    maxlength="20"
                 />
             </el-form-item>
             <el-form-item
@@ -126,6 +125,10 @@ export default {
                         trigger: 'blur',
                         message: '请输入成套名称',
                     },
+                    {
+                        max: 40,
+                        message: '长度不能超过40个字符',
+                    },
                 ],
                 // mainDevice: [
                 //     {