From eba10b7cb7f7165022132220c2dd739e96f9eac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Sun, 24 Sep 2023 23:23:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/project/projectChecking/index.vue     | 13 +++++++++++--
 .../projectChecking/projectCheckingDrawer.vue       | 13 +++++++++++--
 ruoyi-ui/src/views/project/projectMeasure/index.vue | 13 +++++++++++--
 .../project/projectMeasure/projectMeasureDrawer.vue | 13 +++++++++++--
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/views/project/projectChecking/index.vue b/ruoyi-ui/src/views/project/projectChecking/index.vue
index 83f45b6d..68b78962 100644
--- a/ruoyi-ui/src/views/project/projectChecking/index.vue
+++ b/ruoyi-ui/src/views/project/projectChecking/index.vue
@@ -335,7 +335,7 @@
             @change="selectQualityUser"
           >
             <el-option-group
-              v-for="group in deptUserData"
+              v-for="group in deptUserData2"
               :key="group.unitId + ''"
               :label="group.unitName + ' [' + group.unitTypeName + '] '"
             >
@@ -511,6 +511,7 @@ export default {
         checkResult: [{ required: false, message: "请选择验收结果", trigger: "blur" }],
       },
       deptUserData: [],
+      deptUserData2:[],
       previewList: [],
     };
   },
@@ -632,6 +633,14 @@ export default {
         .then((d) => {
           this.deptUserData = d.data;
         });
+      this.$api.publics
+        .selectProjectUnitUser({
+          unitType: "2",
+          projectId: row.projectId,
+        })
+        .then((d) => {
+          this.deptUserData2 = d.data;
+        });  
     },
     /** 提交按钮 */
     submitForm() {
@@ -680,7 +689,7 @@ export default {
     },
     /** 选择质量专员*/
     selectQualityUser(val) {
-      this.deptUserData.forEach((item) => {
+      this.deptUserData2.forEach((item) => {
         item.userinfoList.forEach((u) => {
           if (u.phonenumber == val) {
             this.form.qualityUserName = u.nickName + " [" + u.jobTypeName + "] ";
diff --git a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue
index bd761722..6021e935 100644
--- a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue
@@ -239,7 +239,7 @@
               @change="selectQualityUser"
             >
               <el-option-group
-                v-for="group in deptUserData"
+                v-for="group in deptUserData2"
                 :key="group.unitId + ''"
                 :label="group.unitName + ' [' + group.unitTypeName + '] '"
               >
@@ -397,6 +397,7 @@ export default {
         ywc: "已完成（0）",
       },
       deptUserData: [],
+      deptUserData2:[],
       previewList: [],
     };
   },
@@ -450,6 +451,14 @@ export default {
         .then((d) => {
           this.deptUserData = d.data;
         });
+      this.$api.publics
+        .selectProjectUnitUser({
+          unitType: "2",
+          projectId: project.id,
+        })
+        .then((d) => {
+          this.deptUserData2 = d.data;
+        });
     },
     // 页签点击
     getList() {
@@ -597,7 +606,7 @@ export default {
     },
     /** 选择质量专员*/
     selectQualityUser(val) {
-      this.deptUserData.forEach((item) => {
+      this.deptUserData2.forEach((item) => {
         item.userinfoList.forEach((u) => {
           if (u.phonenumber == val) {
             this.form.qualityUserName = u.nickName + " [" + u.jobTypeName + "] ";
diff --git a/ruoyi-ui/src/views/project/projectMeasure/index.vue b/ruoyi-ui/src/views/project/projectMeasure/index.vue
index aa01248c..2c2a1a94 100644
--- a/ruoyi-ui/src/views/project/projectMeasure/index.vue
+++ b/ruoyi-ui/src/views/project/projectMeasure/index.vue
@@ -413,7 +413,7 @@
             @change="selectQualityUser"
           >
             <el-option-group
-              v-for="group in deptUserData"
+              v-for="group in deptUserData2"
               :key="group.unitId + ''"
               :label="group.unitName + ' [' + group.unitTypeName + '] '"
             >
@@ -585,6 +585,7 @@ export default {
         measureFiles: [{ required: false, message: "请上传测量附件", trigger: "blur" }],
       },
       deptUserData: [],
+      deptUserData2:[],
       previewList: [],
     };
   },
@@ -715,6 +716,14 @@ export default {
         .then((d) => {
           this.deptUserData = d.data;
         });
+      this.$api.publics
+        .selectProjectUnitUser({
+          unitType: "2",
+          projectId: row.projectId,
+        })
+        .then((d) => {
+          this.deptUserData2 = d.data;
+        });
     },
     /** 提交按钮 */
     submitForm() {
@@ -763,7 +772,7 @@ export default {
     },
     /** 选择质量专员*/
     selectQualityUser(val) {
-      this.deptUserData.forEach((item) => {
+      this.deptUserData2.forEach((item) => {
         item.userinfoList.forEach((u) => {
           if (u.phonenumber == val) {
             this.form.qualityUserName = u.nickName + " [" + u.jobTypeName + "] ";
diff --git a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
index 537a1e0c..9388e6dc 100644
--- a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
@@ -282,7 +282,7 @@
               @change="selectQualityUser"
             >
               <el-option-group
-                v-for="group in deptUserData"
+                v-for="group in deptUserData2"
                 :key="group.unitId + ''"
                 :label="group.unitName + ' [' + group.unitTypeName + '] '"
               >
@@ -437,6 +437,7 @@ export default {
         ywc: "已完成（0）",
       },
       deptUserData: [],
+      deptUserData2:[],
       previewList: [],
     };
   },
@@ -501,6 +502,14 @@ export default {
         .then((d) => {
           this.deptUserData = d.data;
         });
+      this.$api.publics
+        .selectProjectUnitUser({
+          unitType: "2",
+          projectId: project.id,
+        })
+        .then((d) => {
+          this.deptUserData2 = d.data;
+        });
     },
     // 页签点击
     getList() {
@@ -648,7 +657,7 @@ export default {
     },
     /** 选择质量专员*/
     selectQualityUser(val) {
-      this.deptUserData.forEach((item) => {
+      this.deptUserData2.forEach((item) => {
         item.userinfoList.forEach((u) => {
           if (u.phonenumber == val) {
             this.form.qualityUserName = u.nickName + " [" + u.jobTypeName + "] ";