diff --git a/src/components/BaseForm/search-form.vue b/src/components/BaseForm/search-form.vue index 101e399b..f1f99380 100644 --- a/src/components/BaseForm/search-form.vue +++ b/src/components/BaseForm/search-form.vue @@ -13,6 +13,7 @@ v-model="searchData[item.prop]" :placeholder="item.placeholder" size="mini" + clearable :style="{ width: item.width }" :readonly="item.readonly" /> @@ -22,6 +23,7 @@ v-model="searchData[item.prop]" :placeholder="item.placeholder" size="mini" + clearable :style="{ width: item.width }" @change="item.change && item.change(that, searchData[item.prop])" > @@ -37,6 +39,7 @@ v-model="searchData[item.prop]" :placeholder="item.placeholder" size="mini" + clearable :style="{ width: item.width }" @change="item.change && item.change(that, searchData[item.prop])" > @@ -96,6 +99,7 @@ value-format="yyyy-MM-dd" format="yyyy-MM-dd" :picker-options="item.pickerOption" + clearable /> - + - + Select{{ $t('common:button:check') }} - (must be in pdf format) + ({{ $t('trials:signature:label:mustBepdf') }}) - + Save{{ $t('common:button:save') }} @@ -138,13 +144,25 @@ export default { }, rules: { FileTypeId: [ - { required: true, message: 'Please select', trigger: ['blur'] }, + { + required: true, + message: this.$t('common:ruleMessage:select'), + trigger: ['blur'], + }, ], SignViewMinimumMinutes: [ - { required: true, message: 'Please specify', trigger: ['change'] }, + { + required: true, + message: this.$t('common:ruleMessage:specify'), + trigger: ['change'], + }, ], NeedConfirmedUserTypeIdList: [ - { required: true, message: 'Please select', trigger: ['blur'] }, + { + required: true, + message: this.$t('common:ruleMessage:select'), + trigger: ['blur'], + }, ], }, fileList: [], @@ -211,7 +229,7 @@ export default { this.fileList = [] return true } else { - this.$alert('must be in pdf format') + this.$alert(this.$t('trials:signature:label:mustBepdf')) return false } @@ -236,7 +254,7 @@ export default { this.$refs.sysAttachmentFrom.validate((valid) => { if (!valid) return if (!this.form.Name) { - this.$alert('Please select file.') + this.$alert(this.$t('trials:signature:message:selectFile')) return } this.saveBtnLoading = true @@ -245,7 +263,7 @@ export default { this.saveBtnLoading = false this.$emit('closeDialog') this.$emit('getList') - this.$message.success('Uploaded successfully') + this.$message.success(this.$t('common:message:updatedSuccessfully')) }) .catch(() => { this.saveBtnLoading = false @@ -263,7 +281,7 @@ export default { } }, handleExceed(files, fileList) { - this.$message.warning(`Upload is currently limited to 1 file`) + this.$message.warning(this.$t('upload:rule:maxFile1')) }, checkFileSuffix(fileName) { var typeArr = ['pdf'] diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue index 29279a3c..f1b79f67 100644 --- a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue +++ b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue @@ -34,7 +34,7 @@ diff --git a/src/views/trials/trials-layout/components/noticeMarquee.vue b/src/views/trials/trials-layout/components/noticeMarquee.vue index 4b54f77b..336504f7 100644 --- a/src/views/trials/trials-layout/components/noticeMarquee.vue +++ b/src/views/trials/trials-layout/components/noticeMarquee.vue @@ -71,6 +71,8 @@ export default { diff --git a/src/views/trials/trials-workbench/components/needSignSysDoc.vue b/src/views/trials/trials-workbench/components/needSignSysDoc.vue index ce8a7d16..1f97a933 100644 --- a/src/views/trials/trials-workbench/components/needSignSysDoc.vue +++ b/src/views/trials/trials-workbench/components/needSignSysDoc.vue @@ -59,7 +59,7 @@ /> @@ -168,7 +168,7 @@ const searchDataDefault = () => { pageIndex: 1, pageSize: 20, asc: false, - sortField: 'UpdateTime', + sortField: 'CreateTime', } } export default { diff --git a/src/views/trials/trials-workbench/components/needSignedSysDoc.vue b/src/views/trials/trials-workbench/components/needSignedSysDoc.vue index c5dd013f..e26c7553 100644 --- a/src/views/trials/trials-workbench/components/needSignedSysDoc.vue +++ b/src/views/trials/trials-workbench/components/needSignedSysDoc.vue @@ -38,7 +38,7 @@ /> @@ -130,7 +130,7 @@ const searchDataDefault = () => { pageIndex: 1, pageSize: 20, asc: false, - sortField: 'UpdateTime' + sortField: 'CreateTime' } } export default {