From f78cc7201b564c2906ca27f380de969956633bd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 1 Mar 2022 16:28:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
=?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E4=BD=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../qbzxdjhgk/component/cancel.vue | 36 +++++++++---------
.../qbzxdjhgk/component/delay.vue | 36 +++++++++---------
.../qbzxdjhgk/component/establish.vue | 22 +++++------
.../qbzxdjhgk/component/merge.vue | 38 +++++++++----------
.../qbzxdjhgk/component/rename.vue | 36 +++++++++---------
.../pages/creatProcess/qbzxdjhgk/step1-5.vue | 22 +++++------
.../pages/creatProcess/qbzxdjhgk/step2.vue | 22 +++++------
.../pages/creatProcess/qbzxdjhgk/step3.vue | 22 +++++------
.../pages/creatProcess/qbzxdjhgk/step4.vue | 22 +++++------
.../pages/creatProcess/qbzxdjhgk/step5.vue | 22 +++++------
10 files changed, 139 insertions(+), 139 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
index 3929de539..4d36599a6 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
@@ -47,6 +47,17 @@
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index 7617ca8c8..3f0280a71 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -70,6 +70,17 @@
+
+
+
+
+
+
-
-
-
@@ -148,17 +151,6 @@
placeholder="请选择标准发布时间">
-
-
-
-
-
-
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
index 9e7431fed..c93a389fb 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
@@ -46,6 +46,17 @@
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
Date: Tue, 1 Mar 2022 18:01:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92?=
=?UTF-8?q?=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/qbzxdlx/step1.vue | 71 ++++++++++++++++++-
1 file changed, 70 insertions(+), 1 deletion(-)
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
index e0ba7e6fa..257716245 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
@@ -332,12 +332,32 @@
@checkedRole="checkedRole"
:nodeList="nodeList"
>
+
+
+
+
+
+
+
@@ -358,6 +378,10 @@ export default {
name: "qbzxdlxStep1",
data() {
return {
+ importModalshowflag: false, //导入弹窗
+ showUploadlist: true, // 导入过程中新增数据时,如果数据错误,不出现导入列表
+ importExcelUrl: 'api/att/attFile/upload', // 导入EXCEL文档
+ defaultFileList: [], // 默认显示
uploadFileListPath: "api/att/attFile/upload", // 上传的地址
fileInfoList: [], // 上传的附件
fileIds: [], // 上传的附件
@@ -483,6 +507,51 @@ export default {
})
},
methods: {
+ onFileExceed() {
+ this.$message.error('最多上传一个文件')
+ },
+ // 导入标准数据成功后执行
+ importFileSuccess (res, file, fileList) {
+ let files = {}
+ if (res.ok) {
+ files.attId = res.data.attId
+ files.fileName = res.data.name
+ if (res.data.standNum != null && res.data.standNum !== '') {
+ files.standNumSplit = res.data.standNum
+ }
+ if (res.data.standName != null && res.data.standName !== '') {
+ files.standNameSplit = res.data.standName
+ }
+ this.defaultFileList.push(file)
+ const _formData = new FormData()
+ _formData.append('standNumSplit', files.standNumSplit)
+ _formData.append('standNameSplit', files.standNameSplit)
+ _formData.append('fileType', files.fileType)
+ _formData.append('file', file.raw)
+ this.$http.postData('importWkExcel/importData', _formData,{
+ _this: this
+ }, res => {
+ if(res.ok){
+ this.qblx_pageData.qblxData = res.data
+ }else{
+ alert(res.message)
+ }
+ })
+ this.$message.success('文件上传成功')
+ this.importModalshowflag = false
+ this.$nextTick(() => {
+ this.$refs.importFileAboutStand.clearFiles()
+ })
+ } else {
+ this.defaultFileList = []
+ this.uploadFilesplitEo.attId = ''
+ this.$message.error(res.message)
+ }
+ },
+ //删除文件时执行
+ removeOneFile(){
+
+ },
getWorkBtn(){
this.page = 1
this.getWorkData()
@@ -787,7 +856,7 @@ export default {
/** 数据导入到列表 */
uploadQblx() {
-
+ this.importModalshowflag = true
},