合并分支 'dev_20230216' 到 'master'
Dev 20230216 查看合并请求 laws-foton-slrs/foton-laws-system-front!62
This commit is contained in:
高嵩
@@ -1866,19 +1866,19 @@
|
||||
filterText(val) {
|
||||
this.$refs.tree.filter(val);
|
||||
},
|
||||
'form.standName': {
|
||||
handler: function (val) {
|
||||
if (val && val !== '') {
|
||||
this.form.FBGBUSSName = val
|
||||
this.FBGBUSSFileList = []
|
||||
this.FBGBUSSFileList = this.assemble(this.form.FBGBUSS, val);
|
||||
} else {
|
||||
this.form.FBGBUSSName = '企业标准'
|
||||
this.FBGBUSSFileList = []
|
||||
this.FBGBUSSFileList = this.assemble(this.form.FBGBUSS, '企业标准');
|
||||
}
|
||||
}
|
||||
},
|
||||
// 'form.standName': {
|
||||
// handler: function (val) {
|
||||
// if (val && val !== '') {
|
||||
// this.form.FBGBUSSName = val
|
||||
// this.FBGBUSSFileList = []
|
||||
// this.FBGBUSSFileList = this.assemble(this.form.FBGBUSS, val);
|
||||
// } else {
|
||||
// this.form.FBGBUSSName = '企业标准'
|
||||
// this.FBGBUSSFileList = []
|
||||
// this.FBGBUSSFileList = this.assemble(this.form.FBGBUSS, '企业标准');
|
||||
// }
|
||||
// }
|
||||
// },
|
||||
},
|
||||
methods: {
|
||||
getMap1(item) {
|
||||
@@ -2069,19 +2069,24 @@
|
||||
this.form.modelData[this.zrIndex].zrUserId = data[0].id
|
||||
this.form.modelData[this.zrIndex].zrUserIdName = data[0].name
|
||||
} else {
|
||||
this.form.modelData.forEach(item => {
|
||||
try{
|
||||
this.form.modelData.forEach(item => {
|
||||
this.zrIdList.forEach(items => {
|
||||
if (item.id === items) {
|
||||
item.zrUserId = data[0].id
|
||||
item.zrUserIdName = data[0].name
|
||||
}
|
||||
if (item.id === items) {
|
||||
item.zrUserId = data[0].id
|
||||
item.zrUserIdName = data[0].name
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
}catch(e){
|
||||
console.log(e)
|
||||
}
|
||||
}
|
||||
if (this.userType === 'bzhUserId') {
|
||||
this.roleForm.bzhUserId = data[0].id
|
||||
this.roleForm.bzhUserName = data[0].name
|
||||
} else if (this.userType === 'fggcsUserId') {
|
||||
console.log(data)
|
||||
this.roleForm.fggcsUserId = data[0].id
|
||||
this.roleForm.fggcsUserName = data[0].name
|
||||
} else if (this.userType === 'jsfzrUserId') {
|
||||
@@ -2757,9 +2762,25 @@
|
||||
},'')
|
||||
// const id = this.selectedListRep[0].id
|
||||
this.selectByIdAtt(ids).then(res =>{
|
||||
if (res && res.data && res.data.fbgbuss !== '') {
|
||||
this.form.LSBBBUSSName = res.data.fbgbussNmae
|
||||
this.form.LSBBBUSS = res.data.fbgbuss
|
||||
if (res && res.data && res.data[0].fbgbuss !== '') {
|
||||
this.form.LSBBBUSSName = res.data.reduce((init,item,index,arr)=>{
|
||||
if(index === 0){
|
||||
init = item.fbgbussNmae
|
||||
}else{
|
||||
init = init + ',' + item.fbgbussNmae
|
||||
}
|
||||
return init
|
||||
},'')
|
||||
this.form.LSBBBUSS = res.data.reduce((init,item,index,arr)=>{
|
||||
if(index === 0){
|
||||
init = item.fbgbuss
|
||||
}else{
|
||||
init = init + ',' + item.fbgbuss
|
||||
}
|
||||
return init
|
||||
},'')
|
||||
// this.form.LSBBBUSSName = res.data[0].fbgbussNmae
|
||||
// this.form.LSBBBUSS = res.data[0].fbgbuss
|
||||
this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName);
|
||||
}
|
||||
})
|
||||
@@ -3471,19 +3492,24 @@
|
||||
this.form.reviseStatus = processForm.reviseStatus
|
||||
this.form.standName = processForm.renameEs ? processForm.renameEs : processForm.esName
|
||||
|
||||
this.$http.get('/lawss/activiti/saveEditFile', {
|
||||
model: 'model_qb'
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res) {
|
||||
this.form.FBGBUSS = res.id
|
||||
this.form.FBGBUSSName = this.form.standName
|
||||
this.FBGBUSSFileList = this.assemble(res.id, this.form.FBGBUSSName);
|
||||
}
|
||||
})
|
||||
|
||||
// this.FBGBUSSFileList=[...this.FBGBJBDFileList,...this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName)]
|
||||
|
||||
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName)
|
||||
|
||||
if(this.FBGBUSSFileList.length === 0){
|
||||
this.$http.get('/lawss/activiti/saveEditFile', {
|
||||
model: 'model_qb'
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res) {
|
||||
this.form.FBGBUSS = res.id + ',' + this.form.FBGBUSS
|
||||
this.form.FBGBUSSName = this.form.standName + ',' + this.form.FBGBUSSName
|
||||
this.FBGBUSSFileList = [...this.assemble(res.id, this.form.standName),...this.FBGBUSSFileList];
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
|
||||
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
|
||||
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
|
||||
@@ -3491,28 +3517,54 @@
|
||||
// 企标制修订计划管控 进入 技术标准起草 修订类型: 发布稿放到历史版本
|
||||
if(processForm.reviseStatus === '2'){
|
||||
this.selectByIdAtt(processForm.rqbJson).then(res =>{
|
||||
if (res && res.data && res.data.fbgbuss !== '') {
|
||||
this.form.LSBBBUSSName = res.data.fbgbussNmae
|
||||
this.form.LSBBBUSS = res.data.fbgbuss
|
||||
// if (res && res.data && res.data.fbgbuss !== '') {
|
||||
// this.form.LSBBBUSSName = res.data.fbgbussNmae
|
||||
// this.form.LSBBBUSS = res.data.fbgbuss
|
||||
// this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName);
|
||||
// }
|
||||
if (res && res.data && res.data[0].fbgbuss !== '') {
|
||||
this.form.LSBBBUSSName = res.data.reduce((init,item,index,arr)=>{
|
||||
if(index === 0){
|
||||
init = item.fbgbussNmae
|
||||
}else{
|
||||
init = init + ',' + item.fbgbussNmae
|
||||
}
|
||||
return init
|
||||
},'')
|
||||
this.form.LSBBBUSS = res.data.reduce((init,item,index,arr)=>{
|
||||
if(index === 0){
|
||||
init = item.fbgbuss
|
||||
}else{
|
||||
init = init + ',' + item.fbgbuss
|
||||
}
|
||||
return init
|
||||
},'')
|
||||
this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName);
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
this.form.QCDW = processForm.QCDW || processForm.unitName
|
||||
this.form.QCDWID = processForm.QCDWID || processForm.unit
|
||||
this.form.QCRBUSSID = processForm.QCRBUSSID || processForm.drafter
|
||||
this.form.QCRBUSS = processForm.QCRBUSS || processForm.drafterName
|
||||
this.form.SYCXCLASS = processForm.SYCXCLASS.length > 0 ? processForm.SYCXCLASS : processForm.area
|
||||
if (processForm.type == '1') {
|
||||
try{
|
||||
this.form.QCDW = processForm.QCDW || processForm.unitName
|
||||
this.form.QCDWID = processForm.QCDWID || processForm.unit
|
||||
this.form.QCRBUSSID = processForm.QCRBUSSID || processForm.drafter
|
||||
this.form.QCRBUSS = processForm.QCRBUSS || processForm.drafterName
|
||||
this.form.SYCXCLASS = processForm.SYCXCLASS && processForm.SYCXCLASS.length > 0 ? processForm.SYCXCLASS : processForm.area
|
||||
if (processForm.type == '1') {
|
||||
this.esId1 = processForm.esId1
|
||||
this.esId2 = processForm.esId2
|
||||
}
|
||||
this.taskType = processForm.type
|
||||
|
||||
// 关联信息
|
||||
this.form.DTQBBHBUSS = processForm.DTQBBHBUSS || processForm.rqbName
|
||||
this.form.CYBZ = processForm.CYBZ || processForm.esStandRelations
|
||||
this.form.YYBZ = processForm.YYBZ || processForm.esMatingRelations
|
||||
let useLevel = this.form.CYCD || processForm.useLevel
|
||||
this.form.CYCD = useLevel === '29l0zgltnq' ? 'IDT等同采用' : processForm.useLevel === '9te26649ne' ? 'NEQ非等效采用' : 'MOD修改采用'
|
||||
}catch(e){
|
||||
console.log(e)
|
||||
}
|
||||
this.taskType = processForm.type
|
||||
this.form.DTQBBHBUSS = processForm.DTQBBHBUSS || processForm.rqbName
|
||||
this.form.CYBZ = processForm.CYBZ || processForm.esStandRelations
|
||||
this.form.YYBZ = processForm.YYBZ || processForm.esMatingRelations
|
||||
// this.form.CYCD = processForm.useLevel === '29l0zgltnq' ? 'IDT等同采用' : processForm.useLevel === '9te26649ne' ? 'NEQ非等效采用' : 'MOD修改采用'
|
||||
this.$http.get('lawss/activiti/judgeAcceptTack', {
|
||||
nowEsId: this.nowEsId,
|
||||
oaFlag: '1',
|
||||
@@ -3526,6 +3578,19 @@
|
||||
this.showreceive = false
|
||||
}
|
||||
})
|
||||
|
||||
// 人员信息
|
||||
let roleForm = JSON.parse(res.mesg).roleForm
|
||||
this.roleForm.qcUserName = roleForm.qcUserName
|
||||
this.roleForm.bzhUserName = roleForm.bzhUserName
|
||||
this.roleForm.hqUserName = roleForm.hqUserName
|
||||
this.roleForm.xdUserName = roleForm.xdUserName
|
||||
this.roleForm.fggcsUserName = roleForm.fggcsUserName
|
||||
this.roleForm.jsfzrUserName = roleForm.jsfzrUserName
|
||||
this.roleForm.bzUserName = roleForm.bzUserName
|
||||
this.roleForm.fzrUserName = roleForm.fzrUserName
|
||||
this.roleForm.zhrUserName = roleForm.zhrUserName
|
||||
this.roleForm.fbUserName = roleForm.fbUserName
|
||||
}
|
||||
}).catch(e => {
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user