diff --git a/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue b/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue
index dcf6938..ed4aa75 100644
--- a/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue
+++ b/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue
@@ -185,11 +185,11 @@ export default {
width: 180
},
// 拆分状态
- {
- dataIndex: 'splitStatus_dictText',
- title: this.$t('docTool.split.splitState'),
- width: 150
- },
+ // {
+ // dataIndex: 'splitStatus_dictText',
+ // title: this.$t('docTool.split.splitState'),
+ // width: 150
+ // },
// 编辑人
// {
// dataIndex: 'author',
diff --git a/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue b/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue
index fa89baa..a20c6c3 100644
--- a/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue
+++ b/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue
@@ -36,10 +36,23 @@
- event.target.value = event.target.value.trim()"
- :maxLength="50"
- v-decorator="['fileType', validatorRules.fileType]" />
+
+
+
+
+
+ 请选择
+
+
+ {{ item.text || item.label }}
+
+
+
@@ -85,6 +98,16 @@ export default {
data () {
return {
StandardSource,
+ dictOptions: [
+ {
+ text: '发布稿',
+ value: '1'
+ },
+ {
+ text: '正文',
+ value: '2'
+ }
+ ],
width: 600,
visible: false,
confirmLoading: false,
@@ -123,6 +146,10 @@ export default {
}
},
methods: {
+ filterOption (input, option) {
+ const text = option.componentOptions.children[0].text || option.componentOptions.children[0].data.attrs.title
+ return text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+ },
open () {
this.visible = true
},
diff --git a/jero-web/src/views/documentTool/documentSplit/modules/splitIsInStorage.vue b/jero-web/src/views/documentTool/documentSplit/modules/splitIsInStorage.vue
index 3ee1f02..2093308 100644
--- a/jero-web/src/views/documentTool/documentSplit/modules/splitIsInStorage.vue
+++ b/jero-web/src/views/documentTool/documentSplit/modules/splitIsInStorage.vue
@@ -39,10 +39,23 @@
- event.target.value = event.target.value.trim()"
- :maxLength="50"
- v-decorator="['fileType', validatorRules.fileType]" />
+
+
+
+
+
+ 请选择
+
+
+ {{ item.text || item.label }}
+
+
+
@@ -89,6 +102,16 @@ export default {
visible: false,
confirmLoading: false,
form: this.$form.createForm(this),
+ dictOptions: [
+ {
+ text: '发布稿',
+ value: '1'
+ },
+ {
+ text: '正文',
+ value: '2'
+ }
+ ],
labelCol: {
xs: { span: 24 },
sm: { span: 6 }
@@ -123,6 +146,10 @@ export default {
}
},
methods: {
+ filterOption (input, option) {
+ const text = option.componentOptions.children[0].text || option.componentOptions.children[0].data.attrs.title
+ return text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+ },
handleStandardNumberChange (name) {
this.form.setFieldsValue({ title: name })
},
diff --git a/jero-web/src/views/onlyoffice/index.vue b/jero-web/src/views/onlyoffice/index.vue
index be86719..dbee661 100644
--- a/jero-web/src/views/onlyoffice/index.vue
+++ b/jero-web/src/views/onlyoffice/index.vue
@@ -21,7 +21,21 @@ export default {
methods: {
fileClick () {
getAction('/onlyOffice/saveEditFile', { model: 'model_qb' }).then((res) => {
-
+ if (res.success) {
+ getAction('/onlyOffice/processEditFile', { id: res.result.id }).then((val) => {
+ if (val.id) {
+ const oldFileName = '比亚迪企业标准'
+ const nowTime = new Date().getTime()
+ window.open('http://127.0.0.1:8080' + '/editor?fileId=' + val.id + '&pid=' + val.pid +
+ '&taskIds=' + val.taskId + '&editType=' + val.editType + '&oldFileName=' + oldFileName +
+ '&fileType=' + 'docx' + '&attId=' + val.id + '&fileUrl=' + val.downLoadUrl +
+ '&key=' + val.id + nowTime + '&filePath=' + val.editFilePath + '&fileName=' + val.fileName +
+ '&userId=' + val.userId + '&userName=' + val.userName + '&isEdit=123')
+ }
+ })
+ } else {
+ this.$message.warning('获取文件失败')
+ }
})
}
}