From d0b3c328b59e91c212388a1cd3f04ae16d93eea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=96=8C=E6=9D=B0?= <>
Date: Mon, 14 Oct 2024 18:18:38 +0800
Subject: [PATCH] ui

---
 src/components/doctorCheck/QueueCheckList.vue |  6 +--
 src/components/report/CusOrgOCX.vue           | 40 ++++++++++++++++---
 src/views/report/unCheckAsbitem.vue           | 18 +++++++--
 3 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/src/components/doctorCheck/QueueCheckList.vue b/src/components/doctorCheck/QueueCheckList.vue
index 6a27eba..e9b3229 100644
--- a/src/components/doctorCheck/QueueCheckList.vue
+++ b/src/components/doctorCheck/QueueCheckList.vue
@@ -28,7 +28,7 @@
           :row-style="{ height: '28px' }" :height="Math.floor((tableHeight - 72) / 3)">
           <el-table-column prop="queueRegisterNumber" label="号" min-width="30" align="center" />
           <el-table-column prop="patientName" label="姓名" min-width="80" align="center" />
-          <el-table-column prop="isVip" label="isVip" min-width="40" align="center">
+          <el-table-column prop="isVip" label="Vip" min-width="40" align="center">
             <template slot-scope="scope">
               <div style="font-family: 'Microsoft YaHei';">
                 {{ scope.row.isVip == 'Y' ? '√' : '' }}
@@ -58,7 +58,7 @@
           @row-click="rowClickAlready" :row-style="{ height: '28px' }" :height="Math.floor((tableHeight - 72) / 3)">
           <el-table-column prop="queueRegisterNumber" label="号" min-width="30" align="center" />
           <el-table-column prop="patientName" label="姓名" min-width="80" align="center" />
-          <el-table-column prop="isVip" label="isVip" min-width="40" align="center">
+          <el-table-column prop="isVip" label="Vip" min-width="40" align="center">
             <template slot-scope="scope">
               <div style="font-family: 'Microsoft YaHei';">
                 {{ scope.row.isVip == 'Y' ? '√' : '' }}
@@ -79,7 +79,7 @@
           :row-style="{ height: '28px' }" :height="Math.floor((tableHeight - 72) / 3)">
           <el-table-column prop="queueRegisterNumber" label="号" min-width="30" align="center" />
           <el-table-column prop="patientName" label="姓名" min-width="80" align="center" />
-          <el-table-column prop="isVip" label="isVip" min-width="40" align="center">
+          <el-table-column prop="isVip" label="Vip" min-width="40" align="center">
             <template slot-scope="scope">
               <div style="font-family: 'Microsoft YaHei';">
                 {{ scope.row.isVip == 'Y' ? '√' : '' }}
diff --git a/src/components/report/CusOrgOCX.vue b/src/components/report/CusOrgOCX.vue
index 55ddda6..5156945 100644
--- a/src/components/report/CusOrgOCX.vue
+++ b/src/components/report/CusOrgOCX.vue
@@ -1,12 +1,15 @@
 <template>
   <div style="display: flex;">
     <div v-if="useCusOrg" style="width: 258px;height:520px;border: 1px solid #EEE;">
-      <div style="margin:2px 2px 2px 2px;">
+      <div style="margin:2px 2px 2px 2px;display: flex;">
+        <el-checkbox style="margin-top: 6px;" v-model="isOnlyCus" true-label="Y" false-label="N" size="small">
+        仅单位
+      </el-checkbox>
         <el-input placeholder="输入关键字进行过滤" v-model="filterText" size="small" />
       </div>
       <div>
         <el-tree style="overflow: scroll;width: 200px;height:480px;" :data="patientRegister.customerOrgTreeAll"
-          :props="treeprops" @node-click="handleNode" :filter-node-method="filterNode"
+          :props="treeprops" node-key="id" @node-click="handleNode" :filter-node-method="filterNode"
           ref="customerOrgTree">
           <span class="custom-tree-node" slot-scope="{ node, data }">
             <div>
@@ -114,6 +117,7 @@ export default {
   props: ["useCustomerOrg", "initDateType", "isUnit"],
   data() {
     return {
+      isOnlyCus: 'Y',
       filterText: '',
       preNodeId: '',  //上一次点击树节点
       curNodeId: '',  //本次点击树节点       
@@ -169,17 +173,28 @@ export default {
   methods: {
 
     //树过滤
-    filterNode(value, data) {
-      //console.log(value,data)
+    filterNode(value, data,node) {
       if (!value) return true;
       return data['displayName'].indexOf(value) !== -1 || data['simpleCode'].indexOf(value.toUpperCase()) !== -1;
     },
+    //树过滤
+    filterParentNode(value) {
+      // console.log(value, data)
+      // if (!value) return true;
+      // return data['displayName'].indexOf(value) > -1 || data['simpleCode'].indexOf(value.toUpperCase()) > -1 || data['shortName'].indexOf(value) > -1 || data['customerOrgCode'].indexOf(value) > -1;
+      console.log(this.patientRegister.customerOrgs)
+      this.patientRegister.customerOrgTreeAll = this.patientRegister.customerOrgs.filter(e => {
+        console.log(e)
+        return e.label.indexOf(value) > -1 || e.simpleCode.indexOf(value.toUpperCase()) > -1 || e.shortName.indexOf(value) > -1
+      })
 
+    },
     //获取体检单位列表树信息
     getCustomerOrgTree() {
       getapi("/api/app/customerorg/getbycodeall").then((res) => {
         if (res.code > -1) {
           this.patientRegister.customerOrgTreeAll = reMadeOrgTree(deepCopy(res.data));
+          this.patientRegister.customerOrgs = deepCopy(this.patientRegister.customerOrgTreeAll)
           //tcdate(this.patientRegister.customerOrgTreeAll)
         }
       });
@@ -447,8 +462,21 @@ export default {
     },
   },
   watch: {
-    "filterText"(newVal, oldVal) {
-      this.$refs['customerOrgTree'].filter(newVal);
+   "filterText"(newVal, oldVal) {
+      if (newVal != oldVal) {
+        if (this.isOnlyCus == 'N') {
+          this.$refs['customerOrgTree'].filter(newVal);
+        } else {
+          this.filterParentNode(newVal)
+        }
+      }
+    },
+    "isOnlyCus"(newVal, oldVal) {
+      if (newVal == 'N') {
+        this.$refs['customerOrgTree'].filter(this.filterText);
+      } else {
+        this.filterParentNode(this.filterText)
+      }
     }
   },
 };
diff --git a/src/views/report/unCheckAsbitem.vue b/src/views/report/unCheckAsbitem.vue
index a1839ad..c8135ce 100644
--- a/src/views/report/unCheckAsbitem.vue
+++ b/src/views/report/unCheckAsbitem.vue
@@ -31,18 +31,25 @@
           <div class="query">
             <el-button type="primary" @click="btnQuery" size="small" class="commonbutton">查询</el-button>
           </div>
+          <div class="query">
+            <el-button @click="handleExport" size="small" class="commonbutton"
+              >导出excel</el-button
+            >
+          </div>
         </div>  
        <div style="background-color: #fff; padding: 15px; border-radius: 8px;">
-         <el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 415 : window.pageHeight - 185-20"
+         <el-table :data="dataList" border width="100%" id="table" :height="window.pageHeight < 600 ? 415 : window.pageHeight - 185-20"
           row-key="id" size="small" highlight-current-row ref="dataList" >
           <el-table-column label="未检项目" width="300">
             <template slot-scope="scope">
               <div style="display: flex; flex-wrap: wrap;">
-                <el-tag type="danger" style="margin-left: 5px;" v-for="item in scope.row.unCheckAsbitems" :key="item"
+                <span v-for="(item,index) in scope.row.unCheckAsbitems" :key="item">{{index==0?'':'、'}}{{ item }}</span>
+                <span v-for="(item,index) in scope.row.giveUpAsbitems" :key="item">、{{ item }}</span>
+                <!-- <el-tag type="danger" style="margin-left: 5px;" v-for="item in scope.row.unCheckAsbitems" :key="item"
                   size="mini">{{ item }}</el-tag>
 
                 <el-tag type="info" style="margin-left: 5px;" v-for="item in scope.row.giveUpAsbitems" :key="item"
-                  size="mini">{{ item }}</el-tag>
+                  size="mini">{{ item }}</el-tag> -->
               </div>              
             </template>
           </el-table-column>
@@ -112,6 +119,7 @@ import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { dddw, objCopy, arrayReduce, arrayExistObj,tcdate } from "@/utlis/proFunc";
 import CusOrgOCX from "../../components/report/CusOrgOCX.vue"
+import { exportToExcel } from "../../utlis/Export2Excel";
 export default {
   components: {
     CusOrgOCX,
@@ -241,7 +249,9 @@ export default {
         }
       });
     },
-
+    handleExport() {
+      exportToExcel("#table", "人员未检组合项目", false);
+    },
     //查询
     btnQuery() {
       let body = {}, customerOrgs = [];