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

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -47,7 +47,7 @@
           <span class="content">{{ anticoagulant }}</span>
         </li>
 
-        <li v-if="isShow('抗凝剂商品名称')">
+        <li v-if="isShow('抗凝剂商品名称') && this.$store.getters.xt_user.template_info.template_id != 24">
           <label>抗凝剂商品名称 : </label>
           <span class="content">{{ antioxidant_commodity_name }}</span>
         </li>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -605,11 +605,11 @@
                             <td width='100'>
                                 <label-box :isChecked="prescription.anticoagulant == 3 ? true : prescription.anticoagulant == 6 ? true : prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素"></label-box>
                             </td>
-                            <td width='100'>
+                            <!-- <td width='100'>
                                 <div class="under-line">
                                     &nbsp;{{ prescription.antioxidant_commodity_name ? prescription.antioxidant_commodity_name : '' }}
                                 </div>
-                            </td>
+                            </td> -->
                             <td width='10'>(</td>
                             <td width='40'>首剂</td>
                             <td width='50'>
@@ -1797,7 +1797,7 @@ export default {
           }
           this.check = response.data.data.check
           this.predialysis = response.data.data.PredialysisEvaluation
-          console.log('透前评估', this.predialysis)
+          // console.log('透前评估', this.predialysis)
           this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
             this.predialysis.blood_access_part_opera_id
           )

src/xt_pages/outpatientCharges/summary.vue

@@ -184,7 +184,7 @@
   import NewStatementPrintTwo from './newStatementPrintTwo'
   import {fetchAllAdminUsers} from '@/api/doctor'
   import axios from 'axios'
-  // import invoicePrint from './invoicePrint'
+  import invoicePrint from './invoicePrint'
 
   export default {
     components: {
@@ -193,7 +193,7 @@
       BreadCrumb,
       listPrint,
       allListPrint,
-      // invoicePrint
+      invoicePrint
     },
     data() {
       return {

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -204,7 +204,7 @@
         input: 1,
       }
     },
-
+    
    methods:{
      createFilter(queryString) {
        return (restaurant) => {
@@ -379,27 +379,34 @@
       },
     },mounted(){
       this.getInitData()
-
+     
     },
     watch:{
-      "prescription.advices":{
-        handler(newVal,oldVal){
-          newVal.map(item => {
-            item.prescribing_number = item.single_dose * item.day
-          })
-        },
-        deep:false
-      },
-      "prescription.project":{
-        handler(newVal,oldVal){
-          newVal.map(item => {
-            item.total = item.single_dose * item.number_days
-          })
-        },
-        deep:true
-      }
+      // "prescription.advices":{
+      //   handler(newVal,oldVal){
+      //     newVal.map(item => {
+      //       // item.prescribing_number = item.single_dose * item.day
+      //       if(item.single_dose != oldVal[index].single_dose || item.number_days != oldVal[index].number_days){
+      //         item.total = item.single_dose * item.number_days
+      //       }
+            
+      //     })
+      //   },
+      //   deep:true
+      // },
+      // "prescription.project":{
+      //   handler(newVal,oldVal){
+      //     newVal.map((item,index) => {
+      //       if(item.single_dose != oldVal[index].single_dose || item.number_days != oldVal[index].number_days){
+      //         item.total = item.single_dose * item.number_days
+      //       }
+            
+      //     })
+      //   },
+      //   deep:true
+      // }
     }
-
+    
   }
 </script>
 

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -22,7 +22,8 @@
           <div class="prescriptionBox">
               <div class="Rp">Rp:</div>
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
+                  <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.drug.drug_spec}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
                   <div style="margin-left:100px;"><span>用法：{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;{{it.day}}天</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
               </div>
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
@@ -36,6 +37,7 @@
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
                 <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
                </div>
+               <div style="text-align:center;" >(以下空白)</div>
 
           </div>
           <div class="doctorBox">

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -710,7 +710,7 @@ export default {
       //本月的结束时间
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
-     // console.log("本月最后一天",timeEnd)
+      // console.log("本月最后一天",timeEnd)
       //本月
       if(state == 0){
        //统计透析总量

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -39,7 +39,8 @@
               <td style="line-height: 18px">
                  <span v-if="item.drug_id != 0">{{item.drug?item.drug.drug_spec:''}}</span>
               </td>
-              <td style="line-height: 18px">{{ getManufacturer(item.manufacturer) }}</td>
+              <!-- <td style="line-height: 18px">{{ getManufacturer(item.manufacturer) }}</td> -->
+              <td style="line-height: 18px">{{ getManufacturer(item.drug.id) }}</td>
               <td style="line-height: 18px">
                 <span>{{getUnit(item.drug_id)}}</span>
               </td>
@@ -218,7 +219,21 @@
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.list.push(response.data.data.list[i])
             }
-            console.log("list222222",this.list)
+           
+            for(let j=0;j<this.list.length;j++){
+              this.list[j].manufacturer_name = ""
+            }
+
+            for(let i=0;i<this.list.length;i++){
+           
+              for(let j=0;j<this.manufacturer.length;j++){
+                 if(this.list[i].manufacturer == this.manufacturer[j].id){
+                    this.list[i].manufacturer_name = this.manufacturer[j].manufacturer_name
+                 }
+              }
+            }
+
+             console.log("list222222",this.list)
           }
         })
       },
@@ -231,13 +246,22 @@
         }
         return name
       },
+      // getManufacturer(id){
+      //   let name = ''
+      //   this.manufacturer.map(item => {
+      //     if(item.id == id){
+      //       name = item.manufacturer_name
+      //     }
+      //   })
+      //   return name
+      // },
       getManufacturer(id){
-        let name = ''
-        this.manufacturer.map(item => {
-          if(item.id == id){
-            name = item.manufacturer_name
-          }
-        })
+        let name = ""
+        for(let i=0;i<this.list.length;i++){
+           if(id == this.list[i].id){
+              name = this.list[i].manufacturer_name
+           }
+        }
         return name
       },
       GetConfigInfo: function() {
@@ -246,7 +270,8 @@
             this.$message.error(response.data.msg);
             return false;
             } else {
-            this.manufacturer = response.data.data.manufacturer;
+             this.manufacturer = response.data.data.manufacturer;
+              this.getList()
             }
         });
       },