From 3f2a339cbad3512f6b3df146ef291ab5c566a036 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 13 Jan 2025 11:49:16 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=BC=96=E8=BE=91=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 68 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 61 insertions(+), 7 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a3fcdc21..35291ad6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,12 +23,38 @@
     >
       i18n
     </div>
-    <el-drawer title="国际化" :visible.sync="drawer" direction="rtl" size="80%">
-      <div style="width: 320px">
-        <el-form label-width="100px" @submit.native.prevent size="small">
-          <el-form-item label="关键字">
+    <el-drawer
+      :title="$t('il8n:title')"
+      :visible.sync="drawer"
+      direction="rtl"
+      size="80%"
+    >
+      <div style="width: 620px">
+        <el-form
+          label-width="100px"
+          @submit.native.prevent
+          size="small"
+          :inline="true"
+          class="demo-form-inline"
+        >
+          <el-form-item :label="$t('il8n:search:keyword')">
             <el-input v-model="key" @input="keyChange" />
           </el-form-item>
+          <el-form-item :label="$t('il8n:search:state')" v-if="il8nExternal">
+            <el-select
+              v-model="State"
+              clearable
+              filterable
+              @change="handleStateChange"
+            >
+              <el-option
+                v-for="item of $d.InternationalizationKeyState"
+                :key="'InternationalizationKeyState' + item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
         </el-form>
       </div>
       <el-table
@@ -39,7 +65,7 @@
       >
         <el-table-column
           prop="Code"
-          label="标签"
+          :label="$t('il8n:table:label')"
           width="300"
           show-overflow-tooltip
         >
@@ -53,7 +79,7 @@
         <!--            {{scope.row.Description}}-->
         <!--          </template>-->
         <!--        </el-table-column>-->
-        <el-table-column prop="Value" label="英文">
+        <el-table-column prop="Value" :label="$t('il8n:table:en')">
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.Value"
@@ -66,7 +92,7 @@
             ></el-input>
           </template>
         </el-table-column>
-        <el-table-column prop="ValueCN" label="中文">
+        <el-table-column prop="ValueCN" :label="$t('il8n:table:cn')">
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.ValueCN"
@@ -79,6 +105,27 @@
             ></el-input>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="ValueCN"
+          :label="$t('il8n:table:state')"
+          v-if="il8nExternal"
+        >
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.State"
+              clearable
+              filterable
+              size="mini"
+            >
+              <el-option
+                v-for="item of $d.InternationalizationKeyState"
+                :key="'InternationalizationKeyState' + item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
       </el-table>
       <div style="text-align: right; padding-top: 10px; padding-right: 10px">
         <el-button size="mini" @click="drawer = false">取消 </el-button>
@@ -111,6 +158,7 @@ export default {
       key: null,
       arr: [],
       il8nExternal: false,
+      State: null,
     }
   },
   mounted() {
@@ -147,6 +195,11 @@ export default {
   //   },
   // },
   methods: {
+    handleStateChange() {
+      this.tableData.forEach((item) => {
+        item.State = this.State
+      })
+    },
     changeValue(target, attr, e) {
       this.$set(target, attr, e)
     },
@@ -212,6 +265,7 @@ export default {
             Module: item.Module,
             Value: item.Value,
             ValueCN: item.ValueCN,
+            State: item.State,
           }
         })
         this.tableData = Object.assign([], tableData)

From 7ff0273c2900588c46b18008b23564b00d234457 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 13 Jan 2025 13:44:30 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AF=84=E5=AE=A1?=
 =?UTF-8?q?=E8=BE=85=E5=8A=A9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/list/index.vue | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue
index d963d16d..9583a02f 100644
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@@ -27,11 +27,26 @@
       <!-- 选择自定义slot -->
       <template slot="tip-slot" slot-scope="{ scope }">
         <i
-          v-if="diffTime(scope.row.LastLoginTime) >= 90"
+          v-if="
+            diffTime(scope.row.LastLoginTime) >= 90 &&
+            diffTime(scope.row.LastChangePassWordTime) >= 90
+          "
+          class="el-icon-warning"
+          style="color: #f56c6c"
+          :title="$t('system:userlist:tip:overTimeAndoverTimePassWord')"
+        />
+        <i
+          v-else-if="diffTime(scope.row.LastLoginTime) >= 90"
           class="el-icon-warning"
           style="color: #f56c6c"
           :title="$t('system:userlist:tip:overTime')"
         />
+        <i
+          v-else-if="diffTime(scope.row.LastChangePassWordTime) >= 90"
+          class="el-icon-warning"
+          style="color: #f56c6c"
+          :title="$t('system:userlist:tip:overTimePassWord')"
+        />
       </template>
       <template slot="genderSlot" slot-scope="{ scope }">
         {{ scope.row.Sex ? 'Male' : 'Female' }}

From 4c1a770969c49e36ea1686e58a146d706a2e49a8 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 13 Jan 2025 14:51:36 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=AE=80=E5=8E=86=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=8E=AF=E5=A2=83=E5=A1=AB=E5=86=99=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=89=80=E5=B1=9E=E5=8C=BB=E9=99=A2=EF=BC=8C=E6=9C=AA?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/info/continuingTraining.vue               | 1 -
 .../reviewers/curriculumVitae/components/info/info.vue   | 9 +++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue b/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue
index 1a013d03..2146a36b 100644
--- a/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/continuingTraining.vue
@@ -159,7 +159,6 @@
               style="width: 100%"
               v-model="form.Hospital"
               :fetch-suggestions="querySearch"
-              @select="handleSelect"
               placeholder=""
             ></el-autocomplete>
           </el-form-item>
diff --git a/src/views/reviewers/curriculumVitae/components/info/info.vue b/src/views/reviewers/curriculumVitae/components/info/info.vue
index af424e38..94f94864 100644
--- a/src/views/reviewers/curriculumVitae/components/info/info.vue
+++ b/src/views/reviewers/curriculumVitae/components/info/info.vue
@@ -757,11 +757,12 @@ export default {
         if (this.reviewerId) {
           this.form.Id = this.reviewerId
         }
+        // console.log(this.form)
         let data = Object.assign({}, this.form)
-        if (!this.hospitalList.find((item) => item.Id === data.HospitalId)) {
-          data.HospitalName = data.HospitalId
-          data.HospitalId = null
-        }
+        // if (!this.hospitalList.find((item) => item.Id === data.HospitalId)) {
+        //   data.HospitalName = data.HospitalId
+        //   data.HospitalId = null
+        // }
         this.loading = true
         let res = await addOrUpdateDoctorBasicInfoAndEmployment(data)
         this.loading = false

From b5643d3774c429b0d5d6f25b530b6a848c2aa88e Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 13 Jan 2025 15:22:28 +0800
Subject: [PATCH 4/4] 1

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 35291ad6..e7b9b781 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -269,7 +269,7 @@ export default {
           }
         })
         this.tableData = Object.assign([], tableData)
-        console.log(tableData)
+        this.arr = Object.assign([], tableData)
         return false
       } else {
         tableData = this.$tl.map((v) => {