diff --git a/src/lang/en.js b/src/lang/en.js index a4555db..9942552 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -77,17 +77,18 @@ export default { operate: 'Action', delete: 'Delete', detail: 'View', - placeholderInput: 'Please Enter', + placeholderInput: 'Please Input', placeholderSelect: 'Please Select', confirmDelete: 'Confirm Delete?', startDate: 'Start Date', endDate: 'End Date', password: 'Password', - signer: 'Signer', + signer: 'Signed By', + signerUser: 'Signed User', signerPsw: 'Password', qmyy: 'Purpose', signTime: '签名时间', - remark: 'remark', + remark: 'Comment', lengthLimit: '长度不能超过', notEmpty: '不能为空', diff --git a/src/lang/en/business/study/study.js b/src/lang/en/business/study/study.js index 06b3729..b74ce47 100644 --- a/src/lang/en/business/study/study.js +++ b/src/lang/en/business/study/study.js @@ -1,16 +1,17 @@ export default { name: 'Study Name', - sn: 'Study ID', + sn: 'Study Number', dateRange: 'Date Range', status: 'Status', startDate: 'Start Date', endDate: 'End Date', leader: 'Study Director', + search: 'Filter', add: 'Create', sort: 'Num', borrowStatus: 'Check-out Status', - formCount: 'Records', + formCount: 'Total Records', formFinishCount: 'Completed Records', createDate: 'Creation Date', remark: 'Description', @@ -63,13 +64,12 @@ export default { qb: 'All', lc: 'Milestone', - bj: 'Edit', + bj: 'Change', ry: 'User', - xg: 'Change', + xg: 'Edit', scsy: 'Remove Study', jysj: 'Checkout Period', - - qxzsy:'Please Select Study' + qxzsy: 'Please Select Study' } diff --git a/src/lang/zh.js b/src/lang/zh.js index 95aa2f3..7dcabc2 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -80,6 +80,7 @@ export default { endDate: '结束日期', password: '密码', signer: '签名人', + signerUser: '签名人用户名', signerPsw: '签名人密码', qmyy: '签名意义', signTime: '签名时间', diff --git a/src/lang/zh/business/study/study.js b/src/lang/zh/business/study/study.js index da5d2ec..ff2763b 100644 --- a/src/lang/zh/business/study/study.js +++ b/src/lang/zh/business/study/study.js @@ -7,6 +7,7 @@ export default { endDate: '结束时间', leader: '负责人', + search: '查询', add: '新增试验', sort: '序号', borrowStatus: '借阅状态', @@ -70,5 +71,5 @@ export default { scsy: '删除试验', jysj: '借阅时间', - qxzsy:'请选择试验' + qxzsy: '请选择试验' } diff --git a/src/views/business/form/drug/comp/edit.vue b/src/views/business/form/drug/comp/edit.vue index 8c12f9b..d61dc04 100644 --- a/src/views/business/form/drug/comp/edit.vue +++ b/src/views/business/form/drug/comp/edit.vue @@ -3,7 +3,7 @@
-
{{$t('page.business.study.drug.create')}}
+
{{this.infoDialog.formData.id!=''?$t('page.business.study.drug.xgsy'):$t('page.business.study.drug.create')}}
{{$t('page.business.study.drug.cancel')}} @@ -82,6 +82,7 @@ export default { ], } }, + oldStatus:1, }; }, created() { @@ -95,10 +96,12 @@ export default { edit(row) { this.$refs['infoDialogForm'] && this.$refs['infoDialogForm'].resetFields() this.infoDialog.formData = _.merge({}, EmptyDialogData,{leader:this.$store.getters.id,leaderName:this.$store.getters.nickName}) + this.oldStatus = 1 if(row && row.id){ this.$modal.loading() drug_info({id:row.id}).then(({data}) => { this.infoDialog.formData = data + this.oldStatus = data.status }).finally(() => { this.$modal.closeLoading() }) @@ -113,7 +116,7 @@ export default { if (valid) { this.infoDialog.formData.status = status if(status === 3){ - this.$refs.editSignRef.show(this.$t('page.business.study.drug.submit'),this.$t('page.business.study.drug.create')) + this.$refs.editSignRef.show(this.oldStatus==1?this.$t('page.business.study.drug.submit'):this.$t('page.business.study.drug.xgsy'),this.oldStatus==1?'创建试验':'修改试验') }else{ this.doSave({}) } diff --git a/src/views/business/form/nonTrial/comp/edit.vue b/src/views/business/form/nonTrial/comp/edit.vue index 84d344f..eca0aea 100644 --- a/src/views/business/form/nonTrial/comp/edit.vue +++ b/src/views/business/form/nonTrial/comp/edit.vue @@ -3,7 +3,7 @@
-
{{$t('page.business.study.nonTrial.create')}}
+
{{this.infoDialog.formData.id!=''?$t('page.business.study.nonTrial.xgsy'):$t('page.business.study.nonTrial.create')}}
{{$t('page.business.study.nonTrial.cancel')}} @@ -82,6 +82,7 @@ export default { ], } }, + oldStatus:1 }; }, created() { @@ -95,10 +96,12 @@ export default { edit(row) { this.$refs['infoDialogForm'] && this.$refs['infoDialogForm'].resetFields() this.infoDialog.formData = _.merge({}, EmptyDialogData,{leader:this.$store.getters.id,leaderName:this.$store.getters.nickName}) + this.oldStatus = 1 if(row && row.id){ this.$modal.loading() nonTrial_info({id:row.id}).then(({data}) => { this.infoDialog.formData = data + this.oldStatus = data.status }).finally(() => { this.$modal.closeLoading() }) @@ -113,7 +116,7 @@ export default { if (valid) { this.infoDialog.formData.status = status if(status === 3){ - this.$refs.editSignRef.show(this.$t('page.business.study.nonTrial.submit'),this.$t('page.business.study.nonTrial.create')) + this.$refs.editSignRef.show(this.oldStatus==1?this.$t('page.business.study.nonTrial.submit'):this.$t('page.business.study.nonTrial.xgsy'),this.oldStatus==1?'创建试验':'修改试验') }else{ this.doSave({}) } diff --git a/src/views/business/study/comp/edit.vue b/src/views/business/study/comp/edit.vue index b0d910a..e11fab9 100644 --- a/src/views/business/study/comp/edit.vue +++ b/src/views/business/study/comp/edit.vue @@ -3,7 +3,7 @@
-
{{$t('page.business.study.study.create')}}
+
{{this.infoDialog.formData.id!=''?$t('page.business.study.study.xgsy'):$t('page.business.study.study.create')}}
{{$t('page.business.study.study.cancel')}} @@ -82,6 +82,7 @@ export default { ], } }, + oldStatus:1 }; }, created() { @@ -95,10 +96,12 @@ export default { edit(row) { this.$refs['infoDialogForm'] && this.$refs['infoDialogForm'].resetFields() this.infoDialog.formData = _.merge({}, EmptyDialogData,{leader:this.$store.getters.id,leaderName:this.$store.getters.nickName}) + this.oldStatus = 1 if(row && row.id){ this.$modal.loading() study_info({id:row.id}).then(({data}) => { this.infoDialog.formData = data + this.oldStatus = data.status }).finally(() => { this.$modal.closeLoading() }) @@ -113,7 +116,7 @@ export default { if (valid) { this.infoDialog.formData.status = status if(status === 3){ - this.$refs.editSignRef.show(this.$t('page.business.study.study.submit'),this.$t('page.business.study.study.create')) + this.$refs.editSignRef.show(this.oldStatus==1?this.$t('page.business.study.study.submit'):this.$t('page.business.study.study.xgsy'),this.oldStatus==1?'创建试验':'修改试验') }else{ this.doSave({}) } diff --git a/src/views/business/study/comp/sign.vue b/src/views/business/study/comp/sign.vue index 5c4568b..bd65ed4 100644 --- a/src/views/business/study/comp/sign.vue +++ b/src/views/business/study/comp/sign.vue @@ -31,6 +31,12 @@ + + + + + @@ -58,6 +64,7 @@ export default { remark:'', qmrId:'', qmrMc:'', + qmrUserName:'', qmrmm:'', startDate:'', @@ -93,6 +100,7 @@ export default { remark:'', qmrId:this.$store.getters.id, qmrMc:this.$store.getters.nickName, + qmrUserName:this.$store.getters.name, qmrmm:'', startDate:'', endDate:'' diff --git a/src/views/business/study/comp/suject.vue b/src/views/business/study/comp/suject.vue index 7d425a0..a638799 100644 --- a/src/views/business/study/comp/suject.vue +++ b/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.$t('page.business.study.study.rybg')) + this.$refs.subjectSignRef.show(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.$t('page.business.study.study.rybg')) + this.$refs.subjectSignRef.show(this.$t('page.business.study.study.rybg'),'人员变更') }, doChangeMember(sign){ diff --git a/src/views/business/study/comp/syxx.vue b/src/views/business/study/comp/syxx.vue index da0977e..a289709 100644 --- a/src/views/business/study/comp/syxx.vue +++ b/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.$t('page.business.study.study.sdsy')) + this.$refs.syxxSignRef.show(this.$t('page.business.study.study.sdsy'),'锁定试验') }).finally(() => { this.$modal.closeLoading() }) diff --git a/src/views/business/study/list.vue b/src/views/business/study/list.vue index a181926..819140a 100644 --- a/src/views/business/study/list.vue +++ b/src/views/business/study/list.vue @@ -36,7 +36,7 @@
- {{ $t('form.search') }} + {{ $t('page.business.study.study.search') }} {{ $t('form.reset') }}
@@ -250,7 +250,7 @@ export default { del(row) { this.operate = 'del' this.operateRow = row - this.$refs.signRef.show(this.$t('page.business.study.study.scsy'),this.$t('page.business.study.study.scsy')) + this.$refs.signRef.show(this.$t('page.business.study.study.scsy'),'删除试验') }, doDel(signInfo) { this.$modal.loading() @@ -270,7 +270,7 @@ export default { gd(row) { this.operate = 'gd' this.operateRow = row - this.$refs.signRef.show(this.$t('page.business.study.study.sqgd'),this.$t('page.business.study.study.sqgd')) + this.$refs.signRef.show(this.$t('page.business.study.study.sqgd'),'申请归档') }, doGd(signInfo) { this.$modal.loading() @@ -290,7 +290,7 @@ export default { js(row) { this.operate = 'js' this.operateRow = row - this.$refs.signRef.show(this.$t('page.business.study.study.jssy'),this.$t('page.business.study.study.jssy')) + this.$refs.signRef.show(this.$t('page.business.study.study.jssy'),'解锁试验') }, doJs(signInfo) { this.$modal.loading() @@ -310,7 +310,7 @@ export default { jd(row) { this.operate = 'jd' this.operateRow = row - this.$refs.signRef.show(this.$t('page.business.study.study.sqjd'),this.$t('page.business.study.study.sqjd')) + this.$refs.signRef.show(this.$t('page.business.study.study.sqjd'),'申请解档') }, doJd(signInfo) { this.$modal.loading() @@ -330,7 +330,7 @@ export default { jy(row) { this.operate = 'jy' this.operateRow = row - this.$refs.signRef.show(this.$t('page.business.study.study.sqjy'),this.$t('page.business.study.study.sqjy'),true) + this.$refs.signRef.show(this.$t('page.business.study.study.sqjy'),'申请借阅',true) }, doJy(signInfo) { this.$modal.loading()