jbtj

src/views/customerReport/diseaseStatistics.vue

@@ -8,8 +8,7 @@
         </div>
       </div>
       <div :style="'display: block;'">
-        <div
-          style="
+        <div style="
             background-color: #fff;
             padding: 15px;
             border-radius: 8px;
@@ -18,42 +17,31 @@
             margin-bottom: 10px;
             height: 35px;
             margin-top: 7px;
-          "
-        >
+          ">
           <div class="query">
-            <span>体检单位：</span>
-            <el-input
-              placeholder="请选择体检单位"
-              v-model="patientRegister.query.cusOrgOCX"
-              style="width: 240px"
-              size="small"
-              disabled
-            >
-              <el-button
-                slot="append"
-                icon="el-icon-search"
-                @click="diagnosis.dialogCusOrgOCX = true"
-                style="font-size: 20px"
-              ></el-button>
+            <span class="spanClass">体检单位</span>
+            <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width: 240px" size="small"
+              disabled>
+              <el-button slot="append" icon="el-icon-search" @click="diagnosis.dialogCusOrgOCX = true"
+                style="font-size: 20px"></el-button>
             </el-input>
           </div>
           <div class="query">
-            <span>诊断：</span>
-            <el-input
-              placeholder="请选择诊断"
-              v-model="patientRegister.query.StatisticsOCX"
-              style="width: 240px"
-              size="small"
-              disabled
-            >
-              <el-button
-                slot="append"
-                icon="el-icon-search"
-                @click="diagnosis.dialogAsbitemOCX = true"
-                style="font-size: 20px"
-              ></el-button>
+            <span class="spanClass">诊断</span>
+            <el-input placeholder="请选择诊断" v-model="patientRegister.query.StatisticsOCX" style="width: 200px"
+              size="small" disabled>
+              <el-button slot="append" icon="el-icon-search" @click="diagnosis.dialogAsbitemOCX = true"
+                style="font-size: 20px"></el-button>
             </el-input>
           </div>
+          <div class="query">
+            <span class="spanClass">状态</span>
+            <el-select v-model="patientRegister.query.completeFlags" placeholder="请选择" clearable style="width: 150px"
+              size="small" multiple collapse-tags>
+              <el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName" :value="item.id">
+              </el-option>
+            </el-select>
+          </div>
           <!-- <div class="query">
             <span>疾病来源：</span>
             <el-select v-model="patientRegister.query.isCharge" placeholder="请选择" clearable style="width: 80px"
@@ -68,97 +56,65 @@
             <span>分类统计</span>
           </div> -->
           <div class="query">
-            <el-button @click="btnQuery" size="small" class="commonbutton"
-              >查询</el-button
-            >
+            <el-button @click="btnQuery" size="small" class="commonbutton">查询</el-button>
           </div>
           <div class="query">
-            <el-button @click="handleExport" size="small" class="commonbutton"
-              >导出excel</el-button
-            >
+            <el-button @click="handleExport" size="small" class="commonbutton">导出excel</el-button>
           </div>
           <div class="query">
-            <el-button @click="onPrint" size="small" class="commonbutton"
-              >打印</el-button
-            >
+            <el-button @click="onPrint" size="small" class="commonbutton">打印</el-button>
           </div>
           <div class="query">
-            <el-button @click="columnarChart" size="small" class="commonbutton"
-              >柱状图</el-button
-            >
+            <el-button @click="columnarChart" size="small" class="commonbutton">柱状图</el-button>
           </div>
           <div class="query">
-            <el-button @click="peiChart" size="small" class="commonbutton"
-              >饼图</el-button
-            >
+            <el-button @click="peiChart" size="small" class="commonbutton">饼图</el-button>
           </div>
         </div>
-        <div
-          style="
+        <div style="
             display: flex;
             justify-content: space-between;
             position: relative;
-          "
-          id="domTable"
-        >
-          <div
-            style="
+          " id="domTable">
+          <div style="
               width: 47.7%;
               background-color: #fff;
               padding: 15px;
               border-radius: 8px;
-            "
-            ref="imageDom"
-          >
-            <el-table
-              :data="dataList"
-              border
-              width="45%"
-              :height="
-                flag
+            " ref="imageDom">
+            <el-table :data="dataList" border width="45%" :height="flag
               ? window.pageHeight < 600
                 ? 415
                 : window.pageHeight - 185 - 20
               : ''
-              "
-              row-key="id"
-              highlight-current-row
-              ref="dataList"
-              id="table"
-              :row-class-name="tableRowClassName"
-              show-summary
-              :summary-method="getSummaries"
-            >
+              " row-key="id" highlight-current-row ref="dataList" id="table" :row-class-name="tableRowClassName"
+              show-summary :summary-method="getSummaries">
               <el-table-column prop="diagnosisName" label="疾病" />
               <el-table-column prop="patientCount" label="人数" />
-              <el-table-column prop="percentage" label="占总检人员百分比" />
+              <el-table-column prop="percentage" label="人员占比" >
+                <template slot-scope="scope">
+                  {{ scope.row.percentage + '%' }}
+                </template>
+              </el-table-column>
             </el-table>
           </div>
-          <div
-            :style="
-              'width: 47.7%;overflow: hidden;height:' +
+          <div :style="'width: 47.7%;overflow: hidden;height:' +
             (window.pageHeight < 600 ? 415 : window.pageHeight - 185 - 20) +
             'px;background-color: #fff; padding: 15px; border-radius: 8px;'
-            "
-          >
-            <div
-              style="
+            ">
+            <div style="
                 font-size: 20px;
                 font-weight: 700;
                 color: #232748;
                 font-family: 'NotoSansSC-Bold';
                 text-align: center;
-              "
-            >
+              ">
               疾病人数统计
             </div>
-            <div
-              :style="
-                'height:' +
+            <div :style="'height:' +
               (window.pageHeight < 600 ? 387 : window.pageHeight - 185 - 48) +
               'px;'
-              "
-            >
+              ">
               <ChartBlock ref="chart2"></ChartBlock>
             </div>
           </div>
@@ -166,23 +122,13 @@
       </div>
     </div>
     <!--通用选单位、体检次数、分组的控件-->
-    <el-dialog
-      title="体检单位选择"
-      :visible.sync="diagnosis.dialogCusOrgOCX"
-      :close-on-click-modal="false"
-      width="880px"
-      height="600px"
-    >
+    <el-dialog title="体检单位选择" :visible.sync="diagnosis.dialogCusOrgOCX" :close-on-click-modal="false" width="880px"
+      height="600px">
       <CusOrgOCX :initDateType="'creationTime'" :useCustomerOrg="true" />
     </el-dialog>
     <!--通用选组合项目的控件-->
-    <el-dialog
-      title="诊断选择"
-      :visible.sync="diagnosis.dialogAsbitemOCX"
-      :close-on-click-modal="false"
-      width="700px"
-      height="600px"
-    >
+    <el-dialog title="诊断选择" :visible.sync="diagnosis.dialogAsbitemOCX" :close-on-click-modal="false" width="700px"
+      height="600px">
       <StatisticsOCX />
     </el-dialog>
   </div>
@@ -375,8 +321,15 @@ page-break-before: avoid;}}`, // 去除页眉页脚
         });
       }
 
+      
+
       body.customerOrgs = customerOrgs;
       body.diagnosisIds = diagnosisIds;
+      if(this.patientRegister.query.completeFlags && Array.isArray(this.patientRegister.query.completeFlags) && this.patientRegister.query.completeFlags.length > 0){
+        body.completeFlags = this.patientRegister.query.completeFlags
+      }else{
+        delete body['completeFlags']
+      }
 
       // if (this.patientRegister.query.isCharge) body.isCharge = this.patientRegister.query.isCharge
 
@@ -525,6 +478,7 @@ page-break-before: avoid;}}`, // 去除页眉页脚
 @import "../../assets/css/global_form.css";
 @import "../../assets/css/global_input.css";
 @import "../../assets/css/global.css";
+
 .query {
   margin-right: 10px;
   display: flex;
@@ -535,10 +489,12 @@ page-break-before: avoid;}}`, // 去除页眉页脚
   font-size: 400;
   font-family: "NotoSansSC-Regular";
 }
+
 .box {
   display: flex;
   flex-direction: column;
 }
+
 ::v-deep .el-input__inner {
   /*text-align: center;*/
   padding-left: 5px;
@@ -558,7 +514,12 @@ page-break-before: avoid;}}`, // 去除页眉页脚
 ::v-deep .el-icon-search:before {
   color: #00F;
 }
+
 .query:last-child {
   margin-right: 0;
 }
+.spanClass {
+  font-size: 14px;
+  padding: 0 2px 0 0;
+}
 </style>