From fd0baa5773f200474e4e2571505d5eef097561c1 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Tue, 13 Jan 2026 15:58:38 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=B5=84=E6=BA=90=E5=BA=93?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86][=E6=9A=82=E5=AD=98=E6=9F=9C=E4=B8=AD?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/zh/business/resource/zcg.js     |  2 +-
 src/views/business/resource/zcg/list.vue | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/lang/zh/business/resource/zcg.js b/src/lang/zh/business/resource/zcg.js
index 1cf5f28..120ae8c 100644
--- a/src/lang/zh/business/resource/zcg.js
+++ b/src/lang/zh/business/resource/zcg.js
@@ -10,7 +10,7 @@ export default {
     ys1jyr: '钥匙1借用人',
     ys2jyr: '钥匙2借用人',
     glyj: '关联药剂',
-    ysff: '钥匙发放',
+    ysff: '发放钥匙',
     gh: '归还',
     ysgh: '钥匙归还',
     ysghts:'请确认是否归还以下钥匙',
diff --git a/src/views/business/resource/zcg/list.vue b/src/views/business/resource/zcg/list.vue
index 69dec75..d31c985 100644
--- a/src/views/business/resource/zcg/list.vue
+++ b/src/views/business/resource/zcg/list.vue
@@ -36,12 +36,22 @@
       <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable" />
       <el-table-column :label="$t('page.business.resource.zcg.zcg')" align="left" prop="mc"
         :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('page.business.resource.zcg.ys1jyr')" align="center" prop="lqr1Mc" width="150px" />
-      <el-table-column :label="$t('page.business.resource.zcg.ys2jyr')" align="center" prop="lqr2Mc" width="150px" />
+      <template v-if="$i18n.locale === 'zh_CN'">
+        <el-table-column :label="$t('page.business.resource.zcg.ys1jyr')" align="center" prop="lqr1Mc" width="150px" />
+        <el-table-column :label="$t('page.business.resource.zcg.ys2jyr')" align="center" prop="lqr2Mc" width="150px" />
+      </template>
+      <template v-else>
+        <el-table-column :label="$t('page.business.resource.zcg.ys1jyr')" align="center" prop="lqr1McEn"
+          width="150px" />
+        <el-table-column :label="$t('page.business.resource.zcg.ys2jyr')" align="center" prop="lqr2McEn"
+          width="150px" />
+      </template>
       <el-table-column :label="$t('page.business.resource.zcg.zt')" align="center" width="150px">
         <template slot-scope="scope">
-          <span v-if="scope.row.zt == 1">{{ $t('page.business.resource.zcg.wjy') }}</span>
-          <span v-if="scope.row.zt == 5">{{ $t('page.business.resource.zcg.jyz') }}</span>
+          <span v-if="scope.row.zt === 1"><span class="status-circle cg"></span>{{ $t('page.business.resource.zcg.wjy')
+          }}</span>
+          <span v-if="scope.row.zt === 5"><span class="status-circle syz"></span>{{ $t('page.business.resource.zcg.jyz')
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('page.business.resource.zcg.glyj')" align="center" prop="glyj"
@@ -101,7 +111,7 @@ export default {
     this.getList()
   },
   methods: {
-     //是否可勾选
+    //是否可勾选
     checkSelectable(row) {
       return row.zt === 5 //只能是借用中的才能勾选
     },