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/components/deskPrescription.vue

@@ -472,12 +472,12 @@
         end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
         register: [
           { value: 11, label: '普通门诊' },
-          { value: 12, label: '门诊挂号' },
-          { value: 13, label: '急诊' },
+          // { value: 12, label: '门诊挂号' },
+          // { value: 13, label: '急诊' },
           { value: 14, label: '门诊特殊病' },
-          { value: 15, label: '门诊统筹' },
-          { value: 16, label: '门诊慢性病' },
-          { value: 21, label: '普通住院' }
+          // { value: 15, label: '门诊统筹' },
+          // { value: 16, label: '门诊慢性病' },
+          // { value: 21, label: '普通住院' }
 
         ],
         isLastOrNextVisible: false,

src/xt_pages/hospitalStation/components/registerDialog.vue

@@ -197,12 +197,12 @@
       return {
         registers: [
           {value: 11, label: "普通门诊"},
-          {value: 12, label: '门诊挂号'},
-          {value: 13, label: "急诊"},
+          // {value: 12, label: '门诊挂号'},
+          // {value: 13, label: "急诊"},
           {value: 14, label: "门诊特殊病"},
-          {value: 15, label: "门诊统筹"},
-          {value: 16, label: "门诊慢性病"},
-          {value: 21, label: "普通住院"},
+          // {value: 15, label: "门诊统筹"},
+          // {value: 16, label: "门诊慢性病"},
+          // {value: 21, label: "普通住院"},
         ],
         medical_care:[
           {value: 11, label: "普通门诊"},

src/xt_pages/hospitalStation/components/registerDialog9504.vue

@@ -186,12 +186,12 @@
         read_loading:false,
         registers: [
           {value: 11, label: "普通门诊"},
-          {value: 12, label: '门诊挂号'},
-          {value: 13, label: "急诊"},
+          // {value: 12, label: '门诊挂号'},
+          // {value: 13, label: "急诊"},
           {value: 14, label: "门诊特殊病"},
-          {value: 15, label: "门诊统筹"},
-          {value: 16, label: "门诊慢性病"},
-          {value: 21, label: "普通住院"},
+          // {value: 15, label: "门诊统筹"},
+          // {value: 16, label: "门诊慢性病"},
+          // {value: 21, label: "普通住院"},
         ],
         medical_care:[
           {value: 11, label: "普通门诊"},

src/xt_pages/hospitalStation/index.vue

@@ -176,12 +176,12 @@
         read_loading: false,
         registers: [
           {value: 11, label: '普通门诊'},
-          {value: 12, label: '门诊挂号'},
-          {value: 13, label: '急诊'},
+          // {value: 12, label: '门诊挂号'},
+          // {value: 13, label: '急诊'},
           {value: 14, label: '门诊特殊病'},
-          {value: 15, label: '门诊统筹'},
-          {value: 16, label: '门诊慢性病'},
-          {value: 21, label: '普通住院'}
+          // {value: 15, label: '门诊统筹'},
+          // {value: 16, label: '门诊慢性病'},
+          // {value: 21, label: '普通住院'}
 
         ],
         sick: [],

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -402,12 +402,12 @@
       return {
         register: [
           { value: 11, label: '普通门诊' },
-          { value: 12, label: '门诊挂号' },
-          { value: 13, label: '急诊' },
+          // { value: 12, label: '门诊挂号' },
+          // { value: 13, label: '急诊' },
           { value: 14, label: '门诊特殊病' },
-          { value: 15, label: '门诊统筹' },
-          { value: 16, label: '门诊慢性病' },
-          { value: 21, label: '普通住院' }
+          // { value: 15, label: '门诊统筹' },
+          // { value: 16, label: '门诊慢性病' },
+          // { value: 21, label: '普通住院' }
 
         ],
         loading: false,

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -197,12 +197,12 @@
       return {
         registers: [
           { value: 11, label: '普通门诊' },
-          { value: 12, label: '门诊挂号' },
-          { value: 13, label: '急诊' },
+          // { value: 12, label: '门诊挂号' },
+          // { value: 13, label: '急诊' },
           { value: 14, label: '门诊特殊病' },
-          { value: 15, label: '门诊统筹' },
-          { value: 16, label: '门诊慢性病' },
-          { value: 21, label: '普通住院' }
+          // { value: 15, label: '门诊统筹' },
+          // { value: 16, label: '门诊慢性病' },
+          // { value: 21, label: '普通住院' }
         ],
         medical_care: [
           { value: 11, label: '普通门诊' },

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -187,12 +187,12 @@
         read_loading:false,
         registers: [
           {value: 11, label: "普通门诊"},
-          {value: 12, label: '门诊挂号'},
-          {value: 13, label: "急诊"},
+          // {value: 12, label: '门诊挂号'},
+          // {value: 13, label: "急诊"},
           {value: 14, label: "门诊特殊病"},
-          {value: 15, label: "门诊统筹"},
-          {value: 16, label: "门诊慢性病"},
-          {value: 21, label: "普通住院"},
+          // {value: 15, label: "门诊统筹"},
+          // {value: 16, label: "门诊慢性病"},
+          // {value: 21, label: "普通住院"},
         ],
         medical_care:[
           {value: 11, label: "普通门诊"},

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -589,22 +589,22 @@
 
         register: [
           { value: 11, label: '普通门诊' },
-          { value: 12, label: '门诊挂号' },
-          { value: 13, label: '急诊' },
+          // { value: 12, label: '门诊挂号' },
+          // { value: 13, label: '急诊' },
           { value: 14, label: '门诊特殊病' },
-          { value: 15, label: '门诊统筹' },
-          { value: 16, label: '门诊慢性病' },
-          { value: 21, label: '普通住院' }
+          // { value: 15, label: '门诊统筹' },
+          // { value: 16, label: '门诊慢性病' },
+          // { value: 21, label: '普通住院' }
 
         ],
         register_two: [
           { value: '11', label: '普通门诊' },
-          { value: '12', label: '门诊挂号' },
-          { value: '13', label: '急诊' },
+          // { value: '12', label: '门诊挂号' },
+          // { value: '13', label: '急诊' },
           { value: '14', label: '门诊特殊病' },
-          { value: '15', label: '门诊统筹' },
-          { value: '16', label: '门诊慢性病' },
-          { value: '21', label: '普通住院' }
+          // { value: '15', label: '门诊统筹' },
+          // { value: '16', label: '门诊慢性病' },
+          // { value: '21', label: '普通住院' }
 
         ],
         loading: false,
@@ -2446,6 +2446,8 @@
 
             let ids = []
             let temp_order_id = 0
+            var index = 0
+
             if (this.radio == 2) {
               for (let i = 0; i < this.patientTableData.length; i++) {
                 if (this.hisPatientInfo.id == this.patientTableData[i].his_patient_id) {
@@ -2455,18 +2457,20 @@
               temp_order_id = ids[ids.length - 1]
               for (let i = 0; i < this.patientTableData.length; i++) {
                 if (temp_order_id == this.patientTableData[i].order_id) {
-                  this.$refs.tab.setCurrentRow(this.patientTableData[i])
+                  index = i
                   // this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order_number, this.patientTableData[i].his_patient_id, this.patientTableData[i].order_id)
                 }
               }
+              this.$refs.tab.setCurrentRow(this.patientTableData[index])
+
             } else {
+              var index = 0
               for (let i = 0; i < this.patientTableData.length; i++) {
                 if (this.hisPatientInfo.id == this.patientTableData[i].his_patient_id) {
-                  this.$refs.tab.setCurrentRow(this.patientTableData[i])
-                  // this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order_number, this.patientTableData[i].his_patient_id, this.patientTableData[i].order_id)
+                  index  = i
                 }
-
               }
+              this.$refs.tab.setCurrentRow(this.patientTableData[index])
             }
           }
         })

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -517,12 +517,12 @@
         end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
         register: [
           { value: 11, label: '普通门诊' },
-          { value: 12, label: '门诊挂号' },
-          { value: 13, label: '急诊' },
+          // { value: 12, label: '门诊挂号' },
+          // { value: 13, label: '急诊' },
           { value: 14, label: '门诊特殊病' },
-          { value: 15, label: '门诊统筹' },
-          { value: 16, label: '门诊慢性病' },
-          { value: 21, label: '普通住院' }
+          // { value: 15, label: '门诊统筹' },
+          // { value: 16, label: '门诊慢性病' },
+          // { value: 21, label: '普通住院' }
 
         ],
         medical_care:[

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -280,12 +280,12 @@
 
         register: [
           { value: 11, label: '普通门诊' },
-          { value: 12, label: '门诊挂号' },
-          { value: 13, label: '急诊' },
+          // { value: 12, label: '门诊挂号' },
+          // { value: 13, label: '急诊' },
           { value: 14, label: '门诊特殊病' },
-          { value: 15, label: '门诊统筹' },
-          { value: 16, label: '门诊慢性病' },
-          { value: 21, label: '普通住院' }
+          // { value: 15, label: '门诊统筹' },
+          // { value: 16, label: '门诊慢性病' },
+          // { value: 21, label: '普通住院' }
 
         ],
         crumbs: [

src/xt_pages/outpatientRegistration/index.vue

@@ -446,12 +446,12 @@
         read_loading: false,
         registers: [
           { value: 11, label: '普通门诊' },
-          { value: 12, label: '门诊挂号' },
-          { value: 13, label: '急诊' },
+          // { value: 12, label: '门诊挂号' },
+          // { value: 13, label: '急诊' },
           { value: 14, label: '门诊特殊病' },
-          { value: 15, label: '门诊统筹' },
-          { value: 16, label: '门诊慢性病' },
-          { value: 21, label: '普通住院' }
+          // { value: 15, label: '门诊统筹' },
+          // { value: 16, label: '门诊慢性病' },
+          // { value: 21, label: '普通住院' }
 
         ],
         sick: [],