合并分支 'fix_foton_20230613' 到 'master'
Fix foton 20230613 查看合并请求 laws-foton-slrs/foton-laws-system-front!92
This commit is contained in:
高嵩
@@ -2539,6 +2539,55 @@
|
||||
})
|
||||
}
|
||||
},
|
||||
ifStandCodebyStandName(standCode,standName){
|
||||
return new Promise((resolve, reject)=>{
|
||||
this.$http._postData('lawss/sarBussionessStand/ifStandCodebyStandName',{standCode,standName})
|
||||
.then(res => resolve(res))
|
||||
.catch(e => {
|
||||
throw new Error(e)
|
||||
})
|
||||
})
|
||||
},
|
||||
completeTask(){
|
||||
this.isSubmit = true
|
||||
this.saveLoading = true
|
||||
this.form.commentText = this.formTongGuo.commentText
|
||||
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
|
||||
this.form.topId = this.pId
|
||||
this.form.reviseStatus = 'buss2_'+this.form.standStatus
|
||||
this.form.textStatusBuss = '6jnqba2mby'
|
||||
// 修订时 清空历史版本文件
|
||||
if(this.form.standStatus==='2') {
|
||||
this.form.LSBBBUSSName = ''
|
||||
this.form.LSBBBUSS = ''
|
||||
}
|
||||
const json = JSON.stringify(this.form);
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: this.taskIds,
|
||||
userId : this.userId,
|
||||
json: json
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
// this.$message.success(res.message)
|
||||
// 流程提交之后，应该流转至待办任务页面
|
||||
this.isSubmit = false
|
||||
this.saveLoading = false
|
||||
this.processCreateBuss(json)
|
||||
// if(this.formTongGuo.approvalOpinion === '1'){
|
||||
// this.$message.warning("驳回成功")
|
||||
// this.isSubmit = false
|
||||
// // 流程提交之后，应该流转至待办任务页面
|
||||
// this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
||||
// }else{
|
||||
// this.processCreateLaws(json)
|
||||
// }
|
||||
}else {
|
||||
this.$message.success(res.message)
|
||||
}
|
||||
})
|
||||
},
|
||||
handleSubmit() {
|
||||
// this.getRule()
|
||||
// const val= this.form.country;
|
||||
@@ -2560,44 +2609,18 @@
|
||||
if (valid) {
|
||||
this.$refs['formTongGuo'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
this.saveLoading = true
|
||||
this.form.commentText = this.formTongGuo.commentText
|
||||
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
|
||||
this.form.topId = this.pId
|
||||
this.form.reviseStatus = 'buss2_'+this.form.standStatus
|
||||
this.form.textStatusBuss = '6jnqba2mby'
|
||||
// 修订时 清空历史版本文件
|
||||
if(this.form.standStatus==='2') {
|
||||
this.form.LSBBBUSSName = ''
|
||||
this.form.LSBBBUSS = ''
|
||||
if(this.form.standStatus === '1' || this.form.standStatus === '2'){
|
||||
this.ifStandCodebyStandName(this.form.standCode,this.form.standName)
|
||||
.then((res)=>{
|
||||
if(res.ok){
|
||||
this.completeTask()
|
||||
}else{
|
||||
this.$message.error(res.data)
|
||||
}
|
||||
})
|
||||
}else{
|
||||
this.completeTask()
|
||||
}
|
||||
const json = JSON.stringify(this.form);
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: this.taskIds,
|
||||
userId : this.userId,
|
||||
json: json
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
// this.$message.success(res.message)
|
||||
// 流程提交之后，应该流转至待办任务页面
|
||||
this.isSubmit = false
|
||||
this.saveLoading = false
|
||||
this.processCreateBuss(json)
|
||||
// if(this.formTongGuo.approvalOpinion === '1'){
|
||||
// this.$message.warning("驳回成功")
|
||||
// this.isSubmit = false
|
||||
// // 流程提交之后，应该流转至待办任务页面
|
||||
// this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
||||
// }else{
|
||||
// this.processCreateLaws(json)
|
||||
// }
|
||||
}else {
|
||||
this.$message.success(res.message)
|
||||
}
|
||||
})
|
||||
}})
|
||||
}else{
|
||||
this.$message.warning('请检查基础信息表单是否填写完整')
|
||||
|
||||
@@ -2647,6 +2647,52 @@
|
||||
this.rules.commentText[0].required = true;
|
||||
}
|
||||
},
|
||||
ifStandCodebyStandName(standCode,standName){
|
||||
return new Promise((resolve, reject)=>{
|
||||
this.$http._postData('lawss/sarBussionessStand/ifStandCodebyStandName',{standCode,standName})
|
||||
.then(res => resolve(res))
|
||||
.catch(e => {
|
||||
throw new Error(e)
|
||||
})
|
||||
})
|
||||
},
|
||||
completeTask(){
|
||||
this.isSubmit = true
|
||||
this.saveLoading = true
|
||||
this.form.commentText = this.formTongGuo.commentText
|
||||
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
|
||||
this.form.topId = this.pId
|
||||
this.form.reviseStatus = 'buss1_'+this.form.reviseStatus
|
||||
this.form.textStatusBuss = '6jnqba2mby'
|
||||
const json = JSON.stringify(this.form);
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: this.taskIds,
|
||||
userId : this.userId,
|
||||
json: json
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
// this.$message.success(res.message)
|
||||
// 流程提交之后，应该流转至待办任务页面
|
||||
this.isSubmit = false
|
||||
this.saveLoading = false
|
||||
this.processCreateBuss(json)
|
||||
// if(this.formTongGuo.approvalOpinion === '1'){
|
||||
// this.$message.warning("驳回成功")
|
||||
// this.isSubmit = false
|
||||
// // 流程提交之后，应该流转至待办任务页面
|
||||
// this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
||||
// }else{
|
||||
// this.processCreateLaws(json)
|
||||
// }
|
||||
}else {
|
||||
this.isSubmit = false
|
||||
this.saveLoading = false
|
||||
this.$message.success(res.message)
|
||||
}
|
||||
})
|
||||
},
|
||||
handleSubmit() {
|
||||
// this.getRule()
|
||||
// const val= this.form.country;
|
||||
@@ -2664,41 +2710,18 @@
|
||||
if (valid) {
|
||||
this.$refs['formTongGuo'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.isSubmit = true
|
||||
this.saveLoading = true
|
||||
this.form.commentText = this.formTongGuo.commentText
|
||||
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
|
||||
this.form.topId = this.pId
|
||||
this.form.reviseStatus = 'buss1_'+this.form.reviseStatus
|
||||
this.form.textStatusBuss = '6jnqba2mby'
|
||||
const json = JSON.stringify(this.form);
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
taskIds: this.taskIds,
|
||||
userId : this.userId,
|
||||
json: json
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
// this.$message.success(res.message)
|
||||
// 流程提交之后，应该流转至待办任务页面
|
||||
this.isSubmit = false
|
||||
this.saveLoading = false
|
||||
this.processCreateBuss(json)
|
||||
// if(this.formTongGuo.approvalOpinion === '1'){
|
||||
// this.$message.warning("驳回成功")
|
||||
// this.isSubmit = false
|
||||
// // 流程提交之后，应该流转至待办任务页面
|
||||
// this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
||||
// }else{
|
||||
// this.processCreateLaws(json)
|
||||
// }
|
||||
}else {
|
||||
this.isSubmit = false
|
||||
this.saveLoading = false
|
||||
this.$message.success(res.message)
|
||||
}
|
||||
})
|
||||
if(this.form.reviseStatus === '1' || this.form.reviseStatus === '2'){
|
||||
this.ifStandCodebyStandName(this.form.standCode,this.form.standName)
|
||||
.then((res)=>{
|
||||
if(res.ok){
|
||||
this.completeTask()
|
||||
}else{
|
||||
this.$message.error(res.data)
|
||||
}
|
||||
})
|
||||
}else{
|
||||
this.completeTask()
|
||||
}
|
||||
}
|
||||
})
|
||||
}else{
|
||||
|
||||
Reference in New Issue
Block a user