Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1841,7 +1841,8 @@
           this.dialysisPrescription.mode_id = pre.mode_id
         }
         console.log('this.dialysisPrescription.mode_id',this.dialysisPrescription.mode_id)
-        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || this.schedual.mode_id == 2 || this.schedual.mode_id == 5 || this.schedual.mode_id == 12) {
+        console.log('this.schedual',schedual.mode_id)
+        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12) {
           this.zhiShow = true
           this.huShow = true
           this.totalShow = true

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2596,6 +2596,7 @@
             this.curPrescriptions = this.prescriptions[i]
             this.$refs.multipleTable.clearSelection()
             this.$refs.tables.clearSelection()
+            this.clearSelection()
 
           }
         }