Merge branch 'master' of http://60.216.109.204:8082/renhongzhi/sle-web-settlement

.env.development

@@ -11,9 +11,9 @@ VUE_APP_BASE_API = ''
 # VUE_APP_BASE_URL = 'http://10.10.40.69:9903'
 VUE_APP_BASE_URL_change = 'http://10.10.8.230:6200/fancy'
 # VUE_APP_BASE_URL = 'http://127.0.0.1:9902'
-VUE_APP_BASE_URL = 'http://10.10.9.219:8802'
+VUE_APP_BASE_URL = 'http://10.10.9.219:9902'
 # VUE_APP_BASE_URL = 'http://10.10.9.219:9902'
-VUE_APP_BASE_URL_SFC = 'http://10.10.9.219:8802'
+VUE_APP_BASE_URL_SFC = 'http://10.10.9.219:9902'
 # VUE_APP_BASE_URL_SFC = 'http://127.0.0.1:9902'
 # VUE_APP_BASE_URL = 'http://192.169.4.171:8002'
 # VUE_APP_BASE_URL = 'http://10.10.40.10:8099'

src/views/jiesuan/outpatient.vue

@@ -2075,12 +2075,12 @@ export default {
             let that = this
             let x = array
             if (array.length > 1) {
-                     if (!(array.every(item => item.doct_name === arr[0].doct_name))) {
-                 that.$message({
-                        message: '本次勾选账单，含多个医生开立的费用',
-                        type: 'warning',
-                    })
-            }
+            //          if (!(array.every(item => item.doct_name === array[0].doct_name))) {
+            //      that.$message({
+            //             message: '本次勾选账单，含多个医生开立的费用',
+            //             type: 'warning',
+            //         })
+            // }
                 var set = new Set()
                 for (var i = 0; i < array.length; i++) {
                     set.add(array[i].distinct_no)

src/views/jiesuan/outpatientCharging.vue

@@ -1766,11 +1766,13 @@ export default {
                     this.yujiesuanload = false
                 }
             } else {
+                this.yujiesuanLoading=true
                 const { code, data } = await verifyFeeStatus({
                     patient_id: this.patientData.patient_id,
                     serial_no: this.cost_id.toString(),
                 })
                 if (code == 200) {
+                     this.yujiesuanLoading=false
                     if (data.status == 2) {
                         this.$message.error(data.msg)
                         return false
@@ -1782,6 +1784,9 @@ export default {
                             this.yujiesuanload = false
                         }
                     }
+                }else{
+                    
+                     this.yujiesuanLoading=false
                 }
             }
         },
@@ -2170,7 +2175,7 @@ export default {
             let that = this
             let x = array
             if (array.length > 1) {
-                        if (!(array.every(item => item.doct_name === arr[0].doct_name))) {
+                        if (!(array.every(item => item.doct_name === array[0].doct_name))) {
                  that.$message({
                         message: '本次勾选账单，含多个医生开立的费用',
                         type: 'warning',