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/newStatementPrintTwo.vue

@@ -93,7 +93,7 @@
           })
             .then(function (response) {
               if (response.data.state == 0) {
-                this.$message.error(response.data.msg);
+                // this.$message.error(response.data.msg);
                 return false
               } else {
                 if (response.data.data.failed_code == -10) {

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -3018,7 +3018,7 @@
             })
               .then(function(response) {
                 if (response.data.state == 0) {
-                  that.$message.error(response.data.msg);
+                  // that.$message.error(response.data.msg);
                   return false
                 } else {
                   if (response.data.data.failed_code == -10) {

src/xt_pages/hospitalStation/treatTemplate/printOne.vue

@@ -360,7 +360,7 @@
         })
           .then(function(response) {
             if (response.data.state == 0) {
-              that.$message.error(response.data.msg);
+              // that.$message.error(response.data.msg);
               return false
             } else {
               if (response.data.data.failed_code == -10) {

src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue

@@ -449,7 +449,7 @@
         })
           .then(function(response) {
             if (response.data.state == 0) {
-              that.$message.error(response.data.msg)
+              // that.$message.error(response.data.msg)
               return false
             } else {
               if (response.data.data.failed_code == -10) {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1069,7 +1069,7 @@
 
           if (this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 0) {
             var that = this
-            
+
             axios.get('http://127.0.0.1:9532/sz/api/settle/get', {
               params: form
             })
@@ -3387,8 +3387,22 @@
             this.cal_three = three_count
 
             this.current_index = 0
+            let ids = []
+            let temp_order_id = 0
             for (let i = 0; i < this.patientTableData.length; i++) {
+              // console.log(this.patientTableData[i])
+
               if (this.hisPatientInfo.id == this.patientTableData[i].his_patient_id) {
+                ids.push(this.patientTableData[i].order_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)
+              }
+
+            }
+
+            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])
                 this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number, this.patientTableData[i].his_patient.id, this.patientTableData[i].order.id)
               }
@@ -4615,7 +4629,7 @@
             })
               .then(function(response) {
                 if (response.data.state == 0) {
-                  that.$message.error(response.data.msg)
+                  // that.$message.error(response.data.msg)
                   return false
                 } else {
                   if (response.data.data.failed_code == -10) {