新分支

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -29,7 +29,7 @@
         <li v-if="isShow('置换速度') && this.$store.getters.xt_user.template_info.org_id == 10375">
           <label>置换速度 : </label>
           <span class="content">{{displace_speed }}</span>
-            <span class="unit">L/h</span>
+            <span class="unit">ml/min</span>
         </li>
 
 

src/xt_pages/dialysis/template/DialysisPrintOrderFiftySeven.vue

@@ -371,14 +371,11 @@
                 <div style="width: 75%">
                   血管通路: &nbsp;
                   <label-box
-                    :isChecked="
-                      predialysis.blood_access_part_opera_name == '内瘘'
-                        ? true
-                        : false
-                    "
+                    :isChecked="predialysis.blood_access_part_opera_name == '内瘘'? true: false"
                     showValue="内瘘"
                   ></label-box
                   >&nbsp; &nbsp;
+                  
                   <label-box
                     :isChecked="
                       predialysis.blood_access_part_opera_name.indexOf(

src/xt_pages/role/admin.vue

@@ -1064,10 +1064,14 @@ export default {
     },
     toSavePDFInformation(){
       toSavePDFInformation().then(response=>{
-         if(response.data.data == 1){
+         if(response.data.state == 1){
           var information =  response.data.data.information
-
+           
            var orderId = response.data.data.orderId
+
+           var imgFile = this.base64ImgtoFile(orderId)
+
+           console.log("imgFilewoowow",imgFile)
          }
       })
     },
@@ -1077,7 +1081,23 @@ export default {
           var information =  response.data.data.information
         }
       })
+    },
+
+    base64ImgtoFile(dataurl, filename = 'file') {
+      let arr = dataurl.split(',')
+      let mime = arr[0].match(/:(.*?);/)[1]
+      let suffix = mime.split('/')[1]
+      let bstr = atob(arr[1])
+      let n = bstr.length
+      let u8arr = new Uint8Array(n)
+      while (n--) {
+        u8arr[n] = bstr.charCodeAt(n)
+      }
+      return new File([u8arr], `${filename}.${suffix}`, {
+        type: mime
+      })
     }
+
   },
   watch: {
     should_update_admins(should_change) {

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -831,8 +831,7 @@ export default {
       },
 
     exportList(){
-      console.log("shij232333",this.tableOut)
-     
+    
        for(let i=0;i<this.tableOut.length;i++){
         this.tableOut[i].index = i+1
         this.tableOut[i].good_name = this.tableOut[i].good_name
@@ -876,13 +875,13 @@ export default {
         }
         if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId == 0 || this.orgId ==10489 || this.orgId == 10375 || this.orgId == 10485){
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
-          console.log("out_count232233232332",this.tableOut[i].out_count)
+         
         }
         if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
         this.tableOut[i].manufacturer_name = this.getManufacturerNameOne(this.tableOut[i].manufacturer)
-        console.log("继续桑",this.tableOut[i].dealer)
+       
         this.tableOut[i].dealer_name = this.getDealerNameOne(this.tableOut[i].dealer)
        }
        console.log("retusoossoso",this.tableOut)