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

feat: There is no way the, 保存当前流程

Browse Source
This commit is contained in:
super_liu
2022-03-28 17:51:47 +08:00
parent 21deb19572
commit 9fab8f5307
19 changed files with 824 additions and 1148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
+30 -34
View File
@@ -159,7 +159,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst,taskDel,queryTaskFirst,processEditFile } from "api/process"; import { changeAssigneeNew, inboundLiaisonDetail,saveTaskForPub, saveTaskFirst,taskDel,queryTaskFirst,processEditFile } from "api/process";
import formList from './common/formList.vue' import formList from './common/formList.vue'
export default { export default {
@@ -303,10 +303,6 @@ export default {
} }
}, },
mounted() { mounted() {
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.getDataS()
}
this.processTable() this.processTable()
this.getData() this.getData()
}, },
@@ -442,32 +438,26 @@ export default {
}) })
}) })
}, },
getDataS(){ getDataS(mesg){
queryTaskFirst({ this.qbfsForm = mesg.qbfsForm
bpnId: this.$route.query.bpnId this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
}).then(res => { this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
let mes = JSON.parse(res.mes) this.qbfsForm['id'] = mesg.qbfsForm.id
console.log(mes) this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS'])
this.qbfsForm = mes.qbfsForm this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS'])
this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS'])
this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
this.qbfsForm['id'] = mes.qbfsForm.id this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS']) this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS']) this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName);
this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS']) this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName);
this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName); this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName); this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName);
this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName); this.standardDrawer = false
this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName); this.verifySarStandard = true
this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName); this.commentText = mesg.commentText
this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName); this.formKey++
this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName); this.$forceUpdate()
this.standardDrawer = false
this.verifySarStandard = true
this.commentText = mes.commentText
this.formKey++
this.$forceUpdate()
});
}, },
getData() { getData() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -476,9 +466,14 @@ export default {
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
}).then(res => { }).then(res => {
if (res) { if (res) {
debugger
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm) if (processForm.qbfsForm === undefined) {
} this.getFormFieldList(processForm)
} else {
//表单文件处理
this.getDataS(processForm)
} }
}).catch(e => { }).catch(e => {
}) })
}) })
@@ -541,13 +536,14 @@ export default {
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName) _formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('taskIds', this.$route.query.taskIds)
_formData.append('prcType', 'buss3') _formData.append('prcType', 'buss3')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
taskInfo: '复审', taskInfo: '复审',
qbfsForm: this.qbfsForm, qbfsForm: this.qbfsForm,
commentText: this.commentText commentText: this.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
+13 -17
View File
@@ -159,7 +159,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst,taskDel,queryTaskFirst,processEditFile } from "api/process"; import { changeAssigneeNew, inboundLiaisonDetail,saveTaskForPub, saveTaskFirst,taskDel,queryTaskFirst,processEditFile } from "api/process";
import formList from './common/formList.vue' import formList from './common/formList.vue'
export default { export default {
@@ -273,10 +273,6 @@ export default {
} }
}, },
mounted() { mounted() {
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.getDataS()
}
this.processTable() this.processTable()
this.getData() this.getData()
}, },
@@ -400,16 +396,11 @@ export default {
}) })
}) })
}, },
getDataS(){ getDataS(mesg){
queryTaskFirst({ this.qbfsForm = mesg.qbfsForm
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
console.log(mes)
this.qbfsForm = mes.qbfsForm
this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
this.qbfsForm['id'] = mes.qbfsForm.id this.qbfsForm['id'] = mesg.qbfsForm.id
this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS']) this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS'])
this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS']) this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS'])
this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS']) this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS'])
@@ -422,10 +413,9 @@ export default {
this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName); this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName);
this.standardDrawer = false this.standardDrawer = false
this.verifySarStandard = true this.verifySarStandard = true
this.commentText = mes.commentText this.commentText = mesg.commentText
this.formKey++ this.formKey++
this.$forceUpdate() this.$forceUpdate()
});
}, },
getData() { getData() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -435,7 +425,12 @@ export default {
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm) if (processForm.qbfsForm === undefined) {
this.getFormFieldList(processForm)
} else {
//表单文件处理
this.getDataS(processForm)
}
} }
}).catch(e => { }).catch(e => {
}) })
@@ -522,13 +517,14 @@ export default {
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName) _formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('taskIds', this.$route.query.taskIds)
_formData.append('prcType', 'buss3') _formData.append('prcType', 'buss3')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
taskInfo: '汇总', taskInfo: '汇总',
qbfsForm: this.qbfsForm, qbfsForm: this.qbfsForm,
commentText: this.commentText commentText: this.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue
+29 -33
View File
@@ -159,7 +159,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { changeAssigneeNew, inboundLiaisonDetail, saveTaskFirst,taskDel,queryTaskFirst,processEditFile } from "api/process"; import { changeAssigneeNew, inboundLiaisonDetail, saveTaskForPub,saveTaskFirst,taskDel,queryTaskFirst,processEditFile } from "api/process";
import formList from './common/formList.vue' import formList from './common/formList.vue'
export default { export default {
@@ -273,10 +273,6 @@ export default {
} }
}, },
mounted() { mounted() {
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.getDataS()
}
this.processTable() this.processTable()
this.getData() this.getData()
}, },
@@ -400,31 +396,26 @@ export default {
}) })
}) })
}, },
getDataS(){ getDataS(mesg){
queryTaskFirst({ this.qbfsForm = mesg.qbfsForm
bpnId: this.$route.query.bpnId this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
}).then(res => { this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
let mes = JSON.parse(res.mes) this.qbfsForm['id'] = mesg.qbfsForm.id
this.qbfsForm = mes.qbfsForm this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS'])
this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS'])
this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS'])
this.qbfsForm['id'] = mes.qbfsForm.id this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS']) this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS']) this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS']) this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName);
this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName); this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName);
this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName); this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName); this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName);
this.QTWJBUSSFileList=this.assemble(this.qbfsForm.QTWJBUSS,this.qbfsForm.QTWJBUSSName); this.standardDrawer = false
this.GLWJBUSSFileList=this.assemble(this.qbfsForm.GLWJBUSS,this.qbfsForm.GLWJBUSSName); this.verifySarStandard = true
this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName); this.commentText = mesg.commentText
this.FSDList=this.assemble(this.qbfsForm.FSD,this.qbfsForm.FSDName); this.formKey++
this.standardDrawer = false this.$forceUpdate()
this.verifySarStandard = true
this.commentText = mes.commentText
this.formKey++
this.$forceUpdate()
});
}, },
getData() { getData() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -434,8 +425,12 @@ export default {
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm) if (processForm.qbfsForm === undefined) {
} this.getFormFieldList(processForm)
} else {
//表单文件处理
this.getDataS(processForm)
} }
}).catch(e => { }).catch(e => {
}) })
}) })
@@ -521,13 +516,14 @@ export default {
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName) _formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('taskIds', this.$route.query.taskIds)
_formData.append('prcType', 'buss3') _formData.append('prcType', 'buss3')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
taskInfo: '重新汇总', taskInfo: '重新汇总',
qbfsForm: this.qbfsForm, qbfsForm: this.qbfsForm,
commentText: this.commentText commentText: this.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+44 -66
View File
@@ -586,7 +586,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList,taskDel} from "api/process"; import {saveTaskForPub,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList,taskDel} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
let Base64 = require('js-base64').Base64; let Base64 = require('js-base64').Base64;
@@ -1365,32 +1365,22 @@
if (!value) return true; if (!value) return true;
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
getTaskId () { getTaskId (mesg) {
if(this.$route.query.bpnId){ this.form = mesg.form
queryTaskFirst({ this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
bpnId: this.$route.query.bpnId this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
}).then(res => { this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
this.verifySarStandard = this.$route.query.verifySarStandard this.getStandInfoByReviseStatus()
let mes = JSON.parse(res.mes) this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.form = mes.form this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')', this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')', this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.getStandInfoByReviseStatus() this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.footFileList=this.assemble(this.form.footFile,this.form.footFileName); this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.roleForm = mesg.roleForm
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); this.formTongGuo.commentText = mesg.commentText
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.formKey++
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.formKey++
})
}else {
this.form.XCSJBUSS = this.dateFormatter()
}
}, },
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data){ setMap(data){
@@ -2267,15 +2257,16 @@
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('taskIds', this.taskIds)
_formData.append('prcType', 'buss2') _formData.append('prcType', 'buss2')
_formData.append('prcName', '企标制修订-产品标准') _formData.append('prcName', '企标制修订-产品标准')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
taskInfo: this.taskInfo, taskInfo: this.taskInfo,
form: this.form, form: this.form,
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.commentText commentText: this.formTongGuo.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
@@ -2519,8 +2510,8 @@
this.form.prcName = this.prcName this.form.prcName = this.prcName
this.form.issueTime = this.dateFormatter() this.form.issueTime = this.dateFormatter()
this.form['id'] = item.id this.form['id'] = item.id
this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')', this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')', this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName); this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName); this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName); this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
@@ -2528,6 +2519,12 @@
this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName); this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
this.XGDFileList=this.assemble(item.XGD,item.XGDName); this.XGDFileList=this.assemble(item.XGD,item.XGDName);
this.getStandInfoByReviseStatus() this.getStandInfoByReviseStatus()
const dateArr = []
if(item.commentCycleStart && item.commentCycleEnd){
dateArr[0] = item.commentCycleStart
dateArr[1] = item.commentCycleEnd
this.commentCycleDate = dateArr
}
this.formKey++ this.formKey++
}) })
}, },
@@ -2551,14 +2548,12 @@
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
const dateArr = [] if (processForm.form === undefined) {
if(processForm.commentCycleStart && processForm.commentCycleEnd){ this.getFormFieldList(processForm)
dateArr[0] = processForm.commentCycleStart } else {
dateArr[1] = processForm.commentCycleEnd //表单文件处理
this.commentCycleDate = dateArr this.getTaskId(processForm)
} }
this.getFormFieldList(processForm)
this.formKey++
} }
}).catch(e => { }).catch(e => {
}) })
@@ -2628,38 +2623,21 @@
}, },
processTable () { processTable () {
this.$nextTick(() => { this.$http.get("lawss/activiti/get_list_by_instance", {
Promise.all([this.getTaskId()]).then((value) => { prcNum: this.$route.query.prcNum,
if(value[0] &&value.length > 0){ sortWord: this.shunxu ? this.paixu : "",
let mes = JSON.parse(value[0].mes) shunxu: this.shunxu
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) }, {
this.form = mes.form loading: "loading",
this.taskIds = mes.taskIds; _this: this
this.pId = mes.pId; }, res => {
this.userId = mes.userId; this.detailData = res
this.prcNum = mes.prcNum; }, e => {
this.prcName = mes.prcName;
this.roleForm = mes.roleForm
this.commentText = mes.commentText
}
this.loading = true
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}, {
loading: 'loading',
_this: this
}, res => {
this.detailData = res
this.loading = false
}, e => {})
})
}) })
}, },
}, },
mounted () { mounted () {
this.getTaskId() // this.getTaskId()
this.getData() this.getData()
this.processTable() this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+47 -69
View File
@@ -630,7 +630,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process"; import {saveTaskForPub,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
let Base64 = require('js-base64').Base64; let Base64 = require('js-base64').Base64;
@@ -1425,29 +1425,19 @@
if (!value) return true; if (!value) return true;
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
getTaskId () { getTaskId (mesg) {
if(this.$route.query.bpnId){ this.form = mesg.form
queryTaskFirst({ this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
bpnId: this.$route.query.bpnId this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
}).then(res => { this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.verifySarStandard = this.$route.query.verifySarStandard this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
let mes = JSON.parse(res.mes) this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.form = mes.form this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.footFileList=this.assemble(this.form.footFile,this.form.footFileName); this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.roleForm = mesg.roleForm
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); this.formTongGuo.commentText = mesg.commentText
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.formKey++
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.formKey++
})
}else {
this.form.XCSJBUSS = this.dateFormatter()
}
}, },
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data){ setMap(data){
@@ -2362,15 +2352,16 @@
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('taskIds', this.taskIds)
_formData.append('prcType', 'buss2') _formData.append('prcType', 'buss2')
_formData.append('prcName', '企标制修订-产品标准') _formData.append('prcName', '企标制修订-产品标准')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
taskInfo: this.taskInfo, taskInfo: this.taskInfo,
form: this.form, form: this.form,
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.commentText commentText: this.formTongGuo.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
@@ -2572,6 +2563,20 @@
this.form.prcNum = this.prcNum this.form.prcNum = this.prcNum
this.form.prcName = this.prcName this.form.prcName = this.prcName
this.form['id'] = item.id this.form['id'] = item.id
const dateArr = []
if(item.commentCycleStart && item.commentCycleEnd){
dateArr[0] = item.commentCycleStart
dateArr[1] = item.commentCycleEnd
this.commentCycleDate = dateArr
}
this.footFileList=this.assemble(item.footFile,item.footFileName);
this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
this.XGDFileList=this.assemble(item.XGD,item.XGDName);
this.formKey++ this.formKey++
}) })
}, },
@@ -2596,22 +2601,12 @@
if (res) { if (res) {
this.taskInfo = '企标编写汇总修订' this.taskInfo = '企标编写汇总修订'
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
const dateArr = [] if (processForm.form === undefined) {
if(processForm.commentCycleStart && processForm.commentCycleEnd){ this.getFormFieldList(processForm)
dateArr[0] = processForm.commentCycleStart } else {
dateArr[1] = processForm.commentCycleEnd //表单文件处理
this.commentCycleDate = dateArr this.getTaskId(processForm)
} }
this.getFormFieldList(processForm)
this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
this.formKey++
} }
}).catch(e => { }).catch(e => {
}) })
@@ -2619,38 +2614,21 @@
} }
}, },
processTable () { processTable () {
this.$nextTick(() => { this.$http.get("lawss/activiti/get_list_by_instance", {
Promise.all([this.getTaskId()]).then((value) => { prcNum: this.$route.query.prcNum,
if(value[0] &&value.length > 0){ sortWord: this.shunxu ? this.paixu : "",
let mes = JSON.parse(value[0].mes) shunxu: this.shunxu
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) }, {
this.form = mes.form loading: "loading",
this.taskIds = mes.taskIds; _this: this
this.pId = mes.pId; }, res => {
this.userId = mes.userId; this.detailData = res
this.prcNum = mes.prcNum; }, e => {
this.prcName = mes.prcName;
this.roleForm = mes.roleForm
this.commentText = mes.commentText
}
this.loading = true
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}, {
loading: 'loading',
_this: this
}, res => {
this.detailData = res
this.loading = false
}, e => {})
})
}) })
}, },
}, },
mounted () { mounted () {
this.getTaskId() // this.getTaskId()
this.getData() this.getData()
this.processTable() this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
+44 -66
View File
@@ -717,7 +717,7 @@
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig' import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process"; import {saveTaskForPub,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
import {getEvaluationIndex} from "api/businessApi"; import {getEvaluationIndex} from "api/businessApi";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
@@ -1665,27 +1665,17 @@
if (!value) return true; if (!value) return true;
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
getTaskId () { getTaskId (mesg) {
if(this.$route.query.bpnId){ this.form = mes.form
queryTaskFirst({ this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
bpnId: this.$route.query.bpnId this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
}).then(res => { this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
this.verifySarStandard = this.$route.query.verifySarStandard this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
let mes = JSON.parse(res.mes) this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.form = mes.form this.summaryList=this.assemble(mesg.summary,mesg.summaryName);
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.roleForm = mesg.roleForm
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); this.formTongGuo.commentText = mesg.commentText
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.summaryList=this.assemble(mes.summary,mes.summaryName);
this.roleForm = mes.roleForm
this.formTongGuo.commentText = mes.commentText
})
}else {
this.form.XCSJBUSS = this.dateFormatter()
}
}, },
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data){ setMap(data){
@@ -2522,6 +2512,7 @@
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('taskIds', this.taskIds)
_formData.append('prcType', 'buss2') _formData.append('prcType', 'buss2')
_formData.append('prcName', '企标制修订-技术标准') _formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
@@ -2533,7 +2524,7 @@
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.formTongGuo.commentText commentText: this.formTongGuo.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
@@ -2722,6 +2713,20 @@
this.form.prcNum = this.prcNum this.form.prcNum = this.prcNum
this.form.prcName = this.prcName this.form.prcName = this.prcName
this.form['id'] = item.id this.form['id'] = item.id
const dateArr = []
if(item.commentCycleStart && item.commentCycleEnd){
dateArr[0] = item.commentCycleStart
dateArr[1] = item.commentCycleEnd
this.commentCycleDate = dateArr
}
this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
this.summaryList=this.assemble(item.summary,item.summaryName);
this.XGDFileList=this.assemble(item.XGD,item.XGDName);
}) })
}, },
assemble(ids,names){ assemble(ids,names){
@@ -2767,21 +2772,12 @@
if (res) { if (res) {
this.taskInfo = '会签征求意见' this.taskInfo = '会签征求意见'
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
const dateArr = [] if (processForm.form === undefined) {
if(processForm.commentCycleStart && processForm.commentCycleEnd){ this.getFormFieldList(processForm)
dateArr[0] = processForm.commentCycleStart } else {
dateArr[1] = processForm.commentCycleEnd //表单文件处理
this.commentCycleDate = dateArr this.getTaskId(processForm)
} }
this.getFormFieldList(processForm)
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.summaryList=this.assemble(processForm.summary,processForm.summaryName);
this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
} }
}).catch(e => { }).catch(e => {
}) })
@@ -2789,39 +2785,21 @@
} }
}, },
processTable () { processTable () {
this.$nextTick(() => { this.$http.get("lawss/activiti/get_list_by_instance", {
Promise.all([this.getTaskId()]).then((value) => { prcNum: this.$route.query.prcNum,
if(value[0] &&value.length > 0){ sortWord: this.shunxu ? this.paixu : "",
let mes = JSON.parse(value[0].mes) shunxu: this.shunxu
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) }, {
this.form = mes.form loading: "loading",
this.taskIds = mes.taskIds; _this: this
this.pId = mes.pId; }, res => {
this.userId = mes.userId; this.detailData = res
this.prcNum = mes.prcNum; }, e => {
this.prcName = mes.prcName;
this.roleForm = mes.roleForm
this.commentText = mes.commentText
}
this.loading = true
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}, {
loading: 'loading',
_this: this
}, res => {
this.detailData = res
this.loading = false
}, e => {})
})
}) })
}, },
}, },
mounted () { mounted () {
console.log(this.$store.getters.userInfo) // this.getTaskId()
this.getTaskId()
this.getData() this.getData()
this.processTable() this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+37 -42
View File
@@ -700,7 +700,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process"; import {saveTaskForPub,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
let Base64 = require('js-base64').Base64; let Base64 = require('js-base64').Base64;
@@ -1517,29 +1517,19 @@
if (!value) return true; if (!value) return true;
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
getTaskId () { getTaskId (mesg) {
if(this.$route.query.bpnId){ this.form = mesg.form
queryTaskFirst({ this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
bpnId: this.$route.query.bpnId this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
}).then(res => { this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.verifySarStandard = this.$route.query.verifySarStandard this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
let mes = JSON.parse(res.mes) this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.form = mes.form this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.footFileList=this.assemble(this.form.footFile,this.form.footFileName); this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.roleForm = mesg.roleForm
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); this.formTongGuo.commentText = mesg.commentText
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.formKey++
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.formKey++
})
}else {
this.form.XCSJBUSS = this.dateFormatter()
}
}, },
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data){ setMap(data){
@@ -2454,15 +2444,16 @@
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('taskIds', this.taskIds)
_formData.append('prcType', 'buss2') _formData.append('prcType', 'buss2')
_formData.append('prcName', '企标制修订-产品标准') _formData.append('prcName', '企标制修订-产品标准')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
taskInfo: this.taskInfo, taskInfo: this.taskInfo,
form: this.form, form: this.form,
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.commentText commentText: this.formTongGuo.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
@@ -2663,6 +2654,20 @@
this.form.prcNum = this.prcNum this.form.prcNum = this.prcNum
this.form.prcName = this.prcName this.form.prcName = this.prcName
this.form['id'] = item.id this.form['id'] = item.id
const dateArr = []
if(item.commentCycleStart && item.commentCycleEnd){
dateArr[0] = item.commentCycleStart
dateArr[1] = item.commentCycleEnd
this.commentCycleDate = dateArr
}
this.footFileList=this.assemble(item.footFile,item.footFileName);
this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
this.XGDFileList=this.assemble(item.XGD,item.XGDName);
this.formKey++ this.formKey++
}) })
}, },
@@ -2687,22 +2692,12 @@
if (res) { if (res) {
this.taskInfo = '意见汇总及标准修改' this.taskInfo = '意见汇总及标准修改'
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
const dateArr = [] if (processForm.form === undefined) {
if(processForm.commentCycleStart && processForm.commentCycleEnd){ this.getFormFieldList(processForm)
dateArr[0] = processForm.commentCycleStart } else {
dateArr[1] = processForm.commentCycleEnd //表单文件处理
this.commentCycleDate = dateArr this.getTaskId(processForm)
} }
this.getFormFieldList(processForm)
this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
this.formKey++
} }
}).catch(e => { }).catch(e => {
}) })
@@ -2741,7 +2736,7 @@
}, },
}, },
mounted () { mounted () {
this.getTaskId() // this.getTaskId()
this.getData() this.getData()
this.processTable() this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+37 -42
View File
@@ -630,7 +630,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process"; import {saveTaskForPub, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
let Base64 = require('js-base64').Base64; let Base64 = require('js-base64').Base64;
@@ -1426,29 +1426,19 @@
if (!value) return true; if (!value) return true;
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
getTaskId () { getTaskId (mesg) {
if(this.$route.query.bpnId){ this.form = mesg.form
queryTaskFirst({ this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
bpnId: this.$route.query.bpnId this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
}).then(res => { this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.verifySarStandard = this.$route.query.verifySarStandard this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
let mes = JSON.parse(res.mes) this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.form = mes.form this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.footFileList=this.assemble(this.form.footFile,this.form.footFileName); this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.roleForm = mesg.roleForm
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); this.formTongGuo.commentText = mesg.commentText
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.formKey++
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.formKey++
})
}else {
this.form.XCSJBUSS = this.dateFormatter()
}
}, },
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data){ setMap(data){
@@ -2363,15 +2353,16 @@
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('taskIds', this.taskIds)
_formData.append('prcType', 'buss2') _formData.append('prcType', 'buss2')
_formData.append('prcName', '企标制修订-产品标准') _formData.append('prcName', '企标制修订-产品标准')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
taskInfo: this.taskInfo, taskInfo: this.taskInfo,
form: this.form, form: this.form,
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.commentText commentText: this.formTongGuo.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
@@ -2573,6 +2564,20 @@
this.form.prcNum = this.prcNum this.form.prcNum = this.prcNum
this.form.prcName = this.prcName this.form.prcName = this.prcName
this.form['id'] = item.id this.form['id'] = item.id
const dateArr = []
if(item.commentCycleStart && item.commentCycleEnd){
dateArr[0] = item.commentCycleStart
dateArr[1] = item.commentCycleEnd
this.commentCycleDate = dateArr
}
this.footFileList=this.assemble(item.footFile,item.footFileName);
this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
this.XGDFileList=this.assemble(item.XGD,item.XGDName);
this.formKey++ this.formKey++
}) })
}, },
@@ -2597,22 +2602,12 @@
if (res) { if (res) {
this.taskInfo = '企标编写汇总修订' this.taskInfo = '企标编写汇总修订'
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
const dateArr = [] if (processForm.form === undefined) {
if(processForm.commentCycleStart && processForm.commentCycleEnd){ this.getFormFieldList(processForm)
dateArr[0] = processForm.commentCycleStart } else {
dateArr[1] = processForm.commentCycleEnd //表单文件处理
this.commentCycleDate = dateArr this.getTaskId(processForm)
} }
this.getFormFieldList(processForm)
this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
this.formKey++
} }
}).catch(e => { }).catch(e => {
}) })
@@ -2651,7 +2646,7 @@
}, },
}, },
mounted () { mounted () {
this.getTaskId() // this.getTaskId()
this.getData() this.getData()
this.processTable() this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+48 -69
View File
@@ -706,7 +706,8 @@
inboundLiaisonDetail, inboundLiaisonDetail,
processModelHisOneCount, processModelHisOneCount,
queryTaskFirst, queryTaskFirst,
saveTaskFirst saveTaskFirst,
saveTaskForPub
} from "api/process"; } from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
@@ -1525,29 +1526,19 @@
if (!value) return true; if (!value) return true;
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
getTaskId () { getTaskId (mesg) {
if(this.$route.query.bpnId){ this.form = mesg.form
queryTaskFirst({ this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
bpnId: this.$route.query.bpnId this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
}).then(res => { this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.verifySarStandard = this.$route.query.verifySarStandard this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
let mes = JSON.parse(res.mes) this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.form = mes.form this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.footFileList=this.assemble(this.form.footFile,this.form.footFileName); this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.roleForm = mesg.roleForm
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); this.formTongGuo.commentText = mesg.commentText
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.formKey++
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.formKey++
})
}else {
this.form.XCSJBUSS = this.dateFormatter()
}
}, },
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data){ setMap(data){
@@ -2462,15 +2453,16 @@
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('taskIds', this.taskIds)
_formData.append('prcType', 'buss2') _formData.append('prcType', 'buss2')
_formData.append('prcName', '企标制修订-产品标准') _formData.append('prcName', '企标制修订-产品标准')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
taskInfo: this.taskInfo, taskInfo: this.taskInfo,
form: this.form, form: this.form,
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.commentText commentText: this.formTongGuo.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
@@ -2671,6 +2663,20 @@
this.form.prcNum = this.prcNum this.form.prcNum = this.prcNum
this.form.prcName = this.prcName this.form.prcName = this.prcName
this.form['id'] = item.id this.form['id'] = item.id
const dateArr = []
if(item.commentCycleStart && item.commentCycleEnd){
dateArr[0] = item.commentCycleStart
dateArr[1] = item.commentCycleEnd
this.commentCycleDate = dateArr
}
this.footFileList=this.assemble(item.footFile,item.footFileName);
this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
this.XGDFileList=this.assemble(item.XGD,item.XGDName);
this.formKey++ this.formKey++
}) })
}, },
@@ -2695,22 +2701,12 @@
if (res) { if (res) {
this.taskInfo = '意见汇总及标准修改' this.taskInfo = '意见汇总及标准修改'
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
const dateArr = [] if (processForm.form === undefined) {
if(processForm.commentCycleStart && processForm.commentCycleEnd){ this.getFormFieldList(processForm)
dateArr[0] = processForm.commentCycleStart } else {
dateArr[1] = processForm.commentCycleEnd //表单文件处理
this.commentCycleDate = dateArr this.getTaskId(processForm)
} }
this.getFormFieldList(processForm)
this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.XGDFileList=this.assemble(processForm.XGD,processForm.XGDName);
this.formKey++
} }
}).catch(e => { }).catch(e => {
}) })
@@ -2718,38 +2714,21 @@
} }
}, },
processTable () { processTable () {
this.$nextTick(() => { this.$http.get("lawss/activiti/get_list_by_instance", {
Promise.all([this.getTaskId()]).then((value) => { prcNum: this.$route.query.prcNum,
if(value[0] &&value.length > 0){ sortWord: this.shunxu ? this.paixu : "",
let mes = JSON.parse(value[0].mes) shunxu: this.shunxu
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) }, {
this.form = mes.form loading: "loading",
this.taskIds = mes.taskIds; _this: this
this.pId = mes.pId; }, res => {
this.userId = mes.userId; this.detailData = res
this.prcNum = mes.prcNum; }, e => {
this.prcName = mes.prcName;
this.roleForm = mes.roleForm
this.commentText = mes.commentText
}
this.loading = true
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}, {
loading: 'loading',
_this: this
}, res => {
this.detailData = res
this.loading = false
}, e => {})
})
}) })
}, },
}, },
mounted () { mounted () {
this.getTaskId() // this.getTaskId()
this.getData() this.getData()
this.processTable() this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+50 -73
View File
@@ -627,7 +627,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process"; import {saveTaskForPub,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -1392,33 +1392,23 @@
if (!value) return true; if (!value) return true;
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
getTaskId () { getTaskId (mesg) {
if(this.$route.query.bpnId){ this.form = mesg.form
queryTaskFirst({ this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
bpnId: this.$route.query.bpnId this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
}).then(res => { this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.verifySarStandard = this.$route.query.verifySarStandard this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
let mes = JSON.parse(res.mes) this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.form = mes.form this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.footFileList=this.assemble(this.form.footFile,this.form.footFileName); this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.madelSubList=this.assemble(this.form.madelSub,this.form.madelSubName);
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); this.roleForm = mesg.roleForm
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.formTongGuo.commentText = mesg.commentText
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); this.formKey++
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
this.madelSubList=this.assemble(this.form.madelSub,this.form.madelSubName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.formKey++
})
}else {
this.form.XCSJBUSS = this.dateFormatter()
}
}, },
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data){ setMap(data){
@@ -2321,6 +2311,7 @@
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('taskIds', this.taskIds)
_formData.append('prcType', 'buss1') _formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准') _formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
@@ -2330,7 +2321,7 @@
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.formTongGuo.commentText commentText: this.formTongGuo.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
@@ -2539,7 +2530,6 @@
getFormFieldList (item) { getFormFieldList (item) {
this.$nextTick(() => { this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item)) this.form = JSON.parse(JSON.stringify(item))
console.log(this.form)
this.form.topId = this.pId this.form.topId = this.pId
this.form.prcNum = this.prcNum this.form.prcNum = this.prcNum
this.form.prcName = this.prcName this.form.prcName = this.prcName
@@ -2548,6 +2538,20 @@
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
const dateArr = []
if(item.commentCycleStart && item.commentCycleEnd){
dateArr[0] = item.commentCycleStart
dateArr[1] = item.commentCycleEnd
this.commentCycleDate = dateArr
}
this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
this.summaryFileList=this.assemble(item.summaryFile,item.summaryFileName);
this.madelSubList=this.assemble(item.madelSub,item.madelSubName);
this.formKey++ this.formKey++
// this.getStandInfoByReviseStatus() // this.getStandInfoByReviseStatus()
}) })
@@ -2582,22 +2586,12 @@
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
const dateArr = [] if (processForm.form === undefined) {
if(processForm.commentCycleStart && processForm.commentCycleEnd){ this.getFormFieldList(processForm)
dateArr[0] = processForm.commentCycleStart } else {
dateArr[1] = processForm.commentCycleEnd //表单文件处理
this.commentCycleDate = dateArr this.getTaskId(processForm)
} }
this.getFormFieldList(processForm)
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
this.madelSubList=this.assemble(processForm.madelSub,processForm.madelSubName);
this.formKey++
} }
}).catch(e => { }).catch(e => {
}) })
@@ -2648,38 +2642,21 @@
}, },
processTable () { processTable () {
this.$nextTick(() => { this.$http.get("lawss/activiti/get_list_by_instance", {
Promise.all([this.getTaskId()]).then((value) => { prcNum: this.$route.query.prcNum,
if(value[0] &&value.length > 0){ sortWord: this.shunxu ? this.paixu : "",
let mes = JSON.parse(value[0].mes) shunxu: this.shunxu
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) }, {
this.form = mes.form loading: "loading",
this.taskIds = mes.taskIds; _this: this
this.pId = mes.pId; }, res => {
this.userId = mes.userId; this.detailData = res
this.prcNum = mes.prcNum; }, e => {
this.prcName = mes.prcName;
this.roleForm = mes.roleForm
this.commentText = mes.commentText
}
this.loading = true
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}, {
loading: 'loading',
_this: this
}, res => {
this.detailData = res
this.loading = false
}, e => {})
})
}) })
}, },
}, },
mounted () { mounted () {
this.getTaskId() // this.getTaskId()
this.getData() this.getData()
this.processTable() this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+54 -76
View File
@@ -628,7 +628,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process"; import {saveTaskForPub,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -1396,35 +1396,25 @@
if (!value) return true; if (!value) return true;
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
getTaskId () { getTaskId (mesg) {
if(this.$route.query.bpnId){ this.form = mesg.form
queryTaskFirst({ this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
bpnId: this.$route.query.bpnId this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
}).then(res => { this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.verifySarStandard = this.$route.query.verifySarStandard this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
let mes = JSON.parse(res.mes) this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
this.form = mes.form this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')', this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')', this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.footFileList=this.assemble(this.form.footFile,this.form.footFileName); this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.madelSubList=this.assemble(this.form.madelSub,this.form.madelSubName);
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); this.roleForm = mesg.roleForm
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.formTongGuo.commentText = mesg.commentText
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); this.formKey++
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
this.madelSubList=this.assemble(this.form.madelSub,this.form.madelSubName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.formKey++
})
}else {
this.form.XCSJBUSS = this.dateFormatter()
}
}, },
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data){ setMap(data){
@@ -2323,6 +2313,7 @@
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('taskIds', this.taskIds)
_formData.append('prcType', 'buss1') _formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准') _formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
@@ -2332,7 +2323,7 @@
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.formTongGuo.commentText commentText: this.formTongGuo.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
@@ -2581,8 +2572,22 @@
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')', this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')', this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')'
const dateArr = []
if(item.commentCycleStart && item.commentCycleEnd){
dateArr[0] = item.commentCycleStart
dateArr[1] = item.commentCycleEnd
this.commentCycleDate = dateArr
}
this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
this.summaryFileList=this.assemble(item.summaryFile,item.summaryFileName);
this.madelSubList=this.assemble(item.madelSub,item.madelSubName);
this.formKey++ this.formKey++
}) })
}, },
@@ -2616,22 +2621,12 @@
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
const dateArr = [] if (processForm.form === undefined) {
if(processForm.commentCycleStart && processForm.commentCycleEnd){ this.getFormFieldList(processForm)
dateArr[0] = processForm.commentCycleStart } else {
dateArr[1] = processForm.commentCycleEnd //表单文件处理
this.commentCycleDate = dateArr this.getTaskId(processForm)
} }
this.getFormFieldList(processForm)
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
this.madelSubList=this.assemble(processForm.madelSub,processForm.madelSubName);
this.formKey++
} }
}).catch(e => { }).catch(e => {
}) })
@@ -2682,38 +2677,21 @@
}, },
processTable () { processTable () {
this.$nextTick(() => { this.$http.get("lawss/activiti/get_list_by_instance", {
Promise.all([this.getTaskId()]).then((value) => { prcNum: this.$route.query.prcNum,
if(value[0] &&value.length > 0){ sortWord: this.shunxu ? this.paixu : "",
let mes = JSON.parse(value[0].mes) shunxu: this.shunxu
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) }, {
this.form = mes.form loading: "loading",
this.taskIds = mes.taskIds; _this: this
this.pId = mes.pId; }, res => {
this.userId = mes.userId; this.detailData = res
this.prcNum = mes.prcNum; }, e => {
this.prcName = mes.prcName;
this.roleForm = mes.roleForm
this.commentText = mes.commentText
}
this.loading = true
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}, {
loading: 'loading',
_this: this
}, res => {
this.detailData = res
this.loading = false
}, e => {})
})
}) })
}, },
}, },
mounted () { mounted () {
this.getTaskId() // this.getTaskId()
this.getData() this.getData()
this.processTable() this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+49 -70
View File
@@ -673,7 +673,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process"; import {saveTaskForPub,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -1449,31 +1449,22 @@
if (!value) return true; if (!value) return true;
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
getTaskId () { getTaskId (mesg) {
if(this.$route.query.bpnId){ this.verifySarStandard = this.$route.query.verifySarStandard
queryTaskFirst({ this.form = mesg.form
bpnId: this.$route.query.bpnId this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
}).then(res => { this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.verifySarStandard = this.$route.query.verifySarStandard this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
let mes = JSON.parse(res.mes) this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
this.form = mes.form this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.footFileList=this.assemble(this.form.footFile,this.form.footFileName); this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.roleForm = mesg.roleForm
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); this.commentText = mesg.commentText
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.formKey++
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.formKey++
})
}else {
this.form.XCSJBUSS = this.dateFormatter()
}
}, },
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data){ setMap(data){
@@ -2409,6 +2400,7 @@
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('taskIds', this.taskIds)
_formData.append('prcType', 'buss1') _formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准') _formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
@@ -2418,7 +2410,7 @@
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.formTongGuo.commentText commentText: this.formTongGuo.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
@@ -2620,6 +2612,19 @@
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
const dateArr = []
if(item.commentCycleStart && item.commentCycleEnd){
dateArr[0] = item.commentCycleStart
dateArr[1] = item.commentCycleEnd
this.commentCycleDate = dateArr
}
this.footFileList=this.assemble(item.footFile,item.footFileName);
this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
this.formKey++
}) })
}, },
filterObj(obj){ filterObj(obj){
@@ -2652,55 +2657,29 @@
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
const dateArr = [] if (processForm.form === undefined) {
if(processForm.commentCycleStart && processForm.commentCycleEnd){ this.getFormFieldList(processForm)
dateArr[0] = processForm.commentCycleStart } else {
dateArr[1] = processForm.commentCycleEnd //表单文件处理
this.commentCycleDate = dateArr this.getTaskId(processForm)
} }
this.getFormFieldList(processForm)
this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.formKey++
} }
}).catch(e => { }).catch(e => {
}) })
}) })
} }
}, },
processTable () { processTable() {
this.$nextTick(() => { this.$http.get("lawss/activiti/get_list_by_instance", {
Promise.all([this.getTaskId()]).then((value) => { prcNum: this.$route.query.prcNum,
if(value[0] &&value.length > 0){ sortWord: this.shunxu ? this.paixu : "",
let mes = JSON.parse(value[0].mes) shunxu: this.shunxu
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) }, {
this.form = mes.form loading: "loading",
this.taskIds = mes.taskIds; _this: this
this.pId = mes.pId; }, res => {
this.userId = mes.userId; this.detailData = res
this.prcNum = mes.prcNum; }, e => {
this.prcName = mes.prcName;
this.roleForm = mes.roleForm
this.commentText = mes.commentText
}
this.loading = true
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}, {
loading: 'loading',
_this: this
}, res => {
this.detailData = res
this.loading = false
}, e => {})
})
}) })
}, },
getDicTypeListCode(res,json) { getDicTypeListCode(res,json) {
@@ -2715,7 +2694,7 @@
}, },
}, },
mounted () { mounted () {
this.getTaskId() // this.getTaskId()
this.getData() this.getData()
this.processTable() this.processTable()
} }
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+47 -67
View File
@@ -891,7 +891,7 @@
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig' import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process"; import {saveTaskForPub,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
import {getEvaluationIndex} from "api/businessApi"; import {getEvaluationIndex} from "api/businessApi";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
@@ -1830,31 +1830,21 @@
if (!value) return true; if (!value) return true;
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
getTaskId () { getTaskId (mesg) {
if(this.$route.query.bpnId){ this.form = mesg.form
queryTaskFirst({ this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
bpnId: this.$route.query.bpnId this.getEvaluation()
}).then(res => { this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.verifySarStandard = this.$route.query.verifySarStandard this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
let mes = JSON.parse(res.mes) this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.form = mes.form this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
this.getEvaluation() this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) this.summaryList=this.assemble(mesg.summary,mesg.summaryName);
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.roleForm = mesg.roleForm
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); this.formTongGuo.commentText = mesg.commentText
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.summaryList=this.assemble(mes.summary,mes.summaryName);
this.roleForm = mes.roleForm
this.formTongGuo.commentText = mes.commentText
})
}else {
this.form.XCSJBUSS = this.dateFormatter()
}
}, },
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data){ setMap(data){
@@ -2691,6 +2681,7 @@
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('taskIds', this.taskIds)
_formData.append('prcType', 'buss1') _formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准') _formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
@@ -2702,7 +2693,7 @@
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.formTongGuo.commentText commentText: this.formTongGuo.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
@@ -2894,6 +2885,19 @@
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
const dateArr = []
if(item.commentCycleStart && item.commentCycleEnd){
dateArr[0] = item.commentCycleStart
dateArr[1] = item.commentCycleEnd
this.commentCycleDate = dateArr
}
this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
this.summaryList=this.assemble(item.summary,item.summaryName);
}) })
}, },
filterObj(obj){ filterObj(obj){
@@ -2948,20 +2952,13 @@
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
const dateArr = [] if (processForm.form === undefined) {
if(processForm.commentCycleStart && processForm.commentCycleEnd){ this.getFormFieldList(processForm)
dateArr[0] = processForm.commentCycleStart } else {
dateArr[1] = processForm.commentCycleEnd //表单文件处理
this.commentCycleDate = dateArr this.getTaskId(processForm)
} }
this.getFormFieldList(processForm)
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.summaryList=this.assemble(processForm.summary,processForm.summaryName);
} }
}).catch(e => { }).catch(e => {
}) })
@@ -2969,38 +2966,21 @@
} }
}, },
processTable () { processTable () {
this.$nextTick(() => { this.$http.get("lawss/activiti/get_list_by_instance", {
Promise.all([this.getTaskId()]).then((value) => { prcNum: this.$route.query.prcNum,
if(value[0] &&value.length > 0){ sortWord: this.shunxu ? this.paixu : "",
let mes = JSON.parse(value[0].mes) shunxu: this.shunxu
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) }, {
this.form = mes.form loading: "loading",
this.taskIds = mes.taskIds; _this: this
this.pId = mes.pId; }, res => {
this.userId = mes.userId; this.detailData = res
this.prcNum = mes.prcNum; }, e => {
this.prcName = mes.prcName;
this.roleForm = mes.roleForm
this.commentText = mes.commentText
}
this.loading = true
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}, {
loading: 'loading',
_this: this
}, res => {
this.detailData = res
this.loading = false
}, e => {})
})
}) })
}, },
}, },
mounted () { mounted () {
this.getTaskId() // this.getTaskId()
this.getData() this.getData()
this.processTable() this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+50 -72
View File
@@ -876,7 +876,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process"; import {saveTaskForPub,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -1796,33 +1796,23 @@
if (!value) return true; if (!value) return true;
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
getTaskId () { getTaskId (mesg) {
if(this.$route.query.bpnId){ this.form = mesg.form
queryTaskFirst({ this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
bpnId: this.$route.query.bpnId this.getEvaluation()
}).then(res => { this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.verifySarStandard = this.$route.query.verifySarStandard this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
let mes = JSON.parse(res.mes) this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
this.form = mes.form this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.getEvaluation() this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.footFileList=this.assemble(this.form.footFile,this.form.footFileName); this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.roleForm = mesg.roleForm
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); this.formTongGuo.commentText = mesg.commentText
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.formKey++
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.formKey++
})
}else {
this.form.XCSJBUSS = this.dateFormatter()
}
}, },
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data){ setMap(data){
@@ -2755,6 +2745,7 @@
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('taskIds', this.taskIds)
_formData.append('prcType', 'buss1') _formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准') _formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
@@ -2764,7 +2755,7 @@
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.formTongGuo.commentText commentText: this.formTongGuo.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
@@ -2971,6 +2962,20 @@
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
const dateArr = []
if(item.commentCycleStart && item.commentCycleEnd){
dateArr[0] = item.commentCycleStart
dateArr[1] = item.commentCycleEnd
this.commentCycleDate = dateArr
}
this.footFileList=this.assemble(item.footFile,item.footFileName);
this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
this.summaryFileList=this.assemble(item.summaryFile,item.summaryFileName);
this.formKey++ this.formKey++
}) })
}, },
@@ -3026,22 +3031,12 @@
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
const dateArr = [] if (processForm.form === undefined) {
if(processForm.commentCycleStart && processForm.commentCycleEnd){ this.getFormFieldList(processForm)
dateArr[0] = processForm.commentCycleStart } else {
dateArr[1] = processForm.commentCycleEnd //表单文件处理
this.commentCycleDate = dateArr this.getTaskId(processForm)
} }
this.getFormFieldList(processForm)
this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
this.formKey++
} }
}).catch(e => { }).catch(e => {
}) })
@@ -3049,38 +3044,21 @@
} }
}, },
processTable () { processTable () {
this.$nextTick(() => { this.$http.get("lawss/activiti/get_list_by_instance", {
Promise.all([this.getTaskId()]).then((value) => { prcNum: this.$route.query.prcNum,
if(value[0] &&value.length > 0){ sortWord: this.shunxu ? this.paixu : "",
let mes = JSON.parse(value[0].mes) shunxu: this.shunxu
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) }, {
this.form = mes.form loading: "loading",
this.taskIds = mes.taskIds; _this: this
this.pId = mes.pId; }, res => {
this.userId = mes.userId; this.detailData = res
this.prcNum = mes.prcNum; }, e => {
this.prcName = mes.prcName;
this.roleForm = mes.roleForm
this.commentText = mes.commentText
}
this.loading = true
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}, {
loading: 'loading',
_this: this
}, res => {
this.detailData = res
this.loading = false
}, e => {})
})
}) })
}, },
}, },
mounted () { mounted () {
this.getTaskId() // this.getTaskId()
this.getData() this.getData()
this.processTable() this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+48 -70
View File
@@ -679,7 +679,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew,evaluationHisListByOne} from "api/process"; import {saveTaskForPub,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew,evaluationHisListByOne} from "api/process";
import {getEvaluationIndex} from "api/businessApi"; import {getEvaluationIndex} from "api/businessApi";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
@@ -1503,35 +1503,25 @@
if (!value) return true; if (!value) return true;
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
getTaskId () { getTaskId (mesg) {
if(this.$route.query.bpnId){ this.form = mesg.form
queryTaskFirst({ this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
bpnId: this.$route.query.bpnId if(this.form.fsRejectStatus === 1){
}).then(res => { this.evaluationHisListByOne()
this.verifySarStandard = this.$route.query.verifySarStandard
let mes = JSON.parse(res.mes)
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
this.form = mes.form
if(this.form.fsRejectStatus === 1){
this.evaluationHisListByOne()
}else {
this.getEvaluation()
}
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
})
}else { }else {
this.form.XCSJBUSS = this.dateFormatter() this.getEvaluation()
} }
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
this.roleForm = mesg.roleForm
this.formTongGuo.commentText = mesg.commentText
}, },
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data){ setMap(data){
@@ -2347,6 +2337,7 @@
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('taskIds', this.taskIds)
_formData.append('prcType', 'buss1') _formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准') _formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
@@ -2356,7 +2347,7 @@
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.formTongGuo.commentText commentText: this.formTongGuo.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
@@ -2545,6 +2536,18 @@
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
const dateArr = []
if(item.commentCycleStart && item.commentCycleEnd){
dateArr[0] = item.commentCycleStart
dateArr[1] = item.commentCycleEnd
this.commentCycleDate = dateArr
}
this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
this.summaryFileList=this.assemble(item.summaryFile,item.summaryFileName);
}) })
}, },
filterObj(obj){ filterObj(obj){
@@ -2612,20 +2615,12 @@
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
const dateArr = [] if (processForm.form === undefined) {
if(processForm.commentCycleStart && processForm.commentCycleEnd){ this.getFormFieldList(processForm)
dateArr[0] = processForm.commentCycleStart } else {
dateArr[1] = processForm.commentCycleEnd //表单文件处理
this.commentCycleDate = dateArr this.getTaskId(processForm)
} }
this.getFormFieldList(processForm)
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
} }
}).catch(e => { }).catch(e => {
}) })
@@ -2633,38 +2628,21 @@
} }
}, },
processTable () { processTable () {
this.$nextTick(() => { this.$http.get("lawss/activiti/get_list_by_instance", {
Promise.all([this.getTaskId()]).then((value) => { prcNum: this.$route.query.prcNum,
if(value[0] &&value.length > 0){ sortWord: this.shunxu ? this.paixu : "",
let mes = JSON.parse(value[0].mes) shunxu: this.shunxu
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) }, {
this.form = mes.form loading: "loading",
this.taskIds = mes.taskIds; _this: this
this.pId = mes.pId; }, res => {
this.userId = mes.userId; this.detailData = res
this.prcNum = mes.prcNum; }, e => {
this.prcName = mes.prcName;
this.roleForm = mes.roleForm
this.commentText = mes.commentText
}
this.loading = true
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}, {
loading: 'loading',
_this: this
}, res => {
this.detailData = res
this.loading = false
}, e => {})
})
}) })
}, },
}, },
mounted () { mounted () {
this.getTaskId() // this.getTaskId()
this.getData() this.getData()
this.processTable() this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+49 -70
View File
@@ -690,7 +690,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew,evaluationHisListByOne,evaluationHisListRepSum} from "api/process"; import {saveTaskForPub,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew,evaluationHisListByOne,evaluationHisListRepSum} from "api/process";
import {getEvaluationIndex} from "api/businessApi"; import {getEvaluationIndex} from "api/businessApi";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
@@ -1528,35 +1528,25 @@
if (!value) return true; if (!value) return true;
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
getTaskId () { getTaskId (mesg) {
if(this.$route.query.bpnId){ this.form = mesg.form
queryTaskFirst({ this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
bpnId: this.$route.query.bpnId if(this.form.fsRejectStatus === 1){
}).then(res => { this.evaluationHisListByOne()
this.verifySarStandard = this.$route.query.verifySarStandard
let mes = JSON.parse(res.mes)
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
this.form = mes.form
if(this.form.fsRejectStatus === 1){
this.evaluationHisListByOne()
}else {
this.getEvaluation()
}
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
})
}else { }else {
this.form.XCSJBUSS = this.dateFormatter() this.getEvaluation()
} }
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
this.roleForm = mesg.roleForm
this.formTongGuo.commentText = mesg.commentText
}, },
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data){ setMap(data){
@@ -2356,6 +2346,7 @@
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('taskIds', this.taskIds)
_formData.append('prcType', 'buss1') _formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准') _formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
@@ -2365,7 +2356,7 @@
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.formTongGuo.commentText commentText: this.formTongGuo.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
@@ -2585,6 +2576,19 @@
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
const dateArr = []
if(item.commentCycleStart && item.commentCycleEnd){
dateArr[0] = item.commentCycleStart
dateArr[1] = item.commentCycleEnd
this.commentCycleDate = dateArr
}
this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
this.summaryFileList=this.assemble(item.summaryFile,item.summaryFileName);
}) })
}, },
filterObj(obj){ filterObj(obj){
@@ -2667,20 +2671,12 @@
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
const dateArr = [] if (processForm.form === undefined) {
if(processForm.commentCycleStart && processForm.commentCycleEnd){ this.getFormFieldList(processForm)
dateArr[0] = processForm.commentCycleStart } else {
dateArr[1] = processForm.commentCycleEnd //表单文件处理
this.commentCycleDate = dateArr this.getTaskId(processForm)
} }
this.getFormFieldList(processForm)
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
} }
}).catch(e => { }).catch(e => {
}) })
@@ -2688,38 +2684,21 @@
} }
}, },
processTable () { processTable () {
this.$nextTick(() => { this.$http.get("lawss/activiti/get_list_by_instance", {
Promise.all([this.getTaskId()]).then((value) => { prcNum: this.$route.query.prcNum,
if(value[0] &&value.length > 0){ sortWord: this.shunxu ? this.paixu : "",
let mes = JSON.parse(value[0].mes) shunxu: this.shunxu
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) }, {
this.form = mes.form loading: "loading",
this.taskIds = mes.taskIds; _this: this
this.pId = mes.pId; }, res => {
this.userId = mes.userId; this.detailData = res
this.prcNum = mes.prcNum; }, e => {
this.prcName = mes.prcName;
this.roleForm = mes.roleForm
this.commentText = mes.commentText
}
this.loading = true
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}, {
loading: 'loading',
_this: this
}, res => {
this.detailData = res
this.loading = false
}, e => {})
})
}) })
}, },
}, },
mounted () { mounted () {
this.getTaskId() // this.getTaskId()
this.getData() this.getData()
this.processTable() this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+51 -73
View File
@@ -709,7 +709,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail,processCreateBuss,evaluationHisList,evaluationHisListRepSum,evaluationHisListRep} from "api/process"; import {saveTaskForPub,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail,processCreateBuss,evaluationHisList,evaluationHisListRepSum,evaluationHisListRep} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
let Base64 = require('js-base64').Base64; let Base64 = require('js-base64').Base64;
@@ -1600,35 +1600,25 @@
if (!value) return true; if (!value) return true;
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
getTaskId () { getTaskId (mesg) {
if(this.$route.query.bpnId){ this.form = mesg.form
queryTaskFirst({ this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
bpnId: this.$route.query.bpnId this.form.evaluationData = []
}).then(res => { this.pid = this.form.topId
this.verifySarStandard = this.$route.query.verifySarStandard this.evaluationHisListRep()
let mes = JSON.parse(res.mes) this.getStandInfoByReviseStatus()
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.evaluationHisListRepSum()
this.form = mes.form this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
this.form.evaluationData = [] this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.pid = this.form.topId this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
this.evaluationHisListRep() this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.getStandInfoByReviseStatus() this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.evaluationHisListRepSum() this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.footFileList=this.assemble(this.form.footFile,this.form.footFileName); this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.madelSubList=this.assemble(this.form.madelSub,this.form.madelSubName);
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); this.roleForm = mesg.roleForm
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.formTongGuo.commentText = mesg.commentText
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); this.formKey++
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
this.madelSubList=this.assemble(this.form.madelSub,this.form.madelSubName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.formKey++
})
}else {
this.form.XCSJBUSS = this.dateFormatter()
}
}, },
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data){ setMap(data){
@@ -2467,6 +2457,7 @@
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('taskIds', this.taskIds)
_formData.append('prcType', 'buss1') _formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准') _formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
@@ -2477,7 +2468,7 @@
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.formTongGuo.commentText commentText: this.formTongGuo.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
@@ -2711,6 +2702,20 @@
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
const dateArr = []
if(item.commentCycleStart && item.commentCycleEnd){
dateArr[0] = item.commentCycleStart
dateArr[1] = item.commentCycleEnd
this.commentCycleDate = dateArr
}
this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
this.summaryFileList=this.assemble(item.summaryFile,item.summaryFileName);
this.madelSubList=this.assemble(item.madelSub,item.madelSubName);
this.formKey++ this.formKey++
}) })
}, },
@@ -2744,22 +2749,12 @@
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
const dateArr = [] if (processForm.form === undefined) {
if(processForm.commentCycleStart && processForm.commentCycleEnd){ this.getFormFieldList(processForm)
dateArr[0] = processForm.commentCycleStart } else {
dateArr[1] = processForm.commentCycleEnd //表单文件处理
this.commentCycleDate = dateArr this.getTaskId(processForm)
} }
this.getFormFieldList(processForm)
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
this.madelSubList=this.assemble(processForm.madelSub,processForm.madelSubName);
this.formKey++
} }
}).catch(e => { }).catch(e => {
}) })
@@ -2810,33 +2805,16 @@
}, },
processTable () { processTable () {
this.$nextTick(() => { this.$http.get("lawss/activiti/get_list_by_instance", {
Promise.all([this.getTaskId()]).then((value) => { prcNum: this.$route.query.prcNum,
if(value[0] &&value.length > 0){ sortWord: this.shunxu ? this.paixu : "",
let mes = JSON.parse(value[0].mes) shunxu: this.shunxu
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) }, {
this.form = mes.form loading: "loading",
this.taskIds = mes.taskIds; _this: this
this.pId = mes.pId; }, res => {
this.userId = mes.userId; this.detailData = res
this.prcNum = mes.prcNum; }, e => {
this.prcName = mes.prcName;
this.roleForm = mes.roleForm
this.commentText = mes.commentText
}
this.loading = true
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}, {
loading: 'loading',
_this: this
}, res => {
this.detailData = res
this.loading = false
}, e => {})
})
}) })
}, },
}, },
src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+48 -69
View File
@@ -673,7 +673,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process"; import {saveTaskForPub,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -1449,31 +1449,21 @@
if (!value) return true; if (!value) return true;
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
getTaskId () { getTaskId (mesg) {
if(this.$route.query.bpnId){ this.form = mesg.form
queryTaskFirst({ this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
bpnId: this.$route.query.bpnId this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
}).then(res => { this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.verifySarStandard = this.$route.query.verifySarStandard this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
let mes = JSON.parse(res.mes) this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.form = mes.form this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.footFileList=this.assemble(this.form.footFile,this.form.footFileName); this.roleForm = mesg.roleForm
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.formTongGuo.commentText = mesg.commentText
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); this.formKey++
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.formKey++
})
}else {
this.form.XCSJBUSS = this.dateFormatter()
}
}, },
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data){ setMap(data){
@@ -2409,6 +2399,7 @@
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('taskIds', this.taskIds)
_formData.append('prcType', 'buss1') _formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准') _formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
@@ -2418,7 +2409,7 @@
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.formTongGuo.commentText commentText: this.formTongGuo.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
@@ -2620,6 +2611,20 @@
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
const dateArr = []
if(item.commentCycleStart && item.commentCycleEnd){
dateArr[0] = item.commentCycleStart
dateArr[1] = item.commentCycleEnd
this.commentCycleDate = dateArr
}
this.footFileList=this.assemble(item.footFile,item.footFileName);
this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
this.formKey++
}) })
}, },
filterObj(obj){ filterObj(obj){
@@ -2652,21 +2657,12 @@
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
const dateArr = [] if (processForm.form === undefined) {
if(processForm.commentCycleStart && processForm.commentCycleEnd){ this.getFormFieldList(processForm)
dateArr[0] = processForm.commentCycleStart } else {
dateArr[1] = processForm.commentCycleEnd //表单文件处理
this.commentCycleDate = dateArr this.getTaskId(processForm)
} }
this.getFormFieldList(processForm)
this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.formKey++
} }
}).catch(e => { }).catch(e => {
}) })
@@ -2674,33 +2670,16 @@
} }
}, },
processTable () { processTable () {
this.$nextTick(() => { this.$http.get("lawss/activiti/get_list_by_instance", {
Promise.all([this.getTaskId()]).then((value) => { prcNum: this.$route.query.prcNum,
if(value[0] &&value.length > 0){ sortWord: this.shunxu ? this.paixu : "",
let mes = JSON.parse(value[0].mes) shunxu: this.shunxu
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) }, {
this.form = mes.form loading: "loading",
this.taskIds = mes.taskIds; _this: this
this.pId = mes.pId; }, res => {
this.userId = mes.userId; this.detailData = res
this.prcNum = mes.prcNum; }, e => {
this.prcName = mes.prcName;
this.roleForm = mes.roleForm
this.commentText = mes.commentText
}
this.loading = true
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}, {
loading: 'loading',
_this: this
}, res => {
this.detailData = res
this.loading = false
}, e => {})
})
}) })
}, },
getDicTypeListCode(res,json) { getDicTypeListCode(res,json) {
@@ -2715,7 +2694,7 @@
}, },
}, },
mounted () { mounted () {
this.getTaskId() // this.getTaskId()
this.getData() this.getData()
this.processTable() this.processTable()
} }
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+49 -70
View File
@@ -876,7 +876,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process"; import {saveTaskForPub,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -1795,32 +1795,22 @@
if (!value) return true; if (!value) return true;
return data.name.indexOf(value) !== -1; return data.name.indexOf(value) !== -1;
}, },
getTaskId () { getTaskId (mesg) {
if(this.$route.query.bpnId){ this.form = mesg.form
queryTaskFirst({ this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
bpnId: this.$route.query.bpnId this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
}).then(res => { this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.verifySarStandard = this.$route.query.verifySarStandard this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
let mes = JSON.parse(res.mes) this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.form = mes.form this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.footFileList=this.assemble(this.form.footFile,this.form.footFileName); this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.roleForm = mesg.roleForm
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); this.commentText = mesg.commentText
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.formKey++
this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.formKey++
})
}else {
this.form.XCSJBUSS = this.dateFormatter()
}
}, },
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data){ setMap(data){
@@ -2753,6 +2743,7 @@
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('taskIds', this.taskIds)
_formData.append('prcType', 'buss1') _formData.append('prcType', 'buss1')
_formData.append('prcName', '企标制修订-技术标准') _formData.append('prcName', '企标制修订-技术标准')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
@@ -2762,7 +2753,7 @@
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.formTongGuo.commentText commentText: this.formTongGuo.commentText
})) }))
saveTaskFirst(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
this.bpnId = res.result this.bpnId = res.result
@@ -2969,6 +2960,20 @@
this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS']) this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
const dateArr = []
if(item.commentCycleStart && item.commentCycleEnd){
dateArr[0] = processForm.commentCycleStart
dateArr[1] = processForm.commentCycleEnd
this.commentCycleDate = dateArr
}
this.footFileList=this.assemble(item.footFile,item.footFileName);
this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
this.summaryFileList=this.assemble(item.summaryFile,item.summaryFileName);
this.formKey++ this.formKey++
}) })
}, },
@@ -3024,22 +3029,13 @@
}).then(res => { }).then(res => {
if (res) { if (res) {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
const dateArr = [] if (processForm.form === undefined) {
if(processForm.commentCycleStart && processForm.commentCycleEnd){ this.getFormFieldList(processForm)
dateArr[0] = processForm.commentCycleStart } else {
dateArr[1] = processForm.commentCycleEnd //表单文件处理
this.commentCycleDate = dateArr this.getTaskId(processForm)
} }
this.getFormFieldList(processForm)
this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.summaryFileList=this.assemble(processForm.summaryFile,processForm.summaryFileName);
this.formKey++
} }
}).catch(e => { }).catch(e => {
}) })
@@ -3047,38 +3043,21 @@
} }
}, },
processTable () { processTable () {
this.$nextTick(() => { this.$http.get("lawss/activiti/get_list_by_instance", {
Promise.all([this.getTaskId()]).then((value) => { prcNum: this.$route.query.prcNum,
if(value[0] &&value.length > 0){ sortWord: this.shunxu ? this.paixu : "",
let mes = JSON.parse(value[0].mes) shunxu: this.shunxu
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) }, {
this.form = mes.form loading: "loading",
this.taskIds = mes.taskIds; _this: this
this.pId = mes.pId; }, res => {
this.userId = mes.userId; this.detailData = res
this.prcNum = mes.prcNum; }, e => {
this.prcName = mes.prcName;
this.roleForm = mes.roleForm
this.commentText = mes.commentText
}
this.loading = true
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.prcNum,
sortWord: this.shunxu ? this.paixu : '',
shunxu: this.shunxu
}, {
loading: 'loading',
_this: this
}, res => {
this.detailData = res
this.loading = false
}, e => {})
})
}) })
}, },
}, },
mounted () { mounted () {
this.getTaskId() // this.getTaskId()
this.getData() this.getData()
this.processTable() this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {