From 615ce4d7d58dd252d20eb24c98455c865412721b Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Sat, 27 Apr 2024 20:32:05 +0800
Subject: [PATCH] SUM

---
 .../patientRegister/PatientRegisterEdit.vue   | 24 +++++++++++++++++--
 .../sumDoctorCheck/SumAsbItemStatus.vue       | 16 ++++++-------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index ffb5bfb..ec3b960 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -120,7 +120,7 @@
               </el-col>
               <el-col :span="3">
                 <el-form-item label="籍贯" prop="birthPlaceId" label-width="50px">
-                  <el-select v-model="form.birthPlaceId" placeholder="请选择" filterable clearable
+                  <el-select v-model="form.birthPlaceId" placeholder="请选择" filterable clearable                  
                     :style="'width:' + Math.floor((window.pageWidth - 630) / 8) + 'px;'" size="small">
                     <el-option v-for="item in dict.birthPlace" :key="item.id" :label="item.displayName"
                       :value="item.id" />
@@ -157,8 +157,9 @@
               <el-col :span="3">
                 <el-form-item label="民族" prop="nationId" label-width="50px">
                   <el-select v-model="form.nationId" placeholder="请选择" filterable clearable
+                    default-first-option :filter-method="filterMethod" 
                     :style="'width:' + Math.floor((window.pageWidth - 630) / 8) + 'px;'" size="small">
-                    <el-option v-for="item in dict.nation" :key="item.id" :label="item.displayName" :value="item.id" />
+                    <el-option v-for="item in nation" :key="item.id" :label="item.displayName" :value="item.id" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -638,6 +639,7 @@ export default {
         prAsbGroup: 0, //触发分组更换
         prAsbPackage: 0, //触发套餐更换
       },
+      nation:[], //
     };
   },
 
@@ -765,6 +767,7 @@ export default {
       getapi("/api/app/nation/in-filter").then((res) => {
         if (res.code != -1) {
           this.dict.nation = res.data;
+          this.nation = deepCopy(res.data)
         }
       });
 
@@ -832,6 +835,23 @@ export default {
 
     },
 
+
+    //快速选择组合项目时，调整可按拼间简码及简称查找
+    filterMethod(keyWords) {
+      //console.log('filterMethod',this.asbItemQuick)  
+      if (keyWords) {
+        this.nation = [];
+        this.dict.nation.forEach(item => {
+          if (item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
+            || item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1) {
+            this.nation.push(item);
+          }
+        });
+      } else {
+        this.nation = deepCopy(this.dict.nation);
+      }
+    },
+
     //选择单位
     async changeCustomerOrgId(v) {
       // console.log('changeCustomerOrgId',v)
diff --git a/src/components/sumDoctorCheck/SumAsbItemStatus.vue b/src/components/sumDoctorCheck/SumAsbItemStatus.vue
index 84da54d..4e59ee8 100644
--- a/src/components/sumDoctorCheck/SumAsbItemStatus.vue
+++ b/src/components/sumDoctorCheck/SumAsbItemStatus.vue
@@ -1,30 +1,30 @@
 <template>
   <div style="display: flex;background-color: #fff;margin-top: 10px;border-radius: 8px;padding: 10px;">
     <div class="asbitemListClass">
-      <div style="font-size:9px;color: #F56C6C;">未检组合项目：</div>
+      <div style="font-size:9px;color: #303133;">未检组合项目：</div>
       <div style="overflow-y:auto; height:68px;width:100%; margin-top:2px;border: 1px solid;">
-        <el-tag type="danger" style="margin-left: 5px;" v-for="item in data.unCheckedAsbitem" :key="item" size="mini">{{
+        <el-tag style="color:#303133;margin-left: 5px;" v-for="item in data.unCheckedAsbitem" :key="item" size="mini">{{
           item }}</el-tag>
       </div>
     </div>
     <div class="asbitemListClass">
-      <div style="font-size:9px;color: #909399;">弃检组合项目：</div>
+      <div style="font-size:9px;color: #303133;">弃检组合项目：</div>
       <div style="overflow-y:auto; height:68px;width:100%; margin-top:2px;border: 1px solid;">
-        <el-tag type="info" style="margin-left: 5px;" v-for="item in data.giveUpAsbitem" :key="item" size="mini">{{ item
+        <el-tag style="color:#303133;margin-left: 5px;" v-for="item in data.giveUpAsbitem" :key="item" size="mini">{{ item
         }}</el-tag>
       </div>
     </div>
     <div class="asbitemListClass">
-      <div style="font-size:9px;color: #409EFF;">组合项目已检但无值的明细项目：</div>
+      <div style="font-size:9px;color: #303133;">组合项目已检但无值的明细项目：</div>
       <div style="overflow-y:auto; height:68px;width:100%; margin-top:2px;border: 1px solid;">
-        <el-tag style="margin-left: 5px;" v-for="item in data.checkedNullValueItem" :key="item" size="mini">{{ item
+        <el-tag style="color:#303133;margin-left: 5px;" v-for="item in data.checkedNullValueItem" :key="item" size="mini">{{ item
         }}</el-tag>
       </div>
     </div>
     <div class="asbitemListClass">
-      <div style="font-size:9px;color: #E6A23C;">组合项目已检但弃检的明细项目：</div>
+      <div style="font-size:9px;color: #303133;">组合项目已检但弃检的明细项目：</div>
       <div style="overflow-y:auto; height:68px;width:100%; margin-top:2px;border: 1px solid;">
-        <el-tag type="warning" style="margin-left: 5px;" v-for="item in data.checkedGiveUpItem" :key="item" size="mini">{{
+        <el-tag style="color:#303133;margin-left: 5px;" v-for="item in data.checkedGiveUpItem" :key="item" size="mini">{{
           item }}</el-tag>
       </div>
     </div>