From cc72d84b113fb2ddef8d2fe1ac87cec61da4441f Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Sat, 11 May 2024 22:50:35 +0800
Subject: [PATCH] dj

---
 .../doctorCheck/RegisterCheckList.vue         |  29 ++---
 .../patientRegister/PatientRegisterList.vue   |  26 +----
 .../PatientRegisterRefuseList.vue             | 103 +++++-------------
 src/components/report/RegisterCheckStatus.vue |  29 ++---
 src/utlis/proFunc.js                          |  38 +++++++
 5 files changed, 83 insertions(+), 142 deletions(-)

diff --git a/src/components/doctorCheck/RegisterCheckList.vue b/src/components/doctorCheck/RegisterCheckList.vue
index 0c6bf29..1478024 100644
--- a/src/components/doctorCheck/RegisterCheckList.vue
+++ b/src/components/doctorCheck/RegisterCheckList.vue
@@ -8,7 +8,7 @@
             :row-style="{ height: '28px' }">
             <el-table-column prop="asbitemName" label="组合项目" width="184">
               <template slot-scope="scope">
-                <div :style="`padding: 0 5px;color: ${setColor(scope.row.completeFlag)};`">
+                <div :style="`padding: 0 5px;color: ${setCheckStatusColor(scope.row.completeFlag)};`">
                   {{ scope.row.asbitemName }}
                 </div>
               </template>
@@ -21,7 +21,7 @@
             :row-style="{ height: '28px' }">
             <el-table-column prop="asbitemName" label="组合项目" width="184">
               <template slot-scope="scope">
-                <div :style="`padding: 0 5px;color: ${setColor(scope.row.completeFlag)};`">
+                <div :style="`padding: 0 5px;color: ${setCheckStatusColor(scope.row.completeFlag)};`">
                   {{ scope.row.asbitemName }}
                 </div>
               </template>
@@ -34,7 +34,7 @@
             :row-style="{ height: '28px' }">
             <el-table-column prop="asbitemName" label="组合项目" width="184">
               <template slot-scope="scope">
-                <div :style="`padding: 0 5px;color: ${setColor(scope.row.completeFlag)};`">
+                <div :style="`padding: 0 5px;color: ${setCheckStatusColor(scope.row.completeFlag)};`">
                   {{ scope.row.asbitemName }}
                 </div>
               </template>
@@ -47,7 +47,7 @@
             :row-style="{ height: '28px' }">
             <el-table-column prop="asbitemName" label="组合项目" width="184">
               <template slot-scope="scope">
-                <div :style="`padding: 0 5px;color: ${setColor(scope.row.completeFlag)};`">
+                <div :style="`padding: 0 5px;color: ${setCheckStatusColor(scope.row.completeFlag)};`">
                   {{ scope.row.asbitemName }}
                 </div>
               </template>
@@ -61,7 +61,7 @@
 <script>
 import { mapState } from 'vuex';
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { listOrderBy } from "../../utlis/proFunc"
+import { listOrderBy,setCheckStatusColor } from "../../utlis/proFunc"
 
 export default {
   components: {},
@@ -101,6 +101,8 @@ export default {
   },
 
   methods: {
+    setCheckStatusColor,
+
     tableRowClassName({ row, rowIndex }) {
       //console.log('tableRowClassName',rowIndex,row)
       if (row.completeFlag === '0') {
@@ -112,23 +114,6 @@ export default {
 
     },
 
-    setColor(completeFlag) {
-      let color = '#FF5054'
-      switch (completeFlag) {
-        case '1':
-          color = '#52555F'
-          break;
-        case '2':
-          color = '#396FFA'
-          break;
-        default:
-          break;
-      }
-      return color
-    },
-
-
-
     //选择组合项目
     rowClick(row) {
       console.log('rowClick')
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 66918fa..706c735 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -20,7 +20,7 @@
                     {{ scope.$index + 1 }}
                   </div>
                   <div v-else-if="dragCol[index].prop == 'completeFlag'"
-                    :style="`color: ${setColor(scope.row.isAudit, scope.row.completeFlag)}`">
+                    :style="`color: ${setPrStatusColor(scope.row.isAudit, scope.row.completeFlag)}`">
                     {{ scope.row.isAudit == 'Y' ? "已审核" : dddw(dict.completeFlag, "id", scope.row.completeFlag,
                       "displayName") }}
                   </div>
@@ -258,7 +258,7 @@ import {
   objCopy,
   arrayReduce,
   arrayExistObj,
-  deepCopy,
+  deepCopy,setPrStatusColor
 } from "../../utlis/proFunc";
 
 import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
@@ -396,7 +396,7 @@ export default {
   },
   methods: {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
-    moment, dddw, deepCopy, checkPagePriv,
+    moment, dddw, deepCopy, checkPagePriv,setPrStatusColor,
 
     // 扩展定义表格行样式
     handleRowClassName({ row, rowIndex }) {
@@ -417,25 +417,7 @@ export default {
       });
     },
 
-    // 设置颜色 
-    setColor(isAudit, completeFlag) {
-      if (isAudit == 'Y') return "#3DC04A"
-      let color = "#52555F"
-      switch (completeFlag) {
-        case '0':
-          color = "#FF5054"
-          break;
-        case '2':
-          color = "#F68A08"
-          break;
-        case '3':
-          color = "#396FFA"
-          break;
-        default:
-          break;
-      }
-      return color
-    },
+    
 
 
     refFuncSetData(item, v) {
diff --git a/src/components/patientRegister/PatientRegisterRefuseList.vue b/src/components/patientRegister/PatientRegisterRefuseList.vue
index 529240a..3ec57b9 100644
--- a/src/components/patientRegister/PatientRegisterRefuseList.vue
+++ b/src/components/patientRegister/PatientRegisterRefuseList.vue
@@ -8,15 +8,8 @@
           <el-table-column type="index" width="50" label="序号" />
           <el-table-column prop="completeFlag" label="体检进度">
             <template slot-scope="scope">
-              <div>
-                {{
-                  ldddw(
-                    dict.completeFlag,
-                    "id",
-                    scope.row.completeFlag,
-                    "displayName"
-                  )
-                }}
+              <div :style="`color: ${setPrStatusColor(scope.row.isAudit, scope.row.completeFlag)}`">
+                {{ dddw(dict.completeFlag,"id",scope.row.completeFlag,"displayName")}}
               </div>
             </template>
           </el-table-column>
@@ -28,20 +21,14 @@
           <el-table-column prop="customerOrgParentName" label="单位" width="180">
             <template slot-scope="scope">
               <div>
-                {{
-                  scope.row.customerOrgParentName
-                  ? scope.row.customerOrgParentName
-                  : scope.row.customerOrgName
-                }}
+                {{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}
               </div>
             </template>
           </el-table-column>
           <el-table-column prop="customerOrgName" label="部门" width="180">
             <template slot-scope="scope">
               <div>
-                {{
-                  scope.row.customerOrgParentName ? scope.row.customerOrgName : ""
-                }}
+                {{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}
               </div>
             </template>
           </el-table-column>
@@ -49,7 +36,7 @@
           <el-table-column prop="sexId" label="性别">
             <template slot-scope="scope">
               <div>
-                {{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}
+                {{ dddw(dict.sex, "id", scope.row.sexId, "displayName") }}
               </div>
             </template>
           </el-table-column>
@@ -62,33 +49,19 @@
               <div v-if="scope.row.medicalPackageId !== dict.personOrgId &&
                 scope.row.customerOrgId === dict.personOrgId
                 ">
-                {{
-                  ldddw(
-                    dict.medicalPackage,
-                    "id",
-                    scope.row.medicalPackageId,
-                    "displayName"
-                  )
-                }}
+                {{ dddw( dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName" ) }}
               </div>
               <div v-if="scope.row.medicalPackageId !== dict.personOrgId &&
                   scope.row.customerOrgId !== dict.personOrgId
                   ">
-                {{
-                  ldddw(
-                    dict.customerOrgGroupAll,
-                    "id",
-                    scope.row.customerOrgGroupId,
-                    "displayName"
-                  )
-                }}
+                {{ dddw( dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName" ) }}
               </div>
             </template>
           </el-table-column>
           <el-table-column prop="nationId" label="民族">
             <template slot-scope="scope">
               <div>
-                {{ ldddw(dict.nation, "id", scope.row.nationId, "displayName") }}
+                {{ dddw(dict.nation, "id", scope.row.nationId, "displayName") }}
               </div>
             </template>
           </el-table-column>
@@ -109,42 +82,21 @@
           <el-table-column prop="maritalStatusId" label="婚姻状况">
             <template slot-scope="scope">
               <div>
-                {{
-                  ldddw(
-                    dict.maritalStatus,
-                    "id",
-                    scope.row.maritalStatusId,
-                    "displayName"
-                  )
-                }}
+                {{ dddw( dict.maritalStatus, "id", scope.row.maritalStatusId, "displayName" ) }}
               </div>
             </template>
           </el-table-column>
           <el-table-column prop="medicalTypeId" label="体检类别">
             <template slot-scope="scope">
               <div v-if="scope.row.medicalTypeId !== dict.personOrgId">
-                {{
-                  ldddw(
-                    dict.medicalType,
-                    "id",
-                    scope.row.medicalTypeId,
-                    "displayName"
-                  )
-                }}
+                {{ dddw( dict.medicalType, "id", scope.row.medicalTypeId, "displayName" ) }}
               </div>
             </template>
           </el-table-column>
           <el-table-column prop="personnelTypeId" label="人员类别">
             <template slot-scope="scope">
               <div v-if="scope.row.personnelTypeId !== dict.personOrgId">
-                {{
-                  ldddw(
-                    dict.personnelType,
-                    "id",
-                    scope.row.personnelTypeId,
-                    "displayName"
-                  )
-                }}
+                {{ dddw( dict.personnelType, "id", scope.row.personnelTypeId, "displayName" ) }}
               </div>
             </template>
           </el-table-column>
@@ -169,10 +121,7 @@
           </el-table-column>
         </el-table>
       </div>
-      <div :style="'margin-left: 15px;width:' +
-        Math.floor((window.pageWidth) / 2) +
-        'px;'
-        ">
+      <div :style="'margin-left: 15px;width:' + Math.floor((window.pageWidth) / 2) + 'px;'">
         <div style="display: flex; flex-wrap: wrap; height: 40px; width: 100%;background-color: #fff;
     border-radius: 8px;margin-bottom: 5px;align-items: center;">
           <div class="query">
@@ -194,15 +143,16 @@
           <el-table :data="doctorCheck.RegisterCheckList"
             :height="window.pageHeight < 600 ? 310 : window.pageHeight - 291" highlight-current-row size="small"
             @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="40" />
+            <el-table-column type="selection" width="40" align="center" />
             <el-table-column prop="asbitemName" label="组合项目" width="180" />
-            <el-table-column label="弃检" width="80">
+            <el-table-column label="状态" width="80" align="center">
               <template slot-scope="scope">
-                <el-checkbox :value="scope.row.completeFlag == '2'"></el-checkbox>
+                <div :style="`color: ${setCheckStatusColor(scope.row.completeFlag)};`">{{ dddw(dict.checkCompleteFlag,
+                  'id', scope.row.completeFlag, 'displayName') }}</div>
               </template>
             </el-table-column>
-            <el-table-column prop="lastModifierName" label="操作员" width="100" />
-            <el-table-column prop="lastModificationTime" label="操作时间" width="180">
+            <el-table-column prop="lastModifierName" label="操作员" width="100" align="center" />
+            <el-table-column prop="lastModificationTime" label="操作时间" width="140" align="center">
               <template slot-scope="scope">
                 <div>
                   {{
@@ -229,7 +179,7 @@
 import moment from "moment";
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { dddw, objCopy, arrayReduce } from "@/utlis/proFunc";
+import { dddw, objCopy, arrayReduce, setCheckStatusColor, setPrStatusColor} from "@/utlis/proFunc";
 
 import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
 import Camera from "../../components/patientRegister/Camera.vue";
@@ -255,7 +205,10 @@ export default {
   created() { },
 
   //挂载完成
-  mounted() { },
+  mounted() { 
+    this.dataList = []
+    this.doctorCheck.RegisterCheckList = []
+  },
   computed: {
     ...mapState([
       "window",
@@ -266,7 +219,7 @@ export default {
     ]),
   },
   methods: {
-    ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
+    ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]), dddw, setCheckStatusColor,setPrStatusColor,
 
     rowClick(row) {
       objCopy(row, this.quick);
@@ -436,10 +389,7 @@ export default {
       this.resuseCore(body);
     },
 
-    ldddw(arrayData, key, value, display) {
-      return dddw(arrayData, key, value, display);
-    },
-
+ 
     lmoment(date, forMat) {
       return moment(new Date(date)).format(forMat);
     },
@@ -496,7 +446,8 @@ export default {
         };
 
       console.log("/api/app/patientregister/getlistinfilter", body);
-
+      this.dataList = []
+      this.doctorCheck.RegisterCheckList = []
       postapi("/api/app/patientregister/getlistinfilter", body)
         .then((res) => {
           if (res.code > -1) {
diff --git a/src/components/report/RegisterCheckStatus.vue b/src/components/report/RegisterCheckStatus.vue
index 92d8792..24334a9 100644
--- a/src/components/report/RegisterCheckStatus.vue
+++ b/src/components/report/RegisterCheckStatus.vue
@@ -4,10 +4,10 @@
     <el-table :data="doctorCheck.RegisterCheckList" border
       :height="(window.pageHeight < 600) ? 290 : (window.pageHeight - 350)" size="small" highlight-current-row
       ref="doctorCheck.RegisterCheckList" >
-      <el-table-column prop="asbitemName" label="组合项目" width="120" />
-      <el-table-column prop="completeFlag" label="状态" align="center">
+      <el-table-column prop="asbitemName" label="组合项目" min-width="120" />
+      <el-table-column prop="completeFlag" label="状态" align="center" width="60">
         <template slot-scope="scope">
-          <div :style="`color: ${setColor(scope.row.completeFlag)}`">
+          <div :style="`color: ${setCheckStatusColor(scope.row.completeFlag)}`">
             {{ dddw(dict.checkCompleteFlag, 'id', scope.row.completeFlag, 'displayName') }}
             <!--
             <el-radio v-model="scope.row.checkCompleteFlag" label="0">未检</el-radio>
@@ -17,7 +17,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="checkDate" label="检查日期" width="90">
+      <el-table-column prop="checkDate" label="检查日期" min-width="90" align="center">
         <template slot-scope="scope">
           <div v-if="scope.row.checkDate">
             {{ moment(scope.row.checkDate).format("yyyy-MM-DD") }}
@@ -31,7 +31,7 @@
 import moment from "moment";
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { dddw } from "../../utlis/proFunc"
+import { dddw, setCheckStatusColor } from "../../utlis/proFunc"
 
 export default {
   components: {},
@@ -51,7 +51,7 @@ export default {
     ...mapState(["window", "dict", "dataTransOpts", "doctorCheck"]),
   },
   methods: {
-    moment, dddw,
+    moment, dddw,setCheckStatusColor,
 
     tableRowClassName({ row, rowIndex }) {
       //console.log(row)
@@ -64,22 +64,7 @@ export default {
           return '';
       }
     },
-
-    // 设置颜色 
-    setColor(checkCompleteFlag) {
-      let color = "#52555F"
-      switch (checkCompleteFlag) {
-        case '0':
-          color = "#FF5054"
-          break;
-        case '2':
-          color = "#396FFA"
-          break;
-        default:
-          break;
-      }
-      return color
-    },
+  
 
     //获取检查组合项目
     registerCheckList(patientRegisterId) {
diff --git a/src/utlis/proFunc.js b/src/utlis/proFunc.js
index d2ba449..8f775dd 100644
--- a/src/utlis/proFunc.js
+++ b/src/utlis/proFunc.js
@@ -326,6 +326,44 @@ function getColorStr(intColor) {
 }
 exports.getColorStr = getColorStr;
 
+// 检查状态颜色设置
+function setCheckStatusColor(completeFlag) {
+  let color = '#FF5054'
+  switch (completeFlag) {
+    case '1':
+      color = '#52555F'
+      break;
+    case '2':
+      color = '#396FFA'
+      break;
+    default:
+      break;
+  }
+  return color
+}
+exports.setCheckStatusColor = setCheckStatusColor;
+
+// 设置体检进度颜色 
+function setPrStatusColor(isAudit, completeFlag) {
+  if (isAudit == 'Y') return "#3DC04A"
+  let color = "#52555F"
+  switch (completeFlag) {
+    case '0':
+      color = "#FF5054"
+      break;
+    case '2':
+      color = "#F68A08"
+      break;
+    case '3':
+      color = "#396FFA"
+      break;
+    default:
+      break;
+  }
+  return color
+}
+exports.setPrStatusColor = setPrStatusColor;
+
 //对象数组排序 keyObjs示例：[{ colName: 'id', sortType: 'A' },]   sortType: A/D(ASC/DESC)
 //简单数组排序 arr.sort(a-b) 升序，arr.sort(b-a)
 function listOrderBy(arr, keyObjs) {