diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index 4bed4251c..dab32ce04 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -169,6 +169,7 @@
>
@@ -184,6 +186,7 @@
点击或拖拽上传文件
+
@@ -198,6 +201,8 @@ export default {
name: "bzdyStep1",
data() {
return {
+ progressType: false,
+ loadProgress: 0,
commentText: '',
nodeList: [],
nodeList2: [],
@@ -310,6 +315,10 @@ export default {
this.drawerTitle = title
this.modalshowflag = true
},
+ progressFile (event, file, fileList) {
+ let loadProgress = Math.floor(event.percent)
+ this.loadProgress = loadProgress
+ },
// 导入按钮 上传之前的钩子
beginImportFile (file) {
var filename = file.name
@@ -318,11 +327,13 @@ export default {
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
+ this.progressType = true
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS文件')
+ this.progressType = false
return false
}
// 判断文件上传大小
@@ -331,6 +342,7 @@ export default {
return true
} else {
this.$message.error('文件' + file.name + '大小不超过200M')
+ this.progressType = false
return false
}
return true
@@ -339,6 +351,8 @@ export default {
importFileSuccess (response, file) {
if (response.ok) {
this.fileMadel = false
+ this.loadProgress = 0
+ this.progressType = false
this.form.model = response.data.id
this.form.modelName = response.data.name
this.$message({
@@ -412,7 +426,7 @@ export default {
})
}
},
- mounted () {}
+ mounted () {},
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index ffb1fd8fe..162232581 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -102,12 +102,12 @@
width="100"
align="center">
-
-
+
+
+
+
+
+
{
item.unitDeptName = this.$store.getters.userInfo.orgName
- item.onlineData = ''
- item.newData = ''
- item.complianceState = ''
- item.oldNumber = ''
- item.complianceRequir = '1'
- item.changePoint = ''
- item.technicalRequir = ''
+ item.onlineData = item.onlineData || ''
+ item.newData = item.newData || ''
+ item.complianceState = item.complianceState || ''
+ item.oldNumber = item.oldNumber || ''
+ item.complianceRequir = item.complianceRequir || '1'
+ item.changePoint = item.changePoint || ''
+ item.technicalRequir = item.technicalRequir || ''
item.itemsTitle = item.itermsConditions
})
- console.log(2);
this.itemList = itemList
+ console.log(this.itemList)
this.loading = false
}).catch(e => {
})