From 89b8e3e4aa4260a28ca419f981cb9c710b87d8f8 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Thu, 26 Oct 2023 17:40:43 +0800
Subject: [PATCH] report

---
 src/components/report/BtnReport.vue           |  4 +-
 .../report/PatientRegisterListNobtn.vue       |  2 +-
 src/components/report/RegisterCheckStatus.vue | 28 +------
 src/components/report/StatisticsOCX.vue       | 51 ++----------
 src/router/index.js                           |  8 +-
 src/views/Home.vue                            |  2 +-
 .../diseaseStatistics.vue                     | 65 +++------------
 .../personnelPositive.vue                     | 66 +++------------
 .../positiveResultsList.vue}                  | 71 +++-------------
 src/views/report/chargeAsbitem.vue            | 62 ++------------
 src/views/report/checkStatus.vue              | 60 +++-----------
 src/views/report/report.vue                   | 83 ++++++-------------
 src/views/report/unCheckAsbitem.vue           | 66 ++-------------
 13 files changed, 104 insertions(+), 464 deletions(-)
 rename src/views/{fee-settings => customerReport}/diseaseStatistics.vue (83%)
 rename src/views/{doctorCheck => customerReport}/personnelPositive.vue (83%)
 rename src/views/{doctorCheck/positiveresults.vue => customerReport/positiveResultsList.vue} (86%)

diff --git a/src/components/report/BtnReport.vue b/src/components/report/BtnReport.vue
index 1dbb897..1790712 100644
--- a/src/components/report/BtnReport.vue
+++ b/src/components/report/BtnReport.vue
@@ -477,6 +477,8 @@ export default {
 };
 </script>
 <style scoped>
+@import '../../assets/css/global_button.css';
+
 .listBtn {
     margin-top: 10px;
     /*
@@ -485,6 +487,6 @@ export default {
 }
 
 .btnClass {
-    width: 110px;
+    width: 100px;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/report/PatientRegisterListNobtn.vue b/src/components/report/PatientRegisterListNobtn.vue
index faed907..0b345c9 100644
--- a/src/components/report/PatientRegisterListNobtn.vue
+++ b/src/components/report/PatientRegisterListNobtn.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div @contextmenu.prevent="onContextmenu">
-      <el-table :data="patientRegister.prList" border :height="(window.pageHeight < 600) ? 220:(window.pageHeight - 380)" highlight-current-row
+      <el-table :data="patientRegister.prList" border :height="(window.pageHeight < 600) ? 290:(window.pageHeight - 310)" highlight-current-row
         @row-click="rowick" size="small" @selection-change="handleSelectionChange" @cell-contextmenu="onCellRightClick">
         <el-table-column type="selection" width="40" align="center" />
         <el-table-column prop="completeFlag" label="体检进度">
diff --git a/src/components/report/RegisterCheckStatus.vue b/src/components/report/RegisterCheckStatus.vue
index aca319c..4335225 100644
--- a/src/components/report/RegisterCheckStatus.vue
+++ b/src/components/report/RegisterCheckStatus.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-table :data="doctorCheck.RegisterCheckList" border
-      :height="(window.pageHeight < 600) ? 220 : (window.pageHeight - 380)" size="small" highlight-current-row
+      :height="(window.pageHeight < 600) ? 290 : (window.pageHeight - 310)" size="small" highlight-current-row
       ref="doctorCheck.RegisterCheckList" :row-class-name="tableRowClassName">
       <el-table-column prop="asbitemName" label="组合项目" width="120" />
       <el-table-column prop="completeFlag" label="状态" align="center">
@@ -94,31 +94,5 @@ export default {
 };
 </script>
 <style scoped>
-::v-deep .el-input__inner {
-  text-align: center;
-  padding-left: 1px;
-  padding-right: 1px;
-}
 
-::v-deep .el-table th.el-table__cell {
-  text-align: center;
-  padding-left: 1px;
-  padding-right: 1px;
-}
-
-::v-deep .el-table td.el-table__cell {
-  padding-left: 1px;
-  padding-right: 1px;
-}
-
-::v-deep .el-table .cell {
-  padding-left: 1px;
-  padding-right: 1px;
-}
-
-::v-deep input[type="number"]::-webkit-inner-spin-button,
-input[type="number"]::-webkit-outer-spin-button {
-  -webkit-appearance: none !important;
-  margin: 0 !important;
-}
 </style>
diff --git a/src/components/report/StatisticsOCX.vue b/src/components/report/StatisticsOCX.vue
index 17e398b..de18094 100644
--- a/src/components/report/StatisticsOCX.vue
+++ b/src/components/report/StatisticsOCX.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="display: flex;  margin-top: -30px;">
+  <div style="display: flex; ">
     <div style="width:230px;">
       <div style="display: flex;">
         <span>项目类别</span>
@@ -17,7 +17,7 @@
       </div>
     </div>
 
-    <div style="width:100px;margin-top: 70px;">
+    <div style="width:110px;margin-top: 70px;">
       <div class="btnList">
         <el-button type="primary" @click="addAbs(asbItemChoosed)" style="width:90px;">添加 <i class="el-icon-right"></i>
         </el-button>
@@ -332,53 +332,12 @@ export default {
 
 .btnList {
   margin-top: 5px;
-  margin-left: 5px;
-  margin-right: 5px;
+  margin-left: 10px;
+  margin-right: 10px;
 }
 
 .disTotal {
   margin-left: 10px;
 }
 
-::v-deep .el-input__inner {
-  /*text-align: center;*/
-  padding-left: 2px;
-  padding-right: 15px;
-}
-
-::v-deep .el-input__icon {
-  width: 15px;
-  /* 输入框下拉箭头或清除图标 默认 25 */
-}
-
-/* 表格 表头 列间距控制 */
-::v-deep .el-table th.el-table__cell>.cell {
-  text-align: center;
-  /* 表格 表头 对齐方式，默认 left */
-  padding-right: 2px;
-  /* 表格 表头 列间距控制，默认 10px */
-  padding-left: 2px;
-  /* 表格 表头 列间距控制，默认 10px */
-}
-
-/* 表格 表体 首列左间距控制 */
-::v-deep .el-table--border .el-table__cell:first-child .cell {
-  padding-left: 2px;
-  /* 表格 表体 首列左间距控制，默认 10px */
-}
-
-/* 表格 行列间距控制 ，默认 10 px*/
-::v-deep .el-table__cell {
-  padding: 2px 2px 2px 2px;
-  /* 上，右，下，左 */
-}
-
-
-::v-deep .cell {
-  padding-left: 2px;
-  padding-right: 2px;
-}
-
-::v-deep .el-icon-date:before {
-  content: ""
-}</style>
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 7a5dc3a..2300c74 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -354,13 +354,13 @@ const routes = [{
                 path: "/diseaseStatistics",
                 name: "疾病人数统计",
                 component: () =>
-                    import ("../views/fee-settings/diseaseStatistics.vue"),
+                    import ("../views/customerReport/diseaseStatistics.vue"),
             },
             {
-                path: "/positiveresults",
+                path: "/positiveResultsList",
                 name: "阳性结果清单",
                 component: () =>
-                    import ("../views/doctorCheck/positiveresults.vue"),
+                    import ("../views/customerReport/positiveResultsList.vue"),
             },
             {
                 path: "/unitphysicalexamination",
@@ -372,7 +372,7 @@ const routes = [{
                 path: "/personnelPositive",
                 name: "人员阳性结果",
                 component: () =>
-                    import ("../views/doctorCheck/personnelPositive.vue")
+                    import ("../views/customerReport/personnelPositive.vue")
             },
             //----------------------  工作量登记  ----------------------
             {
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 2d5e59e..f8c9daa 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -388,7 +388,7 @@
                   class="dropdownmain"
                   >疾病人数统计</el-dropdown-item
                 >
-                <el-dropdown-item command="positiveresults" class="dropdownmain"
+                <el-dropdown-item command="positiveResultsList" class="dropdownmain"
                   >阳性结果人员</el-dropdown-item
                 >
                 <el-dropdown-item
diff --git a/src/views/fee-settings/diseaseStatistics.vue b/src/views/customerReport/diseaseStatistics.vue
similarity index 83%
rename from src/views/fee-settings/diseaseStatistics.vue
rename to src/views/customerReport/diseaseStatistics.vue
index d8ae9c1..83dbdbf 100644
--- a/src/views/fee-settings/diseaseStatistics.vue
+++ b/src/views/customerReport/diseaseStatistics.vue
@@ -1,12 +1,12 @@
 <template>
   <div>
     <el-card>      
-      <div class="publiccss">疾病人数统计</div>
-      <div :style="'display: block; width:' + (window.pageWidth - 85) + 'px;margin-top:20px'">
-        <div style="display: flex; flex-wrap: wrap; height:35px;margin-bottom: 10px;">
+      <div slot="header">疾病人数统计</div>
+      <div :style="'display: block; width:' + (window.pageWidth - 45) + 'px;'">
+        <div style="display: flex; flex-wrap: wrap; height:35px;">
           <div class="query">
             <span>体检单位：</span>
-            <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width:342px;" size="small"
+            <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width:300px;" size="small"
               disabled>
               <el-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true"
                 style="font-size: 20px;"></el-button>
@@ -37,7 +37,7 @@
             <el-button type="primary" @click="btnQuery" size="small">查询</el-button>
           </div>
         </div>  
-        <el-table :data="dataList" border width="45%" :height="window.pageHeight < 600 ? 360 : window.pageHeight - 240"
+        <el-table :data="dataList" border width="45%" :height="window.pageHeight < 600 ? 415 : window.pageHeight - 185"
           row-key="id" size="small" highlight-current-row ref="dataList" :row-class-name="tableRowClassName">
           <el-table-column prop="diagnosisName" label="疾病" />      
           <el-table-column prop="patientCount" label="人数" />      
@@ -205,44 +205,11 @@ export default {
 };
 </script>
 <style scoped>
-::v-deep .el-input__inner {
-  /*text-align: center;*/
-  padding-left: 5px;
-  padding-right: 15px;
-}
-
-::v-deep .el-input-group__append {
-  padding: 0 5px;
-  /* 控件默认 0 20px;*/
-}
-
-/* 表格 表头 列间距控制 */
-::v-deep .el-table th.el-table__cell>.cell {
-  text-align: center;
-  /* 表格 表头 对齐方式，默认 left */
-  padding-right: 2px;
-  /* 表格 表头 列间距控制，默认 10px */
-  padding-left: 2px;
-  /* 表格 表头 列间距控制，默认 10px */
-}
-
-/* 表格 表体 首列左间距控制 */
-::v-deep .el-table--border .el-table__cell:first-child .cell {
-  padding-left: 2px;
-  /* 表格 表体 首列左间距控制，默认 10px */
-}
-
-/* 表格 行列间距控制 ，默认 10 px*/
-::v-deep .el-table__cell {
-  padding: 2px 2px 2px 2px;
-  /* 上，右，下，左 */
-}
-
-/* 表格单元格 .el-table .cell ，默认 10 px*/
-::v-deep .cell {
-  padding-left: 2px;
-  padding-right: 2px;
-}
+@import '../../assets/css/global_button.css';
+@import '../../assets/css/global_card.css';
+@import '../../assets/css/global_input.css';
+@import '../../assets/css/global_table.css';
+@import '../../assets/css/global.css';
 
 .query {
   margin-left: 10px;
@@ -251,16 +218,4 @@ export default {
   align-items: center;
 }
 
-.listBtn {
-  margin-top: 20px;
-}
-
-.btnClass {
-  width: 110px;
-  text-align: center;
-}
-
-.btnClass {
-  width: 110px;
-}
 </style>
diff --git a/src/views/doctorCheck/personnelPositive.vue b/src/views/customerReport/personnelPositive.vue
similarity index 83%
rename from src/views/doctorCheck/personnelPositive.vue
rename to src/views/customerReport/personnelPositive.vue
index 1aba1eb..cd8fbe2 100644
--- a/src/views/doctorCheck/personnelPositive.vue
+++ b/src/views/customerReport/personnelPositive.vue
@@ -1,12 +1,12 @@
 <template>
   <div>
     <el-card>      
-      <div class="publiccss">人员阳性结果</div>
-      <div :style="'display: block; width:' + (window.pageWidth - 85) + 'px;margin-top:20px'">
-        <div style="display: flex; flex-wrap: wrap; height:35px;margin-bottom: 10px;">
+      <div slot="header">人员阳性结果</div>
+      <div :style="'display: block; width:' + (window.pageWidth - 45) + 'px;'">
+        <div style="display: flex; flex-wrap: wrap; height:35px;">
           <div class="query">
             <span>体检单位：</span>
-            <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width:342px;" size="small"
+            <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width:300px;" size="small"
               disabled>
               <el-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true"
                 style="font-size: 20px;"></el-button>
@@ -42,7 +42,7 @@
             <el-button type="primary" @click="btnQuery" size="small">查询</el-button>
           </div>
         </div>  
-        <el-table :data="dataList" border width="45%" :height="window.pageHeight < 600 ? 360 : window.pageHeight - 240"
+        <el-table :data="dataList" border width="45%" :height="window.pageHeight < 600 ? 415 : window.pageHeight - 185"
           row-key="id" size="small" highlight-current-row ref="dataList" :row-class-name="tableRowClassName">
           <el-table-column prop="patientNo" label="档案号" />      
           <el-table-column prop="patientName" label="姓名" />      
@@ -178,7 +178,7 @@ export default {
 
       body.customerOrgs = customerOrgs
     //   body.diagnosisIds = diagnosisIds
-      body.completeFlag = this.completeFlag
+      if(this.completeFlag) body.completeFlag = this.completeFlag
       body.isAudit=this.classification
 
 
@@ -209,44 +209,11 @@ export default {
 };
 </script>
 <style scoped>
-::v-deep .el-input__inner {
-  /*text-align: center;*/
-  padding-left: 5px;
-  padding-right: 15px;
-}
-
-::v-deep .el-input-group__append {
-  padding: 0 5px;
-  /* 控件默认 0 20px;*/
-}
-
-/* 表格 表头 列间距控制 */
-::v-deep .el-table th.el-table__cell>.cell {
-  text-align: center;
-  /* 表格 表头 对齐方式，默认 left */
-  padding-right: 2px;
-  /* 表格 表头 列间距控制，默认 10px */
-  padding-left: 2px;
-  /* 表格 表头 列间距控制，默认 10px */
-}
-
-/* 表格 表体 首列左间距控制 */
-::v-deep .el-table--border .el-table__cell:first-child .cell {
-  padding-left: 2px;
-  /* 表格 表体 首列左间距控制，默认 10px */
-}
-
-/* 表格 行列间距控制 ，默认 10 px*/
-::v-deep .el-table__cell {
-  padding: 2px 2px 2px 2px;
-  /* 上，右，下，左 */
-}
-
-/* 表格单元格 .el-table .cell ，默认 10 px*/
-::v-deep .cell {
-  padding-left: 2px;
-  padding-right: 2px;
-}
+@import '../../assets/css/global_button.css';
+@import '../../assets/css/global_card.css';
+@import '../../assets/css/global_input.css';
+@import '../../assets/css/global_table.css';
+@import '../../assets/css/global.css';
 
 .query {
   margin-left: 10px;
@@ -255,16 +222,5 @@ export default {
   align-items: center;
 }
 
-.listBtn {
-  margin-top: 20px;
-}
 
-.btnClass {
-  width: 110px;
-  text-align: center;
-}
-
-.btnClass {
-  width: 110px;
-}
 </style>
diff --git a/src/views/doctorCheck/positiveresults.vue b/src/views/customerReport/positiveResultsList.vue
similarity index 86%
rename from src/views/doctorCheck/positiveresults.vue
rename to src/views/customerReport/positiveResultsList.vue
index 0eb13dc..b58e454 100644
--- a/src/views/doctorCheck/positiveresults.vue
+++ b/src/views/customerReport/positiveResultsList.vue
@@ -1,12 +1,12 @@
 <template>
   <div>
     <el-card>      
-      <div class="publiccss">阳性结果人员</div>
-      <div :style="'display: block; width:' + (window.pageWidth - 85) + 'px;margin-top:20px'">
-        <div style="display: flex; flex-wrap: wrap; height:35px;margin-bottom: 10px;">
+      <div slot="header">阳性结果人员</div>
+      <div :style="'display: block; width:' + (window.pageWidth - 45) + 'px;'">
+        <div style="display: flex; flex-wrap: wrap; height:35px;">
           <div class="query">
             <span>体检单位：</span>
-            <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width:342px;" size="small"
+            <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width:300px;" size="small"
               disabled>
               <el-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true"
                 style="font-size: 20px;"></el-button>
@@ -14,7 +14,7 @@
           </div> 
           <div class="query">
             <span>诊断：</span>
-            <el-input placeholder="请选择诊断" v-model="patientRegister.query.asbitemOCX" style="width:240px;" size="small"
+            <el-input placeholder="请选择诊断" v-model="patientRegister.query.asbitemOCX" style="width:200px;" size="small"
               disabled>
               <el-button slot="append" icon="el-icon-search" @click="report.dialogAsbitemOCX = true"
                 style="font-size: 20px;"></el-button>
@@ -48,7 +48,7 @@
         <template  v-if="format == 0">
           <div v-for="item,index in dataList" :key="index">
           <div>{{item.diagnosisName}}</div>
-        <el-table :data="item.patientRegisters" border width="45%" :height="dataList.length>1?'':window.pageHeight < 600 ? 360 : window.pageHeight - 240"
+        <el-table :data="item.patientRegisters" border width="45%" :height="dataList.length>1?'':window.pageHeight < 600 ? 415 : window.pageHeight - 185"
           row-key="id" size="small" highlight-current-row ref="dataList" :row-class-name="tableRowClassName">
           <el-table-column prop="departmentName" label="部门" />      
           <el-table-column prop="patientName" label="姓名" />      
@@ -61,7 +61,7 @@
           <el-table-column prop="mobileTelephone" label="手机号" />
         </el-table>
         </div>
-        <el-table :data="dataList" border width="45%" :height="dataList.length>1?'':window.pageHeight < 600 ? 360 : window.pageHeight - 240"
+        <el-table :data="dataList" border width="45%" :height="dataList.length>1?'':window.pageHeight < 600 ? 415 : window.pageHeight - 185"
           row-key="id" size="small" highlight-current-row ref="dataList" :row-class-name="tableRowClassName" v-if="dataList.length==0">
           <el-table-column prop="departmentName" label="部门" />      
           <el-table-column prop="patientName" label="姓名" />      
@@ -222,7 +222,7 @@ export default {
 
       body.customerOrgs = customerOrgs
       body.diagnosisIds = diagnosisIds
-      body.completeFlag = this.completeFlag
+      if(this.completeFlag) body.completeFlag = this.completeFlag
       body.isAudit=this.classification
 
       //console.log('/api/app/peisreport/getregisterasbitemchargestatus',body)
@@ -258,44 +258,11 @@ export default {
 };
 </script>
 <style scoped>
-::v-deep .el-input__inner {
-  /*text-align: center;*/
-  padding-left: 5px;
-  padding-right: 15px;
-}
-
-::v-deep .el-input-group__append {
-  padding: 0 5px;
-  /* 控件默认 0 20px;*/
-}
-
-/* 表格 表头 列间距控制 */
-::v-deep .el-table th.el-table__cell>.cell {
-  text-align: center;
-  /* 表格 表头 对齐方式，默认 left */
-  padding-right: 2px;
-  /* 表格 表头 列间距控制，默认 10px */
-  padding-left: 2px;
-  /* 表格 表头 列间距控制，默认 10px */
-}
-
-/* 表格 表体 首列左间距控制 */
-::v-deep .el-table--border .el-table__cell:first-child .cell {
-  padding-left: 2px;
-  /* 表格 表体 首列左间距控制，默认 10px */
-}
-
-/* 表格 行列间距控制 ，默认 10 px*/
-::v-deep .el-table__cell {
-  padding: 2px 2px 2px 2px;
-  /* 上，右，下，左 */
-}
-
-/* 表格单元格 .el-table .cell ，默认 10 px*/
-::v-deep .cell {
-  padding-left: 2px;
-  padding-right: 2px;
-}
+@import '../../assets/css/global_button.css';
+@import '../../assets/css/global_card.css';
+@import '../../assets/css/global_input.css';
+@import '../../assets/css/global_table.css';
+@import '../../assets/css/global.css';
 
 .query {
   margin-left: 10px;
@@ -304,16 +271,4 @@ export default {
   align-items: center;
 }
 
-.listBtn {
-  margin-top: 20px;
-}
-
-.btnClass {
-  width: 110px;
-  text-align: center;
-}
-
-.btnClass {
-  width: 110px;
-}
 </style>
diff --git a/src/views/report/chargeAsbitem.vue b/src/views/report/chargeAsbitem.vue
index 9ad5a38..dfa59c3 100644
--- a/src/views/report/chargeAsbitem.vue
+++ b/src/views/report/chargeAsbitem.vue
@@ -1,12 +1,12 @@
 <template>
   <div>
     <el-card>      
-      <div class="publiccss">人员费用组合项目</div>
-      <div :style="'display: block; width:' + (window.pageWidth - 85) + 'px;margin-top:20px'">
+      <div slot="header">人员费用组合项目</div>
+      <div :style="'display: block; width:' + (window.pageWidth - 45) + 'px;'">
         <div style="display: flex; flex-wrap: wrap; height:35px;">
           <div class="query">
             <span>体检单位：</span>
-            <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width:342px;" size="small"
+            <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width:300px;" size="small"
               disabled>
               <el-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true"
                 style="font-size: 20px;"></el-button>
@@ -32,7 +32,7 @@
             <el-button type="primary" @click="btnQuery" size="small">查询</el-button>
           </div>
         </div>  
-        <el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 370 : window.pageHeight - 230"
+        <el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 415 : window.pageHeight - 185"
           row-key="id" size="small" highlight-current-row ref="dataList" :row-class-name="tableRowClassName">
           <el-table-column prop="asbitemName" label="组合项目名称" width="120"/>          
           <el-table-column prop="completeFlag" label="检查状态" width="70" align="center">
@@ -339,59 +339,13 @@ export default {
 };
 </script>
 <style scoped>
-::v-deep .el-input__inner {
-  /*text-align: center;*/
-  padding-left: 5px;
-  padding-right: 15px;
-}
-
-::v-deep .el-input-group__append {
-  padding: 0 5px;
-  /* 控件默认 0 20px;*/
-}
-
-/* 表格 表头 列间距控制 */
-::v-deep .el-table th.el-table__cell>.cell {
-  text-align: center;
-  /* 表格 表头 对齐方式，默认 left */
-  padding-right: 2px;
-  /* 表格 表头 列间距控制，默认 10px */
-  padding-left: 2px;
-  /* 表格 表头 列间距控制，默认 10px */
-}
-
-/* 表格 表体 首列左间距控制 */
-::v-deep .el-table--border .el-table__cell:first-child .cell {
-  padding-left: 2px;
-  /* 表格 表体 首列左间距控制，默认 10px */
-}
-
-/* 表格 行列间距控制 ，默认 10 px*/
-::v-deep .el-table__cell {
-  padding: 2px 2px 2px 2px;
-  /* 上，右，下，左 */
-}
-
-/* 表格单元格 .el-table .cell ，默认 10 px*/
-::v-deep .cell {
-  padding-left: 2px;
-  padding-right: 2px;
-}
+@import '../../assets/css/global_card.css';
+@import '../../assets/css/global_input.css';
+@import '../../assets/css/global_table.css';
+@import '../../assets/css/global.css';
 
 .query {
   margin-left: 10px;
 }
 
-.listBtn {
-  margin-top: 20px;
-}
-
-.btnClass {
-  width: 110px;
-  text-align: center;
-}
-
-.btnClass {
-  width: 110px;
-}
 </style>
diff --git a/src/views/report/checkStatus.vue b/src/views/report/checkStatus.vue
index 5e655ab..9a8e1c5 100644
--- a/src/views/report/checkStatus.vue
+++ b/src/views/report/checkStatus.vue
@@ -1,12 +1,12 @@
 <template>
   <div>
     <el-card>
-      <div class="publiccss">组合项目检查状态</div>
-      <div :style="'display: block; width:' + (window.pageWidth - 82) + 'px;margin-top:20px'">
+      <div slot="header">组合项目检查状态</div>
+      <div :style="'display: block; width:' + (window.pageWidth - 45) + 'px;'">
         <div style="display: flex; flex-wrap: wrap; height:35px;">
           <div class="query">
             <span>体检单位：</span>
-            <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width:342px;" size="small"
+            <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width:300px;" size="small"
               disabled>
               <el-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true"
                 style="font-size: 20px;"></el-button>
@@ -33,10 +33,10 @@
           </div>
         </div>
         <div>
-          <el-table :data="dataList" border :height="window.pageHeight < 600 ? 360 : window.pageHeight - 240" row-key="id"
+          <el-table :data="dataList" border :height="window.pageHeight < 600 ? 415 : window.pageHeight - 185" row-key="id"
             size="small" highlight-current-row ref="dataList" :row-class-name="tableRowClassName">
-            <el-table-column prop="asbitemName" label="组合项目名称" width="120" />
-            <el-table-column prop="completeFlag" label="检查状态" width="70" 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>
               </template>
@@ -343,50 +343,14 @@ export default {
 };
 </script>
 <style scoped>
-::v-deep .el-input__inner {
-  /*text-align: center;*/
-  padding-left: 5px;
-  padding-right: 15px;
-}
-
-::v-deep .el-input-group__append {
-  padding: 0 5px;
-  /* 控件默认 0 20px;*/
-}
-/* 表格 表头 列间距控制 */
-::v-deep .el-table th.el-table__cell>.cell {
-  text-align: center;
-  /* 表格 表头 对齐方式，默认 left */
-  padding-right: 2px;
-  /* 表格 表头 列间距控制，默认 10px */
-  padding-left: 2px;
-  /* 表格 表头 列间距控制，默认 10px */
-}
-
-/* 表格 表体 首列左间距控制 */
-::v-deep .el-table--border .el-table__cell:first-child .cell {
-  padding-left: 2px;
-  /* 表格 表体 首列左间距控制，默认 10px */
-}
+@import '../../assets/css/global_button.css';
+@import '../../assets/css/global_card.css';
+@import '../../assets/css/global_input.css';
+@import '../../assets/css/global_table.css';
+@import '../../assets/css/global.css';
 
-/* 表格 行列间距控制 ，默认 10 px*/
-::v-deep .el-table__cell {
-  padding: 2px 2px 2px 2px;
-  /* 上，右，下，左 */
-}
 .query {
   margin-left: 10px;
 }
 
-.listBtn {
-  margin-top: 20px;
-}
-
-.btnClass {
-  width: 110px;
-  text-align: center;
-}
-
-.btnClass {
-  width: 110px;
-}</style>
+</style>
diff --git a/src/views/report/report.vue b/src/views/report/report.vue
index e582f55..5be6e8a 100644
--- a/src/views/report/report.vue
+++ b/src/views/report/report.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
     <el-card>
-      <div class="publiccss">体检报告</div>
-      <div style="display: flex; margin-top: 20px">
+      <div slot="header">体检报告</div>
+      <div style="display: flex;">
         <div
           :style="
-            'display: block; width:' + (window.pageWidth - 120 - 80) + 'px;'
+            'display: block; width:' + (window.pageWidth - 110 - 45) + 'px;'
           "
         >
           <PatientRegisterQueryNobtn orgEnable="Y" />
@@ -13,7 +13,7 @@
             <div
               :style="
                 'width:' +
-                Math.floor(((window.pageWidth - 120 - 80) * 3) / 4) +
+                Math.floor(((window.pageWidth - 110 - 45) * 3) / 4) +
                 'px;'
               "
             >
@@ -22,7 +22,7 @@
             <div
               :style="
                 'margin-left: 2px;width:' +
-                Math.floor((window.pageWidth - 120 - 80 - 8) / 4) +
+                Math.floor((window.pageWidth - 110 - 45 - 8) / 4) +
                 'px;'
               "
             >
@@ -35,7 +35,7 @@
             :patientRegisterId="patientRegister.patientRegisterId"
           />
         </div>
-        <div style="margin-left: 10px; width: 110px">
+        <div style="margin-left: 10px; ">
           <BtnReport />
         </div>
       </div>
@@ -86,7 +86,7 @@ export default {
     dictInit() {
       //性别
       getapi("/api/app/sex").then((res) => {
-        if (res.code == 1) {
+        if (res.code != -1) {
           this.dict.sex = res.data;
         }
       });
@@ -94,7 +94,7 @@ export default {
       //体检中心
       getapi("/api/app/organization-units/organization-unit-by-is-peis").then(
         (res) => {
-          if (res.code == 1) {
+          if (res.code != -1) {
             this.dict.organization = res.data;
           }
         }
@@ -102,7 +102,7 @@ export default {
 
       //体检单位树
       getapi("/api/app/customerorg/getbycodeall").then((res) => {
-        if (res.code == 1) {
+        if (res.code != -1) {
           this.patientRegister.customerOrgTreeAll = res.data;
           tcdate(this.patientRegister.customerOrgTreeAll);
         }
@@ -110,77 +110,77 @@ export default {
 
       //体检类别
       getapi("/api/app/medical-type/in-filter").then((res) => {
-        if (res.code == 1) {
+        if (res.code != -1) {
           this.dict.medicalType = res.data.items;
         }
       });
 
       //人员类别
       getapi("/api/app/personnel-type/in-filter").then((res) => {
-        if (res.code == 1) {
+        if (res.code != -1) {
           this.dict.personnelType = res.data.items;
         }
       });
 
       //婚姻状况
       getapi("/api/app/marital-statuses").then((res) => {
-        if (res.code == 1) {
+        if (res.code != -1) {
           this.dict.maritalStatus = res.data.items;
         }
       });
 
       //性激素期
       getapi("/api/app/sex-hormone-term/in-filter").then((res) => {
-        if (res.code == 1) {
+        if (res.code != -1) {
           this.dict.sexHormoneTerm = res.data.items;
         }
       });
 
       //民族
       getapi("/api/app/nation/in-filter").then((res) => {
-        if (res.code == 1) {
+        if (res.code != -1) {
           this.dict.nation = res.data.items;
         }
       });
 
       //籍惯 ，出生地
       getapi("/api/app/birth-place/in-filter").then((res) => {
-        if (res.code == 1) {
+        if (res.code != -1) {
           this.dict.birthPlace = res.data.items;
         }
       });
 
       //套餐
       getapi("/api/app/medical-package/in-filter").then((res) => {
-        if (res.code == 1) {
+        if (res.code != -1) {
           this.dict.medicalPackage = res.data.items;
         }
       });
 
       //分组，所有分组，不限单位，不限次数
       getapi("/api/app/customer-org-group").then((res) => {
-        if (res.code == 1) {
+        if (res.code != -1) {
           this.dict.customerOrgGroupAll = res.data.items;
         }
       });
 
       //支付方式
       getapi("/api/app/pay-mode").then((res) => {
-        if (res.code == 1) {
+        if (res.code != -1) {
           this.dict.payMode = res.data;
         }
       });
 
       //体检类别 树结构
       getapi("/api/app/item-type/by-code-all").then((res) => {
-        if (res.code == 1) {
+        if (res.code != -1) {
           this.dict.itemTypeTree = res.data;
           tcdate(this.dict.itemTypeTree);
         }
       });
 
       getapi("/api/app/asbitem/in-filter?Filter").then((res) => {
-        if (res.code == 1) {
+        if (res.code != -1) {
           this.dict.asbItemAll = res.data.items;
         }
       });
@@ -202,41 +202,10 @@ export default {
 };
 </script>
 <style scoped>
-/* 表格 表头 列间距控制 */
-::v-deep .el-table th.el-table__cell > .cell {
-  text-align: center; /* 表格 表头 对齐方式，默认 left */
-  padding-right: 2px; /* 表格 表头 列间距控制，默认 10px */
-  padding-left: 2px; /* 表格 表头 列间距控制，默认 10px */
-}
-
-/* 表格 表体 首列左间距控制 */
-::v-deep .el-table--border .el-table__cell:first-child .cell {
-  padding-left: 2px; /* 表格 表体 首列左间距控制，默认 10px */
-}
-
-/* 表格 行列间距控制 ，默认 10 px*/
-::v-deep .el-table__cell {
-  padding: 2px 2px 2px 2px; /* 上，右，下，左 */
-}
-
-::v-deep .cell {
-  padding-left: 2px;
-  padding-right: 2px;
-}
-.query {
-  margin-left: 10px;
-}
-
-.listBtn {
-  margin-top: 20px;
-}
-
-.btnClass {
-  width: 110px;
-  text-align: center;
-}
-
-.btnClass {
-  width: 110px;
-}
+@import '../../assets/css/global_card.css';
+@import '../../assets/css/global_input.css';
+@import '../../assets/css/global_table.css';
+@import '../../assets/css/global.css';
+
+
 </style>
diff --git a/src/views/report/unCheckAsbitem.vue b/src/views/report/unCheckAsbitem.vue
index a3206e8..d3b50a6 100644
--- a/src/views/report/unCheckAsbitem.vue
+++ b/src/views/report/unCheckAsbitem.vue
@@ -1,12 +1,12 @@
 <template>
   <div>
     <el-card>      
-      <div class="publiccss">人员未检组合项目</div>
-      <div :style="'display: block; width:' + (window.pageWidth - 85) + 'px;margin-top:20px'">
+      <div slot="header">人员未检组合项目</div>
+      <div :style="'display: block; width:' + (window.pageWidth - 45) + 'px;'">
         <div style="display: flex; flex-wrap: wrap; height:35px;">
           <div class="query">
             <span>体检单位：</span>
-            <el-input placeholder="请选择单位" v-model="patientRegister.query.cusOrgOCX" style="width:342px;" size="small" disabled>          
+            <el-input placeholder="请选择单位" v-model="patientRegister.query.cusOrgOCX" style="width:300px;" size="small" disabled>          
               <el-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true"></el-button>
             </el-input>
           </div>
@@ -25,7 +25,7 @@
             <el-button type="primary" @click="btnQuery" size="small">查询</el-button>
           </div>
         </div>  
-        <el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 370 : window.pageHeight - 230"
+        <el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 415 : window.pageHeight - 185"
           row-key="id" size="small" highlight-current-row ref="dataList" >
           <el-table-column label="未检项目" width="300">
             <template slot-scope="scope">
@@ -310,63 +310,15 @@ export default {
 };
 </script>
 <style scoped>
-::v-deep .el-input__inner {
-  /*text-align: center;*/
-  padding-left: 5px;
-  padding-right: 15px;
-}
-::v-deep .el-input__icon{
-  width: 15px; /* 输入框下拉箭头或清除图标 默认 25 */
-}
-
-::v-deep .el-input-group__append {
-  padding: 0 5px;
-  /* 控件默认 0 20px;*/
-}
-/* 表格 表头 列间距控制 */
-::v-deep .el-table th.el-table__cell>.cell {
-  text-align: center;
-  /* 表格 表头 对齐方式，默认 left */
-  padding-right: 2px;
-  /* 表格 表头 列间距控制，默认 10px */
-  padding-left: 2px;
-  /* 表格 表头 列间距控制，默认 10px */
-}
-
-/* 表格 表体 列间距控制 */
-::v-deep .el-table td.el-table__cell>.cell {
-  /* 表格 表头 对齐方式，默认 left */
-  padding-right: 2px;
-  /* 表格 表头 列间距控制，默认 10px */
-  padding-left: 2px;
-  /* 表格 表头 列间距控制，默认 10px */
-}
+@import '../../assets/css/global_button.css';
+@import '../../assets/css/global_card.css';
+@import '../../assets/css/global_input.css';
+@import '../../assets/css/global_table.css';
+@import '../../assets/css/global.css';
 
-/* 表格 表体 首列左间距控制 */
-::v-deep .el-table--border .el-table__cell:first-child .cell {
-  padding-left: 2px;
-  /* 表格 表体 首列左间距控制，默认 10px */
-}
-
-/* 表格 行列间距控制 ，默认 10 px*/
-::v-deep .el-table__cell {
-  padding: 2px 2px 2px 2px;
-  /* 上，右，下，左 */
-}
 .query {
   margin-left: 10px;
 }
 
-.listBtn {
-  margin-top: 20px;
-}
 
-.btnClass {
-  width: 110px;
-  text-align: center;
-}
-
-.btnClass {
-  width: 110px;
-}
 </style>