feat: [试验管理] 稽查轨迹修改

src/utils/request.js

@@ -18,7 +18,7 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 10000
+  timeout: 90000
 })
 
 // request拦截器

src/views/business/comps/common/JcgjList.vue

@@ -18,24 +18,28 @@
       <el-timeline style="margin-left: -30px;">
       <el-timeline-item placement="top" v-for="(item, index) in list" :key="index"  :color="item.color">
         <div class="jcgjList-title">
-          <div class="jcgjList-jcmc" :style="'color:' + item.color">{{ item.jcmc }}</div>
+          <div class="jcgjList-jcmc" :style="'color:' + item.color">{{ $i18n.locale === 'zh_CN'?item.jcmc:item.jcmcEn }}</div>
           <div>{{ item.createTime }}</div>
         </div>
         <div class="jcglList-jcnr">
-          <div v-for="(pitem, pindex) in item.jcnrList" :key="pindex">
-            {{ pitem.name }}：{{ pitem.value }}
-          </div>
+          <template v-if="$i18n.locale === 'zh_CN'">
+            <div v-for="(pitem, pindex) in item.jcnrList" :key="pindex">
+              {{ pitem.name }}：{{ pitem.value }}
+            </div>
+          </template>
+          <template v-else>
+            <div v-for="(pitem, pindex) in item.jcnrListEn" :key="pindex">
+              {{ pitem.name }}：{{ pitem.value }}
+            </div>
+          </template>
           <div v-if="item.remark&&item.remark!==''">
             {{$t('form.remark')}}：{{ item.remark  }}
           </div>
           <div v-if="item.qmrId&&item.qmrId>0">
-            {{$t('form.qmyy')}}：{{ item.jcmc  }}
-          </div>
-          <div v-if="item.qmrId&&item.qmrId>0">
-            {{$t('form.signer')}}：{{ item.qmrMc  }}
+            {{$t('form.qmyy')}}：{{ $i18n.locale === 'zh_CN'?item.jcmc:item.jcmcEn  }}
           </div>
           <div v-if="item.qmrId&&item.qmrId>0">
-            {{$t('form.signerUser')}}：{{ item.qmrUserName  }}
+            {{$t('form.signer')}}：{{ $i18n.locale === 'zh_CN'?item.qmrMc:item.qmrMcEn  }}
           </div>
         </div>
       </el-timeline-item>
@@ -92,8 +96,11 @@ export default {
         let item = a
         try {
           item.jcnrList = JSON.parse(a.jcnr)
+          item.jcnrListEn = JSON.parse(a.jcnrEn)
+          debugger
         } catch (e) {
           item.jcnrList = []
+          item.jcnrListEn = []
         }
         // 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 
         if (item.jcmcys == 1) {

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

@@ -116,7 +116,7 @@ export default {
         if (valid) {
           this.infoDialog.formData.status = status
           if(status === 3){
-            this.$refs.editSignRef.show(this.oldStatus==1?this.$t('page.business.study.drug.submit'):this.$t('page.business.study.drug.xgsy'),this.oldStatus==1?'创建麻精药文件夹':'修改麻精药文件夹')
+            this.$refs.editSignRef.show(this.oldStatus==1?this.$t('page.business.study.drug.submit'):this.$t('page.business.study.drug.xgsy'),this.oldStatus==1?this.$t('page.business.study.drug.create'):this.$t('page.business.study.drug.xgsy'))
           }else{
             this.doSave({})
           }

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

@@ -31,12 +31,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item :label="$t('form.signerUser')">
-              <el-input type="text" v-model="form.qmrUserName" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
               <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" autocomplete="off" auto-complete="new-password" />
             </el-form-item>
@@ -64,7 +58,7 @@ export default {
         remark:'',
         qmrId:'',
         qmrMc:'',
-        qmrUserName:'',
+        qmrMcEn:'',
         qmrmm:'',
 
         startDate:'',
@@ -100,7 +94,7 @@ export default {
         remark:'',
         qmrId:this.$store.getters.id,
         qmrMc:this.$store.getters.nickName,
-        qmrUserName:this.$store.getters.name,
+        qmrMcEn:this.$store.getters.name,
         qmrmm:'',
         startDate:'',
         endDate:''

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

@@ -393,7 +393,7 @@ export default {
       drug_checkSd({
         study:{id:this.study.id},
       }).then(() => {
-        this.$refs.fsySignRef.show(this.$t('page.business.study.drug.sdsy'),'锁定麻精药文件夹')
+        this.$refs.fsySignRef.show(this.$t('page.business.study.drug.sdsy'),this.$t('page.business.study.drug.sdsy'))
       }).finally(() => {
         this.$modal.closeLoading()
       })

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

@@ -249,7 +249,7 @@ export default {
     del(row) {
       this.operate = 'del'
       this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.drug.scsy'),'删除麻精药文件夹')
+      this.$refs.signRef.show(this.$t('page.business.study.drug.scsy'),this.$t('page.business.study.drug.scsy'))
     },
     doDel(signInfo) {
       this.$modal.loading()
@@ -269,7 +269,7 @@ export default {
     gd(row) {
       this.operate = 'gd'
       this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.drug.sqgd'),'申请归档')
+      this.$refs.signRef.show(this.$t('page.business.study.drug.sqgd'),this.$t('page.business.study.drug.sqgd'))
     },
     doGd(signInfo) {
       this.$modal.loading()
@@ -289,7 +289,7 @@ export default {
     js(row) {
       this.operate = 'js'
       this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.drug.jssy'),'解锁麻精药文件夹')
+      this.$refs.signRef.show(this.$t('page.business.study.drug.jssy'),this.$t('page.business.study.drug.jssy'))
     },
     doJs(signInfo) {
       this.$modal.loading()
@@ -309,7 +309,7 @@ export default {
     jd(row) {
       this.operate = 'jd'
       this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.drug.sqjd'),'申请解档')
+      this.$refs.signRef.show(this.$t('page.business.study.drug.sqjd'),this.$t('page.business.study.drug.sqjd'))
     },
     doJd(signInfo) {
       this.$modal.loading()
@@ -329,7 +329,7 @@ export default {
     jy(row) {
       this.operate = 'jy'
       this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.drug.sqjy'),'申请借阅',true)
+      this.$refs.signRef.show(this.$t('page.business.study.drug.sqjy'),this.$t('page.business.study.drug.sqjy'),true)
     },
     doJy(signInfo) {
       this.$modal.loading()

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

@@ -116,7 +116,7 @@ export default {
         if (valid) {
           this.infoDialog.formData.status = status
           if(status === 3){
-            this.$refs.editSignRef.show(this.oldStatus==1?this.$t('page.business.study.nonTrial.submit'):this.$t('page.business.study.nonTrial.xgsy'),this.oldStatus==1?'创建非试验':'修改非试验')
+            this.$refs.editSignRef.show(this.oldStatus==1?this.$t('page.business.study.nonTrial.submit'):this.$t('page.business.study.nonTrial.xgsy'),this.oldStatus==1?this.$t('page.business.study.nonTrial.create'):this.$t('page.business.study.nonTrial.xgsy'))
           }else{
             this.doSave({})
           }

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

@@ -31,12 +31,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item :label="$t('form.signerUser')">
-              <el-input type="text" v-model="form.qmrUserName" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
               <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" autocomplete="off" auto-complete="new-password" />
             </el-form-item>
@@ -64,7 +58,7 @@ export default {
         remark:'',
         qmrId:'',
         qmrMc:'',
-        qmrUserName:'',
+        qmrMcEn:'',
         qmrmm:'',
 
         startDate:'',
@@ -100,7 +94,7 @@ export default {
         remark:'',
         qmrId:this.$store.getters.id,
         qmrMc:this.$store.getters.nickName,
-        qmrUserName:this.$store.getters.name,
+        qmrMcEn:this.$store.getters.name,
         qmrmm:'',
         startDate:'',
         endDate:''

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

@@ -392,7 +392,7 @@ export default {
       nonTrial_checkSd({
         study:{id:this.study.id},
       }).then(() => {
-        this.$refs.fsySignRef.show(this.$t('page.business.study.nonTrial.sdsy'),'锁定非试验')
+        this.$refs.fsySignRef.show(this.$t('page.business.study.nonTrial.sdsy'),this.$t('page.business.study.nonTrial.sdsy'))
       }).finally(() => {
         this.$modal.closeLoading()
       })

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

@@ -249,7 +249,7 @@ export default {
     del(row) {
       this.operate = 'del'
       this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.nonTrial.scsy'),'删除非试验')
+      this.$refs.signRef.show(this.$t('page.business.study.nonTrial.scsy'),this.$t('page.business.study.nonTrial.scsy'))
     },
     doDel(signInfo) {
       this.$modal.loading()
@@ -269,7 +269,7 @@ export default {
     gd(row) {
       this.operate = 'gd'
       this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.nonTrial.sqgd'),'申请归档')
+      this.$refs.signRef.show(this.$t('page.business.study.nonTrial.sqgd'),this.$t('page.business.study.nonTrial.sqgd'))
     },
     doGd(signInfo) {
       this.$modal.loading()
@@ -289,7 +289,7 @@ export default {
     js(row) {
       this.operate = 'js'
       this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.nonTrial.jssy'),'解锁非试验')
+      this.$refs.signRef.show(this.$t('page.business.study.nonTrial.jssy'),this.$t('page.business.study.nonTrial.jssy'))
     },
     doJs(signInfo) {
       this.$modal.loading()
@@ -309,7 +309,7 @@ export default {
     jd(row) {
       this.operate = 'jd'
       this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.nonTrial.sqjd'),'申请解档')
+      this.$refs.signRef.show(this.$t('page.business.study.nonTrial.sqjd'),this.$t('page.business.study.nonTrial.sqjd'))
     },
     doJd(signInfo) {
       this.$modal.loading()
@@ -329,7 +329,7 @@ export default {
     jy(row) {
       this.operate = 'jy'
       this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.nonTrial.sqjy'),'申请借阅',true)
+      this.$refs.signRef.show(this.$t('page.business.study.nonTrial.sqjy'),this.$t('page.business.study.nonTrial.sqjy'),true)
     },
     doJy(signInfo) {
       this.$modal.loading()

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

@@ -116,7 +116,7 @@ export default {
         if (valid) {
           this.infoDialog.formData.status = status
           if(status === 3){
-            this.$refs.editSignRef.show(this.oldStatus==1?this.$t('page.business.study.study.submit'):this.$t('page.business.study.study.xgsy'),this.oldStatus==1?'创建试验':'修改试验')
+            this.$refs.editSignRef.show(this.oldStatus==1?this.$t('page.business.study.study.submit'):this.$t('page.business.study.study.xgsy'),this.oldStatus==1?this.$t('page.business.study.study.create'):this.$t('page.business.study.study.xgsy'))
           }else{
             this.doSave({})
           }

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

@@ -31,12 +31,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item :label="$t('form.signerUser')">
-              <el-input type="text" v-model="form.qmrUserName" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
               <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" autocomplete="off" auto-complete="new-password" />
             </el-form-item>
@@ -64,7 +58,7 @@ export default {
         remark:'',
         qmrId:'',
         qmrMc:'',
-        qmrUserName:'',
+        qmrMcEn:'',
         qmrmm:'',
 
         startDate:'',
@@ -100,7 +94,7 @@ export default {
         remark:'',
         qmrId:this.$store.getters.id,
         qmrMc:this.$store.getters.nickName,
-        qmrUserName:this.$store.getters.name,
+        qmrMcEn:this.$store.getters.name,
         qmrmm:'',
         startDate:'',
         endDate:''

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

@@ -171,7 +171,7 @@ export default {
       }
       this.infoDialog.saveList = postList
       this.signType = 'save'
-      this.$refs.subjectSignRef.show(this.$t('page.business.study.study.rybg'),'人员变更')
+      this.$refs.subjectSignRef.show(this.$t('page.business.study.study.rybg'),this.$t('page.business.study.study.rybg'))
     },
     doSign(val){
       if(this.signType==='save'){
@@ -238,7 +238,7 @@ export default {
       }
       this.memberList = postList
       this.signType = 'member'
-      this.$refs.subjectSignRef.show(this.$t('page.business.study.study.rybg'),'人员变更')
+      this.$refs.subjectSignRef.show(this.$t('page.business.study.study.rybg'),this.$t('page.business.study.study.rybg'))
     },
 
     doChangeMember(sign){

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

@@ -124,7 +124,7 @@ export default {
       study_checkSd({
         study:{id:this.studyId},
       }).then(() => {
-        this.$refs.syxxSignRef.show(this.$t('page.business.study.study.sdsy'),'锁定试验')
+        this.$refs.syxxSignRef.show(this.$t('page.business.study.study.sdsy'),this.$t('page.business.study.study.sdsy'))
       }).finally(() => {
         this.$modal.closeLoading()
       })

src/views/business/study/list.vue

@@ -249,7 +249,7 @@ export default {
     del(row) {
       this.operate = 'del'
       this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.study.scsy'),'删除试验')
+      this.$refs.signRef.show(this.$t('page.business.study.study.scsy'),this.$t('page.business.study.study.scsy'))
     },
     doDel(signInfo) {
       this.$modal.loading()
@@ -269,7 +269,7 @@ export default {
     gd(row) {
       this.operate = 'gd'
       this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.study.sqgd'),'申请归档')
+      this.$refs.signRef.show(this.$t('page.business.study.study.sqgd'),this.$t('page.business.study.study.sqgd'))
     },
     doGd(signInfo) {
       this.$modal.loading()
@@ -289,7 +289,7 @@ export default {
     js(row) {
       this.operate = 'js'
       this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.study.jssy'),'解锁试验')
+      this.$refs.signRef.show(this.$t('page.business.study.study.jssy'),this.$t('page.business.study.study.jssy'))
     },
     doJs(signInfo) {
       this.$modal.loading()
@@ -309,7 +309,7 @@ export default {
     jd(row) {
       this.operate = 'jd'
       this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.study.sqjd'),'申请解档')
+      this.$refs.signRef.show(this.$t('page.business.study.study.sqjd'),this.$t('page.business.study.study.sqjd'))
     },
     doJd(signInfo) {
       this.$modal.loading()
@@ -329,7 +329,7 @@ export default {
     jy(row) {
       this.operate = 'jy'
       this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.study.sqjy'),'申请借阅',true)
+      this.$refs.signRef.show(this.$t('page.business.study.study.sqjy'),this.$t('page.business.study.study.sqjy'),true)
     },
     doJy(signInfo) {
       this.$modal.loading()