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

src/lang/en/business/resource/sj.js

@@ -54,6 +54,7 @@ export default {
   bz: 'Comment/Reason',
   czsj: 'Datetime',
 
+  jbxx: 'Basic Information',
   jcgj: 'Track Record',
   sqgd: 'Apply for Archiving',
   sqjd: 'Apply for De-archiving',

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

@@ -55,6 +55,7 @@ export default {
   bz: '备注/原因',
   czsj: '操作时间',
 
+  jbxx: '基本信息',
   jcgj: '稽查轨迹',
   sqgd: '申请归档',
   sqjd: '申请解档案',

src/views/business/resource/sj/comps/Xq.vue

@@ -8,15 +8,16 @@
           <div class="left-title"></div>
         </div>
         <div class="right-top">
-        <el-button @click="cancel()">{{$t('form.cancel')}}</el-button>
+          <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
         </div>
       </div>
-       <div class="detail-title"><img src="@/assets/images/detail-title.png" >{{ $t('page.business.resource.sj.sjxq') }}<img src="@/assets/images/detail-title.png" /></div>
+      <div class="detail-title"><img src="@/assets/images/detail-title.png">{{ $t('page.business.resource.sj.sjxq')
+        }}<img src="@/assets/images/detail-title.png" /></div>
       <div class="detail-content">
         <div class="content-left">
           <div class="content-title">
             <div class="line"></div>
-            <div class="subtitle"> 基本信息</div>
+            <div class="subtitle"> {{ $t('page.business.resource.sj.jbxx') }}</div>
           </div>
           <div class="pal">
             <div class="left">
@@ -112,9 +113,16 @@
           <div class="pal">
             <el-table :data="tzList" v-loading="loadingTz">
               <el-table-column :label="$t('page.business.resource.sj.qmr')" align="center" prop="qmrMc"
-                :show-overflow-tooltip="true" />
+                :show-overflow-tooltip="true" >
+                <template slot-scope="scope">
+                  {{ $i18n.locale === 'zh_CN' ? scope.row.qmrMc : scope.row.qmrMcEn }}
+                </template>
+              </el-table-column>
               <el-table-column :label="$t('page.business.resource.sj.czlx')" align="center" prop="qmyy"
                 :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                  {{ $i18n.locale === 'zh_CN' ? scope.row.qmyy : scope.row.qmyyEn }}
+                </template>
               </el-table-column>
               <el-table-column :label="$t('page.business.resource.sj.czl')" align="center"
                 :show-overflow-tooltip="true">
@@ -179,7 +187,7 @@ export default {
   created() {
   },
   methods: {
-    exportExcel(){
+    exportExcel() {
       alert('todo')
     },
     jcgjListHandleQuery(val) {