export

src/components/doctorCheck/PacsDcmList.vue

@@ -101,7 +101,7 @@
             <el-tab-pane v-for="(item, seq) in doctorCheck.checkItemList" :label="dispLabel(item.itemName)"
               :name="seq + ''" :key="seq">
               <el-input style="width: 98%;border: 1px solid #232748;" type="textarea" v-model="item.result"
-                placeholder="请输入检查结果" :autosize="{ minRows: 6, maxRows: 6 }" />
+                placeholder="请输入检查结果" :autosize="{ minRows: 5, maxRows: 5 }" />
               <div style="display: flex;justify-content: space-between;">
                 <div></div>
                 <div>
@@ -120,7 +120,7 @@
         </div>
         <div style="margin-top: -15px;">
           <span style="color: #232748;">检查结论：</span>
-          <el-table row-key="id" :data="doctorCheck.checkSummaryList" size="samll" height="140" width="100%" border>
+          <el-table row-key="id" :data="doctorCheck.checkSummaryList" size="samll" height="120" width="100%" border>
             <el-table-column width="30" align="center">
               <template slot-scope="scope">
                 <el-tag class="moveSummary" style="height:25px;padding:0 2px;cursor: move;background-color: #EEEEEE;">
@@ -275,7 +275,7 @@ export default {
       return moment(new Date(date)).format(forMat);
     },
     tableHeight() {
-      return this.window.pageHeight - 105 - 480 - 26
+      return this.window.pageHeight - 105 - 360 - 76
     },
   },
   methods: {

src/components/patientRegister/PatientRegisterEdit.vue

@@ -411,7 +411,7 @@
               <el-col :span="14">
                 <el-form-item label="接害因素" label-width="65px">
                   <el-select v-model="form.poisonIds" size="small"
-                    :style="`width:${Math.floor((window.pageWidth - 222) / 1.714)}px;`" clearable filterable
+                    :style="`width:${Math.floor((window.pageWidth - 242) / 1.714)}px;`" clearable filterable
                     :filter-method="filterMethodPoison" value-key="id" multiple @change="changeOccPosionOrCheckType"
                     :disabled="form.completeFlag == '3' ? true : false">
                     <el-option-group v-for="group in poison" :key="group.poisonTypeName" :label="group.poisonTypeName">

src/views/report/checkStatus.vue

@@ -4,13 +4,12 @@
       <div class="middlebox">
         <div class="contenttitle">
           体检查询 /
-          <span class="contenttitleBold"
-            >组合项目检查状态</span
-          >
+          <span class="contenttitleBold">组合项目检查状态</span>
         </div>
       </div>
       <div :style="'display: block;'">
-        <div style="background-color: #fff; padding: 15px; border-radius: 8px;display: flex;flex-wrap: wrap;    margin-bottom: 10px;height:35px;margin-top: 7px;">
+        <div
+          style="background-color: #fff; padding: 15px; border-radius: 8px;display: flex;flex-wrap: wrap;    margin-bottom: 10px;height:35px;margin-top: 7px;">
           <div class="query">
             <span>体检单位：</span>
             <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width:300px;" size="small"
@@ -31,19 +30,25 @@
             <span>检查状态：</span>
             <el-select v-model="patientRegister.query.checkCompleteFlag" placeholder="请选择" clearable style="width: 80px"
               size="small">
-              <el-option v-for="item in dict.checkCompleteFlag" :key="item.id" :label="item.displayName" :value="item.id">
+              <el-option v-for="item in dict.checkCompleteFlag" :key="item.id" :label="item.displayName"
+                :value="item.id">
               </el-option>
             </el-select>
           </div>
           <div class="query">
             <el-button type="primary" @click="btnQuery" size="small" class="commonbutton">查询</el-button>
           </div>
+          <div class="query">
+            <el-button @click="handleExport" size="small" class="commonbutton">导出excel</el-button>
+          </div>
         </div>
         <div style="background-color: #fff; padding: 15px; border-radius: 8px;">
-          <el-table :data="dataList" border :height="window.pageHeight < 600 ? 415 : window.pageHeight - 185-20" row-key="id"
-            size="small" highlight-current-row ref="dataList" :row-class-name="tableRowClassName">
-            <el-table-column type="index" label="序号" width="40" align="center"/>
-            <el-table-column prop="asbitemName" label="组合项目名称" min-width="120" />
+          <el-table id="tableChekStatus" :data="dataList" border
+            :height="window.pageHeight < 600 ? 415 : window.pageHeight - 185 - 20" row-key="id" size="small"
+            highlight-current-row ref="dataList" :row-class-name="tableRowClassName">
+            <el-table-column type="index" label="序号" width="40" align="center" />
+            <el-table-column prop="checkRequestNo" label="检查条码" min-width="120" align="center" />
+            <el-table-column prop="asbitemName" label="检查项目" min-width="120" />
             <el-table-column prop="completeFlag" label="检查状态" min-width="70" align="center">
               <template slot-scope="scope">
                 <div>{{ dddw(dict.checkCompleteFlag, 'id', scope.row.completeFlag, 'displayName') }}</div>
@@ -54,11 +59,11 @@
                 <div>{{ scope.row.checkCompleteFlag == 'Y' ? '已收费' : '未收费' }}</div>
               </template>
             </el-table-column>
-            <el-table-column prop="standardPrice" label="标准价格" width="70" align="center"/>
-            <el-table-column prop="chargePrice" label="应收价格" width="70" align="center"/>
+            <el-table-column prop="standardPrice" label="标准价格" width="70" align="center" />
+            <el-table-column prop="chargePrice" label="应收价格" width="70" align="center" />
             <el-table-column prop="patientRegisterNo" label="人员条码号" width="130" />
             <el-table-column prop="patientNo" label="档案号" width="130" />
-            <el-table-column prop="medicalTimes" label="体检次数" width="70" align="center"/>
+            <el-table-column prop="medicalTimes" label="体检次数" width="70" align="center" />
             <el-table-column prop="customerOrgName" label="单位" width="180" />
             <!--
             <el-table-column prop="customerOrgParentName" label="单位" width="180">
@@ -126,6 +131,8 @@ import moment from "moment";
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { dddw, objCopy, arrayReduce, arrayExistObj, tcdate } from "@/utlis/proFunc";
+import { exportToExcel } from "../../utlis/Export2Excel";
+
 import CusOrgOCX from "../../components/report/CusOrgOCX.vue"
 import AsbitemOCX from "../../components/report/AsbitemOCX.vue"
 export default {
@@ -223,7 +230,7 @@ export default {
       });
 
       //套餐
-      postapi("/api/app/medicalpackage/GetBasicList",{}).then((res) => {
+      postapi("/api/app/medicalpackage/GetBasicList", {}).then((res) => {
         if (res.code == 1) {
           this.dict.medicalPackage = res.data;
         }
@@ -251,7 +258,7 @@ export default {
         }
       });
 
-      postapi("/api/app/asbitem/GetBasicList",{}).then((res) => {
+      postapi("/api/app/asbitem/GetBasicList", {}).then((res) => {
         if (res.code == 1) {
           this.dict.asbItemAll = res.data;
         }
@@ -269,6 +276,7 @@ export default {
       }
     },
 
+
     //查询
     btnQuery() {
       let body = {}, customerOrgs = [], asbitemIds = [];
@@ -333,6 +341,10 @@ export default {
         }
       })
     },
+
+    handleExport() {
+      exportToExcel("#tableChekStatus", "组合项目具体结果明细统计", false);
+    },
   },
 
   //监听事件
@@ -362,8 +374,8 @@ export default {
   font-weight: 400;
   font-family: "NotoSansSC-Regular";
 }
+
 ::v-deep .el-icon-search:before {
   color: #00F;
 }
-
 </style>