From 31fcce17ea3a97201dd245769c624708248787a8 Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Thu, 11 Jan 2024 18:23:47 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/classes/ClassesForm.vue       | 16 +++++++++++-----
 .../src/views/heli/composition/index.vue         |  2 +-
 .../src/views/heli/dept/DeptForm.vue             | 11 ++++++++---
 .../src/views/heli/material/MaterialForm.vue     |  3 ++-
 .../src/views/heli/mouldtype/index.vue           |  2 +-
 .../src/views/heli/workshop/WorkshopForm.vue     | 11 ++++++++---
 6 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue
index 69ffaf11..d4e4b24d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue
@@ -15,7 +15,7 @@
       </el-form-item>
       <el-form-item label="所属车间" prop="workshopId">
         <el-select v-model="formData.workshopId"
-                   placeholder="请输入负责人"
+                   placeholder="请输入所属车间"
                    :remote-method="remoteWorkshopSearch"
                    remote-show-suffix
                    remote
@@ -154,14 +154,20 @@ const open = async (type: string, id?: number) => {
       formData.value = await ClassesApi.getClasses(id)
     }
     // 获得用户列表
-    const data = await UserApi.getSimpleUserList()
-    userList.value = data;
-    userSelectList.value = data;
+    let userParams = {
+      pageNo: 1,
+      pageSize: 10,
+      status: "0"
+    }
+    const data = await UserApi.getUserPage(userParams);
+    userList.value = data.list;
+    userSelectList.value = data.list;
 
     // 获得车间列表
     let params = {
       pageNo: 1,
-      pageSize: 99
+      pageSize: 10,
+      status: "1"
     }
     const dataWorkshop = await WorkshopApi.getWorkshopPage(params)
     workshopList.value = dataWorkshop.list;
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/composition/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/composition/index.vue
index 6d851284..2a87680f 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/composition/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/composition/index.vue
@@ -150,7 +150,7 @@ const queryParams = reactive({
   name: undefined,
   code: undefined,
   description: undefined,
-  status: undefined,
+  status: 1,
   createTime: [],
   original: undefined,
   density: undefined,
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue
index 402bb930..6a523883 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue
@@ -140,9 +140,14 @@ const open = async (type: string, id?: number) => {
     }
   }
   // 获得用户列表
-  const data = await UserApi.getSimpleUserList()
-  userList.value = data;
-  userSelectList.value = data;
+  let userParams = {
+    pageNo: 1,
+    pageSize: 10,
+    status: "0"
+  }
+  const data = await UserApi.getUserPage(userParams)
+  userList.value = data.list;
+  userSelectList.value = data.list;
   // 获得部门树
   await getTree()
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue
index b590c1f1..04709cd5 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/material/MaterialForm.vue
@@ -185,7 +185,8 @@ const open = async (type: string, id?: number) => {
     }
     let params = {
       pageNo: 1,
-      pageSize: 99
+      pageSize: 10,
+      status: "1"
     };
     const supplierData = await getSupplierPage(params);
     supplierList.value = supplierData.list;
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/mouldtype/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/mouldtype/index.vue
index 5535102a..f51405b6 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/mouldtype/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/mouldtype/index.vue
@@ -126,7 +126,7 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   name: undefined,
-  status: undefined,
+  status: 1,
   createTime: [],
 })
 const queryFormRef = ref() // 搜索的表单
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/workshop/WorkshopForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/workshop/WorkshopForm.vue
index 46c2d8fd..4e578230 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/workshop/WorkshopForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/workshop/WorkshopForm.vue
@@ -125,9 +125,14 @@ const open = async (type: string, id?: number) => {
     // 加载部门树
     deptList.value = handleTree(await DeptApi.getSimpleDeptList())
     // 获得用户列表
-    const data = await UserApi.getSimpleUserList()
-    userList.value = data;
-    userSelectList.value = data;
+    let userParams = {
+      pageNo: 1,
+      pageSize: 10,
+      status: "0"
+    }
+    const data = await UserApi.getUserPage(userParams)
+    userList.value = data.list;
+    userSelectList.value = data.list;
   } finally {
     formLoading.value = false
   }