- *
+ *
{{item.db_field_txt}}
@@ -271,7 +271,9 @@
},
methods: {
sumber() {
+ console.log('vilidate',this.$refs.ruleForm1)
this.$refs.ruleForm1.validate(valid => {
+ console.log('va',valid)
if (valid) {
let url = ''
if (this.formInline.id) {
@@ -321,8 +323,8 @@
let rules = {}
this.ruleList.forEach((res, index) => {
const rule = []
- if (res.field_must_input == 0) {
- if (res.field_show_type === 'text') {
+ if (res.field_must_input == 1) {
+ if (res.field_show_type === '1') {
rule.push({
required: true,
message: res.db_field_txt + '不能为空',
@@ -347,7 +349,13 @@
message: res.db_field_txt + '不能为空',
trigger: 'blur'
})
- } else if (res.field_show_type === 'RADIO' || res.field_show_type === 'list') {
+ } else if (res.field_show_type === 'RADIO' || res.field_show_type === '3') {
+ rule.push({
+ required: true,
+ message: res.db_field_txt + '不能为空',
+ trigger: 'change'
+ })
+ }else if (res.field_show_type === '7') {
rule.push({
required: true,
message: res.db_field_txt + '不能为空',
@@ -363,6 +371,7 @@
this.$set(this, 'rules', rules)
this.isFormInline = true
this.confirmLoading = false
+ console.log('rules',rules,this)
},
getForm() {
this.confirmLoading = true
diff --git a/jero-web/src/components/ocrTable/docTable.vue b/jero-web/src/components/ocrTable/docTable.vue
new file mode 100644
index 000000000..9d1a0e5b8
--- /dev/null
+++ b/jero-web/src/components/ocrTable/docTable.vue
@@ -0,0 +1,245 @@
+
+
+
+
+
+
+
diff --git a/jero-web/src/components/ocrTable/index.vue b/jero-web/src/components/ocrTable/index.vue
new file mode 100644
index 000000000..c2c170367
--- /dev/null
+++ b/jero-web/src/components/ocrTable/index.vue
@@ -0,0 +1,245 @@
+
+
+
+
+
+
+
diff --git a/jero-web/src/components/ocrUpload/index.vue b/jero-web/src/components/ocrUpload/index.vue
index e7235b5a8..3c2bb46a0 100644
--- a/jero-web/src/components/ocrUpload/index.vue
+++ b/jero-web/src/components/ocrUpload/index.vue
@@ -14,7 +14,7 @@
:remove='remove'
@change="handleChange">
-
点击上传
+
{{$t('clickUpload')}}
@@ -35,7 +35,7 @@
fileList:[],
fileTypeSatus:false,
headers:{},
- title:'上传文件'
+ title:this.$t('UploadFile')
}
},
created(){
diff --git a/jero-web/src/views/documentManage/collection/index.vue b/jero-web/src/views/documentManage/collection/index.vue
index 567ff49ee..ce0643465 100644
--- a/jero-web/src/views/documentManage/collection/index.vue
+++ b/jero-web/src/views/documentManage/collection/index.vue
@@ -80,7 +80,7 @@
import { getAction, postAction, deleteAction, putAction } from '@/api/manage'
import eventBUs from '../../../common/event'
import search from '@/components/search/index'
- import tableData from '@/components/tableDate/index'
+ import tableData from '@/components/coTable/index'
export default {
name:'collection',
components:{
diff --git a/jero-web/src/views/documentManage/ocr/index.vue b/jero-web/src/views/documentManage/ocr/index.vue
index 16ee12744..563e53e6b 100644
--- a/jero-web/src/views/documentManage/ocr/index.vue
+++ b/jero-web/src/views/documentManage/ocr/index.vue
@@ -22,7 +22,7 @@
- 该文件未进行校验,确定要同步至文档库?
+ {{$t('sureSynchronize')}}
- 确定对该文件未进行校验?
+ {{$t('sureVerified')}}
import { axios } from '@/utils/request'
- import { getAction, postAction, deleteAction } from '@/api/manage'
+ import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
import search from '@/components/search/index'
- import tableData from '@/components/tableDate/index'
+ import tableData from '@/components/ocrTable/index'
import addForm from '@/components/ocrAddForm/index'
import docTable from './modules/docTable'
import ocrUpload from '@/components/ocrUpload/index'
@@ -108,21 +108,21 @@
return{
OperationList: [
{
- text: '同步至文档库',
+ text: this.$t('SyncLibrary'),
ClickEvent: 'actionSynchron'
- },
+ }, //同步至文档库
{
- text: '校核',
+ text: this.$t('check'),
ClickEvent: 'actionCheck'
- },
+ }, //校核
{
- text: '下载',
+ text: this.$t('download'),
ClickEvent: 'actionDown'
- },
+ }, //下载
{
- text: '删除',
+ text: this.$t('delete'),
ClickEvent: 'actionDelete'
- }
+ } //删除
],
pageSize:10,
labelCol: { span:4 },
@@ -189,7 +189,7 @@
}
if(this.selectedIds){
this.$confirm({
- title: '确认要批量删除?',
+ title: this.$t('ConfirmBatchDeletion'),
content: '',
onOk:
async () => {
@@ -205,7 +205,7 @@
onCancel() {},
});
}else{
- this.$message.warning('请选择至少一条数据!');
+ this.$message.warning(this.$t('selectLeastOne'));
}
},
//同步
@@ -228,11 +228,8 @@
},
//下载
actionDown(val){
- if(val.resultContent=='转换成功'){
-
- }else{
- this.$message.warning('未转换成功或已同步至文档库')
- }
+ console.log()
+ downloadFile('/sys/common/download', val.fileName, { id: val.id })
},
//删除
actionDelete(record){
@@ -240,7 +237,7 @@
id:record.id
}
this.$confirm({
- title: '确认删除?',
+ title: this.$t('ConfirmDelete'),
content: '',
onOk:
async () => {
@@ -262,7 +259,6 @@
},
onSelectChange(selectedRowKeys,selectedRows){
this.selectedIds=selectedRowKeys.join(',')
- // console.log('seIds',this.selectedIds)
},
//上传确定按钮
diff --git a/jero-web/src/views/documentManage/ocr/modules/docTable.vue b/jero-web/src/views/documentManage/ocr/modules/docTable.vue
index 73178ff1c..852ed2ce8 100644
--- a/jero-web/src/views/documentManage/ocr/modules/docTable.vue
+++ b/jero-web/src/views/documentManage/ocr/modules/docTable.vue
@@ -12,26 +12,6 @@
@@ -39,26 +19,10 @@
:flag="'header'"
:url="url"
:showAction="false"
+ :OperationList="OperationList"
@onSelectChange="onSelectChange"
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-