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

src/xt_pages/dialysis/template/DialysisPrintOrderSop.vue

@@ -105,7 +105,9 @@
                 <div style="line-height:30px;">
                  <span v-if="org_id != 9779">处方脱水量: {{ prescription.prescription_water ? prescription.prescription_water : "" }} ml&nbsp;&nbsp;</span> 
                  <span v-if="org_id == 9779">目标脱水量:{{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "" }} L&nbsp;&nbsp;</span>
-                 <span>透析液流量: {{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }} </span>ml/h
+                 <span>透析液流量: {{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }} </span>
+                  <span v-if="org_id !=9779">ml/h</span>
+                  <span v-if="org_id ==9779">ml/min</span>
                 </div>
               </td>
               <td >

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -1435,6 +1435,9 @@ export default {
           if (prescription.anticoagulant == 7) {
             prescription.anticoagulant = '低分子肝素钠'
           }
+          if (prescription.anticoagulant == 15) {
+            prescription.anticoagulant = '甲磺酸萘莫司他'
+          }
           if (prescription.blood_access === 1) {
             prescription.blood_access = '正常'
           }

src/xt_pages/outpatientCharges/listTemplate/batch_listPrint.vue

@@ -172,6 +172,7 @@ export default {
       list_batch(this.list_id).then(res =>{
         console.log('res',res);
         this.list_arr = res.data.data.orders
+        console.log("listArr=======",this.list_arr)
         for(let x in this.list_arr){
           this.list_arr[x]['lists']=[]
           for (let i = 0; i < this.list_arr[x].order_info.length; i++) {
@@ -194,10 +195,11 @@ export default {
               obj['unit'] =  infos.project.project.unit
               obj['is_total']= 0
               obj['record_date'] = infos.project.record_date
+              obj['spec'] = ""
 
             }else if (infos.project.type == 3){
               obj['name'] = infos.project.good_info.good_name
-              obj['spec'] = ""
+              obj['spec'] = infos.project.good_info.specification_name
               obj['code'] = infos.project.good_info.medical_insurance_number
               obj['unit'] = infos.project.good_info.packing_unit
               obj['is_total']= 0