Merge branch 'master' of http://47.110.224.240:13000/pengqiang/xiangan_pc

src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog top="30px" class="number-manage" append-to-body :visible.sync="visible" width="40%" :title="title" :before-close="closeDialog">
+  <el-dialog top="30px" class="number-manage" append-to-body :visible.sync="visible" width="50%" :title="title" :before-close="closeDialog">
     <el-form ref="addPatientForm" :rules="dataRule" size="small" :model="form" label-width="90px">
       <el-form-item required label="选择患者:" prop="patientId">
         <el-input v-model="form.patientId" :readonly="isEdit" suffix-icon="el-icon-search" placeholder="请输入登记号" @change="searchPatient" />

src/page-subspecialty/views/modules/optometryManagement/seeDoctor/CornealReview.vue

@@ -312,7 +312,7 @@ export default {
       set(val) {
 
       }
-    },
+    }
   },
   mounted() {
     this.$store.commit('initPlugin')
@@ -322,6 +322,24 @@ export default {
     signClick(index) {
       this.$store.commit('beginSign', index)
     },
+    async querySecondInfo() {
+      const params = {
+        patientId: this.patientId
+      }
+      const { data: res } = await this.$http.get('/hospital/notice/getSecondDiagnosisInfos', {
+        params: params
+      })
+      if (res.code === 0) {
+        this.formData.iolOd = res.data.iolOd
+        this.formData.iolOs = res.data.iolOs
+        this.formData.iopOd = res.data.iopOd
+        this.formData.iopOs = res.data.iopOs
+        this.formData.vaOd = res.data.vaOd
+        this.formData.vaOs = res.data.vaOs
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
     setSign() {
       const userData = window.sessionStorage.getItem('qg-userData')
       const date = this.$moment().format('YYYY-MM-DD')
@@ -345,6 +363,7 @@ export default {
         if (this.formData.isChange === 0) {
           this.$store.commit('checkSign', '')
           await this.getPatientData()
+          await this.querySecondInfo()
           this.setSign()
         } else {
           this.$store.commit('checkSign', res.data.checkSign)
@@ -364,8 +383,10 @@ export default {
         }
       )
       if (res.code === 0) {
+        if (res.data) {
           this.formData.patientId = res.data.patientId
           this.formData.patientName = res.data.patientName
+        }
       } else {
         this.$message.error(res.msg)
       }

src/page-subspecialty/views/modules/optometryManagement/seeDoctor/first-visit/index.vue

@@ -245,7 +245,6 @@ export default {
   },
   mounted() {
     this.queryFirstVisit()
-    this.getPatientData()
   },
   methods: {
     async queryFirstVisit() {
@@ -257,6 +256,38 @@ export default {
       })
       if (res.code === 0) {
         this.formData = res.data
+        if (!this.formData.id) {
+          await this.getPatientData()
+          await this.queryFirstInfo()
+        }
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    async queryFirstInfo() {
+      const params = {
+        patientId: this.patientId
+      }
+      const { data: res } = await this.$http.get('/hospital/notice/getFirstDiagnosisInfos', {
+        params: params
+      })
+      if (res.code === 0) {
+        this.formData.butOd = res.data.butOd
+        this.formData.butOs = res.data.butOs
+        this.formData.eod = res.data.eod
+        this.formData.eos = res.data.eos
+        this.formData.hdOd = res.data.hdOd
+        this.formData.hdOs = res.data.hdOs
+        this.formData.hod = res.data.hod
+        this.formData.hos = res.data.hos
+        this.formData.iolOd = res.data.iolOd
+        this.formData.iolOs = res.data.iolOs
+        this.formData.npOd = res.data.npOd
+        this.formData.npOs = res.data.npOs
+        this.formData.vod = res.data.vod
+        this.formData.vos = res.data.vos
+        this.formData.zjOd = res.data.zjOd
+        this.formData.zjOs = res.data.zjOs
       } else {
         this.$message.error(res.msg)
       }
@@ -272,12 +303,13 @@ export default {
         }
       )
       if (res.code === 0) {
+        if (res.data) {
           this.formData.patientId = res.data.patientId
-        // this.formData.patientAge = res.data.patientAge
           this.formData.patientSex = res.data.patientSex
           this.formData.patientName = res.data.patientName
           this.formData.patientAddress = res.data.patientAddress
           this.formData.patientPhone = res.data.patientPhone
+        }
       } else {
         this.$message.error(res.msg)
       }

src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue

@@ -25,7 +25,7 @@
           <notice-book :patient-id="patientId" />
         </el-tab-pane>
         <el-tab-pane label="首诊单" name="firstVisit">
-          <first-visit :crf-id="patientInfoObj.crfId" :patient-id="patientId" />
+          <first-visit :patient-id="patientId" />
         </el-tab-pane>
         <el-tab-pane label="OK镜" name="okLens">
           <ok-lens-rgp ref="okLensRgp" :patient-id="patientId" :doctor-list="doctorList" tab-title="okLens" />
@@ -115,7 +115,6 @@ export default {
   created() {
     this.pageParams = JSON.parse(this.$Base64.decode(this.$route.query.info))
     this.patientId = this.pageParams.patientId
-    this.patientId = this.pageParams.patientId
     this.getPatientInfo()
     this.getDoctorList()
   },
@@ -136,8 +135,9 @@ export default {
       }).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
-        }
+        } else {
           this.patientInfoObj = res.data
+        }
       }).catch(() => {})
     },
     // 获取医生列表

src/page-subspecialty/views/modules/optometryManagement/seeDoctor/ok-lens-rgp/left-right-eye.vue

@@ -12,7 +12,7 @@
       </el-select>
     </el-form-item>
     <el-form-item label="品 牌:" label-width="95px" prop="brandId">
-      <el-select v-model="dataForm.brandId" placeholder="请选择品牌" clearable multiple filterable allow-create>
+      <el-select v-model="dataForm.brandId" placeholder="请选择品牌" clearable>
         <el-option v-for="(item,index) in brandList " :key="index" :value="item.id" :label="item.brand" @click.native="selectOptionBrandHandle(item)" />
       </el-select>
     </el-form-item>
@@ -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
       }

src/page-subspecialty/views/modules/optometryManagement/seeDoctor/review.vue

@@ -23,7 +23,7 @@
       </div>
     </div>
     <div class="reviewRight">
-      <corneal-review :case-id="caseId" :patient-id="patientId"/>
+      <corneal-review v-if="formList.length" :case-id="caseId" :patient-id="patientId"/>
     </div>
 <!--    <el-tabs v-model="activeName">-->
 <!--      <el-tab-pane label="复查情况" name="first">-->

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
-              }
-            })
+    // 获取医生列表
+    async getProjectUser() {
+      const { data: res } = await this.$http.get('/dp/getDoctorList')
+      if (res.code === 0) {
+        this.AllJoinedPeopleList = res.data
       }
-          this.AllJoinedPeopleList = [...res.data.joinedList, ...res.data.notJoined]
-        })
     },
+    // 获取人员列表
+    // 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

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