Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/lang/zh/business/resource/zcg.js

@@ -10,7 +10,7 @@ export default {
     ys1jyr: '钥匙1借用人',
     ys2jyr: '钥匙2借用人',
     glyj: '关联药剂',
-    ysff: '钥匙发放',
+    ysff: '发放钥匙',
     gh: '归还',
     ysgh: '钥匙归还',
     ysghts:'请确认是否归还以下钥匙',

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 //只能是借用中的才能勾选
     },