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

config/index.js

 
      // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-    host: 'xt.test.sgjyun.com',
-    // host: 'localhost',
+    // host: 'xt.test.sgjyun.com',
+    host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

                      type="primary">预结算！
           </el-button>
 
-          <el-button v-loading="loadingtwo" v-if="this.hisPatientInfo.id > 0 && this.order.id == 0" size="small"
+          <el-button v-loading="loadingtwo" v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1 " size="small"
                      @click="open(21)"
                      type="primary">收费！
           </el-button>
           </el-button>
 
           <!--<el-button size="small" @click="open(5)" type="primary"-->
-                    <!--&gt;退费-->
+          <!--&gt;退费-->
           <!--</el-button>-->
 
 
           </el-button>
 
           <el-button v-if="this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877"
-          size="small" @click="open(10)" type="primary"
+                     size="small" @click="open(10)" type="primary"
           >退号
           </el-button>
 
-          <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 3877"
-          size="small" @click="open(11)" type="primary"
+          <el-button
+            v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 3877"
+            size="small" @click="open(11)" type="primary"
           >撤销明细
           </el-button>
 
     },
     methods: {
       query() {
-        if (this.$store.getters.xt_user.org_id == 4 ||  this.$store.getters.xt_user.org_id == 3877) {
+        if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 3877) {
           var that = this
           axios.get('http://127.0.0.1:9532/api/org/info', {
             params: {}
         form['record_time'] = this.record_date
         form['admin_user_id'] = this.$store.getters.xt_user.user.id
         form['order_id'] = this.order.id
-
+        form['org_id'] = this.$store.getters.xt_user.org_id
 
         if (this.activeName == 'first') {
           form['settle_accounts_type'] = 1
         }
 
         this.loadingtwo = true
-        if (this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 3877) {
+        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877) {
           var that = this
           axios.get('http://127.0.0.1:9532/api/settle/get', {
             params: form
         this.$refs.charge.hide()
       },
       confirm(forms) {
-        forms['record_time'] = this.record_date,
-          forms['admin_user_id'] = this.$store.getters.xt_user.user.id
+        forms['record_time'] = this.record_date
+        forms['admin_user_id'] = this.$store.getters.xt_user.user.id
+        forms['org_id'] = this.$store.getters.xt_user.org_id
+
         this.loadingone = true
 
-        if (this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 3877) {
+        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877) {
           var that = this
 
           axios.get('http://127.0.0.1:9532/api/register/get', {
           }
 
         } else if (index == 5) {
-          if (this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 3877) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877) {
 
             var that = this
             this.$confirm('是否退费', '退费', {
                 'number': this.order.number,
                 'patient_id': this.patientInfo.id,
                 'record_time': this.record_date,
-                'admin_user_id': this.$store.getters.xt_user.user.id
+                'admin_user_id': this.$store.getters.xt_user.user.id,
+                'org_id': this.$store.getters.xt_user.org_id
 
               }
               axios.get('http://127.0.0.1:9532/api/refund/post', {
             start_time: '2020-12-28',
             end_time: '2020-12-30',
             insutype: '390',
-            clr_type: '11'
+            clr_type: '11',
+            org_id: this.$store.getters.xt_user.org_id
+
           }
 
           var that = this
 
-          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877 ) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877) {
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
               params: params
             })
           let params = {
 
             'patient_id': this.patientInfo.id,
-            'record_time': this.record_date
+            'record_time': this.record_date,
+            "org_id": this.$store.getters.xt_user.org_id
           }
           axios.get('http://127.0.0.1:9532/api/refundnumber/post', {
             params: params
             'order_id': this.order.id,
             'number': this.order.number,
             'patient_id': this.patientInfo.id,
-            'record_time': this.record_date
+            'record_time': this.record_date,
+            "org_id": this.$store.getters.xt_user.org_id
           }
           axios.get('http://127.0.0.1:9532/api/refunddetail/post', {
             params: params
             })
         } else if (index == 15) {
           var that = this
-          if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919) {
+          if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919) {
 
             if (this.diagnosis.length || this.diagnosis == 0) {
               that.$message.error('诊断不能为空,请选择诊断内容')
 
           }
 
-        }else if(index == 20){
+        } else if (index == 20) {
           if (this.patientInfo.id == 0) {
             this.$message({ message: '该选择要收费的患者', type: 'error' })
             return
             }
           }
 
-
           var form = {}
           form['id'] = this.patientInfo.id
           form['record_time'] = this.record_date
           form['admin_user_id'] = this.$store.getters.xt_user.user.id
+          form['org_id'] = this.$store.getters.xt_user.org_id
 
           if (this.activeName == 'first') {
             form['settle_accounts_type'] = 1
 
           }
           this.loadingtwo = true
-          if (this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 3877) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877) {
             var that = this
             axios.get('http://127.0.0.1:9532/api/pre_upload/get', {
               params: form
           } else {
 
           }
-        }else if(index == 21){
+        } else if (index == 21) {
 
           if (this.patientInfo.id == 0) {
             this.$message({ message: '该选择要收费的患者', type: 'error' })
           let obj = {}
           let count = 0
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
-            if (project_ids[i].price == project_month_prescriptions.project[a].price &&project_ids[i].id == project_month_prescriptions.project[a].project_id ) {
+            if (project_ids[i].price == project_month_prescriptions.project[a].price && project_ids[i].id == project_month_prescriptions.project[a].project_id) {
               obj['project_name'] = project_month_prescriptions.project[a].project.project_name
               obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
               obj['single_dose'] = project_month_prescriptions.project[a].single_dose
           let count = 0
           if (addition_month_prescriptions.addition) {
             for (let a = 0; a < addition_month_prescriptions.addition.length; a++) {
-              if (additions_ids[i].price == addition_month_prescriptions.addition[a].price &&additions_ids[i].id == addition_month_prescriptions.addition[a].item_id) {
+              if (additions_ids[i].price == addition_month_prescriptions.addition[a].price && additions_ids[i].id == addition_month_prescriptions.addition[a].item_id) {
                 obj['item_name'] = addition_month_prescriptions.addition[a].item_name
                 obj['id'] = addition_month_prescriptions.addition[a].id
                 obj['item_id'] = addition_month_prescriptions.addition[a].item_id

src/xt_pages/outpatientCharges/statementPrint.vue

 
     },
     getInfo(order_id) {
-      if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919) {
+      if (this.$store.getters.xt_user.org_id == 3877 || this.$store.getters.xt_user.org_id == 9919) {
 
         var that = this