From 2b87adf1eeac692f68478bcca07acc6acbf872ee Mon Sep 17 00:00:00 2001
From: Superman_Main <396572590@qq.com>
Date: Fri, 26 Nov 2021 10:48:18 +0800
Subject: [PATCH 1/4] feat:FOTON release
---
src/components/treeSelect/treeSelectNew.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/treeSelect/treeSelectNew.vue b/src/components/treeSelect/treeSelectNew.vue
index 35f323421..df83e5e61 100644
--- a/src/components/treeSelect/treeSelectNew.vue
+++ b/src/components/treeSelect/treeSelectNew.vue
@@ -139,7 +139,7 @@
isShowSelect: false, // 是否显示树状选择器
options: [],
selectedData: [], // 选中的节点
- style: 'width:' + this.width + 'px;' + 'height:100%;',
+ style: 'width:' + this.width + 'px;' + '',
selectStyle: 'width:100%;',
checkedIds: [],
checkedData: [],
From 9ed1437bf5308bdad7ebad69b9a7b344848e3893 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sat, 27 Nov 2021 19:03:10 +0800
Subject: [PATCH 2/4] commit
---
.../pages/creatProcess/bzrk/step1.vue | 22 +++++++++++++------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 4959aa198..e69de97e1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -164,13 +164,13 @@
实施日期
-
+
@@ -178,7 +178,7 @@
@@ -188,7 +188,7 @@
@@ -1283,6 +1283,7 @@
zbjbdFileList: [],
kwjFileList: [],
glwjFileList: [],
+ nodeList5: [],
filterText:'',
textStatusMap: {}, // 文本状态id与name对应
standardDrawer: false,
@@ -1406,9 +1407,9 @@
standSystemName: '',// 标准体系名称
gxhbq: '', // 标签
// 实施日期
- ssrq: '', // 实施日期(标准文本)
- xcxssrq: '', // 新车型实施日期(标准文本)
- zccssrq: '', // 在产车实施日期(标准文本)
+ ssrq: [], // 实施日期(标准文本)
+ xcxssrq: [], // 新车型实施日期(标准文本)
+ zccssrq: [], // 在产车实施日期(标准文本)
ssrqgj: '', // 实施日期(国际)
xcxssrqgj: '', // 新车型实施日期(国际)
zccssrqgj: '', // 在产车实施日期(国际)
@@ -1466,6 +1467,8 @@
zrUserName: '',
jlUserId: '',
jlUserName: '',
+ wssmr: '',
+ wssmrId: '',
applyUpdUserId: this.$store.getters.userInfo.userId,
applyUpdUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId,
@@ -2801,6 +2804,11 @@
position: relative;
overflow: hidden;
}
+ .prc-content-border {
+ /deep/ .el-input__inner {
+ padding-left: 30px;
+ }
+ }
/deep/ .el-dialog__body {
padding: 0 20px 10px;
color: #606266;
From fa4f1a37ba56a128ed86bce2f032bb194effa994 Mon Sep 17 00:00:00 2001
From: Superman_Main <396572590@qq.com>
Date: Sat, 27 Nov 2021 20:33:55 +0800
Subject: [PATCH 3/4] feat: There is no way the, online preview
---
public/static/onlyOffice/editor.html | 59 +++++-
public/static/onlyOffice/js/vue.min.js | 6 +
public/static/onlyOffice/onlinePreview.html | 199 ++++++++++++++++++
src/api/process.js | 9 +
src/components/CustomFormComponents/File.vue | 76 +++++--
.../CustomFormComponents/js/vue.min.js | 6 +
6 files changed, 324 insertions(+), 31 deletions(-)
create mode 100644 public/static/onlyOffice/js/vue.min.js
create mode 100644 public/static/onlyOffice/onlinePreview.html
create mode 100644 src/components/CustomFormComponents/js/vue.min.js
diff --git a/public/static/onlyOffice/editor.html b/public/static/onlyOffice/editor.html
index e60778481..d8200d73f 100644
--- a/public/static/onlyOffice/editor.html
+++ b/public/static/onlyOffice/editor.html
@@ -1,6 +1,6 @@
-
+
@@ -8,8 +8,10 @@
在线编辑
-
-
+
+
+
+
@@ -17,12 +19,46 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/api/process.js b/src/api/process.js
index bb866770b..cfab0cb4e 100644
--- a/src/api/process.js
+++ b/src/api/process.js
@@ -604,6 +604,15 @@ export function getConvertFileByAttId(data) {
})
}
+// 获取openOffice 在线预览文件
+export function getBusStandFileByAttId(data) {
+ return axios({
+ url: 'api/att/attFile/getBusStandFileByAttId',
+ method: 'get',
+ params: data
+ })
+}
+
// 未符合项跟踪修改状态
export function updateBaseInfo(data) {
return axios({
diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue
index 7f43379ab..5a64f5188 100644
--- a/src/components/CustomFormComponents/File.vue
+++ b/src/components/CustomFormComponents/File.vue
@@ -67,7 +67,8 @@