Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1311,11 +1311,11 @@
           >
           </DialysisPrintOrderSixtyeight>
 
-          <DialysisPrintOrderZero
+          <!-- <DialysisPrintOrderZero
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 199"
           >
-          </DialysisPrintOrderZero>
+          </DialysisPrintOrderZero> -->
         </div>
       </el-container>
     </div>
@@ -2032,7 +2032,7 @@ export default {
           style: style12,
           scanStyles: false,
         });
-        console.log("printjswowoowowowwoow",style12)
+       
 
       }else if (this.org_template_info.template_id == 65 || this.org_template_info.template_id == 6) {
         printJS({
@@ -2058,7 +2058,7 @@ export default {
           style: style2,
           scanStyles: false,
         });
-        console.log('77777',this.org_template_info.template_id);
+        // console.log('77777',this.org_template_info.template_id);
       }
       else if (
         this.org_template_info.template_id == 53
@@ -2227,7 +2227,7 @@ export default {
           scanStyles: false,
         });
       } else if (this.org_template_info.template_id == 53 ) {
-        console.log("进来233232323232")
+       
         printJS({
           printable: "dialysis-print-box-1-2",
           type: "html",
@@ -2241,7 +2241,7 @@ export default {
           style: style12,
           scanStyles: false,
         });
-        console.log("printjswowoowowowwoow",style12)
+       
 
       }
     },
@@ -2281,7 +2281,7 @@ export default {
       return name;
     },
     setAdminUserES(id) {
-      console.log(id);
+      // console.log(id);
       if (id == 0) {
         return "";
       }
@@ -2303,7 +2303,7 @@ export default {
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state == 1) {
           this.childResponse = response;
-          console.log('this.org_template_info是数据',response.data.data.org_template_info.template_id);
+          // console.log('this.org_template_info是数据',response.data.data.org_template_info.template_id);
           this.org_template_info = response.data.data.org_template_info;
           this.loading = false;
           //   this.adminUser = response.data.data.users
@@ -2730,7 +2730,7 @@ export default {
       });
     },
     changePatient(schedual) {
-      console.log(schedual);
+      // console.log(schedual);
       var xtdate = parseTime(schedual.schedule_date, "{y}-{m}-{d}");
       this.$router.push(
         "/dialysis/print?xtdate=" +
@@ -2757,11 +2757,11 @@ export default {
     getData() {
       let patientArr = [];
       patientArr = JSON.parse(JSON.stringify(this.zone_schedules));
-      console.log("patientArr", patientArr);
+      // console.log("patientArr", patientArr);
       let arr1 = [];
       if (this.patientStateVal == 0) {
         arr1 = patientArr;
-        console.log(arr1);
+        // console.log(arr1);
       } else if (this.patientStateVal == 1) {
         let arr = [];
         arr = patientArr;
@@ -2782,7 +2782,7 @@ export default {
             }
           }
         }
-        console.log("执行1", arr);
+        // console.log("执行1", arr);
         arr1 = arr;
       } else if (this.patientStateVal == 2) {
         let arr = [];
@@ -2800,12 +2800,12 @@ export default {
                   .systolic_blood_pressure != 0)
             ) {
               // 删除元素后改变i的值
-              console.log("几次");
+              // console.log("几次");
               arr[i].schedules.splice(j--, 1);
             }
           }
         }
-        console.log("执行2", arr);
+        // console.log("执行2", arr);
         arr1 = arr;
       } else if (this.patientStateVal == 3) {
         let arr = [];
@@ -2921,7 +2921,7 @@ export default {
         newArr.push(...item.schedules);
       });
       this.tableData = newArr;
-      console.log("table", this.tableData);
+      // console.log("table", this.tableData);
     },
   },
   watch: {
@@ -2951,8 +2951,8 @@ export default {
     },
   },
   created() {
-    console.log("hhahahhahahahah=======",this.org_template_info.template_id)
-    console.log("this.$store.getters.xt_user.org.id",this.$store.getters.xt_user.org.id)
+    // console.log("hhahahhahahahah=======",this.org_template_info.template_id)
+    // console.log("this.$store.getters.xt_user.org.id",this.$store.getters.xt_user.org.id)
     var schedule_type_selected = this.$store.getters.schedule_type_selected;
     var zone_selected = this.$store.getters.zone_selected;
     var patient_state_selected = this.$store.getters.patient_state_selected;

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -42,12 +42,12 @@
 
        
       </div>
-      <div class="filter-container">
+      <!-- <div class="filter-container">
       <el-input style="width:200px" placeholder="请输入药品名称" v-model="keyword"></el-input>
        <el-button type="primary" @click="toSeachOne">搜索</el-button>
 
        
-      </div>
+      </div> -->
       <div class="cell clearfix">
         <label class="title">
           <span class="name">日期查询:</span>

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -1752,15 +1752,17 @@ export default {
       return name;
     },
     setAdminUserES(id) {
-      console.log(id);
-      if (id == 0) {
+      // console.log(id);
+      if (id == 0 || id == "undefined") {
         return "";
-      }
-      if (id in this.operatorMaps) {
+      }else{
+        if (id in this.operatorMaps) {
         return this.operatorMaps[id].url;
-      } else {
-        return "";
+        } else {
+          return "";
+        }
       }
+     
     },
     modeName(mode_id) {
       return typeof this.modeOptions[mode_id] !== "undefined" &&

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -179,7 +179,6 @@
                   透析前情况
                 </td>
               </tr>
-
               <tr>
                 <td colspan="2">
                   <div
@@ -1144,7 +1143,6 @@
                   </div>
                 </td>
               </tr>
-
               <tr>
                 <td style="padding: 0; position: relative" colspan="2">
                   <table class="inside_table">
@@ -1407,7 +1405,6 @@
                   </table>
                 </td>
               </tr>
-
               <tr>
                 <td style="padding: 0; position: relative" colspan="2">
                   <table class="inside_table">
@@ -1438,6 +1435,7 @@
                         <td style="font-size: 16px" width="10%">时间</td>
                       </tr>
                       <!-- <template v-for="group in doctor_advices" > -->
+
                       <tr
                         v-for="(advice, advice_index) in doctor_advices"
                         :key="advice_index"

src/xt_pages/dialysis/template/DialysisPrintOrderZero.vue

@@ -1,14 +1,13 @@
 <template>
     <div >
       <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
-      <el-button type="primary" @click="toUpload">一键上传</el-button>
+      <el-button type="primary" @click="getPdf">一键上传</el-button>
       <div >
         <div
-          id="dialysis-print-box-64-1  "
+          id="dialysis-print-box-64-1"
           class="dialysis-print-order print-template-two print_page_main_content"
           
         >
-        <!-- style="padding:10px 0 0 40px  ;" -->
           <div id="dialysis-print-box-64">
             <!-- <div 10px 0 0 40px
               class="order-yy-name"
@@ -650,7 +649,7 @@
   import html2pdf from 'html2pdf.js'
   import { UploadPrintOrder } from "@/api/role/admin"
   import { HTML5_FMT } from "moment";
-  import html2canvas from 'html2canvas'
+  import html2Canvas from 'html2canvas'
   import { jsPDF } from 'jspdf';
   export default {
     data() {
@@ -1242,59 +1241,117 @@
         }
         return name
       },
+
+      getPdf() {
+        // let dom = document.getElementById("dialysis-print-box-64")
+        html2Canvas(document.querySelector('#dialysis-print-box-64'), {
+          allowTaint: false,
+          taintTest: false,
+          logging: false,
+          useCORS: true,
+          dpi: window.devicePixelRatio * 4, // 将分辨率提高到特定的DPI 提高四倍
+          scale: 4 // 按比例增加分辨率
+        }).then(canvas => {
+          // eslint-disable-next-line
+          var pdf = new jsPDF('p', 'mm', 'a4') // A4纸，纵向
+          var ctx = canvas.getContext('2d')
+          var a4w = 190; var a4h = 277 // A4大小，210mm x 297mm，四边各保留10mm的边距，显示区域190x277
+          var imgHeight = Math.floor(a4h * canvas.width / a4w) // 按A4显示比例换算一页图像的像素高度
+          var renderedHeight = 0
+
+          while (renderedHeight < canvas.height) {
+            var page = document.createElement('canvas')
+            page.width = canvas.width
+            page.height = Math.min(imgHeight, canvas.height - renderedHeight)// 可能内容不足一页
+
+            // 用getImageData剪裁指定区域，并画到前面创建的canvas对象中
+            page.getContext('2d').putImageData(ctx.getImageData(0, renderedHeight, canvas.width, Math.min(imgHeight, canvas.height - renderedHeight)), 0, 0)
+            pdf.addImage(page.toDataURL('image/jpeg', 1.0), 'JPEG', 10, 10, a4w, Math.min(a4h, a4w * page.height / page.width)) // 添加图像到页面，保留10mm边距
+
+            renderedHeight += imgHeight
+            if (renderedHeight < canvas.height) {
+              pdf.addPage()// 如果后面还有内容，添加一个空页
+            }
+            // delete page;
+          }
+          console.log("podeww22222",pdf)
+          var newBase64Data =  pdf.output("dataurlstring").split("base64,")[1]
+          console.log("newBase64Data",newBase64Data)
+          // const blob = this.base64ToBlob(newBase64Data, 'application/pdf');
+          // this.openPdf(blob);
+          // // 保存文件
+          // pdf.save(中国 + '.pdf')
+
+          var data = {
+              name:newBase64Data,
+            }
+            UploadPrintOrder(data).then(response=>{
+              if(response.data.state == 1){
+                var sign =  response.data.data.sign
+                console.log("SIGNWWOOWWO")
+                var pdfBase64 = response.data.data.pdfBase64
+                console.log("pdfBase64",pdfBase64)
+                this.$message.success("保存成功!")
+                const blob = this.base64ToBlob(pdfBase64, 'application/pdf');
+                this.openPdf(blob);
+              }
+            })
+        })
+      },
+
   
-      toUpload() {
+      // toUpload() {
          
-          let dom = document.getElementById("dialysis-print-box-64")
-          //调用方法下载
-          html2canvas(dom, {
-            useCORS: true, //允许跨域
-            allowTaint: false,
-            logging: false,
-            letterRendering: true,
-            ddpi: window.devicePixelRatio * 4, //将分辨率提高到特定的DPI 提高四倍
-            scale: 4, //按比例增加分辨率
-            background: '#fff',//pdf背景色为白色，默认是黑色的
-          }).then((canvas) => {
-            //返回图片dataURL，参数：图片格式和清晰度(0-1)
-            var pageData = canvas.toDataURL('image/jpeg', 1.0);
-  
-            //方向默认竖直，尺寸ponits，格式a4[595.28,841.89]
-            var pdf = new jsPDF('', 'pt', 'a4');
-  
-            //addImage后两个参数控制添加图片的尺寸，此处将页面高度按照a4纸宽高比列进行压缩
-            //  pdf.addImage(pageData, 'JPEG', 0, 0, 595.28, 592.28 / canvas.width * canvas.height);
-             pdf.addImage(pageData, 'JPEG', 0, 0, 555.28, 592.28 / canvas.width * canvas.height);
+      //     let dom = document.getElementById("dialysis-print-box-64")
+      //     //调用方法下载
+      //     html2canvas(dom, {
+      //       useCORS: true, //允许跨域
+      //       allowTaint: false,
+      //       logging: false,
+      //       letterRendering: true,
+      //       ddpi: window.devicePixelRatio * 4, //将分辨率提高到特定的DPI 提高四倍
+      //       scale: 4, //按比例增加分辨率
+      //       background: '#fff',//pdf背景色为白色，默认是黑色的
+      //     }).then((canvas) => {
+      //       //返回图片dataURL，参数：图片格式和清晰度(0-1)
+      //       var pageData = canvas.toDataURL('image/jpeg', 1.0);
+  
+      //       //方向默认竖直，尺寸ponits，格式a4[595.28,841.89]
+      //       var pdf = new jsPDF('', 'pt', 'a4');
+  
+      //       //addImage后两个参数控制添加图片的尺寸，此处将页面高度按照a4纸宽高比列进行压缩
+      //       //  pdf.addImage(pageData, 'JPEG', 0, 0, 595.28, 592.28 / canvas.width * canvas.height);
+      //       pdf.addImage(pageData, 'JPEG', 0, 0, 555.28, 592.28 / canvas.width * canvas.height);
             
-            console.log("pdf222222222222222222",pdf)
+      //       console.log("pdf222222222222222222",pdf)
 
-            var newBase64Data =  pdf.output("dataurlstring").split("base64,")[1]
-            // console.log("base63",newBase64Data)
-            const blob = this.base64ToBlob(newBase64Data, 'application/pdf');
-            console.log("blobwoowowowwo",blob)
-            this.openPdf(blob);
+      //       var newBase64Data =  pdf.output("dataurlstring").split("base64,")[1]
+      //       // console.log("base63",newBase64Data)
+      //       const blob = this.base64ToBlob(newBase64Data, 'application/pdf');
+      //       console.log("blobwoowowowwo",blob)
+      //       this.openPdf(blob);
             
-            // var data = {
-            //   name:newBase64Data,
-            // }
-            // UploadPrintOrder(data).then(response=>{
-            //   if(response.data.state == 1){
-            //     var sign =  response.data.data.sign
-            //     console.log("SIGNWWOOWWO")
-            //     var pdfBase64 = response.data.data.pdfBase64
-            //     console.log("pdfBase64",pdfBase64)
-            //     this.$message.success("保存成功!")
-            //     const blob = this.base64ToBlob(pdfBase64, 'application/pdf');
-            //     this.openPdf(blob);
-            //   }
-            // })
+      //       // var data = {
+      //       //   name:newBase64Data,
+      //       // }
+      //       // UploadPrintOrder(data).then(response=>{
+      //       //   if(response.data.state == 1){
+      //       //     var sign =  response.data.data.sign
+      //       //     console.log("SIGNWWOOWWO")
+      //       //     var pdfBase64 = response.data.data.pdfBase64
+      //       //     console.log("pdfBase64",pdfBase64)
+      //       //     this.$message.success("保存成功!")
+      //       //     const blob = this.base64ToBlob(pdfBase64, 'application/pdf');
+      //       //     this.openPdf(blob);
+      //       //   }
+      //       // })
             
-            // this.viewPdf(newBase64Data)
-            //保存到pdf，名字是stone
-            // pdf.save('stone.pdf');
+      //       // this.viewPdf(newBase64Data)
+      //       //保存到pdf，名字是stone
+      //       // pdf.save('stone.pdf');
            
-          });
-        },
+      //     });
+      //   },
      
       viewPdf(content) {
         console.log("content",content);