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

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

@@ -24,7 +24,7 @@ export default {
     kgy1:'Warehouse Keeper',
     kgy2:'Warehouse Keeper 2',
 
-    plff:'批量发放',
+    plff:'Batch Distribution',
     plczyj:'Batch Dispose Substance',
     plczrq:'Batch Dispose Containers',
     plsd:'Batch Lock',
@@ -36,7 +36,7 @@ export default {
     jiedang:'De-archive',
     jieyue:'Check-out',
     guihuan:'Return',
-    fafang:'发放',
+    fafang:'Distribution',
     ysff:'Issue Key',
     czrq:'Dispose Container',
     czyj:'Dispose Substance',

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

@@ -23,7 +23,7 @@ export default {
     kgy1:'Warehouse Keeper',
     kgy2:'Warehouse Keeper 2',
 
-    plff:'批量发放',
+    plff:'Batch Distribution',
     plczyj:'Batch Dispose Substance',
     plczrq:'Batch Dispose Containers',
     plsd:'Batch Lock',
@@ -35,7 +35,7 @@ export default {
     jiedang:'De-archive',
     jieyue:'Check-out',
     guihuan:'Return',
-    fafang:'发放',
+    fafang:'Distribution',
     ysff:'Issue Key',
     czrq:'Dispose Container',
     czyj:'Dispose Substance',

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

@@ -1,12 +1,12 @@
 export default {
-    ysbh: '钥匙编号',
+    ysbh: 'ID',
     jyr: '借用人',
     zt: 'Status',
     jyz: 'In Use',
     wjy: 'Not in Use',
-    plgh: '批量归还',
+    plgh: 'Batch Return',
     zcg: 'Locker',
-    ysbh: '钥匙编号',
+    ysbh: 'ID',
     ys1jyr: 'Key 1 User',
     ys2jyr: 'Key 2 User',
     glyj: 'Contained Substance',
@@ -20,13 +20,13 @@ export default {
     ghr2mm:'钥匙2归还人密码',
     jsr:'接收人',
     jsrmm:'接收人密码',
-    qmyy:'签名意义',
+    qmyy:'Purpose',
     remark:'Remark',
     lqr1Id:'Key 1 User',
     lqr1mm:'Key 1 User Password',
     lqr2Id:'Key 2 User',
     lqr2mm:'Key 2 User Password',
-    ffr:'发放人',
-    ffrmm:'发放人密码',
+    ffr:'Distribute User',
+    ffrmm:'Distribute User Password',
 
 }

src/lang/en/business/study/studyFormFill.js

@@ -1,4 +1,12 @@
 export default {
+ mc:'Name',
+ bh:'Id',
+ syl:'Usage Amount', 
+ cz:'Dispose',
+ tjcz:'Add Dispose',
+ cc:'Storage',
+ tjcc:'Add Storage',
+ yltj:'用量统计',
  jcsz:'Setup',
  bdtb:'Form filling',
  xzbd:'Create',
@@ -33,7 +41,7 @@ export default {
  dcxgjcgj:'导出(修改稽查轨迹)',
  dcbhsjgj:'导出(不含数据轨迹)',
  
-ytbd:'预填表单',
+ ytbd:'Preset',
  tbz:'On-going',
  ytj:'Submitted',
  ywc:'Completed',

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

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

src/utils/menu.js

@@ -40,5 +40,8 @@ export function getMenuName(menuName) {
   if (!this.$i18n.locale || this.$i18n.locale === 'zh_CN') {
     return menuName
   }
-  return menuObj[menuName]
+  if (menuName.indexOf(':') > -1) {
+    return menuObj[menuName.split(':')[0]] + menuName.split(':')[1]
+  }
+  return menuObj[menuName] || menuName
 }

src/views/business/comps/select/SelectDeptUserMultipleDialog.vue

@@ -144,6 +144,8 @@ export default {
         })
       }
       this.$emit('change', backList)
+    },
+    close(){
       this.open = false
     },
     delSelected(row){

src/views/business/form/drug/comp/enter.vue

@@ -52,7 +52,7 @@ export default {
       this.$modal.loading()
       drug_info({id:this.$route.params.studyId}).then(({data}) => {
         this.study = data
-        const obj = Object.assign({}, this.$route, { title: '麻精药：'+this.study.sn }) 
+        const obj = Object.assign({}, this.$route, { title: '麻精药表单:'+this.study.sn }) 
         this.$tab.updatePage(obj);
       }).finally(() => {
         this.$modal.closeLoading()

src/views/business/form/drug/list.vue

@@ -237,7 +237,7 @@ export default {
       this.getList()
     },
     enter(row){
-      this.$tab.openPage("进入", '/drug/enter/' + row.id)
+      this.$tab.openPage(" ", '/drug/enter/' + row.id)
       // this.showType = 'enter'
       // this.$refs.enter.show(row)
     },

src/views/business/form/nonTrial/comp/enter.vue

@@ -50,7 +50,7 @@ export default {
       this.$modal.loading()
       nonTrial_info({id:this.$route.params.studyId}).then(({data}) => {
         this.study = data
-        const obj = Object.assign({}, this.$route, { title: '非试验：'+this.study.sn }) 
+        const obj = Object.assign({}, this.$route, { title: '非试验表单:'+this.study.sn }) 
         this.$tab.updatePage(obj);
       }).finally(() => {
         this.$modal.closeLoading()

src/views/business/form/nonTrial/list.vue

@@ -237,7 +237,7 @@ export default {
       this.getList()
     },
     enter(row){
-      this.$tab.openPage("进入", '/nonTrial/enter/' + row.id)
+      this.$tab.openPage(" ", '/nonTrial/enter/' + row.id)
       // this.showType = 'enter'
       // this.$refs.enter.show(row)
     },

src/views/business/resource/gyzj/comps/ffjl/Gd.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 锁定弹窗 -->
-    <el-dialog :title="$t('page.business.resource.gyzj.lock')" :visible.sync="open" width="500px" append-to-body
+    <el-dialog :title="$t('page.business.resource.gyzj.guidang')" :visible.sync="open" width="500px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <div class="sbzdtcma"> <input type="text"> <input type="password"> </div>

src/views/business/resource/gyzj/comps/ffjl/Xq.vue

@@ -18,7 +18,7 @@
       <div class="content-left">
         <div class="content-title">
           <div class="line"></div>
-          <div class="subtitle"> 基本信息</div>
+          <div class="subtitle"> {{ $t('page.business.resource.gyzj.jbxx') }}</div>
         </div>
         <div class="pal">
           <div class="left">
@@ -155,7 +155,7 @@
       <div class="content-right">
         <div class="content-title">
           <div class="line"></div>
-          <div class="subtitle"> 稽查轨迹日志</div>
+          <div class="subtitle"> {{ $t('page.business.resource.gyzj.jcgj') }}</div>
         </div>
         <jcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
 

src/views/business/resource/mjy/comps/ffjl/Xq.vue

@@ -17,7 +17,7 @@
       <div class="content-left">
         <div class="content-title">
           <div class="line"></div>
-          <div class="subtitle"> 基本信息</div>
+          <div class="subtitle"> {{ $t('page.business.resource.mjy.jbxx') }}</div>
         </div>
         <div class="pal">
           <div class="left">
@@ -161,7 +161,7 @@
       <div class="content-right">
         <div class="content-title">
           <div class="line"></div>
-          <div class="subtitle"> 稽查轨迹日志</div>
+          <div class="subtitle"> {{ $t('page.business.resource.mjy.jcgj') }}</div>
         </div>
         <jcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
 

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

src/views/business/study/comp/enter.vue

@@ -62,7 +62,7 @@ export default {
       this.$modal.loading()
       study_info({id:this.$route.params.studyId}).then(({data}) => {
         this.study = data
-        const obj = Object.assign({}, this.$route, { title: '进入试验：'+this.study.sn }) 
+        const obj = Object.assign({}, this.$route, { title: '试验管理:'+this.study.sn }) 
         this.$tab.updatePage(obj);
       }).finally(() => {
         this.$modal.closeLoading()

src/views/business/study/comp/suject.vue

@@ -242,8 +242,18 @@ export default {
         }
       }
       this.memberList = postList
-      this.signType = 'member'
-      this.$refs.subjectSignRef.show(this.$t('page.business.study.study.rybg'),this.$t('page.business.study.study.rybg'))
+      studySubjectUser_save({
+        studySubjectId:this.memberSubject.id,
+        subjectUserList:this.memberList,
+        sign:{}
+      }).then(() => {
+        this.$refs.selectSubjectDeptUserMultipleDialog.close()
+        this.signType = 'member'
+        this.$refs.subjectSignRef.show(this.$t('page.business.study.study.rybg'),this.$t('page.business.study.study.rybg'))
+      }).catch((e) => {
+      }).finally(() => {
+      })
+      
     },
 
     doChangeMember(sign){

src/views/business/study/list.vue

@@ -236,7 +236,7 @@ export default {
       this.getList()
     },
     enter(row){
-      this.$tab.openPage("进入试验", '/study/enter/' + row.id)
+      this.$tab.openPage(" ", '/study/enter/' + row.id)
 
       // this.showType = 'enter'
       // this.$refs.enter.show(row)

src/views/system/dept/index.vue

@@ -89,7 +89,7 @@
             v-hasPermi="['system:dept:add']"
           >{{$t('page.system.dept.add')}}</el-button>
           <el-button
-            v-if="scope.row.parentId != 0"
+            v-if="scope.row.parentId != 0 && scope.row.deptId!=216"
            
             type="text"
             @click="handleDelete(scope.row)"