diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 1259e9eba..41eaf80a5 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1186,4 +1186,5 @@ module.exports = {
translatedText:'Translated Text',
Administrativeprivileges:'Administrativ Pprivileges',
Checkthepermissions:'Check The Permissions',
+ onlyFilesUploaded:'Only.Docx,.Doc files can 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 bb2251c6c..dc7f6b8cb 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1190,4 +1190,5 @@ module.exports = {
translatedText:'译文',
Administrativeprivileges:'管理权限',
Checkthepermissions:'查看权限',
+ onlyFilesUploaded:'只能上传.docx、.doc文件',
}
\ No newline at end of file
diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue
index fab54f96b..b27182372 100644
--- a/jero-web/src/components/uploadFile/file.vue
+++ b/jero-web/src/components/uploadFile/file.vue
@@ -2,7 +2,7 @@
1) {
- this.$message.warning('只能上传一个文件')
+ this.$message.warning(this.$t('onlyOnefileUploaded'))
+ return false
+ }
+ }
+ if (this.restrictUploads) {
+ let fileName = file.name
+ let index1 = fileName.lastIndexOf('.')
+ let index2 = fileName.length
+ let fileSuffix = fileName.substring(index1, index2)
+ if (fileSuffix == '.docx' || fileSuffix == '.doc') {
+
+ } else {
+ this.$message.warning(this.$t('onlyFilesUploaded'))
return false
}
}
diff --git a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue
index fe311363b..985d82608 100644
--- a/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue
+++ b/jero-web/src/views/documentTools/documentTranslation/components/RetrieveFilesList.vue
@@ -42,10 +42,10 @@
@@ -69,37 +69,21 @@
{{$t('translationLanguage')}}
-
-
-
- {{ item.name }}
-
-
-
+
-
-
-
- {{ item.name }}
-
-
-
+
@@ -166,19 +150,19 @@
},
{
title: this.$t('TextStatus'),
- dataIndex: 'TextStatus',
+ dataIndex: 'state',
align: 'center',
ellipsis: true
},
{
title: this.$t('fileName'),
- dataIndex: 'fileName',
+ dataIndex: 'file_name',
align: 'center',
ellipsis: true
},
{
title: this.$t('textInformation'),
- dataIndex: 'textInformation',
+ dataIndex: 'text_info',
align: 'center',
ellipsis: true
}
@@ -189,19 +173,24 @@
pageNo: 1,
pageSize: 10,
total: 0,
- fieldList: [],
- queryConditionVOList: []
+ selectedRowKeysRecord: []
}
},
mounted() {
},
methods: {
+ handleInput(value) {
+ this.$nextTick(() => {
+ this.formInline = { ...this.formInline }
+ this.$refs.ruleForm.validateField([value])
+ })
+ },
addModel() {
this.visible = true
this.queryParam = {}
this.selectedRowKeys = []
- // this.replacePage()
+ this.replacePage()
},
searchQuery() {
this.pageNo = 1
@@ -222,13 +211,16 @@
this.replacePage()
},
replacePage() {
+ let pageNo = JSON.parse(JSON.stringify(this.pageNo))
+ let pageSize = JSON.parse(JSON.stringify(this.pageSize))
let query = {
- pageNo: this.pageNo,
- pageSize: this.pageSize,
+ pageNo: pageNo + '',
+ pageSize: pageSize + '',
+ type: 'pdf',
...this.queryParam
}
this.loading = true
- postAction('', query).then((res) => {
+ postAction('document/bussDocumentLibraryEO/ocrPageInfo', query).then((res) => {
if (res.success) {
this.dataList = res.result.records || []
this.total = res.result.total
@@ -240,8 +232,15 @@
}
})
},
- onSelectChange(value) {
+ onSelectChange(value, record) {
this.selectedRowKeys = value
+ if (this.selectedRowKeys.length > 1) {
+ this.selectedRowKeys.shift()
+ }
+ this.selectedRowKeysRecord = record.filter(res => {
+ return res.id == this.selectedRowKeys[0]
+ })
+ this.selectedRowKeysRecord = [...this.selectedRowKeysRecord]
},
handleCancel() {
this.visible = false
diff --git a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue
index a96e3a73b..c13dbc0ca 100644
--- a/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue
+++ b/jero-web/src/views/documentTools/documentTranslation/components/addModel.vue
@@ -34,7 +34,7 @@
*
{{$t('standard')}}
-
+
*
{{$t('TextStatus')}}
-
+
-
- {{ item.name }}
+ :value="item.id">
+
+ {{ item.dbFieldTxt }}
@@ -72,45 +72,29 @@
*
{{$t('translationLanguage')}}
-
-
-
-
- {{ item.name }}
-
-
-
+
+
-
-
-
-
- {{ item.name }}
-
-
-
+
+
-
+
@@ -140,28 +124,28 @@
trigger: 'change'
}
],
- standard: [
+ serialNumber: [
{
required: true,
message: this.$t('standard') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
- translationResults: [
+ textStatus: [
{
required: true,
message: this.$t('TextStatus') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
- translationLanguage: [
+ sourceLanguage: [
{
required: true,
message: this.$t('translationLanguage') + this.$t('cannotEmpty'),
trigger: 'change'
}
],
- translationLanguageOne: [
+ targetLanguage: [
{
required: true,
message: this.$t('translationLanguage') + this.$t('cannotEmpty'),
@@ -175,8 +159,18 @@
}
},
mounted() {
+ this.getTextStatus()
},
methods: {
+ getTextStatus() {
+ getAction('/docTranslation/docTranslationEO/queryTextStatusVal', {}).then((res) => {
+ if (res.success) {
+ this.translationResultsList = res.result || []
+ } else {
+ this.translationResultsList = []
+ }
+ })
+ },
add() {
this.visible = true
this.formInline = {}
@@ -193,18 +187,16 @@
handleOk() {
this.$refs.ruleForm.validate(valid => {
if (valid) {
- let ids = JSON.parse(JSON.stringify(this.ids))
let query = {
- ids: ids.join(','),
...this.formInline
}
this.confirmLoading = true
- postAction(this.url.setBatch, query).then((res) => {
+ postAction('/docTranslation/docTranslationEO/add', query).then((res) => {
if (res.success) {
this.$message.success(this.$t('OperationSuccessful'))
this.visible = false
this.confirmLoading = false
- this.$emit('batSettingList')
+ this.$emit('addModelForm')
} else {
this.$message.warning(this.$t('operationFailed'))
this.confirmLoading = false
@@ -232,20 +224,36 @@
/** 上传文件的回调 */
uploadSuccess(data) {
let attIdList = []
+ let fileName = []
if (data && data.length > 0) {
data.map(item => {
attIdList.push(item.id || data.name)
+ fileName.push(item.fileName)
})
}
/** 赋值给当前对应的表单文件 */
this.formInline[this.uploadName] = attIdList.join(',')
+ this.formInline.fileName = fileName.join(',')
this.formInline = { ...this.formInline }
+ this.$nextTick(() => {
+ if (this.formInline[this.uploadName]) {
+ this.$refs.ruleForm.validateField([this.uploadName])
+ }
+ })
},
standardClick() {
this.$refs.standardDataRef.addModel()
},
- standardDataForm() {
-
+ standardDataForm(row) {
+ this.formInline.serialNumber = row.serial_number
+ this.formInline.title = row.title
+ this.formInline.bussDocumentLibraryId = row.id
+ this.formInline = { ...this.formInline }
+ this.$nextTick(() => {
+ if (this.formInline.serialNumber) {
+ this.$refs.ruleForm.validateField(['serialNumber'])
+ }
+ })
}
}
}
diff --git a/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue b/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue
index 9ba6c282c..4ea4ffa48 100644
--- a/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue
+++ b/jero-web/src/views/documentTools/documentTranslation/components/standardData.vue
@@ -157,7 +157,7 @@
total: 0,
fieldList: [],
queryConditionVOList: [],
- selectedRowKeysRecord:[],
+ selectedRowKeysRecord: []
}
},
mounted() {
@@ -214,12 +214,12 @@
}
})
},
- onSelectChange(value) {
+ onSelectChange(value,record) {
this.selectedRowKeys = value
if (this.selectedRowKeys.length > 1) {
this.selectedRowKeys.shift()
}
- this.selectedRowKeysRecord = record.filter(res=>{
+ this.selectedRowKeysRecord = record.filter(res => {
return res.id == this.selectedRowKeys[0]
})
this.selectedRowKeysRecord = [...this.selectedRowKeysRecord]
@@ -229,8 +229,7 @@
},
handleSubmit() {
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
- this.confirmLoading = true
- let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+ this.$emit('standardDataForm', this.selectedRowKeysRecord[0])
this.visible = false
} else {
this.$message.warning(this.$t('selectLeastOne'))
diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue
index 0f01630f4..2c3b82588 100644
--- a/jero-web/src/views/documentTools/documentTranslation/index.vue
+++ b/jero-web/src/views/documentTools/documentTranslation/index.vue
@@ -26,19 +26,10 @@
{{$t('translationResults')}}
-
-
-
- {{ item.name }}
-
-
-
+
@@ -47,19 +38,10 @@
{{$t('releaseSituation')}}
-
-
-
- {{ item.name }}
-
-
-
+
@@ -106,12 +88,17 @@
{{$t('view')}}
-
- {{!record.state || record.state == 0 ? $t('release') :$t('withdraw')}}
+
+ {{!record.releaseCondition || record.releaseCondition == 'draft' ? $t('release') :$t('withdraw')}}
- {{$t('download')}}
- {{$t('delete')}}
+ {{$t('download')}}
+ {{$t('delete')}}
@@ -133,9 +120,11 @@