FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-01-19 13:16:39 +08:00
parent fcfe34637a 900389a578
commit 8df028e561
19 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+3 -2
View File
@@ -1101,6 +1101,7 @@
}
}]
},
bpnId: this.$route.query.bpnId,
fileList: [],
FBGBUSSFileList: [],
BZSMBUSSFileList: [],
@@ -2564,7 +2565,7 @@
this.saveLoading = true
let _formData = new FormData()
this.fileInfoHandle()
// _formData.append('id', this.bpnId)
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss2')
@@ -2578,7 +2579,7 @@
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+2 -2
View File
@@ -2254,7 +2254,7 @@
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss2')
@@ -2268,7 +2268,7 @@
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue
+2 -2
View File
@@ -2196,7 +2196,7 @@
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss2')
@@ -2210,7 +2210,7 @@
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+2 -2
View File
@@ -2259,7 +2259,7 @@
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss2')
@@ -2273,7 +2273,7 @@
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
+2 -2
View File
@@ -2334,7 +2334,7 @@
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss2')
@@ -2351,7 +2351,7 @@
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+2 -2
View File
@@ -2350,7 +2350,7 @@
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss2')
@@ -2364,7 +2364,7 @@
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+2 -2
View File
@@ -2259,7 +2259,7 @@
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss2')
@@ -2273,7 +2273,7 @@
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+2 -2
View File
@@ -2350,7 +2350,7 @@
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss2')
@@ -2364,7 +2364,7 @@
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+3 -2
View File
@@ -1190,6 +1190,7 @@
}
}]
},
bpnId: this.$route.query.bpnId,
fileList: [],
FBGBUSSFileList: [],
BZSMBUSSFileList: [],
@@ -2700,7 +2701,7 @@
this.saveLoading = true
let _formData = new FormData()
this.fileInfoHandle()
// _formData.append('id', this.bpnId)
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss1')
@@ -2714,7 +2715,7 @@
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
+2 -2
View File
@@ -2083,7 +2083,7 @@
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'laws1')
@@ -2103,7 +2103,7 @@
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+2 -2
View File
@@ -2215,7 +2215,7 @@
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss1')
@@ -2230,7 +2230,7 @@
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+2 -2
View File
@@ -2198,7 +2198,7 @@
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss1')
@@ -2213,7 +2213,7 @@
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+2 -2
View File
@@ -2286,7 +2286,7 @@
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss1')
@@ -2301,7 +2301,7 @@
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+2 -2
View File
@@ -2504,7 +2504,7 @@
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss1')
@@ -2521,7 +2521,7 @@
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+2 -2
View File
@@ -2637,7 +2637,7 @@
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss1')
@@ -2652,7 +2652,7 @@
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+2 -3
View File
@@ -325,7 +325,6 @@
@over2="handle1"
>
</ProcessFooter>
</ProcessFooter>
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
<el-upload
multiple
@@ -2310,7 +2309,7 @@
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss1')
@@ -2325,7 +2324,7 @@
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+2 -2
View File
@@ -2296,7 +2296,7 @@
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss1')
@@ -2311,7 +2311,7 @@
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+2 -2
View File
@@ -2286,7 +2286,7 @@
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss1')
@@ -2301,7 +2301,7 @@
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+2 -2
View File
@@ -2637,7 +2637,7 @@
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', 'buss1')
@@ -2652,7 +2652,7 @@
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})