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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
396572590@qq.com
2022-07-14 08:50:30 +08:00
parent f75a4d3773 32370c07e7
commit 7e123b6f2c
4 changed files with 74 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+18 -13
View File
@@ -373,20 +373,23 @@
this.foldFormFlag = !this.foldFormFlag this.foldFormFlag = !this.foldFormFlag
}, },
getData () { getData () {
const queryId = this.$route.query.bpnId
if(queryId !== null && queryId !== undefined && queryId !==''){
queryTaskFirst({ queryTaskFirst({
bpnId: this.$route.query.bpnId bpnId: this.$route.query.bpnId
}).then(res => { }).then(res => {
this.bpnId = this.$route.query.bpnId this.bpnId = this.$route.query.bpnId
let mes = JSON.parse(res.mes) let mes = JSON.parse(res.mes)
if (mes.form.date) { if (mes.form.date) {
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
} else { } else {
mes.form.date = '' mes.form.date = ''
} }
this.form = mes.form this.form = mes.form
this.roleForm = mes.roleForm this.roleForm = mes.roleForm
this.commentText1 = mes.commentText1 || '' this.commentText1 = mes.commentText1 || ''
}) })
}
}, },
checkedRole2 (data) { checkedRole2 (data) {
var idList = '' var idList = ''
@@ -597,9 +600,11 @@
let taskId = { let taskId = {
id: this.$route.query.bpnId id: this.$route.query.bpnId
} }
taskDel(taskId).then(res=>{ if(taskId !=='' && taskId !== undefined && taskId !== null){
taskDel(taskId).then(res=>{
return res return res
}) })
}
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
this.isSubmit = false this.isSubmit = false
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+5 -3
View File
@@ -589,9 +589,11 @@ export default {
let taskId = { let taskId = {
id: this.$route.query.bpnId id: this.$route.query.bpnId
} }
taskDel(taskId).then(res=>{ if(taskId !== '' && taskId !== undefined && taskId !== null){
return res taskDel(taskId).then(res=>{
}) return res
})
}
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
this.isSubmit = false this.isSubmit = false
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+19 -14
View File
@@ -862,22 +862,25 @@
this.itermsConditionsTitle = row.replace(/''/g, '\'') this.itermsConditionsTitle = row.replace(/''/g, '\'')
}, },
getData () { getData () {
const queryId =this.$route.query.bpnId
if(queryId !== null && queryId !== undefined && queryId !==''){
queryTaskFirst({ queryTaskFirst({
bpnId: this.$route.query.bpnId bpnId: this.$route.query.bpnId
}).then(res => { }).then(res => {
let mes = JSON.parse(res.mes) let mes = JSON.parse(res.mes)
this.bpnId = this.$route.query.bpnId this.bpnId = this.$route.query.bpnId
if (mes.form.date) { if (mes.form.date) {
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
} else { } else {
mes.form.date = '' mes.form.date = ''
} }
this.form = mes.form this.form = mes.form
this.roleForm = mes.roleForm this.roleForm = mes.roleForm
this.commentText1 = mes.commentText1 || '' this.commentText1 = mes.commentText1 || ''
this.itemList = mes.itemList this.itemList = mes.itemList
this.sarType = mes.sarType this.sarType = mes.sarType
}) })
}
}, },
setMap(data){ setMap(data){
data.forEach(item => { data.forEach(item => {
@@ -1136,9 +1139,11 @@
let taskId = { let taskId = {
id: this.$route.query.bpnId id: this.$route.query.bpnId
} }
if(taskId !== '' && taskId !== undefined && taskId !== null){
taskDel(taskId).then(res=>{ taskDel(taskId).then(res=>{
return res return res
}) })
}
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
}) })
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+32 -27
View File
@@ -661,30 +661,33 @@ export default {
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
}, },
getData() { getData() {
queryTaskFirst({ const queryId = this.$route.query.bpnId
bpnId: this.$route.query.bpnId if(queryId !== null && queryId !== undefined && queryId !==''){
}).then(res => { queryTaskFirst({
let mes = JSON.parse(res.mes) bpnId: this.$route.query.bpnId
console.log(mes); }).then(res => {
this.bpnId = this.$route.query.bpnId let mes = JSON.parse(res.mes)
if (mes.form.endTime) { console.log(mes);
mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD')) this.bpnId = this.$route.query.bpnId
} else { if (mes.form.endTime) {
mes.form.endTime = '' mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD'))
} } else {
this.addFjList = mes.filesId || mes.form.filesId || '' mes.form.endTime = ''
this.form.fjListName = mes.filesName }
this.form = mes.form this.addFjList = mes.filesId || mes.form.filesId || ''
this.roleForm = mes.roleForm this.form.fjListName = mes.filesName
this.commentText1 = mes.commentText1 || '' this.form = mes.form
if (this.form.standId) { this.roleForm = mes.roleForm
this.$http.get('SarStandItems/sar-stand-items/getFileTypeHG', { this.commentText1 = mes.commentText1 || ''
standId: this.form.standId if (this.form.standId) {
}, {}, res => { this.$http.get('SarStandItems/sar-stand-items/getFileTypeHG', {
this.textTypeList = res.data standId: this.form.standId
}) }, {}, res => {
} this.textTypeList = res.data
}) })
}
})
}
}, },
addZqyjList() { addZqyjList() {
this.title = '国内外标准库' this.title = '国内外标准库'
@@ -860,9 +863,11 @@ export default {
let taskId = { let taskId = {
id: this.$route.query.bpnId id: this.$route.query.bpnId
} }
taskDel(taskId).then(res=>{ if(taskId !== '' && taskId !== undefined && taskId !== null){
return res taskDel(taskId).then(res=>{
}) return res
})
}
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
}) })