From a5fab491616e113a3560b4b053250418473628f9 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期二, 18 二月 2025 11:53:15 +0800
Subject: [PATCH] 1

---
 src/components/jianceResult/index.vue |   43 +++++++++-
 src/views/system/biol/index.vue       |  133 +--------------------------------
 src/api/doctor/checkAll.js            |   12 ++
 3 files changed, 51 insertions(+), 137 deletions(-)

diff --git a/src/api/doctor/checkAll.js b/src/api/doctor/checkAll.js
index b3030ed..9d18451 100644
--- a/src/api/doctor/checkAll.js
+++ b/src/api/doctor/checkAll.js
@@ -40,7 +40,17 @@
   })
 }
 
-
+// 鐢熸垚pdf
+export function getPdfpre(tjNumber, flag, sfdy) {
+  return request({
+    url: '/system/report/previewprint/' + flag + '/' + tjNumber + '/' + sfdy,
+    method: 'get',
+    responseType: 'blob',
+    headers: {
+      "type": 'application/pdf'
+    }
+  })
+}
 export function isPdfOrJimu(tjNumber) {
   return request({
     url: '/system/report/isPdfOrJimu',
diff --git a/src/components/jianceResult/index.vue b/src/components/jianceResult/index.vue
index 0ee3f4a..55118a0 100644
--- a/src/components/jianceResult/index.vue
+++ b/src/components/jianceResult/index.vue
@@ -7,15 +7,25 @@
           <el-input v-model="queryParams.xmgz" placeholder="璇疯緭鍏ュ唴瀹�" clearable @keyup.enter.native="handleQuery"
             style="width: 130px;" />
         </el-form-item>
-        <el-form-item>
+        <el-form-item>                                                                                                                                                                                                                                                                                                          
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
         </el-form-item>
+        <el-form-item label="妫�娴嬬粨鏋�" prop="xmg">
+          <el-input
+            type="textarea"
+            :autosize="{ minRows: 2, maxRows: 4 }"
+            v-model="selectedContent"
+            placeholder=""
+            style="width: 400px;"
+            clearable
+          />
+        </el-form-item>
       </el-form>
-      <el-table :data="dataList" ref="elTable" v-loading="loading" border @selection-change="handleSelectionChange">
+      <el-table :data="dataList" ref="elTable" v-loading="loading" border @selection-change="handleSelectionChange" style="max-height: 360px; overflow-y: auto;">
         <el-table-column type="selection" width="40" align="center" />
         <el-table-column label="鏍囧彿" prop="aid" align="center" />
         <el-table-column label="缁撹鍊�" prop="ruleStr" align="center" />
-        <el-table-column label="鍙傝�冭寖鍥�" prop="reference" align="center" />
+        <el-table-column label="鍙傝�冭寖鍥�" prop="reference" align="center" />      
         <el-table-column label="绠�鐮�" prop="jm" align="center" />
       </el-table>
       <span slot="footer" class="dialog-footer">
@@ -55,21 +65,26 @@
   mounted() {
   },
   methods: {
+    handleOk() {
+        this.open = false
+        this.$emit('add', this.list);
+        this.list = [];  // 娓呯┖宸查�夊垪琛�
+        this.queryParams.xmgz = '';  // 娓呯┖鏌ヨ鍙傛暟
+    },
     quxiao(){
       this.open = false
       this.queryParams = {
         xmgz: ''
       }
-    },
-    handleOk() {
-        this.open = false
-        this.$emit('add', this.list);
+      this.list = [];  // 娓呯┖宸查�夊垪琛�
     },
     handleQuery() {
       this.getList();
     },
     handleSelectionChange(selection) {
       this.list = selection
+      console.log(this.list);
+      
     },
     getList() {
       this.loading = true;
@@ -88,6 +103,20 @@
       });
     },
   },
+  computed: {
+    selectedContent: {
+      get() {
+        return this.list.map(item => item.ruleStr).join(',');
+      },
+      set(value) {
+        // 鎵嬪姩缂栬緫鏃跺悓姝ュ洖list锛堥渶瑕佹牴鎹疄闄呮暟鎹粨鏋勮皟鏁达級
+        this.list = value.split(',').map(str => ({
+          ...this.dataList.find(item => item.ruleStr === str.trim()),
+          ruleStr: str.trim()
+        })).filter(Boolean);
+      }
+    }
+  },
 };
 </script>
 
diff --git a/src/views/system/biol/index.vue b/src/views/system/biol/index.vue
index 81e2f80..aed1d2f 100644
--- a/src/views/system/biol/index.vue
+++ b/src/views/system/biol/index.vue
@@ -544,9 +544,8 @@
 import { getInfo } from "@/api/login";
 import { isPdfOrJimu } from "@/api/doctor/checkAll";
 import {
-  listOrder,
-  getNumber,
   getPdf,
+  getPdfpre,
   getprint,
   hasReport,
   hasPrintCode,
@@ -819,14 +818,15 @@
     },
     baogaoyulan() {
       const tjNumber = this.report[0];
-      console.log(tjNumber, 5555);
       this.isLoading = true;  
 
       isPdfOrJimu(tjNumber).then((response) => {
         if (response.data.flag == "0") {
           const flag = true;
           this.isLoading = false;  
-          getPdf(tjNumber, flag).then((response) => {
+          let sfdy = this.queryParams.dyzt
+          getPdfpre(tjNumber, flag, sfdy).then((response) => {
+          
             if (response.size === 0) {
               const loading = this.$loading({
                 lock: true,
@@ -837,15 +837,12 @@
               setTimeout(() => {
                 loading.close();
               }, 3000);
-              // this.$message.msgSuccess("鎶ュ憡姝e湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�");
               this.$message({
                 message: "鎶ュ憡姝e湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�",
                 type: "warning",
               });
             } else {
-              console.log(response);
               this.dialogVisible = true;
-
               this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
             }
           });
@@ -933,18 +930,6 @@
           contentType: "application/pdf",
         }).then((res) => {
           this.dialogVisible = true;
-          // 杞悗鍚庣殑blob瀵硅薄
-          console.log("blob", res.preview);
-          // var ifr = document.createElement("iframe");
-          // ifr.style.frameborder = "no";
-          // ifr.style.display = "none";
-          // ifr.style.pageBreakBefore = "always";
-          // ifr.setAttribute("id", "printPdf");
-          // ifr.setAttribute("name", "printPdf");
-          // ifr.src =res.preview
-          // document.body.appendChild(ifr);
-          // this.doPrint("printPdf");
-          // window.URL.revokeObjectURL( ifr.src);
           try {
             this.url = res.preview;
           } catch (error) {
@@ -954,116 +939,6 @@
       });
     },
 
-    // 浣撴鎶ュ憡
-    // viewReport() {
-    //   const flag = true;
-    //   this.failList = [];
-    //   this.form.name = "鎶ュ憡鎵撳嵃澶辫触锛�";
-
-    //   if (this.report.length == 1) {
-    //     this.report.forEach((item) => {
-    //       this.tjNumber = item;
-    //     });
-    //     getPdf(this.tjNumber, flag).then((response) => {
-    //       if (response.size == 0) {
-    //         // this.$message.error("璇ョ敤鎴蜂綋妫�鎶ュ憡鏆傛湭瀹屾垚锛�");
-    //         this.dialogVisible = false;
-    //         this.DataList1.forEach((item) => {
-    //           if (item.tjNumber === this.tjNumber) {
-    //             this.userId = item.tjCustomerName;
-    //             this.form.name += item.tjCustomerName;
-    //           }
-    //         });
-    //         this.failList.push({
-    //           tjNumber: this.tjNumber,
-    //           printStatus: 0,
-    //           printBy: this.userId,
-    //           createBy: this.userIds,
-    //         });
-    //       } else {
-    //         this.dialogVisible = true;
-    //         this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
-    //         console.log(this.url)
-    //         this.DataList1.forEach((item) => {
-    //           if (item.tjNumber === this.tjNumber) {
-    //             this.userId = item.tjCustomerName;
-    //             // this.form.name += item.tjCustomerName
-    //           }
-    //         });
-    //         this.failList.push({
-    //           tjNumber: this.tjNumber,
-    //           printStatus: 1,
-    //           printBy: this.userId,
-    //           createBy: this.userIds,
-    //         });
-    //       }
-    //       this.joggle(this.failList);
-    //       this.getList();
-    //     });
-    //   } else {
-    //     for (let i = 0; i < this.report.length; i++) {
-    //       if (i <= this.report.length) {
-    //         this.tjNumber = this.report[i];
-    //         getPdf(this.tjNumber, flag).then((response) => {
-    //           if (response.size == 0) {
-    //             this.failList = [];
-    //             this.DataList1.forEach((item) => {
-    //               if (item.tjNumber === this.report[i]) {
-    //                 this.userId = item.tjCustomerName;
-    //                 if (this.form.name) {
-    //                   this.form.name =
-    //                     this.form.name + "," + item.tjCustomerName;
-    //                 }
-    //               }
-    //             });
-    //             this.failList.push({
-    //               tjNumber: this.report[i],
-    //               printStatus: 0,
-    //               printBy: this.userId,
-    //               createBy: this.userIds,
-    //             });
-    //             this.joggle(this.failList);
-    //             this.getList();
-    //             // this.$message.error("璇ョ敤鎴蜂綋妫�鎶ュ憡鏆傛湭瀹屾垚锛�");
-    //             this.dialogVisible = false;
-    //           } else {
-    //             this.failList = [];
-    //             this.DataList1.forEach((item) => {
-    //               if (item.tjNumber === this.report[i]) {
-    //                 this.userId = item.tjCustomerName;
-    //               }
-    //             });
-    //             this.failList.push({
-    //               tjNumber: this.report[i],
-    //               printStatus: 1,
-    //               printBy: this.userId,
-    //               createBy: this.userIds,
-    //             });
-    //             this.joggle(this.failList);
-    //             this.getList();
-    //             // this.dialogVisible = true;
-    //             // this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
-    //             const newBlob = [];
-    //             newBlob.push(response);
-    //             const blob = new Blob(newBlob, { type: "application/pdf" });
-
-    //             var date = new Date().getTime();
-    //             var ifr = document.createElement("iframe");
-    //             ifr.style.frameborder = "no";
-    //             ifr.style.display = "none";
-    //             ifr.style.pageBreakBefore = "always";
-    //             ifr.setAttribute("id", "printPdf" + date);
-    //             ifr.setAttribute("name", "printPdf" + date);
-    //             ifr.src = window.URL.createObjectURL(blob);
-    //             document.body.appendChild(ifr);
-    //             this.doPrint("printPdf" + date);
-    //             window.URL.revokeObjectURL(ifr.src); // 閲婃斁URL 瀵硅薄
-    //           }
-    //         });
-    //       }
-    //     }
-    //   }
-    // },
 
     doPrint(val) {
       var ordonnance = document.getElementById(val).contentWindow;

--
Gitblit v1.8.0