From fa9ea5456951acf168aa199adf2a1cfbd8021453 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Thu, 16 May 2024 15:43:54 +0800
Subject: [PATCH] report seo

---
 .../patientRegister/PatientRegisterEdit.vue   |  6 +++--
 .../report/PatientRegisterListNobtn.vue       | 24 +++++++++----------
 .../report/PatientRegisterQueryNobtn.vue      | 15 ++++++++----
 src/components/report/RegisterCheckStatus.vue |  7 +++---
 4 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index c9cc47a..a11386b 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -1498,9 +1498,11 @@ export default {
                     type: "warning",
                   })
                     .then(async () => {
-                      try {
+                      try {      
+
+                        await this.labelPrint(false)  // 先打条码，这样指引单上才有条码数据
+
                         if(this.LocalConfig.patientRegister.printGuideLabel.indexOf('guide') > -1) await this.guidePrint('0001', false)
-                        await this.labelPrint(false)
                       } catch (error) {
                         // this.$message.info({ showClose: true, message: error });
                         console.log(error)
diff --git a/src/components/report/PatientRegisterListNobtn.vue b/src/components/report/PatientRegisterListNobtn.vue
index 4dc2206..bcd5651 100644
--- a/src/components/report/PatientRegisterListNobtn.vue
+++ b/src/components/report/PatientRegisterListNobtn.vue
@@ -7,15 +7,10 @@
         <el-table-column type="selection" width="40" align="center" />
         <el-table-column prop="completeFlag" label="体检进度">
           <template slot-scope="scope">
-            <div>{{ dddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
+            <div :style="`color: ${setPrStatusColor(scope.row.isAudit, scope.row.completeFlag)}`">{{ dddw(dict.completeFlag, "id", scope.row.completeFlag, "displayName") }}</div>
           </template>
-        </el-table-column>
-        <el-table-column prop="guidePrintTimes" label="打印" width="50" align="center">
-          <template slot-scope="scope">
-            <i class="el-icon-printer" v-if="scope.row.guidePrintTimes > 0" style="font-size: 24px;color: green;"></i>
-          </template>
-        </el-table-column>
-        <el-table-column prop="isLock" label="锁住" align="center">
+        </el-table-column>        
+        <el-table-column prop="isLock" label="锁住" align="center" width="50">
           <template slot-scope="scope">
             <div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
           </template>
@@ -23,6 +18,7 @@
         <el-table-column prop="customerOrgName" label="单位" width="180" />
         <el-table-column prop="departmentName" label="部门" width="180" />
         <el-table-column prop="patientName" label="姓名" align="center" />
+        <el-table-column prop="mobileTelephone" label="手机" width="130" />
         <el-table-column prop="sexName" label="性别" align="center" />
         <el-table-column prop="age" label="年龄" align="center" />
         <el-table-column prop="patientRegisterNo" label="条码号" width="150" align="center"/>
@@ -54,8 +50,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="email" label="邮箱" width="180" />
-        <el-table-column prop="mobileTelephone" label="手机" width="130" />
+        <el-table-column prop="email" label="邮箱" width="180" />        
         <el-table-column prop="telephone" label="电话" width="130" />
         <el-table-column prop="address" label="地址" width="400"/>
         <el-table-column prop="medicalCardNo" label="体检卡号" />
@@ -102,6 +97,11 @@
             <div>{{ scope.row.isUpload == "Y" ? "是" : "否" }}</div>
           </template>
         </el-table-column>
+        <el-table-column prop="guidePrintTimes" label="打印" width="50" align="center">
+          <template slot-scope="scope">
+            <i class="el-icon-printer" v-if="scope.row.guidePrintTimes > 0" style="font-size: 24px;color: green;"></i>
+          </template>
+        </el-table-column>
         <!--
         "sexHormoneTermId": "00000000-0000-0000-0000-000000000000",
         "interposeMeasure": null,
@@ -144,7 +144,7 @@
 import moment from "moment";
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { dddw, deepCopy, objCopy, arrayReduce, arrayExistObj } from "@/utlis/proFunc";
+import { dddw, deepCopy, objCopy, arrayReduce, arrayExistObj,setPrStatusColor } from "@/utlis/proFunc";
 
 import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
 import Camera from "../../components/patientRegister/Camera.vue";
@@ -198,7 +198,7 @@ export default {
     ...mapState(["window", "dict", 'dataTransOpts', "patientRegister", "customerOrg", "report"]),
   },
   methods: {
-    dddw,
+    dddw,setPrStatusColor,
 
     handleSelectionChange(val) {
       this.multipleSelection = val;
diff --git a/src/components/report/PatientRegisterQueryNobtn.vue b/src/components/report/PatientRegisterQueryNobtn.vue
index 4bbbd22..5f2a639 100644
--- a/src/components/report/PatientRegisterQueryNobtn.vue
+++ b/src/components/report/PatientRegisterQueryNobtn.vue
@@ -55,9 +55,7 @@
           <span class="spanClass">检查状态</span>
           <el-select v-model="patientRegister.query.completeFlag" placeholder="请选择" clearable style="width: 80px"
             size="small">
-            <el-option v-for="item in dict.completeFlag.filter(e => { return e.id != '0' })" :key="item.id"
-              :label="item.displayName" :value="item.id">
-            </el-option>
+            <el-option v-for="item in local.completeFlag" :key="item.id" :label="item.displayName" :value="item.id"/>
           </el-select>
         </div>
         <div class="query">
@@ -95,6 +93,7 @@
 <script>
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { deepCopy } from "../../utlis/proFunc"
 import CusOrgOCX from "./CusOrgOCX.vue"
 
 export default {
@@ -105,7 +104,9 @@ export default {
   data() {
     return {
       dialogVisible: false,
-
+      local:{
+        completeFlag:[]
+      }
     };
   },
 
@@ -115,7 +116,13 @@ export default {
 
   //挂载完成
   mounted() {
+
+    this.local.completeFlag = deepCopy(this.dict.completeFlag)
+    this.local.completeFlag.splice(0, 1) //预记选项去掉
+    this.local.completeFlag.splice(2, 0, { id: '5', displayName: '全部已检(未总检)' }) //插入
+
     this.enterToQuery()
+    
   },
 
   computed: {
diff --git a/src/components/report/RegisterCheckStatus.vue b/src/components/report/RegisterCheckStatus.vue
index 24334a9..8b6b558 100644
--- a/src/components/report/RegisterCheckStatus.vue
+++ b/src/components/report/RegisterCheckStatus.vue
@@ -31,7 +31,7 @@
 import moment from "moment";
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { dddw, setCheckStatusColor } from "../../utlis/proFunc"
+import { dddw, setCheckStatusColor,listOrderBy } from "../../utlis/proFunc"
 
 export default {
   components: {},
@@ -72,10 +72,11 @@ export default {
       if (!patientRegisterId) return      
       postapi('/api/app/RegisterCheck/GetRegisterCheckAsbitemsByPatientRegisterId', { patientRegisterId })
         .then((res) => {
-          console.log("registerCheckList", res.data);
+          // console.log("registerCheckList", res.data);
           if (res.code > -1) {
-            this.doctorCheck.RegisterCheckList = res.data;
+            this.doctorCheck.RegisterCheckList = listOrderBy(res.data,[{ colName: 'completeFlag', sortType: 'A' }])
           }
+          // console.log("this.doctorCheck.RegisterCheckList", this.doctorCheck.RegisterCheckList);
         })
         .catch((err) => {
           this.$message.error({ showClose: true, message:  `操作失败，原因：${err}` });