From 6ca25ecc7cc615fa8e352be08c8efdc4b7ed0ae4 Mon Sep 17 00:00:00 2001
From: newPeter7 <aqdxeducation7@163.com>
Date: Fri, 26 May 2023 11:05:12 +0800
Subject: [PATCH] peter

---
 .../seeDoctor/ok-lens-rgp/left-right-eye.vue  |  3 -
 .../subjectMgt/doctor/index.vue               | 93 ++++++++++---------
 .../scientificManagement/sys/project.vue      |  8 +-
 3 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/left-right-eye.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/left-right-eye.vue
index 6e6d1d8..73d2d30 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/left-right-eye.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/left-right-eye.vue
@@ -153,7 +153,6 @@ export default {
     }
   },
   created() {
-
   },
   methods: {
     // 获取可以换片的定片记录
@@ -194,7 +193,6 @@ export default {
     },
     // 选择颜色变化
     selectOptionColorHandle(item) {
-      console.log(item)
       this.dataForm.colour = item.colour
     },
     // 获取颜色
@@ -205,7 +203,6 @@ export default {
         }
       })
       this.brandCOlorList = res.data
-      console.log(res.data)
       if (title !== '编辑') {
         this.dataForm.colourId = this.dataForm.eyeType === 'OD' ? res.data.odDefault.id : res.data.osDefault.id
       }
diff --git a/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/doctor/index.vue b/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/doctor/index.vue
index 5178ce0..7b0fc18 100644
--- a/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/doctor/index.vue
+++ b/src/page-subspecialty/views/modules/scientificManagement/subjectMgt/doctor/index.vue
@@ -15,7 +15,6 @@
           </el-button>
         </el-form-item>
       </el-form>
-
       <el-table :data="doctorList">
         <el-table-column prop="userName" label="用户名" header-align="center" align="center" />
         <el-table-column prop="realName" label="真实姓名" header-align="center" align="center" />
@@ -33,23 +32,23 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="status" label="状态" header-align="center" align="center">
-          <template slot-scope="scope">
-            <span
-              :class="scope.row.status=='1' ? 'state-circle state-circle-green' :'state-circle state-circle-red'"
-            />
-            <span>{{ scope.row.status == '1' ? '正常':'停用' }}</span>
-          </template>
-        </el-table-column>
+<!--        <el-table-column prop="status" label="状态" header-align="center" align="center">-->
+<!--          <template slot-scope="scope">-->
+<!--            <span-->
+<!--              :class="scope.row.status=='1' ? 'state-circle state-circle-green' :'state-circle state-circle-red'"-->
+<!--            />-->
+<!--            <span>{{ scope.row.status == '1' ? '正常':'停用' }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column prop="operation" label="操作" header-align="center" align="center">
           <template slot-scope="scope">
             <span v-if="opPermission(scope.row)">
-              <el-dropdown trigger="click" @command="handleRoleCommand(scope.row,$event)">
-                <span class="el-dropdown-link" style="padding-right:8px;cursor: pointer;">更改角色</span>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item v-for="item in roleList" :key="item.roleId" :command="item.id">{{ item.name }}</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
+<!--              <el-dropdown trigger="click" @command="handleRoleCommand(scope.row,$event)">-->
+<!--                <span class="el-dropdown-link" style="padding-right:8px;cursor: pointer;">更改角色</span>-->
+<!--                <el-dropdown-menu slot="dropdown">-->
+<!--                  <el-dropdown-item v-for="item in roleList" :key="item.roleId" :command="item.id">{{ item.name }}</el-dropdown-item>-->
+<!--                </el-dropdown-menu>-->
+<!--              </el-dropdown>-->
               <span
                 style="color:#FF4D4F"
                 class="operation-delete"
@@ -75,7 +74,7 @@
           :render-content="renderFunc"
           :format="{noChecked: '${total}',hasChecked: '${checked}/${total}'}"
           :titles="['未加入', '已加入课题']"
-          :props="{key: 'userId', label: 'realName'}"
+          :props="{key: 'doctorId', label: 'doctorName'}"
           :data="AllJoinedPeopleList"
           @change="handleChange"
         />
@@ -107,7 +106,7 @@ export default {
       inputSearchValue: '',
       transferData: generateData(),
       renderFunc(h, option) {
-        return <span>{option.realName}</span>
+        return <span>{option.doctorName}</span>
       },
       dialogFormVisible: false,
       projectId: '',
@@ -125,7 +124,8 @@ export default {
     }
   },
   created() {
-    this.projectId = window.SITE_CONFIG['projectId']
+    // this.projectId = window.SITE_CONFIG['projectId']
+    this.projectId = this.$route.query.projectId
     this.getDoctorList()
     this.getProjectUser()
     this.getRoleList()
@@ -144,32 +144,39 @@ export default {
     assignPeopleClick() {
       this.dialogFormVisible = true
     },
-    // 获取人员列表
-    getProjectUser() {
-      this.$http.get(`/projectUser/getUserList/${this.projectId}`)
-        .then(({ data: res }) => {
-          this.JoinedPeopleList = res.data.joinedList
-          this.notJoinedPeopleList = res.data.notJoined
-          // 已加入
-          if (res.data.joinedList.length > 0) {
-            res.data.joinedList.forEach(item => {
-              this.rightValue.push(item.userId)
-              if (item.isAdmin === 1) {
-                item.disabled = true
-              }
-            })
-          }
-          // 未加入
-          if (res.data.notJoined.length > 0) {
-            res.data.notJoined.forEach(item => {
-              if (item.isAdmin === 1) {
-                item.disabled = true
-              }
-            })
-          }
-          this.AllJoinedPeopleList = [...res.data.joinedList, ...res.data.notJoined]
-        })
+    // 获取医生列表
+    async getProjectUser() {
+      const { data: res } = await this.$http.get('/dp/getDoctorList')
+      if (res.code === 0) {
+        this.AllJoinedPeopleList = res.data
+      }
     },
+    // 获取人员列表
+    // getProjectUser() {
+    //   this.$http.get(`/projectUser/getUserList/${this.projectId}`)
+    //     .then(({ data: res }) => {
+    //       this.JoinedPeopleList = res.data.joinedList
+    //       this.notJoinedPeopleList = res.data.notJoined
+    //       // 已加入
+    //       if (res.data.joinedList.length > 0) {
+    //         res.data.joinedList.forEach(item => {
+    //           this.rightValue.push(item.userId)
+    //           if (item.isAdmin === 1) {
+    //             item.disabled = true
+    //           }
+    //         })
+    //       }
+    //       // 未加入
+    //       if (res.data.notJoined.length > 0) {
+    //         res.data.notJoined.forEach(item => {
+    //           if (item.isAdmin === 1) {
+    //             item.disabled = true
+    //           }
+    //         })
+    //       }
+    //       this.AllJoinedPeopleList = [...res.data.joinedList, ...res.data.notJoined]
+    //     })
+    // },
     // 分配人员变化时
     handleChange(value) {
       this.joinedListUserId = value
diff --git a/src/page-subspecialty/views/modules/scientificManagement/sys/project.vue b/src/page-subspecialty/views/modules/scientificManagement/sys/project.vue
index 6851122..1e83803 100644
--- a/src/page-subspecialty/views/modules/scientificManagement/sys/project.vue
+++ b/src/page-subspecialty/views/modules/scientificManagement/sys/project.vue
@@ -288,8 +288,8 @@ export default {
   data() {
     return {
       mixinViewModuleOptions: {
-        // getDataListURL: '/project/approvalPage',
-        getDataListURL: '/project/page',
+        getDataListURL: '/project/approvalPage',
+        // getDataListURL: '/project/page',
         getDataListIsPage: true,
         deleteURL: '/project',
         deleteIsBatch: false
@@ -319,7 +319,9 @@ export default {
       //   name: 'subject'
       // })
       // window.open(href, '_blank')
-      // this.$router.push('subjectMgt')
+      this.$router.push({ path: 'subjectMgt', query: {
+        projectId: projectId
+      }})
     },
     handleChange(value) {
       this.joinedListUserId = value