diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index c2b252303..f9d5ed681 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -628,4 +628,14 @@ module.exports = { CurrentStatusOfTheProject:'Current status of the project', NonConformance:'Non conformance', listSubclauses:'list subclauses', + fileType:'file type', + view:'view', + Korea:'Korea', + America:'America', + Europe:'Europe', + Japan:'Japan', + China:'China', + onlyOnefileUploaded:'only one file can be uploaded', + typeCannotUploaded:'this type of file cannot be uploaded', + } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index a7d1b3b21..3b34f8c0f 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -631,5 +631,16 @@ module.exports = { DeliverableStatus:'交付物状态', CurrentStatusOfTheProject:'项目当前状态', NonConformance:'未符合项', - listSubclauses:'清单条目' + listSubclauses:'清单条目', + fileType:'文件类型', + view:'查看', + Korea:'韩国', + America:'美国', + Europe:'欧洲', + Japan:'日本', + China:'中国', + onlyOnefileUploaded:'只能上传一个文件', + typeCannotUploaded:'不支持上传该类型的文件', + + } \ No newline at end of file diff --git a/jero-web/src/components/OcrAddForm/index.vue b/jero-web/src/components/OcrAddForm/index.vue index 00e3914b4..3bc992041 100644 --- a/jero-web/src/components/OcrAddForm/index.vue +++ b/jero-web/src/components/OcrAddForm/index.vue @@ -342,7 +342,7 @@ if (res.field_show_type === '1') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'blur' }) if(res.db_field_name=='standNumber'){ @@ -359,35 +359,44 @@ res.field_show_type === 'date' || res.field_show_type === 'file') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'change' }) } else if (res.field_show_type === 'NUMBER') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'blur' }) } else if (res.field_show_type === 'TEXTAREA') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'blur' }) } else if (res.field_show_type === 'RADIO' || res.field_show_type === '3') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'change' }) }else if (res.field_show_type === '7') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'change', }) } } + if (res.field_show_type === '1' || + res.field_show_type === '8' || res.field_show_type === '9' || res.field_show_type === '10' + || res.field_show_type === '11') { + rule.push({ + max: res.db_length, + message: res.db_field_txt + this.$t('cantExeed') + res.db_length + this.$t('characters'), + trigger: 'blur' + }) + } if (rule.length > 0) { rules[res.db_field_name] = rule } diff --git a/jero-web/src/components/OcrUpload/index.vue b/jero-web/src/components/OcrUpload/index.vue index 228a93a1d..fe52ea3d4 100644 --- a/jero-web/src/components/OcrUpload/index.vue +++ b/jero-web/src/components/OcrUpload/index.vue @@ -52,7 +52,7 @@ // console.log('file',this.accept) this.fileTypeSatus=false if(this.myfileList&&this.myfileList.length>=1){ - this.$message.warning('只能上传一个文件') + this.$message.warning(this.$t('onlyOnefileUploaded')) return false }else{ // let thisFileType = this.thisFileType.replace(/\s+/g, ""); @@ -88,7 +88,7 @@ if (status === 'error') { this.$emit('uploadSuccess', this.fileList) this.$message.destroy() - this.$message.error(`${info.file.name} 文件上传失败。`); + this.$message.error(`${info.file.name}`+this.$t('fileUploadFailed')); } else if (status === 'removed') { this.myfileList = info.fileList; this.fileList = [] @@ -102,7 +102,7 @@ // console.log('remove',this.fileList) this.$emit('uploadSuccess', this.fileList) this.$message.destroy() - this.$message.success(`${info.file.name} 删除成功。`); + this.$message.success(`${info.file.name}`+this.$t('deletedSuccessfully')); } else if (status === 'done') { this.fileList = [] this.myfileList = info.fileList; @@ -121,7 +121,7 @@ // console.log('file1111',this.fileList) this.$emit('uploadSuccess', this.fileList) this.$message.destroy() - this.$message.error('最多只能上传一个文件'); + this.$message.error(this.$t('onlyOnefileUploaded')); return } // console.log('my222',this.myfileList) @@ -137,7 +137,7 @@ if(this.myfileList.length > 0){ this.$emit('uploadSuccess', this.fileList) this.$message.destroy() - this.$message.success(`${info.file.name} 文件上传成功。`); + this.$message.success(`${info.file.name}`+this.$t('fileUploadFailed')); } } else if (status === 'uploading') { this.myfileList = info.fileList; @@ -146,7 +146,7 @@ } } }else{ - this.$message.warning('不支持上传该类型的文件!') + this.$message.warning(this.$t('typeCannotUploaded')) } }, } diff --git a/jero-web/src/components/SplitBatForm/index.vue b/jero-web/src/components/SplitBatForm/index.vue index 78c515c3d..6650155b0 100644 --- a/jero-web/src/components/SplitBatForm/index.vue +++ b/jero-web/src/components/SplitBatForm/index.vue @@ -380,58 +380,67 @@ if (res.field_show_type === '1') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'blur' }) - if(res.db_field_name=='standNumber'){ - rule.push( - { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' }, - ) - }else if(res.db_field_name=='standName'){ - rule.push( - { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' }, - ) - } + // if(res.db_field_name=='standNumber'){ + // rule.push( + // { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' }, + // ) + // }else if(res.db_field_name=='standName'){ + // rule.push( + // { min:1, max: 200, message: this.$t('cantExeed')+'200'+this.$t('characters'), trigger: 'blur' }, + // ) + // } } else if (res.field_show_type === 'CHECKBOX' || res.field_show_type === 'list_multi' || res.field_show_type === 'date' || res.field_show_type === 'file') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'change' }) } else if (res.field_show_type === 'NUMBER') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'blur' }) } else if (res.field_show_type === 'TEXTAREA') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'blur' }) } else if (res.field_show_type === 'RADIO' || res.field_show_type === '3') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'change' }) }else if (res.field_show_type === '7') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'change', }) }else if (res.field_show_type === '0') { rule.push({ required: true, - message: res.db_field_txt + '不能为空', + message: res.db_field_txt + this.$t('cannotEmpty'), trigger: 'change', }) } } + if (res.field_show_type === '1' || + res.field_show_type === '8' || res.field_show_type === '9' || res.field_show_type === '10' + || res.field_show_type === '11') { + rule.push({ + max: res.db_length, + message: res.db_field_txt + this.$t('cantExeed') + res.db_length + this.$t('characters'), + trigger: 'blur' + }) + } if (rule.length > 0) { rules[res.db_field_name] = rule } diff --git a/jero-web/src/components/SplitImport/index.vue b/jero-web/src/components/SplitImport/index.vue index 4074322b6..e746afa7b 100644 --- a/jero-web/src/components/SplitImport/index.vue +++ b/jero-web/src/components/SplitImport/index.vue @@ -92,7 +92,7 @@ }, beforeUpload(file,fileList) { if(this.myfileList&&this.myfileList.length>=1){ - this.$message.warning('只能上传一个文件') + this.$message.warning(this.$t('onlyOnefileUploaded')) return false }else{ // let thisFileType = this.thisFileType.replace(/\s+/g, ""); @@ -139,7 +139,7 @@ if (status === 'error') { this.$emit('uploadSuccess', this.fileList) this.$message.destroy() - this.$message.error(`${info.file.name} 文件上传失败。`); + this.$message.error(`${info.file.name}`+this.$t('fileUploadFailed')); } else if (status === 'removed') { this.myfileList = info.fileList; this.fileList = [] @@ -153,7 +153,7 @@ // console.log('remove',this.fileList) this.$emit('uploadSuccess', this.fileList) this.$message.destroy() - this.$message.success(`${info.file.name} 删除成功。`); + this.$message.success(`${info.file.name}`+this.$t('deletedSuccessfully')); } else if (status === 'done') { // console.log('file1111',this.fileList) this.$emit('uploadSuccess', this.fileList,'success') @@ -174,7 +174,7 @@ this.$emit('uploadSuccess', this.fileList,'success') this.$message.destroy() - this.$message.error('最多只能上传一个文件'); + this.$message.error(this.$t('onlyOnefileUploaded')); return } // console.log('my222',this.myfileList) @@ -191,7 +191,7 @@ // console.log('file1111',this.fileList) this.$emit('uploadSuccess', this.fileList,'success') this.$message.destroy() - this.$message.success(`${info.file.name} 文件上传成功。`); + this.$message.success(`${info.file.name}`+this.$t('fileUploadFailed')); } } else if (status === 'uploading') { this.myfileList = info.fileList; diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue index 9ec6716b6..17e9bfa93 100644 --- a/jero-web/src/components/SplitTable/index.vue +++ b/jero-web/src/components/SplitTable/index.vue @@ -21,7 +21,7 @@ {{ol.text}} - + {{ol.text}} diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue index ae9c130b7..45c199de4 100644 --- a/jero-web/src/views/documentManage/splitting/index.vue +++ b/jero-web/src/views/documentManage/splitting/index.vue @@ -109,7 +109,7 @@ ClickEvent: 'backDocument' }, //回传至文档库 { - text: this.$t('See'), + text: this.$t('view'), ClickEvent: 'detailClick' }, //查看 { diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue index 569e9c1d4..e0e9a460c 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue @@ -20,11 +20,11 @@ :label-col="labelCol" :wrapper-col="wrapperCol" > - -
+ - -
+ + +
* {{item.db_field_txt}} @@ -36,10 +36,10 @@ :placeholder="$t('PleaseEnter')+item.db_field_txt"/>
- - -
+ + +
* {{item.db_field_txt}} @@ -51,10 +51,8 @@ v-model="formInline[item.db_field_name]" :max="99999999"/>
- - -
+
* {{item.db_field_txt}} @@ -68,10 +66,9 @@ :triggerChange="false" :dictCode="item.dict_field"/>
- - -
+ +
* {{item.db_field_txt}} @@ -84,9 +81,9 @@ :triggerChange="false" :dictCode="item.dict_field"/>
- - -
+ + +
* {{item.db_field_txt}} @@ -101,9 +98,9 @@
- - -
+ + +
* {{item.db_field_txt}} @@ -114,10 +111,9 @@ @change="onChange(item.db_field_name)">
- - -
+ +
* {{item.db_field_txt}} @@ -134,10 +130,9 @@
- - -
+ +
* {{item.db_field_txt}} @@ -149,10 +144,9 @@ v-model="formInline[item.db_field_name]" :rows="4"/>
- - -
+ +
* {{item.db_field_txt}} @@ -165,10 +159,9 @@ v-model="formInline[item.db_field_name]"/>
- - -
+ +
* {{item.db_field_txt}} @@ -181,10 +174,9 @@ v-model="formInline[item.db_field_name]"/>
- - -
+ +
* {{item.db_field_txt}} @@ -197,10 +189,9 @@ :type="'radio'" :triggerChange="false" :dictCode="item.dict_field"/>
- - -
+ +
* {{item.db_field_txt}} @@ -218,10 +209,9 @@
- - -
+ +
* {{item.db_field_txt}} @@ -235,7 +225,7 @@
-
+ @@ -249,10 +239,10 @@ {{$t('Add')}}
- +
- +
@@ -595,6 +585,8 @@ // } }, mounted() { + + this.visible=this.addVisible // this.formInline=this.item // console.log('form',this.formInline,this.item) @@ -983,7 +975,7 @@ || res.field_show_type === '11') { rule.push({ max: res.db_length, - message: res.db_field_txt + '不能超出' + res.db_length + '个字符', + message: res.db_field_txt + this.$t('cantExeed') + res.db_length + this.$t('characters'), trigger: 'blur' }) } @@ -1119,6 +1111,9 @@ margin-bottom: 20px; text-align: right; } + + } + .split-content-row{ .split-row{ display: flex; justify-content: space-between; @@ -1264,6 +1259,11 @@ .ant-input-number{ width: 100%; } + .split-form-row{ + display: flex; + flex-wrap: wrap; + justify-content: start; + } } .split-img{ .ant-modal-body{ diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue index 2b0e526eb..e1e3c892f 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue @@ -20,10 +20,19 @@