diff --git a/src/page-subspecialty/store/modules/sign.js b/src/page-subspecialty/store/modules/sign.js
index a16a93e..af20ce2 100644
--- a/src/page-subspecialty/store/modules/sign.js
+++ b/src/page-subspecialty/store/modules/sign.js
@@ -46,7 +46,7 @@ export default {
informedDocSign: state => state.informedDocSign,
informPatientSign: state => state.informPatientSign,
checkSign: state => state.checkSign,
- fundusDocSign: state => state.fundusDocSign,
+ fundusDocSign: state => state.fundusDocSign,
kinSign: state => state.kinSign,
performerSign: state => state.performerSign,
checkerSign: state => state.checkerSign
@@ -192,7 +192,7 @@ export default {
this.commit('informedDocSign', img_base64)
} else if (state.type === 11) {
this.commit('informPatientSign', img_base64)
- } else if (state.type === 12) {
+ } else if (state.type === 12) {
this.commit('fundusDocSign', img_base64)
} else if (state.type === 13) {
this.commit('kinSign', img_base64)
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
index e9263bd..fb85dab 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/CornealReview.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/CornealReview.vue
index 3f01f04..6b1cf66 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/CornealReview.vue
+++ b/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) {
- this.formData.patientId = res.data.patientId
- this.formData.patientName = res.data.patientName
+ if (res.data) {
+ this.formData.patientId = res.data.patientId
+ this.formData.patientName = res.data.patientName
+ }
} else {
this.$message.error(res.msg)
}
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/first-visit/index.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/first-visit/index.vue
index e702b44..6c4fa5c 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/first-visit/index.vue
+++ b/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) {
- 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
+ if (res.data) {
+ this.formData.patientId = res.data.patientId
+ 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)
}
diff --git a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue
index eb5be84..1e3e191 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/index.vue
@@ -25,7 +25,7 @@
-
+
@@ -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
}
- this.patientInfoObj = res.data
}).catch(() => {})
},
// 获取医生列表
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 b15dace..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
@@ -12,7 +12,7 @@
-
+
@@ -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/optometryManagement/seeDoctor/review.vue b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/review.vue
index 8adbe20..b340d5c 100644
--- a/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/review.vue
+++ b/src/page-subspecialty/views/modules/optometryManagement/seeDoctor/review.vue
@@ -23,7 +23,7 @@
-
+
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 @@
-
@@ -33,23 +32,23 @@
-
-
-
- {{ scope.row.status == '1' ? '正常':'停用' }}
-
-
+
+
+
+
+
+
+
+
-
- 更改角色
-
- {{ item.name }}
-
-
+
+
+
+
+
+
@@ -107,7 +106,7 @@ export default {
inputSearchValue: '',
transferData: generateData(),
renderFunc(h, option) {
- return {option.realName}
+ return {option.doctorName}
},
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