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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
zyd
2022-10-24 16:10:10 +08:00
parent 8a290cbc24 feb0aa215c
commit a37070a052
2 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
+3 -3
View File
@@ -294,9 +294,9 @@ export default {
releaseTime: [
{required: true, message: "请选择计划标准发布日期", trigger: "change"}
],
FSDName: [
{ required: true, validator: validateFsOnlineFile, trigger: 'blur' }
],
// FSDName: [
// { required: true, validator: validateFsOnlineFile, trigger: 'blur' }
// ],
},
}
},
src/pages/processCenter/pages/creatProcess/qbfs/step6.vue
+12 -17
View File
@@ -1303,7 +1303,7 @@ export default {
selListRep2:[],
id:'',
standNum:'',
standStatus:'1', // 标准状态
standStatus:'2', // 标准状态
planId:'',
planStatus:'',
reviseStatus:'',
@@ -1967,20 +1967,13 @@ export default {
const bringData = standObj.data
const json = Object.assign(bringData, bringData.attrInfoMap,item);
this.qbfsForm = JSON.parse(JSON.stringify(json))
console.log(this.qbfsForm)
this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
this.qbfsForm['id'] = bringData.id
this.form.expirationDate = this.qbfsForm.expirationDate
this.form = this.qbfsForm
this.form.standStatus = '2'
this.commentText = this.form.commentText
this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName);
this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName);
this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
this.standardDrawer = false
this.verifySarStandard = true
this.formKey++
@@ -3007,6 +3000,7 @@ export default {
if (valid) {
this.isSubmit = true
// this.qbfsForm.commentText = this.commentText
this.form.commentText = this.commentText;
let jsons = JSON.stringify(this.form);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.$route.query.taskIds,
@@ -3037,6 +3031,7 @@ export default {
_this: this
}, res => {
if (res.ok) {
return
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
@@ -3046,14 +3041,14 @@ export default {
}, res => {
if (res.success) {
this.$message.success("操作成功");
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
// if (this.bpnId !== '') {
// let taskId = {
// id: this.bpnId
// }
// taskDel(taskId).then(res=>{
// return res
// })
// }
this.isSubmit = false;
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
}