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

src/page-subspecialty/views/modules/formList/InformedConsent.vue

@@ -165,6 +165,7 @@ export default {
   },
   data() {
     return {
+      origin: '',
       confirmData: {
         bnz: '',
         coats: '',
@@ -368,6 +369,7 @@ export default {
     }
   },
   created() {
+    this.origin = JSON.parse(JSON.stringify(this.confirmData))
     // 患者信息带入
     this.confirmData.patientName = this.patientDetail.patientName
     this.confirmData.patientAge = this.patientDetail.patientAge

src/page-subspecialty/views/modules/formList/laserSurgery.vue

@@ -286,8 +286,14 @@ export default {
     }
   },
   created() {
+    this.confirmData.patientName = this.patientDetail.patientName
+    this.confirmData.patientAge = this.patientDetail.patientAge
+    this.confirmData.patientSex = this.patientDetail.patientSex
+    this.confirmData.patientId = this.patientDetail.patientId
+    this.confirmData.patientAddress = this.patientDetail.patientAddress
+    this.confirmData.patientPhone = this.patientDetail.patientPhone
+    this.confirmData.operateDate = new Date()
     // 患者信息带入
-    this.origin = JSON.parse(JSON.stringify(this.confirmData))
     this.getConfirmDetail()
     this.queryProject()
     this.$store.commit('initPlugin')
@@ -365,19 +371,9 @@ export default {
         caseId: this.caseId
       }}).then(data => {
         const detail = data.data.data
-        if (detail.jzNumber) {
-          this.confirmData = { ...detail }
-        } else {
-          this.confirmData = this.origin
-          this.queryDiagnostic()
-          this.confirmData.patientName = this.patientDetail.patientName
-          this.confirmData.patientAge = this.patientDetail.patientAge
-          this.confirmData.patientSex = this.patientDetail.patientSex
-          this.confirmData.patientId = this.patientDetail.patientId
-          this.confirmData.patientAddress = this.patientDetail.patientAddress
-          this.confirmData.patientPhone = this.patientDetail.patientPhone
-          this.confirmData.operateDate = new Date()
-          this.confirmData.jzNumber = ''
+        this.confirmData = { ...detail }
+        this.queryDiagnostic()
+        if (!detail.jzNumber) {
           if (this.confirmData.eyeType === 'OD') {
             this.confirmData.jgzlSyt = odOrOs.od
           } else {