From ced3a8b5f49b6e7039be5415a705ae3575c102fb Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期三, 06 十二月 2023 15:50:29 +0800
Subject: [PATCH] qxtj

---
 src/views/doctor/check/index.vue    |  324 ++++++++++++++------
 src/views/doctor/checkAll/index.vue |  507 ++++++++++++---------------------
 vue.config.js                       |    2 
 src/api/doctor/check.js             |   10 
 4 files changed, 422 insertions(+), 421 deletions(-)

diff --git a/src/api/doctor/check.js b/src/api/doctor/check.js
index d0abc25..545dda4 100644
--- a/src/api/doctor/check.js
+++ b/src/api/doctor/check.js
@@ -111,4 +111,14 @@
     method: 'get',
     params:data
   })
+}
+
+
+//鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏
+export function AutoGetRule(data) {
+  return request({
+    url: '/hosp/rules/AutoGetRule',
+    method: 'get',
+    params:data
+  })
 }
\ No newline at end of file
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index 40b6104..191b98f 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -185,6 +185,13 @@
       </div>
     </el-dialog>
 
+
+    <el-dialog title="PDF 棰勮" :visible.sync="dialogVisible" :close-on-click-modal="false">
+      <div class="main">
+        <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
+      </div>
+    </el-dialog>
+
     <!-- 鐐瑰嚮鍙宠竟寮瑰嚭灞� -->
     <el-drawer :visible.sync="drawer" :with-header="false" size="70%" :before-close="handleClose">
       <div style="font-size: 14px">
@@ -238,131 +245,150 @@
           </tr>
         </table>
       </div>
-      <div>
+      <div style="display: flex;">
         <div style="margin: 10px 10px;" v-if="hasdeptList.length >= 1">
           <el-button type="primary" size="mini" @click="Changeapply()">浼氳瘖鐢宠</el-button>
         </div>
-        <div style="margin: 10px 10px;" >
+        <div style="margin: 10px 10px;">
           <el-button type="primary" size="mini" @click="historicalreport()">鍘嗗彶鎶ュ憡</el-button>
         </div>
       </div>
 
-
-      <template>
-        <div style="margin-left: 10px">
-          <el-radio-group v-model="radio" v-for="(item, index) in Parent" :key="index"
-            @input="radioChange1(item.proId, item)">
-            <el-radio-button :label="item.proId">{{
-              item.proName
-            }}</el-radio-button>
-          </el-radio-group>
-        </div>
-      </template>
-      <el-table v-loading="loading" :data="proParentList.sons" border height="460px"
-        style="width: 96%; margin: 10px 10px">
-        <el-table-column prop="project.proName" label="妫�娴嬮」鐩�" width="150">
-          <!-- <template slot-scope="scope">
+      <el-row>
+        <el-col :span="18">
+          <template>
+            <div style="margin-left: 10px">
+              <el-radio-group v-model="radio" v-for="(item, index) in Parent" :key="index"
+                @input="radioChange1(item.proId, item)">
+                <el-radio-button :label="item.proId">{{
+                  item.proName
+                }}</el-radio-button>
+              </el-radio-group>
+            </div>
+          </template>
+          <el-table v-loading="loading" :data="proParentList.sons" border height="460px"
+            style="width: 96%; margin: 10px 10px">
+            <el-table-column prop="project.proName" label="妫�娴嬮」鐩�" width="150">
+              <!-- <template slot-scope="scope">
             {{ scope.row.project.proName }}
           </template> -->
-        </el-table-column>
-        <el-table-column prop="proResult" label="妫�娴嬬粨鏋�" width="280">
-          <template slot-scope="scope">
-            <el-input size="mini" v-model="scope.row.proResult" autocomplete="off" placeholder="璇疯緭鍏ユ娴嬬粨鏋�"
-              @blur="handleInputConfirm(scope.row)" @input="vale"></el-input>
-          </template>
-        </el-table-column>
-        <el-table-column label="瑙勫垯" width="55">
-          <template slot-scope="scope">
-            <el-button class="blue-button" @click="handleguize(scope.row)">...</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column prop="project.proMetering" label="鍗曚綅">
-          <!-- <template slot-scope="scope">
+            </el-table-column>
+            <el-table-column prop="proResult" label="妫�娴嬬粨鏋�" width="280">
+              <template slot-scope="scope">
+                <el-input size="mini" v-model="scope.row.proResult" autocomplete="off" placeholder="璇疯緭鍏ユ娴嬬粨鏋�"
+                  @blur="handleInputConfirm(scope.row)" @input="vale" @focus="handleInConfirm(scope.row)"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="瑙勫垯" width="55">
+              <template slot-scope="scope">
+                <el-button class="blue-button" @click="handleguize(scope.row)">...</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="project.proMetering" label="鍗曚綅">
+              <!-- <template slot-scope="scope">
             {{ scope.row.standard.company }}
           </template> -->
-        </el-table-column>
-        <el-table-column prop="project.proScope" label="鍙傝�冭寖鍥�">
-        </el-table-column>
-        <el-table-column prop="conclusion" label="缁撴灉缁撹" width="280">
-          <template slot-scope="scope">
-            <el-input size="mini" v-model="scope.row.conclusion" autocomplete="off" placeholder="璇疯緭鍏ユ娴嬬粨鏋�"
-              disabled></el-input>
-          </template>
-        </el-table-column>
-        <el-table-column prop="exceptionDesc" label="鏄惁寮傚父" width="80px" align="center">
-          <template slot-scope="scope">
-            <el-checkbox v-model="scope.row.exceptionDesc"></el-checkbox>
-          </template>
-        </el-table-column>
-        <el-table-column prop="isReturn" label="鏄惁澶嶈瘖" width="80px" align="center">
-          <template slot-scope="scope">
-            <el-checkbox v-model="scope.row.isReturn"></el-checkbox>
-          </template>
-        </el-table-column>
-        <el-table-column prop="project.resultType" label="缁撴灉绫诲瀷">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.tj_result_type" :value="scope.row.project.resultType" />
-          </template>
-        </el-table-column>
-        <el-table-column prop="isPositive" label="閲嶅ぇ闃虫��">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.isPositive" active-value="1" inactive-value="0"
-              @change="checkboxchange(scope.row)"></el-switch>
+            </el-table-column>
+            <el-table-column prop="project.proScope" label="鍙傝�冭寖鍥�">
+            </el-table-column>
+            <el-table-column prop="conclusion" label="缁撴灉缁撹" width="280">
+              <template slot-scope="scope">
+                <el-input size="mini" v-model="scope.row.conclusion" autocomplete="off" placeholder="璇疯緭鍏ユ娴嬬粨鏋�"
+                  disabled></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="exceptionDesc" label="鏄惁寮傚父" width="80px" align="center">
+              <template slot-scope="scope">
+                <el-checkbox v-model="scope.row.exceptionDesc"></el-checkbox>
+              </template>
+            </el-table-column>
+            <el-table-column prop="isReturn" label="鏄惁澶嶈瘖" width="80px" align="center">
+              <template slot-scope="scope">
+                <el-checkbox v-model="scope.row.isReturn"></el-checkbox>
+              </template>
+            </el-table-column>
+            <el-table-column prop="project.resultType" label="缁撴灉绫诲瀷">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.tj_result_type" :value="scope.row.project.resultType" />
+              </template>
+            </el-table-column>
+            <el-table-column prop="isPositive" label="閲嶅ぇ闃虫��">
+              <template slot-scope="scope">
+                <el-switch v-model="scope.row.isPositive" active-value="1" inactive-value="0"
+                  @change="checkboxchange(scope.row)"></el-switch>
 
-          </template>
-        </el-table-column>
-      </el-table>
+              </template>
+            </el-table-column>
+          </el-table>
 
-      <div style="font-size: 14px; overflow-y: auto; height: 286px">
-        <table style="
+          <div style="font-size: 14px; overflow-y: auto; height: 286px">
+            <table style="
             width: 96%;
             margin: 4px 10px;
             border: 1px solid #dfe6ec;
             border-collapse: collapse;
           " cellspacing="4">
-          <tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
-            <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
-              鐥呯閫夋嫨锛�
-            </td>
-            <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
-              <el-select v-model="value" multiple placeholder="璇烽�夋嫨" style="width: 100%; height: 45px"
-                v-if="deptAdviceList" @change="sel" filterable>
-                <el-option v-for="item in deptAdviceList" :key="item.id" :label="item.title" :value="item.id">
-                </el-option>
-              </el-select>
-            </td>
-            <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
-              涓绘鍖诲笀锛�
-            </td>
-            <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
-              <el-select v-model="doctorName" placeholder="璇烽�夋嫨" style="width: 100%" v-if="deptAdviceList"
-                @change="selName" filterable>
-                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
-                </el-option>
-              </el-select>
-            </td>
-          </tr>
-          <tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
-            <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
-              寤鸿锛�
-            </td>
-            <td style="border: 1px solid #dfe6ec; border-collapse: collapse" colspan="2">
-              <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="proParentList.remark" rows="7">
-              </el-input>
-            </td>
-          </tr>
-        </table>
+              <tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
+                <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+                  鐥呯閫夋嫨锛�
+                </td>
+                <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+                  <el-select v-model="value" multiple placeholder="璇烽�夋嫨" style="width: 100%; height: 45px"
+                    v-if="deptAdviceList" @change="sel" filterable>
+                    <el-option v-for="item in deptAdviceList" :key="item.id" :label="item.title" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </td>
+                <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+                  涓绘鍖诲笀锛�
+                </td>
+                <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+                  <el-select v-model="doctorName" placeholder="璇烽�夋嫨" style="width: 100%" v-if="deptAdviceList"
+                    @change="selName" filterable>
+                    <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
+                    </el-option>
+                  </el-select>
+                </td>
+              </tr>
+              <tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
+                <td style="border: 1px solid #dfe6ec; border-collapse: collapse">
+                  寤鸿锛�
+                </td>
+                <td style="border: 1px solid #dfe6ec; border-collapse: collapse" colspan="2">
+                  <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="proParentList.remark" rows="7">
+                  </el-input>
+                </td>
+              </tr>
+            </table>
 
-        <div slot="footer" class="dialog-footers">
-          <!-- <el-button type="primary"
+            <div slot="footer" class="dialog-footers">
+              <!-- <el-button type="primary"
           size="mini"
           @click="radioChange"
           v-hasPermi="['system:notice:add']"
           v-show="tjStatus == '1'"
         >浼氳瘖鐢宠</el-button> -->
-          <el-button type="primary" @click="determine" v-show="tjStatus == '0'">鎻� 浜�</el-button>
-        </div>
-      </div>
+              <el-button type="primary" @click="determine" v-show="tjStatus == '0'">鎻� 浜�</el-button>
+            </div>
+          </div>
+        </el-col>
+        <el-col :span="6" v-if="reportHistorydata.length >= 1">
+          <el-table v-loading="loading" :data="reportHistorydata" border style="margin-top: 46px;">
+            <el-table-column prop="createTime" label="妫�娴嬫椂闂�">
+            </el-table-column>
+            <el-table-column label="鎿嶄綔" align="center" width="130px">
+              <template slot-scope="scope">
+                <el-button type="primary" icon="el-icon-share" size="mini" @click="handlecan(scope.row)"
+                  title="鏌ョ湅"></el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+        <el-col :span="6" v-else>
+          <div>鏆傛棤鍘嗗彶鎶ュ憡</div>
+        </el-col>
+      </el-row>
+
       <!-- <div style="background-color: #f3f3f3;font-size:14px;overflow-y:auto;height: calc(100% - 11%);">
         <table style="width:96%;margin: 4px 10px;border:1px solid white" cellspacing="4" border="2"
           v-for="(item, index) in proParentList.sons" :key="index">
@@ -411,10 +437,12 @@
 
 <script>
 import Public from "@/components/public";
+import { getPdf } from "@/api/hosp/order";
 import { getInfo } from "@/api/login";
 import {
   getProList,
   getSons,
+  AutoGetRule,
   getaddRemark,
   getParentList,
   getParentId,
@@ -442,11 +470,15 @@
       loading: false,
       open: false,
       foropen: false,
+      dialogVisible: false,
+      reportHistorydata: [],
+      url: "",
       cateringList: [],
       orderDetailId: "",
       textarea: "",
       title: "",
       formIn: {},
+      focusrow: {},
       hzlogList: [],
       // proDefault: "",
       // dataList: [],
@@ -472,6 +504,7 @@
       row: {},
       info: {},
       allList: [],
+      autorule: [],
       form: {
         createTime: new Date()
       },
@@ -622,6 +655,52 @@
 
     vale(datas) {
       this.proResult = datas;
+      var pattern3 = new RegExp("[0-9]+");
+      if (pattern3.test(this.proResult)) {
+        let data = {
+          proId: this.focusrow.proId,
+          cusId: this.tableAll.cusId,
+          keyNum: this.proResult
+        }
+        AutoGetRule(data).then(res => {
+          this.focusrow.conclusion = ""
+          if (res.data) {
+            this.autorule = res.data
+            this.focusrow.rulesList = this.autorule;
+            this.autorule.forEach(item => {
+              if (this.focusrow.conclusion) {
+                this.focusrow.conclusion += item.bingzhong;
+              } else {
+                this.focusrow.conclusion = item.bingzhong;
+              }
+            })
+          }
+
+        })
+      }else {
+        let data = {
+          proId: this.focusrow.proId,
+          cusId: this.tableAll.cusId,
+          keyWord: this.proResult
+        }
+        AutoGetRule(data).then(res => {
+          this.focusrow.conclusion = ""
+          if (res.data) {
+            this.autorule = res.data
+            this.focusrow.rulesList = this.autorule;
+            this.autorule.forEach(item => {
+              if (this.focusrow.conclusion) {
+                this.focusrow.conclusion += item.bingzhong;
+              } else {
+                this.focusrow.conclusion = item.bingzhong;
+              }
+            })
+          }
+
+        })
+      }
+
+
       // this.$refs.aaa.open = true;
       // this.$refs.aaa.getList();
     },
@@ -864,12 +943,41 @@
       this.Hzlog(this.tableAll.tjNumber)
     },
     historicalreport() {
+      this.loading = true
       let data = {
-        cusId:this.tableAll.cusId
+        cusId: this.tableAll.cusId
       }
-      reportHistory(data).then(res =>{
-
+      reportHistory(data).then(res => {
+        this.loading = false
+        if (res.data[0] != null) {
+          this.reportHistorydata = res.data
+        }
       })
+    },
+
+    handlecan(row) {
+      this.dialogVisible = true
+      const tjNumber = row.tjNumber;
+      const flag = true;
+      getPdf(tjNumber, flag).then((response) => {
+        if (response.size === 0) {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          });
+          setTimeout(() => {
+            loading.close();
+          }, 3000);
+          this.$message.msgSuccess("鎶ュ憡姝e湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�");
+
+        } else {
+          this.dialogVisible = true;
+
+          this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
+        }
+      });
     },
     submitFormreply() {
       let data = {
@@ -1226,6 +1334,9 @@
           });
         });
     },
+    handleInConfirm(row) {
+      this.focusrow = row
+    },
 
     handleInputConfirm(row) {
       this.rows.push(row);
@@ -1320,6 +1431,11 @@
   margin-left: calc(100% - 10%);
 }
 
+.main {
+  height: 700px;
+  overflow: hidden;
+}
+
 .pag {
   width: 100%;
   display: flex;
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 41732ba..68e1d04 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -2,68 +2,44 @@
   <div>
     <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px">
       <el-form-item label="濮撳悕" prop="name">
-        <el-input v-model="queryParams.name" style="width: 120px" placeholder="璇疯緭鍏ュ鍚�" clearable @keyup.enter.native="handleQuery"></el-input>
+        <el-input v-model="queryParams.name" style="width: 120px" placeholder="璇疯緭鍏ュ鍚�" clearable
+          @keyup.enter.native="handleQuery"></el-input>
       </el-form-item>
       <el-form-item label="浣撴鍙�" prop="tjNumber">
-        <el-input ref="inputName" v-model="queryParams.tjNumber" style="width: 180px" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable @keyup.enter.native="handleQuery"></el-input>
+        <el-input ref="inputName" v-model="queryParams.tjNumber" style="width: 180px" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable
+          @keyup.enter.native="handleQuery"></el-input>
       </el-form-item>
       <el-form-item label="浣撴鏃堕棿" prop="tjTime">
-        <el-date-picker v-model="startTime" type="datetimerange" align="right" :picker-options="pickerOptions" style="width: 310px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :default-time="['00:00:00', '23:00:00']" format="yyyy-MM-dd HH:mm"
-          value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1">
+        <el-date-picker v-model="startTime" type="datetimerange" align="right" :picker-options="pickerOptions"
+          style="width: 310px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :default-time="['00:00:00', '23:00:00']"
+          format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1">
         </el-date-picker> </el-form-item>
       <el-form-item label="鍗曚綅鍚嶇О" prop="tjCompName" style="margin-left: 20px;">
-        <el-select  :remote-method="getRemoteData" v-model="queryParams.tjCompName" value-key="drugManufacturerId" style="width: 180px" remote filterable placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="searchSelect">
-          <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName" :value="dict"/>
+        <el-select :remote-method="getRemoteData" v-model="queryParams.tjCompName" value-key="drugManufacturerId"
+          style="width: 180px" remote filterable placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="searchSelect">
+          <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName" :value="dict" />
         </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" size="mini" @click="submitForm">鎼滅储</el-button>
-        <el-button  size="mini" @click="resetQuery">閲嶇疆</el-button>
+        <el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
       </el-form-item>
     </el-form>
 
-    <el-radio-group
-      v-model="tjStatus"
-      @input="radioChange"
-      style="margin-left: 20px"
-    >
+    <el-radio-group v-model="tjStatus" @input="radioChange" style="margin-left: 20px">
       <el-radio-button label="0">鏈鏍�</el-radio-button>
       <el-radio-button label="1">宸插鏍�</el-radio-button>
     </el-radio-group>
 
     <template>
-      <el-table
-        v-loading="loading"
-        :data="checkList"
-        ref="table"
-        border
-        style="margin: 20px; width: 98%"
-      >
+      <el-table v-loading="loading" :data="checkList" ref="table" border style="margin: 20px; width: 98%">
         <!-- <template slot="empty">鏁版嵁姝e湪鍔犺浇涓�</template> -->
-        <el-table-column
-          label="浣撴鍙�"
-          align="center"
-          prop="tjNumber"
-          :show-overflow-tooltip="true"
-          width="160px"
-          fixed="left"
-        />
-        <el-table-column
-          label="濮撳悕"
-          align="center"
-          prop="cusName"
-          :show-overflow-tooltip="true"
-          width="100px"
-          fixed="left"
-        />
-        
-        <el-table-column
-          label="鎬у埆"
-          align="center"
-          prop="cusSex"
-          :show-overflow-tooltip="true"
-          width="55px"
-        >
+        <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" :show-overflow-tooltip="true" width="160px"
+          fixed="left" />
+        <el-table-column label="濮撳悕" align="center" prop="cusName" :show-overflow-tooltip="true" width="100px"
+          fixed="left" />
+
+        <el-table-column label="鎬у埆" align="center" prop="cusSex" :show-overflow-tooltip="true" width="55px">
           <template slot-scope="scope">
             <span v-if="scope.row.cusSex == '0'">鐢�</span>
             <span v-if="scope.row.cusSex == '1'">濂�</span>
@@ -71,117 +47,49 @@
             <span v-if="scope.row.cusSex == '9'">鏈鏄庢�у埆</span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="鍑虹敓鏃ユ湡"
-          align="center"
-          prop="cusBrithday"
-          :show-overflow-tooltip="true"
-          width="110px"
-        />
-        <el-table-column
-          label="鐢佃瘽"
-          align="center"
-          prop="cusPhone"
-          :show-overflow-tooltip="true"
-          width="130px"
-        />
-        
-        <el-table-column
-          label="浣撴鏃堕棿"
-          align="center"
-          prop="tjTime"
-          :show-overflow-tooltip="true"
-          width="110px"
-        />
-        <el-table-column
-          label="瀹屾垚鏃堕棿"
-          align="center"
-          prop="finishTime"
-          :show-overflow-tooltip="true"
-          width="160px"
-        />
-        <el-table-column
-          label="鐘舵��"
-          align="center"
-          prop="tjStatus"
-          :show-overflow-tooltip="true"
-          width="50px"
-        >
+        <el-table-column label="鍑虹敓鏃ユ湡" align="center" prop="cusBrithday" :show-overflow-tooltip="true" width="110px" />
+        <el-table-column label="鐢佃瘽" align="center" prop="cusPhone" :show-overflow-tooltip="true" width="130px" />
+
+        <el-table-column label="浣撴鏃堕棿" align="center" prop="tjTime" :show-overflow-tooltip="true" width="110px" />
+        <el-table-column label="瀹屾垚鏃堕棿" align="center" prop="finishTime" :show-overflow-tooltip="true" width="160px" />
+        <el-table-column label="鐘舵��" align="center" prop="tjStatus" :show-overflow-tooltip="true" width="50px">
           <template slot-scope="scope">
             <span>{{ scope.row.tjStatus == "1" ? "宸叉" : "鏈" }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="鍗曚綅鍚嶇О"
-          align="center"
-          prop="tjCompName"
-          :show-overflow-tooltip="true"
-        />
-        
+        <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="tjCompName" :show-overflow-tooltip="true" />
+
         <el-table-column label="鎿嶄綔" align="center" width="90px" fixed="right">
           <template slot-scope="scope">
-            <el-button
-              fixed="right"
-              title="璇︽儏"
-              type="text"
-              size="mini"
-              @click="handleClick(scope.row)"
-              icon="el-icon-document-copy"
-            ></el-button>
+            <el-button fixed="right" title="璇︽儏" type="text" size="mini" @click="handleClick(scope.row)"
+              icon="el-icon-document-copy"></el-button>
             <!-- <el-button type="text" size="mini" @click="generate(scope.row)" v-if="scope.row.tjStatus=='1'">鐢熸垚</el-button> -->
-            <el-button
-              type="text"
-              size="mini"
-              @click="
-                viewReport(scope.row);
-              "
-              v-if="scope.row.tjStatus == '1'"
-              title="棰勮"
-              icon="el-icon-view"
-            ></el-button>
-            <el-button
-              type="text"
-              size="mini"
-              v-if="scope.row.tjStatus == '1'"
-              title="鎾ら攢"
-              @click="getRevoke(scope.row)"
-              icon="el-icon-refresh-left"
-            ></el-button>
+            <el-button type="text" size="mini" @click="
+              viewReport(scope.row);
+            " v-if="scope.row.tjStatus == '1'" title="棰勮" icon="el-icon-view"></el-button>
+            <el-button type="text" size="mini" v-if="scope.row.tjStatus == '1'" title="鎾ら攢" @click="getRevoke(scope.row)"
+              icon="el-icon-refresh-left"></el-button>
           </template>
         </el-table-column>
       </el-table>
 
       <div class="pag">
         <div class="pag1">
-          <pagination
-            v-show="total > 0"
-            :total="total"
-            :page.sync="queryParams.page"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-          />
+          <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.pageSize"
+            @pagination="getList" />
         </div>
       </div>
     </template>
 
     <!-- 鐐瑰嚮寮瑰嚭妗� -->
-    <el-drawer
-      title=""
-      :visible.sync="drawer"
-      :before-close="handleClose"
-      :with-header="false"
-      size="80%"
-    >
+    <el-drawer title="" :visible.sync="drawer" :before-close="handleClose" :with-header="false" size="80%">
       <div style="font-size: 14px">
-        <table
-          style="
+        <table style="
             width: 96%;
             margin: 10px 10px;
             border: 1px solid #dfe6ec;
             border-collapse: collapse;
-          "
-          cellspacing="4"
-        >
+          " cellspacing="4">
           <caption style="background-color: #f8f8f9; font-size: 18px">
             {{
               tableAll.cusName
@@ -217,243 +125,195 @@
           </tr>
         </table>
       </div>
+      <div>
+        <div style="margin: 10px 10px;">
+          <el-button type="primary" size="mini" @click="historicalreport()">鍘嗗彶鎶ュ憡</el-button>
+        </div>
+      </div>
 
-      <div style="font-size: 14px; overflow-y: auto; height: calc(100% - 11%)">
-        <table
-          style="
+      <el-row>
+        <el-col :span="18">
+          <div style="font-size: 14px; overflow-y: auto; height: calc(100% - 11%)">
+            <table style="
             width: 96%;
             margin: 10px 10px;
             border: 1px solid #dfe6ec;
             border-collapse: collapse;
-          "
-          cellspacing="4"
-          v-for="(item, index) in changedate"
-          :key="index"
-        >
-          <caption style="background-color: #f8f8f9">
-            {{
-              item.parent || ""
-            }}
-          </caption>
-          <tr
-            style="border: 1px solid #dfe6ec; border-collapse: collapse"
-            align="center"
-          >
-            <th
-              style="
+          " cellspacing="4" v-for="(item, index) in changedate" :key="index">
+              <caption style="background-color: #f8f8f9">
+                {{
+                  item.parent || ""
+                }}
+              </caption>
+              <tr style="border: 1px solid #dfe6ec; border-collapse: collapse" align="center">
+                <th style="
                 border: 1px solid #dfe6ec;
                 border-collapse: collapse;
                 width: 200px;
-              "
-            >
-              妫�娴嬮」鐩�
-            </th>
-            <th
-              style="
+              ">
+                  妫�娴嬮」鐩�
+                </th>
+                <th style="
                 border: 1px solid #dfe6ec;
                 border-collapse: collapse;
                 width: 200px;
-              "
-            >
-              妫�娴嬬粨鏋�
-            </th>
-            <th
-              style="
+              ">
+                  妫�娴嬬粨鏋�
+                </th>
+                <th style="
                 border: 1px solid #dfe6ec;
                 border-collapse: collapse;
                 width: 200px;
-              "
-            >
-              鍗曚綅
-            </th>
-            <th
-              style="
+              ">
+                  鍗曚綅
+                </th>
+                <th style="
                 border: 1px solid #dfe6ec;
                 border-collapse: collapse;
                 width: 200px;
-              "
-            >
-              鍙傝�冭寖鍥�
-            </th>
-          </tr>
+              ">
+                  鍙傝�冭寖鍥�
+                </th>
+              </tr>
 
-          <tr
-            style="
+              <tr style="
               border: 1px solid #dfe6ec;
               border-collapse: collapse;
               width: 200px;
               height: 35px;
               text-align: center;
-            "
-            v-for="item1 in item.sons"
-            :key="item1.proId"
-          >
-            <td
-              style="
+            " v-for="item1 in item.sons" :key="item1.proId">
+                <td style="
                 border: 1px solid #dfe6ec;
                 border-collapse: collapse;
                 width: 200px;
-              "
-              v-if="item1.project != null"
-            >
-              {{ item1.project.proName || "" }}
-            </td>
-            <td
-              style="
+              " v-if="item1.project != null">
+                  {{ item1.project.proName || "" }}
+                </td>
+                <td style="
                 border: 1px solid #dfe6ec;
                 border-collapse: collapse;
                 width: 200px;
-              "
-             v-else
-            >
-              {{  "" }}
-            </td>
-            <td
-              style="
+              " v-else>
+                  {{ "" }}
+                </td>
+                <td style="
                 border: 1px solid #dfe6ec;
                 border-collapse: collapse;
                 width: 200px;
-              "
-            >
-              {{ item1.proResult }}
-              <!-- <el-input v-model="item1.proResult" placeholder="璇疯緭鍏ュ唴瀹�"></el-input> -->
-            </td>
-            <td
-              style="
+              ">
+                  {{ item1.proResult }}
+                  <!-- <el-input v-model="item1.proResult" placeholder="璇疯緭鍏ュ唴瀹�"></el-input> -->
+                </td>
+                <td style="
                 border: 1px solid #dfe6ec;
                 border-collapse: collapse;
                 width: 200px;
-              "
-            >
-              {{ item1.standard.company }}
-            </td>
-            <td
-              style="
+              ">
+                  {{ item1.standard.company }}
+                </td>
+                <td style="
                 border: 1px solid #dfe6ec;
                 border-collapse: collapse;
                 width: 200px;
-              "
-            >
-              {{
-                item1.standard.tjStandardGtValue +
-                "-" +
-                item1.standard.tjStandardLtValue
-              }}
-            </td>
-          </tr>
-          <tr
-            style="
+              ">
+                  {{
+                    item1.standard.tjStandardGtValue +
+                    "-" +
+                    item1.standard.tjStandardLtValue
+                  }}
+                </td>
+              </tr>
+              <tr style="
               border: 1px solid #dfe6ec;
               border-collapse: collapse;
               width: 200px;
-            "
-          >
-            <td>灏忕粨锛�</td>
-            <td
-              style="
+            ">
+                <td>灏忕粨锛�</td>
+                <td style="
                 border: 1px solid #dfe6ec;
                 border-collapse: collapse;
                 width: 200px;
-              "
-            >
-              <el-input v-model="item.parentAdvice" disabled></el-input>
-              <!-- <el-select v-model="item.value" multiple filterable placeholder="璇烽�夋嫨" style="width: 100%" @change="xiAoJieChange($event, item)">
+              ">
+                  <el-input v-model="item.parentAdvice" disabled></el-input>
+                  <!-- <el-select v-model="item.value" multiple filterable placeholder="璇烽�夋嫨" style="width: 100%" @change="xiAoJieChange($event, item)">
                 <el-option v-for="item1 in item.parentAdvice" :key="item1.id" :label="item1.title" :value="item1.id">
                 </el-option>
               </el-select> -->
-            </td>
-            <td
-              style="
+                </td>
+                <td style="
                 border: 1px solid #dfe6ec;
                 border-collapse: collapse;
                 width: 200px;
-              "
-            >
-              涓绘鍖诲笀锛�
-            </td>
-            <td
-              style="
+              ">
+                  涓绘鍖诲笀锛�
+                </td>
+                <td style="
                 border: 1px solid #dfe6ec;
                 border-collapse: collapse;
                 width: 200px;
-              "
-            >
-              {{ item.doctorName }}
-            </td>
-          </tr>
-          <tr
-            style="
+              ">
+                  {{ item.doctorName }}
+                </td>
+              </tr>
+              <tr style="
               border: 1px solid #dfe6ec;
               border-collapse: collapse;
               width: 200px;
-            "
-          >
-            <td
-              style="
+            ">
+                <td style="
                 border: 1px solid #dfe6ec;
                 border-collapse: collapse;
                 width: 200px;
-              "
-            >
-              澶囨敞锛�
-            </td>
-            <td
-              style="
+              ">
+                  澶囨敞锛�
+                </td>
+                <td style="
                 border: 1px solid #dfe6ec;
                 border-collapse: collapse;
                 width: 200px;
-              "
-              colspan="2"
-            >
-              <textarea
-                placeholder="璇疯緭鍏ュ唴瀹�"
-                :autosize="{ minRows: 2, maxRows: 2 }"
-                style="width: 100%; height: 100%"
-                v-model="changedate[index].remark"
-                v-on:input="change"
-              ></textarea>
-              <!-- <el-input type="textarea" autosize >
+              " colspan="2">
+                  <textarea placeholder="璇疯緭鍏ュ唴瀹�" :autosize="{ minRows: 2, maxRows: 2 }" style="width: 100%; height: 100%"
+                    v-model="changedate[index].remark" v-on:input="change"></textarea>
+                  <!-- <el-input type="textarea" autosize >
               </el-input> -->
-            </td>
-          </tr>
-        </table>
-        <el-form
-          ref="numberValidateForm"
-          label-width="80px"
-          class="demo-ruleForm"
-        >
-          <el-form-item label="鎬绘寤鸿">
-            <el-input
-              type="textarea"
-              placeholder="璇疯緭鍏ュ唴瀹�"
-              v-model="textarea1"
-              :rows="3"
-              style="width: 96%"
-            >
-            </el-input>
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footers">
-          <el-button type="primary" @click="determine" :disabled="isdisabled"
-            >鎻愪氦骞剁敓鎴愭姤鍛�</el-button
-          >
-        </div>
-      </div>
+                </td>
+              </tr>
+            </table>
+            <el-form ref="numberValidateForm" label-width="80px" class="demo-ruleForm">
+              <el-form-item label="鎬绘寤鸿">
+                <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="textarea1" :rows="3" style="width: 96%">
+                </el-input>
+              </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footers">
+              <el-button type="primary" @click="determine" :disabled="isdisabled">鎻愪氦骞剁敓鎴愭姤鍛�</el-button>
+            </div>
+          </div>
+        </el-col>
+        <el-col :span="6" >
+          <el-table v-if="reportHistorydata.length >= 1" v-loading="loading" :data="reportHistorydata" border style="margin-top: 30px;">
+            <el-table-column prop="createTime" label="妫�娴嬫椂闂�">
+            </el-table-column>
+            <el-table-column label="鎿嶄綔" align="center" width="130px">
+              <template slot-scope="scope">
+                <el-button type="primary" icon="el-icon-share" size="mini" @click="viewReport(scope.row)"
+                  title="鏌ョ湅"></el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div v-else>鏆傛棤鍘嗗彶鎶ュ憡</div>
+        </el-col>
+      </el-row>
+
+
+
+
     </el-drawer>
 
-    <el-dialog
-      class="dia"
-      title="PDF 棰勮"
-      :visible.sync="dialogVisible"
-      :close-on-click-modal="false"
-    >
+    <el-dialog class="dia" title="PDF 棰勮" :visible.sync="dialogVisible" :close-on-click-modal="false">
       <div class="main">
-        <iframe
-          id="printIframe"
-          :src="url"
-          frameborder="0"
-          style="width: 100%; height: 100%"
-        ></iframe>
+        <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
       </div>
     </el-dialog>
   </div>
@@ -474,7 +334,7 @@
 } from "@/api/doctor/checkAll";
 import { getInfo } from "@/api/login";
 import { getCompany, queryCompany } from "@/api/team/tuanti";
-// import { getDeptAdvice } from "@/api/doctor/check";
+import { reportHistory } from "@/api/doctor/check";
 import { getPdf, revoke } from "@/api/hosp/order";
 import ViewPdf from "@/components/ViewPdf";
 
@@ -497,6 +357,7 @@
       flag: true,
       bill: null,
       numberList: [],
+      reportHistorydata: [],
       dialogVisible: false,
       pickerOptions: {
         shortcuts: [
@@ -562,7 +423,7 @@
         endTime: null,
         compId: null,
         name: null,
-        checkStatus:null,
+        checkStatus: null,
       },
 
       // 鏌ヨ鍙傛暟
@@ -674,22 +535,36 @@
       getPdf(tjNumber, flag).then((response) => {
         if (response.size === 0) {
           const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        setTimeout(() => {
-          loading.close();
-        }, 3000);
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          });
+          setTimeout(() => {
+            loading.close();
+          }, 3000);
           this.$message.msgSuccess("鎶ュ憡姝e湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�");
-          
+
         } else {
           this.dialogVisible = true;
-          
+
           this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
         }
       });
+    },
+
+
+    historicalreport() {
+      this.loading = true
+      let data = {
+        cusId: this.tableAll.cusId
+      }
+      reportHistory(data).then(res => {
+        this.loading = false
+        if (res.data[0] != null) {
+          this.reportHistorydata = res.data
+        }
+      })
     },
     // viewReport(row) {
     //   const tjNumber = row.tjNumber;
@@ -936,7 +811,7 @@
             state: 1,
             id: this.MsgId,
           };
-          getfiedState(data).then((res) => {});
+          getfiedState(data).then((res) => { });
         });
     },
 
@@ -1001,7 +876,7 @@
             remarks,
           },
         ];
-        getModified(updateOrderRemarkVos).then((response) => {});
+        getModified(updateOrderRemarkVos).then((response) => { });
       }
       this.submitForm()
       this.$forceUpdate()
diff --git a/vue.config.js b/vue.config.js
index 65ccafb..2bf47cb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,7 +36,7 @@
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         //target: `https://ltpeis.xaltjdkj.cn:5501/prod-api/getInfo`,
-        target: `http://192.168.0.101:5011`,
+        target: `http://192.168.0.111:5011`,
         // // target: `http://192.168.0.99:8080/ltkj-admin`,
         // target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
         changeOrigin: true,

--
Gitblit v1.8.0