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

src/xt_pages/hospitalStation/costComparison.vue

@@ -432,10 +432,11 @@
             start_time: this.start_time,
             end_time: this.end_time,
             insutype: this.insutype,
-            clr_type: '11'
+            clr_type: '11',
+            admin_user_id:that.$store.getters.xt_user.user.id,
           };
           var that = this;
-          if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990 ) {
+
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
               params: params
             })
@@ -476,7 +477,7 @@
 
               })
 
-          }
+
 
         } else {
           let params = {

src/xt_pages/outpatientCharges/costComparison.vue

@@ -476,6 +476,7 @@ c<template>
             insutype: this.insutype,
             clr_type: this.clr_type,
             clr_optins:this.query_clr_org,
+            admin_user_id:that.$store.getters.xt_user.user.id,
           }
           var that = this
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1988,9 +1988,10 @@
           if (last_info.diagnosis.length == 0) {
             this.diagnose = []
           } else {
-            console.log(last_info.diagnosis)
             for (let i = 0; i < last_info.diagnosis.split(",").length; i++) {
-              this.diagnose.push(parseInt(last_info.diagnosis.split(',')[i]))
+              if(last_info.diagnosis.split(',')[i].length > 0) {
+                this.diagnose.push(parseInt(last_info.diagnosis.split(',')[i]))
+              }
             }
           }
 
@@ -2008,8 +2009,11 @@
           if (info.diagnosis.length == 0) {
             this.diagnose = []
           } else {
+
             for (let i = 0; i < info.diagnosis.split(",").length; i++) {
-              this.diagnose.push(parseInt(info.diagnosis.split(',')[i]))
+              if(info.diagnosis.split(',')[i].length > 0) {
+                this.diagnose.push(parseInt(info.diagnosis.split(',')[i]))
+              }
 
             }
 

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1153,10 +1153,6 @@
 
       },
       removeTab(targetName) {
-        if (targetName == '处方1') {
-          this.$message.error('该处方无法删除')
-          return
-        }
         this.$confirm('处方删除后不可恢复，是否确认删除', '删除', {
           confirmButtonText: '确 定',
           cancelButtonText: '取 消',