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

@@ -17,7 +17,7 @@
       <printOne v-if="org_id != 10106 && this.paramsObj.balance_accounts_type != 2" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
       <!--<printThree v-if="org_id == 0 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printThree>-->
-      <print-three v-if="org_id == 0 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
+      <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
     </div>
   </div>
 </template>
@@ -58,7 +58,7 @@
     created() {
       this.getInfo(this.paramsObj.id)
       this.org_id = this.$store.getters.xt_user.org_id
-      if(this.org_id == 0){
+      if(this.org_id == 10106){
         if(this.paramsObj.balance_accounts_type == 2){
 
           this.getInfoPrivateExpenses10106(this.paramsObj.id)

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2700,7 +2700,7 @@
                   delivery_way: temp2[b].delivery_way,
                   execution_frequency: temp2[b].execution_frequency,
                   number_days: temp2[b].number_days.toString(),
-                  total: 1,
+                  total:  temp2[b].cus_total,
                   price: temp2[b].price,
                   remark: '',
                   medical_code: temp2[b].medical_code,
@@ -2752,6 +2752,7 @@
                 number_days: project[i].number_days,
                 price: project[i].price,
                 medical_code: project[i].medical_code,
+                cus_total:1,
                 unit: project[i].unit,
                 type: 2,
                 total:project[i].total
@@ -2771,6 +2772,7 @@
                 delivery_way: '',
                 execution_frequency: '',
                 number_days: 1,
+                cus_total:1,
                 price: good_info[i].packing_price,
                 medical_code: good_info[i].medical_insurance_number,
                 unit: this.getGoodUnit(good_info[i].good_unit),
@@ -2864,7 +2866,7 @@
                   delivery_way: project[i].project.delivery_way,
                   execution_frequency: project[i].project.execution_frequency,
                   number_days: project[i].project.number_days,
-                  total: project[i].number,
+                  cus_total:project[i].number,
                   price: project[i].project.price,
                   remark: '',
                   medical_code: project[i].project.medical_code,
@@ -2885,15 +2887,15 @@
                   delivery_way: '',
                   execution_frequency: '',
                   number_days: '',
-                  total: project[i].number,
+                  cus_total: project[i].number,
                   price: project[i].good_info.retail_price,
                   remark: '',
                   medical_code: project[i].good_info.medical_insurance_number,
                   unit: project[i].good_info.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)