doctor

src/components/doctorCheck/RegisterCheckList.vue

@@ -1,10 +1,26 @@
 <template>
   <div>
+    <!-- :row-class-name="tableRowClassName" -->
     <el-table :data="doctorCheck.RegisterCheckList" style="width: 100%" 
-      :height="window.pageHeight < 600 ? 340:window.pageHeight-260" 
+      :height="window.pageHeight < 600 ? 340:window.pageHeight-260"  
       border highlight-current-row ref='doctorCheck_RegisterCheckList'
-      :row-class-name="tableRowClassName" @row-click="rowClick">
-      <el-table-column prop="asbitemName" label="组合项目" width="198" />    
+      @row-click="rowClick">
+      <el-table-column prop="asbitemName" label="组合项目" width="198">
+        <template slot-scope="scope">
+            <div>
+              <el-tooltip class="item" effect="dark" content="未检" placement="top">
+                <i v-if="scope.row.completeFlag == '0'" class="el-icon-circle-plus" style="font-size: 16px;color: red;"></i>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="已检" placement="top">
+                <i v-if="scope.row.completeFlag == '1'" class="el-icon-success" style="font-size: 16px;color: green;"></i>
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="弃检" placement="top">
+                <i v-if="scope.row.completeFlag == '2'" class="el-icon-remove" style="font-size: 16px;"></i>
+              </el-tooltip>
+              {{scope.row.asbitemName}}
+            </div>
+        </template>
+      </el-table-column>
     </el-table>
   </div>
 </template>

src/components/patientRegister/PatientRegisterItem.vue

@@ -96,7 +96,10 @@
           <el-table-column label="已选组合项目" min-width="120" prop="asbitemName" >
             <template slot-scope="scope">
               <div>
-                <i v-if="scope.row.groupPackageId" class="el-icon-star-on" style="font-size: 14px;color: purple;"></i>{{ scope.row.asbitemName }}
+                <el-tooltip class="item" effect="dark" content="套餐/分组中包含的组合项目" placement="top">
+                  <i v-if="scope.row.groupPackageId" class="el-icon-star-on" style="font-size: 14px;color: purple;"></i>
+                </el-tooltip>
+                {{ scope.row.asbitemName }}
               </div>
             </template>
           </el-table-column>

src/components/sumDoctorCheck/ButtonList.vue

@@ -24,9 +24,11 @@
         <div class="listBtn">
             <el-button type="primary" class="btnClass" @click="addSuggtion">新增建议</el-button>
         </div>
+        <!-- 直接放在 建议旁边
         <div class="listBtn">
             <el-button type="primary" class="btnClass" @click="addDiagnosis">疾病诊断</el-button>
         </div>
+        -->
         <div class="listBtn">
             <el-button type="primary" class="btnClass" @click="report">体检报告</el-button>
         </div>
@@ -50,11 +52,12 @@
           <PatientRegisterList :win="sumDoctorCheck" :winAbsolute="false"/>
         </el-drawer>
         -->
+        <!-- 直接放在 建议旁边
         <el-drawer title="诊断列表" :visible.sync="sumDoctorCheck.sumDiagnosisVisible" direction="ltr"  :size="300"
           :wrapperClosable="false">
           <SumDiagnosis :patientRegisterId="sumDoctorCheck.sumPREdit.id" />
         </el-drawer>
-
+        -->
     </div>
 </template>
 <script>

src/components/sumDoctorCheck/SumDiagnosis.vue

@@ -1,14 +1,14 @@
 <template>
-  <div style="padding: 0 5px;">
+  <div style="padding: 0 2px;">
     <div>
       <el-select v-model="diagnosis" placeholder="快速选择诊断疾病" size="small" filterable clearable remote automatic-dropdown
         :remote-method="remoteMethod" @change="quickChoosedDiag" default-first-option ref="diagnosises" value-key="id"
-        style="width:250px;text-align: left;padding-right: 15px;">
+        style="width:196px;text-align: left;padding-right: 15px;">
         <el-option v-for="item in diagnosisesCur" :key="item.id" :value="item" :label="item.displayName" />
       </el-select>
     </div>
     <div>
-      <el-table :data="sumDoctorCheck.diagnosisList" :height="window.pageHeight - 110" width="100%" size="small">
+      <el-table :data="sumDoctorCheck.diagnosisList" :height="window.pageHeight < 600 ? 178 : window.pageHeight - 390 - 32" width="100%" size="small">
         <!-- temporaryselection   personnelUnit.nogroupselected-->
         <!--
         "patientRegisterId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
@@ -17,12 +17,12 @@
         "displayOrder": 0,
         "diagnosisName": "string"
         -->
-        <el-table-column type="index" label="序号" align="center" width="60" />
-        <el-table-column label="诊断疾病" width="160" prop="diagnosisName" />
-        <el-table-column fixed="right" label="操作" width="60">
+        <el-table-column type="index" align="center" width="25" />
+        <el-table-column label="诊断疾病" min-width="130" prop="diagnosisName" />
+        <el-table-column fixed="right" width="25">
           <template slot-scope="scope">
             <i class="el-icon-delete" @click="deleteRow(scope.$index)"
-              style="font-size: 24px;color: red;cursor:pointer;"></i>
+              style="font-size: 20px;color: red;cursor:pointer;"></i>
           </template>
         </el-table-column>
       </el-table>

src/views/doctorCheck/doctorCheck.vue

@@ -80,6 +80,7 @@ import RegisterCheckList from "../../components/doctorCheck/RegisterCheckList.vu
 import CheckItemList from "../../components/doctorCheck/CheckItemList.vue";
 import CheckSumSug from "../../components/doctorCheck/CheckSumSug.vue";
 import RegisterCheckEdit from "../../components/doctorCheck/RegisterCheckEdit.vue";
+import moment from 'moment';
 
 export default {
   components: {

src/views/doctorCheck/sumDoctorCheck.vue

@@ -13,10 +13,19 @@
             ">
             <el-tabs v-model="tabChoosed">
               <el-tab-pane label="综述建议" name="1">
+                <div style="display: flex;">
+                  <!-- 综述建议 -->
+                  <div :style="'width:' + (window.pageWidth - 110 - 45 - 200) + 'px;'">
+                    <SumSug :patientRegisterId="sumDoctorCheck.sumPREdit.id" />
+                  </div>
+                  <div style="width:200px;">
+                    <SumDiagnosis :patientRegisterId="sumDoctorCheck.sumPREdit.id" />
+                  </div>
+                </div>
                 <div>
-                  <!-- -->
-                  <SumSug :patientRegisterId="sumDoctorCheck.sumPREdit.id" />                  
+                  <!-- 总检状态 -->                                  
                   <SumPREdit />
+                  <!-- 检查情况 --> 
                   <SumAsbItemStatus :patientRegisterId="sumDoctorCheck.sumPREdit.id" />
                 </div>
               </el-tab-pane>
@@ -51,6 +60,7 @@ import { tcdate } from "../../utlis/proFunc";
 import PatientRegisterBase from "../../components/doctorCheck/PatientRegisterBase.vue";
 import ButtonList from "../../components/sumDoctorCheck/ButtonList.vue";
 import SumSug from "../../components/sumDoctorCheck/SumSug.vue";
+import SumDiagnosis from "../../components/sumDoctorCheck/SumDiagnosis.vue";
 import SumPREdit from "../../components/sumDoctorCheck/SumPREdit.vue";
 import SumAsbItemStatus from "../../components/sumDoctorCheck/SumAsbItemStatus.vue";
 import CheckDetails from "../../components/sumDoctorCheck/CheckDetails.vue";
@@ -62,6 +72,7 @@ export default {
     PatientRegisterBase,
     ButtonList,
     SumSug,
+    SumDiagnosis,
     SumPREdit,
     SumAsbItemStatus,
     CheckDetails,