diff --git a/public/index.html b/public/index.html
index e24ae46..47688a7 100644
--- a/public/index.html
+++ b/public/index.html
@@ -53,8 +53,8 @@
<% if (process.env.VUE_APP_NODE_ENV === 'prod') { %>
<% } %>
diff --git a/src/components/360View/index.vue b/src/components/360View/index.vue
index 980b1f4..8fff240 100644
--- a/src/components/360View/index.vue
+++ b/src/components/360View/index.vue
@@ -408,8 +408,8 @@ export default {
// 360浏览器
handlePacs() {
// const baseUrl = 'http://z1.huimucloud.com:8085'
- // const baseUrl = 'http://10.80.5.32:8026'
- const baseUrl = 'http://192.168.0.85:8001'
+ const baseUrl = 'http://10.80.5.32:8026'
+ // const baseUrl = 'http://192.168.0.85:8001'
const href = `${baseUrl}/EXAMINE_Report/InterFace?PatID=${this.patientId}&DoctorID=${this.employeeId}&PatIdKey=&ExamNo=`
window.open(href, '_blank')
// const { href } = this.$router.resolve({
diff --git a/src/components/360View/special/index.vue b/src/components/360View/special/index.vue
index c2b0699..265c46e 100644
--- a/src/components/360View/special/index.vue
+++ b/src/components/360View/special/index.vue
@@ -213,8 +213,8 @@ export default {
// }
// })
// const baseUrl = 'http://z1.huimucloud.com:8085'
- // const baseUrl = 'http://10.80.5.32:8026'
- const baseUrl = 'http://192.168.0.85:8001'
+ const baseUrl = 'http://10.80.5.32:8026'
+ // const baseUrl = 'http://192.168.0.85:8001'
const href = `${baseUrl}/EXAMINE_Report/InterFace?PatID=${this.patientId}&DoctorID=${this.employeeId}&PatIdKey=&ExamNo=`
window.open(href, '_blank')
},
diff --git a/src/page-subspecialty/views/modules/formList/reportForm.vue b/src/page-subspecialty/views/modules/formList/reportForm.vue
index 6525e42..857f0fe 100644
--- a/src/page-subspecialty/views/modules/formList/reportForm.vue
+++ b/src/page-subspecialty/views/modules/formList/reportForm.vue
@@ -89,6 +89,7 @@ export default {
data() {
return {
origin: {},
+ originForm: {},
confirmData: {
fmwOd: '',
fmwOs: '',
@@ -154,7 +155,7 @@ export default {
}
},
created() {
- this.origin = JSON.parse(JSON.stringify(this.formData))
+ this.originForm = JSON.parse(JSON.stringify(this.formData))
this.getReportInfo()
},
methods: {
@@ -215,19 +216,21 @@ export default {
}
this.$http.get('/mzbl/getMzblBgInfo', { params }).then(data => {
const res = data.data.data
- this.handleResValue(res.fmwOd, this.formData.form.OD)
- this.handleResValue(res.fmwOs, this.formData.form.OS)
- this.confirmData.remark = res.remark
- this.confirmData.operator = res.operator
- this.confirmData.operateDate = res.operateDate
- if (!res.jzNumber) {
- this.confirmData.patientName = this.patientDetail.patientName
- const userData = JSON.parse(window.sessionStorage.getItem('qg-userData'))
- this.confirmData.operator = userData.signImgBase
- this.confirmData.operateDate = this.$moment().format('YYYY-MM-DD')
- }
+ this.setData(res)
})
},
+ setData(res) {
+ this.confirmData = res
+ this.handleResValue(res.fmwOd, this.formData.form.OD)
+ this.handleResValue(res.fmwOs, this.formData.form.OS)
+ if (!res.jzNumber) {
+ this.formData = JSON.parse(JSON.stringify(this.originForm))
+ this.confirmData.patientName = this.patientDetail.patientName
+ const userData = JSON.parse(window.sessionStorage.getItem('qg-userData'))
+ this.confirmData.operator = userData.signImgBase
+ this.confirmData.operateDate = this.$moment().format('YYYY-MM-DD')
+ }
+ },
// 获取项目id列表
async queryProject() {
const project = window.sessionStorage.getItem('projectItem') ? JSON.parse(window.sessionStorage.getItem('projectItem')) : []