新分支

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -750,14 +750,14 @@
                         >
                          
 
-                          <span v-if="org_id==10223">
+                          <span v-if="org_id==10265">
                               {{
                             record.prescription.replacement_total
                               ? record.prescription.replacement_total
                               : "/"
                            }}
                           </span>
-                          <span v-if="org_id!=10223">
+                          <span v-if="org_id!=10265">
                             {{
                             record.prescription &&
                             record.prescription.displace_liqui_value

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -2099,9 +2099,9 @@ export default {
         });
       }else if (this.org_template_info.template_id == 199 ) {
         printJS({
-          printable: "dialysis-print-box-64",
+          printable: "dialysis-print-box-1",
           type: "html",
-          style: style12,
+          style: style2,
           scanStyles: false,
         });
        

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -762,13 +762,13 @@
                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
-                      <span v-if="org_id==10223"> {{
+                      <span v-if="org_id ==10265"> {{
                           prescription.replacement_total
                             ? prescription.replacement_total
                             : "/"
                         }}
                         </span> 
-                        <span v-if="org_id!=10223"> {{
+                        <span v-if="org_id!=10265"> {{
                           prescription.displace_liqui_value
                             ? prescription.displace_liqui_value
                             : "/"

src/xt_pages/role/admin.vue

@@ -25,13 +25,13 @@
         >医药师登记</el-button>
 
 
-        <el-button
+        <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toJiaBan">加班</el-button>
-       
+        -->
 
          <!-- <el-button
           type="primary"

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -588,8 +588,9 @@ export default {
     },
 
      exportList(){
-       
         
+        
+       
         for(let i=0;i<this.tablePrint.length;i++){
           this.tablePrint[i].index = i+1
           this.tablePrint[i].ctime = this.getTime(this.tablePrint[i].ctime)
@@ -599,24 +600,26 @@ export default {
         for(let i=0;i<this.tablePrint.length;i++){
            if(this.org_id == 9919 || this.org_id == 9671){
              this.tablePrint[i].min_price = this.tablePrint[i].price
-             this.tablePrint[i].count = parseInt((this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child))/this.tablePrint[i].min_number)
+             this.tablePrint[i].count_one = parseInt((this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child))/this.tablePrint[i].min_number)
              this.tablePrint[i].total_price =  ((parseInt((this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child))/this.tablePrint[i].min_number))*this.tablePrint[i].price).toFixed(2)
              this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
              this.tablePrint[i].total = this.getCountSenvenOne(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)/this.tablePrint[i].min_number
             
            }else{
-              this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
+              this.tablePrint[i].count_one = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
               this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price)
               this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
               this.tablePrint[i].total = this.getTotalPriceOne(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price)
            }
         }
-
-
+        console.log("wowowoowowowowo",this.tablePrint)
+       
+       
+       
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号','生产厂商','进销商', '单位','数量','单价','总价','出库时间','备注']
        if(this.org_id == 9919){
-        const filterVal = ['index','drug_name', 'unit', 'manufacturer_name','dealer_name','max_unit','count','min_price','total_price','ctime','remark']
+        const filterVal = ['index','drug_name', 'unit', 'manufacturer_name','dealer_name','max_unit','count_one','min_price','total_price','ctime','remark']
            
        let obj = {'index':'合计','total_price':0.00}
        for(let i=0;i<this.tablePrint.length;i++){
@@ -819,6 +822,7 @@ export default {
         if(response.data.state == 1){
             var list = response.data.data.list
             console.log("很粗扣扣我噢噢",list)
+           
             this.dealerList = response.data.data.dealerList
             this.manufacturerList = response.data.data.manufacturerList
             let objInfo = {}
@@ -882,6 +886,8 @@ export default {
                 }
               }
             }
+
+           console.log("newArrwowowowowoowowowowowowow",newArr)
            this.tablePrint = newArr
 
         }
@@ -893,11 +899,14 @@ export default {
         var min_str = ""
         for(let i=0;i<arr.length;i++){
           if(arr[i].count_unit == max_unit){
-            arr[i].count = arr[i].count * min_number
+            arr[i].count_one = 0
+            arr[i].count_one = arr[i].count * min_number
+          }else{
+            arr[i].count_one = arr[i].count
           }
         }
         for(let i=0;i<arr.length;i++){
-          total+= arr[i].count
+          total+= arr[i].count_one
         }
 
        if(total<min_number){
@@ -915,6 +924,8 @@ export default {
         return str + min_str
       },
       getTotalPrice(arr,max_unit,min_number,min_price){
+        console.log("arrwoowowow",arr)
+      
         var total = 0
         for(let i=0;i<arr.length;i++){
           if(arr[i].count_unit == max_unit){