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

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -26,7 +26,7 @@ import printOne from './invoiceTemplate/printOne'
 import printTwo from './invoiceTemplate/printTwo'
 import printThree from './invoiceTemplate/printThree'
 export default {
-  name: "invoicePrint",
+   name: "invoicePrint",
   components: {
     printOne,
     printTwo,
@@ -40,7 +40,7 @@ export default {
       childResponse: {},
     //   invoiceParams:{},
      org_id:''
-      
+
 
     };
   },
@@ -76,7 +76,7 @@ export default {
             style: style,
             scanStyles: false
         });
-      
+
 
       // if (this.org_template_info.template_id == 1) {
       //   printJS({
@@ -96,7 +96,7 @@ export default {
     paramsObj:{//深度监听，可监听到对象、数组的变化
       handler(val, oldVal){
         this.invoiceParams = val
-        
+
       },
       deep:true
     }
@@ -150,7 +150,7 @@ export default {
 }
 .actionBar{
     display: flex;
-    justify-content: space-between; 
+    justify-content: space-between;
     line-height: 24px;
     padding:0 10px;
 }

src/xt_pages/outpatientCharges/invoiceTemplate/printTwo.vue

@@ -135,6 +135,7 @@ export default {
         let params = {
             order_id: this.paramsObj.order_id,
             patient_id: this.paramsObj.patient_id,
+            number: this.paramsObj.number,
         }
         this.getInvoice(params)
         // var data = new Date();
@@ -186,7 +187,7 @@ export default {
             }
 
             var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
-            n += "00";  
+            n += "00";
 
             var indexpoint = n.indexOf('.');  // 如果是小数，截取小数点前面的位数
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -4772,7 +4772,11 @@
               })
 
             } else {
-
+              var ids = []
+              for (let i = 0; i < prescriptions.length; i++) {
+                ids.push(prescriptions[i].id)
+              }
+              var ids_str = ids.join(',')
               var that = this
               let form = {}
               form['id'] = this.patientInfo.id
@@ -4780,7 +4784,7 @@
               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
-
+              form['ids'] = ids_str
               form['p_type'] = med_type
               form['diagnosis'] = this.form.diagnosis.join(',')
               form['sick_type'] = this.form.sick_type

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2873,8 +2873,8 @@
                   unit: project[i].project.unit,
                   type: project[i].type
                 }
-                if (obj.total == 0 || obj.total == undefined) {
-                  obj.total = 1
+                if (obj.cus_total == 0 || obj.cus_total == undefined) {
+                  obj.cus_total = 1
                 }
 
                 this.teamList.push(obj)