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

@@ -945,7 +945,8 @@
           'his_patient_id':val.his_patient.id,
           'record_date': val,
           'patient_id': this.patientInfo.id,
-          'type': this.radio
+          'type': this.radio,
+          'p_type': 1,
         };
         GetHisHospitalChargePatientInfo(params).then(response => {
           if (response.data.state == 0) {
@@ -2471,7 +2472,9 @@
           'number': batch_number,
           'start_time': this.other_start_time,
           'end_time': this.other_end_time,
-          'type': this.radio
+          'type': this.radio,
+          'p_type': 1,
+
 
         };
         this.loading = true;

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -979,7 +979,8 @@
         let params = {
           'record_date': val,
           'patient_id': this.patientInfo.id,
-          'type': this.radio
+          'type': this.radio,
+          'p_type':2,
         };
         getChargeHisPatientInfo(params).then(response => {
           if (response.data.state == 0) {
@@ -2386,7 +2387,9 @@
           'number': batch_number,
           'start_time': this.other_start_time,
           'end_time': this.other_end_time,
-          'type': this.radio
+          'type': this.radio,
+          'p_type':2,
+
 
         };
         this.loading = true;

src/xt_pages/outpatientCharges/summary.vue

@@ -247,8 +247,8 @@
         }
 
       },toRefund(row){
-        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106) {
-          var that = this
+        if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9538 || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990) {
+          var that = this;
           this.$confirm('是否退费', '退费', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
@@ -259,19 +259,19 @@
               'patient_id': row.patient_id,
               'record_time': that.getTimes(row.settle_accounts_date),
               'admin_user_id': that.$store.getters.xt_user.user.id,
-            }
+            };
             axios.get('http://127.0.0.1:9532/api/refund/post', {
               params: params
             })
               .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) {
                     that.$message.error(response.data.data.msg)
                   } else {
-                    that.$message({ message: '退费成功', type: 'success', duration: 5000 })
+                    that.$message({ message: '退费成功', type: 'success', duration: 5000 });
                     that.getHisOrderList()
 
                   }
@@ -293,13 +293,13 @@
               'patient_id': this.patientInfo.id,
               'record_time': this.record_date
 
-            }
+            };
             Refund(params).then(response => {
               if (response.data.state == 0) {
-                this.$message.error(response.data.msg)
+                this.$message.error(response.data.msg);
                 return false
               } else {
-                this.$message({ message: '退费成功', type: 'success' })
+                this.$message({ message: '退费成功', type: 'success' });
                 this.getHisOrderList()
               }
             })
@@ -309,51 +309,51 @@
       },
       toPrint(row) {
         if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028) {
-          this.statementVisible9504 = true
+          this.statementVisible9504 = true;
           let obj = {
             order_id: row.id,
             patient_id: row.patient_id,
             record_time: this.getTimes(row.settle_accounts_date),
             admin_user_id: this.$store.getters.xt_user.user.id
-          }
+          };
           this.orderObj9504 = obj
         } else {
-          this.statementVisible = true
+          this.statementVisible = true;
           let obj = {
             order_id: row.id
-          }
+          };
           this.orderObj = obj
         }
 
       },
       settlementPrint(row){
-        this.settlementVisible = true
+        this.settlementVisible = true;
         let obj = {
           order_id: row.id
-        }
+        };
         this.settlementObj = obj
       },
       export_detail() {
         let params = {
           start_time: this.start_time,
           end_time: this.end_time
-        }
+        };
         getExportConsumeDetailList(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
 
-            let list = []
+            let list = [];
             for (let i = 0; i < response.data.data.order.length; i++) {
-              let order = response.data.data.order[i]
-              let number = ''
-              let name = ''
-              let department = ''
-              let doctor_name = ''
-              let balance_accounts = ''
+              let order = response.data.data.order[i];
+              let number = '';
+              let name = '';
+              let department = '';
+              let doctor_name = '';
+              let balance_accounts = '';
 
-              let order_status = ''
+              let order_status = '';
 
               if (order.his_patient != null && order.his_patient.number.length > 0) {
                 number = order.his_patient.number
@@ -414,13 +414,13 @@
                 '收费日期': '',
                 '收费状态': order_status,
                 '退费日期': ''
-              }
+              };
               list.push(obj)
             }
             import('@/vendor/Export2Excel').then(excel => {
-              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期']
-              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期']
-              const data = this.formatJson(filterVal, list)
+              const tHeader = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期'];
+              const filterVal = ['就诊号', '患者姓名', '应收金额', '实收金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费日期', '收费状态', '退费日期'];
+              const data = this.formatJson(filterVal, list);
               excel.export_json_to_excel({
                 header: tHeader,
                 data,
@@ -435,30 +435,30 @@
         return jsonData.map(v => filterVal.map(j => v[j]))
       },
       changeDoctor() {
-        this.page = 1
-        this.keywords = ''
+        this.page = 1;
+        this.keywords = '';
         this.getHisOrderList()
       },
       handleSizeChange(limit) {
-        this.limit = limit
+        this.limit = limit;
         this.getHisOrderList()
 
       }, handleCurrentChange(page) {
-        this.page = page
+        this.page = page;
         this.getHisOrderList()
 
       },
       handleStartTimeChange() {
-        this.page = 1
-        this.keywords = ''
+        this.page = 1;
+        this.keywords = '';
         this.getHisOrderList()
       }, handleEndTimeChange() {
-        this.page = 1
-        this.keywords = ''
+        this.page = 1;
+        this.keywords = '';
         this.getHisOrderList()
       },
       searchAction() {
-        this.page = 1
+        this.page = 1;
         this.getHisOrderList()
 
       },
@@ -480,13 +480,13 @@
           start_time: this.start_time,
           end_time: this.end_time,
           type: this.admin_user_id
-        }
+        };
         getHisOrderList(params).then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
-            this.tableData = response.data.data.order
+            this.tableData = response.data.data.order;
             this.total = response.data.data.total
           }
         })
@@ -494,7 +494,7 @@
       }, getDoctorList() {
         getDoctorList().then(response => {
           if (response.data.state == 0) {
-            this.$message.error(response.data.msg)
+            this.$message.error(response.data.msg);
             return false
           } else {
             this.doctors = response.data.data.doctors
@@ -509,7 +509,7 @@
         }
       },
       invoicePrint(obj){
-        console.log(obj)
+        console.log(obj);
         let paramsObj = {
           order_id: obj.id,
           patient_id: obj.patient_id,
@@ -517,15 +517,15 @@
           age:obj.age,
           gend:obj.gend,
           setl_time:obj.setl_time
-        }
-        this.invoiceParams = paramsObj
+        };
+        this.invoiceParams = paramsObj;
         this.invoiceVisible = true
       }
     }, created() {
 
 
-      this.fetchAllAdminUsers()
-      this.getDoctorList()
+      this.fetchAllAdminUsers();
+      this.getDoctorList();
       this.getHisOrderList()