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

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

@@ -20,8 +20,8 @@ export default {
 
   sjlb: '试剂列表',
   gsplb: '供试品列表',
-  gyzjlb: '给药制剂列表',
-  mjylb: '麻精药列表',
+  gyzjlb: 'DosageManage',
+  mjylb: 'DrugManage',
   xblb: '细胞列表',
   xjlb: '细菌列表'
 }

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

@@ -1,6 +1,6 @@
 export default {
   jcsz: 'Setup',
-  bdtb: '表单填报',
+  bdtb: 'Data Record',
   xzbd: 'Create',
   fh: 'QC',
   jq: 'Sign',
@@ -16,7 +16,7 @@ export default {
   save: 'Save',
   submit: 'Submit',
   bdnr: '表单内容',
-  qmxx: '签名信息',
+  qmxx: 'Signature information',
   qmr: 'Signed By',
   qmyy: 'Purpose',
   qmsj: 'Date',

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

@@ -8,7 +8,7 @@ export default {
   tjcc: 'Add Input for Storage',
   yltj: 'Summary of Usage',
   jcsz: 'Setup',
-  bdtb: 'Preset Fill',
+  bdtb: 'Data Record',
   xzbd: 'Create',
   fh: 'QC',
   jq: 'Sign',
@@ -24,7 +24,7 @@ export default {
   save: 'Save',
   submit: 'Submit',
   bdnr: '表单内容',
-  qmxx: '签名信息',
+  qmxx: 'Signature information',
   qmr: 'Signed By',
   qmyy: 'Purpose',
   qmsj: 'Date',

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

@@ -1,6 +1,6 @@
 export default {
   jcsz: 'Setup',
-  bdtb: '表单填报',
+  bdtb: 'Data Record',
   xzbd: 'Create',
   fh: 'QC',
   ghgsr: 'Change Owner',
@@ -13,7 +13,7 @@ export default {
   save: 'Save',
   submit: 'Submit',
   bdnr: '表单内容',
-  qmxx: '签名信息',
+  qmxx: 'Signature information',
   qmr: 'Signed By',
   qmyy: 'Purpose',
   qmsj: 'Date',
@@ -48,7 +48,7 @@ export default {
   syfzr: 'Study Director',
   cjsj: 'Creation Date',
   sdsy: 'Lock Study',
-  syjj: '试验简介',
+  syjj: 'Study Description',
   xz: 'Create',
   syxkxx: 'Discipline',
   ysy: '已审阅'

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

@@ -17,7 +17,7 @@ export default {
   shjj: '审核拒绝',
   tb: '填报',
   bdnr: '表单内容',
-  qmxx: '签名信息',
+  qmxx: 'Signature information',
   qmr: 'Signed By',
   qmyy: 'Purpose',
   qmsj: 'Date',
@@ -25,7 +25,7 @@ export default {
   jcgj: 'Track Record',
   cjjl: 'Create',
   xjbd: 'Create',
-  fzbdxz: '复制表单选择',
+  fzbdxz: 'Copy Existing Preset',
   sssyfsy: 'From Study/Non-study',
   fzbd: 'Copy Preset',
   fzbj: 'Copy and Edit',

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

@@ -121,12 +121,13 @@
       <el-form ref="form" label-width="120px">
         <el-row>
           <el-col :span="24" style="text-align: center; margin-top: 50px;">
-            <el-button type="primary" style="width: 80%; height: 40px;" @click="add" plain
-              icon="el-icon-circle-plus">创建新表单</el-button>
+            <el-button type="primary" style="width: 80%; height: 40px;" @click="add" plain icon="el-icon-circle-plus">{{
+              $t('page.business.study.studyFormPre.cjxbd') }}</el-button>
           </el-col>
           <el-col :span="24" style="text-align: center; margin: 50px 0px;">
             <el-button type="primary" style="width: 80%;height: 40px;" @click="copy" plain
-              icon="el-icon-document-copy">复制已有表单</el-button>
+              icon="el-icon-document-copy">{{
+                $t('page.business.study.studyFormPre.fzyybd') }}</el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -134,7 +135,7 @@
 
     <el-dialog :title="$t('page.business.study.studyFormPre.fzbdxz')" :visible.sync="openXz" width="500px"
       append-to-body :close-on-click-modal="false">
-      <el-form ref="formXz" :model="formXz" :rules="rulesXz" label-width="150px">
+      <el-form ref="formXz" :model="formXz" :rules="rulesXz" label-width="180px">
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('page.business.study.studyFormPre.sssyfsy')" prop="studyId">
@@ -152,7 +153,8 @@
           </el-col>
           <el-col :span="24">
             <el-form-item>
-              <el-button type="primary" @click="previewFzbd" :disabled="!(formXz.formPreId)">预览</el-button>
+              <el-button type="primary" @click="previewFzbd" :disabled="!(formXz.formPreId)">{{
+                $t('page.business.study.studyFormPre.yulan') }}</el-button>
             </el-form-item>
           </el-col>
         </el-row>

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

@@ -122,12 +122,13 @@
       <el-form ref="form" label-width="120px">
         <el-row>
           <el-col :span="24" style="text-align: center; margin-top: 50px;">
-            <el-button type="primary" style="width: 80%; height: 40px;" @click="add" plain
-              icon="el-icon-circle-plus">创建新表单</el-button>
+            <el-button type="primary" style="width: 80%; height: 40px;" @click="add" plain icon="el-icon-circle-plus">{{
+              $t('page.business.study.studyFormPre.cjxbd') }}</el-button>
           </el-col>
           <el-col :span="24" style="text-align: center; margin: 50px 0px;">
             <el-button type="primary" style="width: 80%;height: 40px;" @click="copy" plain
-              icon="el-icon-document-copy">复制已有表单</el-button>
+              icon="el-icon-document-copy">{{
+                $t('page.business.study.studyFormPre.fzyybd') }}</el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -135,7 +136,7 @@
 
     <el-dialog :title="$t('page.business.study.studyFormPre.fzbdxz')" :visible.sync="openXz" width="500px"
       append-to-body :close-on-click-modal="false">
-      <el-form ref="formXz" :model="formXz" :rules="rulesXz" label-width="150px">
+      <el-form ref="formXz" :model="formXz" :rules="rulesXz" label-width="180px">
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('page.business.study.studyFormPre.sssyfsy')" prop="studyId">
@@ -153,7 +154,8 @@
           </el-col>
           <el-col :span="24">
             <el-form-item>
-              <el-button type="primary" @click="previewFzbd" :disabled="!(formXz.formPreId)">预览</el-button>
+              <el-button type="primary" @click="previewFzbd" :disabled="!(formXz.formPreId)">{{
+                $t('page.business.study.studyFormPre.yulan') }}</el-button>
             </el-form-item>
           </el-col>
         </el-row>

src/views/business/study/comp/jhbd/Xq.vue

@@ -26,7 +26,7 @@
             <el-button type="primary" @click="dcbhsjgj">{{ $t('page.business.study.studyFormPlan.dcbhsjgj') }}
             </el-button>
           </div>
-          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="audit" :templateData="form"/>
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="audit" :templateData="form" />
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormPlan.qmxx') }}</div>
@@ -35,8 +35,8 @@
             <el-table :data="qmxxList" v-loading="loadingQmxx">
               <el-table-column :label="$t('page.business.study.studyFormPlan.qmr')" align="center" prop="qmrMc"
                 width="150px" />
-              <el-table-column :label="$t('page.business.study.studyFormPlan.qmyy')" align="center" prop="qmyy"
-                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormPlan.qmyy')" align="center"
+                :prop="$i18n.locale === 'zh_CN' ? 'qmyy' : 'qmyyEn'" width="150px" />
               <el-table-column :label="$t('page.business.study.studyFormPlan.qmsj')" align="center" prop="createTime"
                 width="150px" />
               <el-table-column :label="$t('page.business.study.studyFormPlan.bzyy')" align="center" prop="remark"
@@ -51,7 +51,7 @@
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormPlan.jcgj') }}</div>
           </div>
-          <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" :showXg="true"/>
+          <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" :showXg="true" />
 
           <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
             @pagination="getJjcgjList" />
@@ -64,7 +64,7 @@
 </template>
 
 <script>
-import {  studyFormPlan_info, studyFormPlan_jcgj, studyFormPlan_qmxx } from "@/api/business/study/studyFormPlan"
+import { studyFormPlan_info, studyFormPlan_jcgj, studyFormPlan_qmxx } from "@/api/business/study/studyFormPlan"
 import { mapGetters } from 'vuex'
 import JcgjList from "@/views/business/comps/common/JcgjList";
 import TemplateTable from '@/views/business/comps/template/TemplateTable';
@@ -109,7 +109,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {

src/views/business/study/comp/sqbd/Xq.vue

@@ -37,8 +37,8 @@
             <el-table :data="qmxxList" v-loading="loadingQmxx">
               <el-table-column :label="$t('page.business.study.studyFormApply.qmr')" align="center" prop="qmrMc"
                 width="150px" />
-              <el-table-column :label="$t('page.business.study.studyFormApply.qmyy')" align="center" prop="qmyy"
-                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormApply.qmyy')" align="center"
+                :prop="$i18n.locale === 'zh_CN' ? 'qmyy' : 'qmyyEn'" width="150px" />
               <el-table-column :label="$t('page.business.study.studyFormApply.qmsj')" align="center" prop="createTime"
                 width="150px" />
               <el-table-column :label="$t('page.business.study.studyFormApply.bzyy')" align="center" prop="remark"
@@ -53,7 +53,7 @@
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormApply.jcgj') }}</div>
           </div>
-          <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" :showXg="true"/>
+          <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" :showXg="true" />
 
           <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
             @pagination="getJjcgjList" />
@@ -124,7 +124,7 @@ export default {
       openApprove: false,
       formApprove: {
         id: null,
-        qmyy:  $t('page.business.study.studyFormApply.cjjl'),
+        qmyy: $t('page.business.study.studyFormApply.cjjl'),
         remark: '',
         qmrmm: '',
       },
@@ -170,13 +170,13 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {
   },
   methods: {
-  
+
     dcqbjcgj() {
       alert('todo')
     },

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

@@ -5,7 +5,7 @@
         <div class="operate-img"></div>
         <div class="operate-left">{{ $t('page.business.study.studyFormPlan.syxx') }}</div>
       </div>
-      <el-form ref="form" label-width="90px">
+      <el-form ref="form" label-width="150px">
         <el-row>
           <el-col :span="6">
             <el-form-item :label="$t('page.business.study.studyFormPlan.symc')">

src/views/business/study/comp/tbbd/Xq.vue

@@ -37,8 +37,8 @@
             <el-table :data="qmxxList" v-loading="loadingQmxx">
               <el-table-column :label="$t('page.business.study.studyFormFill.qmr')" align="center" prop="qmrMc"
                 width="150px" />
-              <el-table-column :label="$t('page.business.study.studyFormFill.qmyy')" align="center" prop="qmyy"
-                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormFill.qmyy')" align="center"
+                :prop="$i18n.locale === 'zh_CN' ? 'qmyy' : 'qmyyEn'" width="150px" />
               <el-table-column :label="$t('page.business.study.studyFormFill.qmsj')" align="center" prop="createTime"
                 width="150px" />
               <el-table-column :label="$t('page.business.study.studyFormFill.bzyy')" align="center" prop="remark"
@@ -53,7 +53,7 @@
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormFill.jcgj') }}</div>
           </div>
-          <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" :showXg="true"/>
+          <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" :showXg="true" />
 
           <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
             @pagination="getJjcgjList" />
@@ -124,7 +124,7 @@ export default {
       openApprove: false,
       formApprove: {
         id: null,
-        qmyy:  this.$t('page.business.study.studyFormFill.cjjl'),
+        qmyy: this.$t('page.business.study.studyFormFill.cjjl'),
         remark: '',
         qmrmm: '',
       },
@@ -170,13 +170,13 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {
   },
   methods: {
-  
+
     dcqbjcgj() {
       alert('todo')
     },

src/views/business/study/comp/ytbd/Xq.vue

@@ -25,8 +25,8 @@
             <el-table :data="qmxxList" v-loading="loadingQmxx">
               <el-table-column :label="$t('page.business.study.studyFormPre.qmr')" align="center" prop="qmrMc"
                 width="150px" />
-              <el-table-column :label="$t('page.business.study.studyFormPre.qmyy')" align="center" prop="qmyy"
-                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormPre.qmyy')" align="center"
+                :prop="$i18n.locale === 'zh_CN' ? 'qmyy' : 'qmyyEn'" width="150px" />
               <el-table-column :label="$t('page.business.study.studyFormPre.qmsj')" align="center" prop="createTime"
                 width="150px" />
               <el-table-column :label="$t('page.business.study.studyFormPre.bzyy')" align="center" prop="remark"

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

@@ -133,7 +133,7 @@
 
     <el-dialog :title="$t('page.business.study.studyFormPre.fzbdxz')" :visible.sync="openXz" width="500px"
       append-to-body :close-on-click-modal="false">
-      <el-form ref="formXz" :model="formXz" :rules="rulesXz" label-width="150px">
+      <el-form ref="formXz" :model="formXz" :rules="rulesXz" label-width="180px">
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('page.business.study.studyFormPre.sssyfsy')" prop="studyId">