diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index d5c9cdd82..96dd7e975 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -1384,9 +1384,18 @@ export default { checkedRole(data){ if(data[0].id){ let asdId = sessionStorage.getItem('queId') + const usid = data.reduce((init,item,index,arr)=>{ + let result + if(index === arr.length - 1){ + result = init + item.id + }else{ + result = init + item.id + ',' + } + return result + },'') this.$http.postData('lawss/AskUser/insertAskUser',{ asdId: asdId, - usid: data[0].id, + usid, },{ _this: this }, res => { @@ -1680,7 +1689,8 @@ export default { this.dataLoading = true sessionStorage.setItem('queId', this.activeQue) this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{ - id: this.activeQue + id: this.activeQue, + userId: this.$store.getters.userInfo.userId },{ _this: this }, res => { diff --git a/src/pages/phone/domesticDetails.vue b/src/pages/phone/domesticDetails.vue index aa56b0568..8ebd458a7 100644 --- a/src/pages/phone/domesticDetails.vue +++ b/src/pages/phone/domesticDetails.vue @@ -2801,7 +2801,7 @@ if (res) { const editFileInfo = res const nowTime = new Date().getTime() - this.loadingText = true + // this.loadingText = true if (editFileInfo.fileSuffix.toLowerCase() === 'pdf') { // if (/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) { // //alert(navigator.userAgent); @@ -2811,15 +2811,15 @@ // this.loadingText = false // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) // } else { - this.loadingText = false - window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) + // this.loadingText = false + window.open(kkFileViewUrl + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))); + // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) // } // window.open('/#/phonePDF?fileId='+editFileInfo.id) } else { const nowTime = new Date().getTime() // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) window.open(kkFileViewUrl + '/onlinePreview?url=' + encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))); - } } }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue index aed3af715..98e6de778 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -1124,6 +1124,11 @@ export default { // this.$emit('reveseStatusChange',val) // } // } + 'form.standNum': { + handler: function(val){ + this.$emit('standNumChange',val) + } + } } } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 8c9dfc88a..00ff850ee 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -2699,12 +2699,13 @@ message: '标准最多选择20项', type: 'warning' }) - } else if (this.form.reviseStatus === '2' && this.selectedListRep.length + textArr.length > 1) { - return this.$message({ - message: '标准最多选择1项', - type: 'warning' - }) } + // else if (this.form.reviseStatus === '2' && this.selectedListRep.length + textArr.length > 1) { + // return this.$message({ + // message: '标准最多选择1项', + // type: 'warning' + // }) + // } this.selectedListRep.map((item) => { let texts = '' if (item.standCode !== null && item.standCode !== '') { @@ -2725,8 +2726,9 @@ // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 if (this.replaceLawType === 'DTQBBHBUSS') { - let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',') - this.form.DTQBBHBUSS = this.filterSetData(arr1) + // let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',') + // this.form.DTQBBHBUSS = this.filterSetData(arr1) + this.form.DTQBBHBUSS = textArr.join(',') this.form.standNum = this.filterSetData(textArr2.join(',')) } else if (this.replaceLawType === 'CYBZ') { let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' + textArr.join(',') : textArr.join(',') @@ -2740,6 +2742,28 @@ this.form.byybj = this.form.byybj ? this.form.byybj + ',' + textArr.join(',') : textArr.join(',') } // this.$emit('input', textArr.join(',')) + + // 修订 时 手动查找代替企标编号 发布稿放到历史版本 + if(this.replaceLawType === 'DTQBBHBUSS' && this.form.reviseStatus === '2' && this.selectedListRep.length){ + let ids = this.selectedListRep.reduce((init,item,index,arr)=>{ + let result + if(index === arr.length - 1){ + result = init + item.id + }else{ + result = init + item.id + ',' + } + return result + },'') + // 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 + this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName); + } + }) + } + this.$refs.selections.clearSelection() }, filterSetData(data) { @@ -3405,6 +3429,17 @@ this.modelOptions = res.data }) }, + selectByIdAtt(id){ + return new Promise((resolve,reject)=>{ + this.$http.get('/lawss/sarBussionessStand/selectByIdAtt', { + id + }, { + _this: this + }, res => { + resolve(res) + }) + }) + }, getData() { if (this.$route.query.taskIds && this.$route.query.prcId) { return new Promise((resolve, reject) => { @@ -3438,6 +3473,19 @@ this.FBGBUSSFileList = this.assemble(res.id, this.form.FBGBUSSName); } }) + + // 企标制修订计划管控 进入 技术标准起草 修订类型: 发布稿放到历史版本 + 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 + this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName); + } + }) + } + + this.form.QCDW = processForm.unitName this.form.QCDWID = processForm.unit this.form.QCRBUSSID = processForm.drafter diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 8bef8f07f..6afca61c5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -47,6 +47,7 @@ @formChoiceZRR5 = "formChoiceZRR5" @standSortChange = "standSortChange" @reveseStatusChange = 'reveseStatusChange' + @standNumChange="standNumChange" />
@@ -1195,60 +1196,67 @@ this.form.standSn = standSn this.form.standNumber = standSn this.form.standNum = standSn + + // this.form.standYear = this.standYear.slice(0,4) + let year = new Date().getFullYear() + if(this.standYear !== year){ + // if(this.standYear.slice(0,4) == this.form.standYear){ + // this.form.standYear = year + ' X' + // }else{ + this.form.standYear = year + // } + }else{ + if(this.standYear.slice(0,4) == this.form.standYear){ + this.form.standYear = this.standYear + ' X' + }else{ + this.form.standYear = this.standYear + } + } + + this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }, e => { }) - // this.form.standYear = this.standYear.slice(0,4) - let year = new Date().getFullYear() - if(this.standYear !== year){ - // if(this.standYear.slice(0,4) == this.form.standYear){ - // this.form.standYear = year + ' X' - // }else{ - this.form.standYear = year - // } - }else{ - if(this.standYear.slice(0,4) == this.form.standYear){ - this.form.standYear = this.standYear + ' X' - }else{ - this.form.standYear = this.standYear - } - } + }else if(this.form.reviseStatus === '2'){ this.form.standNum = this.standNum === undefined ? '' : this.standNum let year = new Date().getFullYear() - if(this.standYear.slice(0,4) != year){ + if((this.standYear+'').slice(0,4) != year){ if((this.form.standYear+'').slice(0,4) === year){ this.form.standYear = year + ' X' }else{ this.form.standYear = year } }else{ - if(this.standYear.slice(0,4) == (this.form.standYear + '').slice(0,4)){ + if((this.standYear+'').slice(0,4) == (this.form.standYear + '').slice(0,4)){ this.form.standYear = this.standYear + ' X' }else{ this.form.standYear = this.standYear } } - - - }else if(this.form.reviseStatus === '3'){ - // this.form.standSort = this.standSort - this.form.standCode = this.standCode - this.form.standNum = this.standNum - if(this.standYear.slice(0,4) == this.form.standYear){ - this.form.standYear = this.standYear + ' X' - }else{ - this.form.standYear = this.standYear - } - this.form.standSort = this.standSort + this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) } + // else if(this.form.reviseStatus === '3'){ + // // this.form.standSort = this.standSort + // this.form.standCode = this.standCode + // this.form.standNum = this.standNum + // if(this.standYear.slice(0,4) == this.form.standYear){ + // this.form.standYear = this.standYear + ' X' + // }else{ + // this.form.standYear = this.standYear + // } + // this.form.standSort = this.standSort + // } }, standSortChange(val){ this.reveseStatusChange(); // this.form.standCode = val + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }, + standNumChange(val){ + this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }, checkedRoleTransfer (data) { this.isSubmit = true this.saveLoading = true @@ -1349,9 +1357,9 @@ this.fileType = fileType this.fileUpload(fileType) } - if(form.reviseStatus !== '3'){ - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) - } + // if(form.reviseStatus !== '3'){ + // this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + // } }, modelProp(row,index){ console.log(row) @@ -2890,12 +2898,14 @@ // 截取企标号中的日期 // 'Q-F 101-2023 X' // --- - if(this.form.standCode == ''){ - this.form.standCode = this.form.DTQBBHBUSS - // this.form.standCode = 'Q/FT A033-2023' - } - let index1 = this.form.standCode.lastIndexOf('-') // 7 - this.standYear = this.form.standCode.slice(index1 + 1) // 2023 x + // if(this.form.standCode == ''){ + // this.form.standCode = this.form.DTQBBHBUSS + // this.form.standCode = 'Q/FTA033-2023' + // } + // console.log(this.form.DTQBBHBUSS.split(',')[0]) + // 被代替企标编号年份 + let index1 = this.form.DTQBBHBUSS.split(',')[0].lastIndexOf('-') // 7 + this.standYear = this.form.DTQBBHBUSS.split(',')[0].slice(index1 + 1) // 2023 x if(this.standYear.indexOf(' ')>0){ const _index = this.standYear.indexOf(' ') this.standYear = this.standYear.slice(0,_index) @@ -2904,36 +2914,55 @@ this.standYear = this.standYear.slice(0,_index) // 2023 } - let noYearStand = this.form.standCode.slice(0, index1) // 'Q-F 101' - let index2 = noYearStand.lastIndexOf(' ') // 3 - this.standNum = noYearStand.slice(index2 + 1) // '101' + // let noYearStand = this.form.standCode.slice(0, index1) // 'Q-F 101' + // let index2 = noYearStand.lastIndexOf(' ') // 3 + // this.standNum = noYearStand.slice(index2 + 1) // '101' + // this.standNum = noYearStand.replace(this.form.standSort,'').trim() - this.standSort = noYearStand.slice(0, index2) // 'Q-F' + // this.standSort = noYearStand.slice(0, index2) // 'Q-F' + // this.standSort = this.form.standSort - this.form.standSort = this.standSort - this.form.standNum = this.standNum + // this.form.standSort = this.standSort + // this.form.standNum = this.standNum // --- - this.form.standSn = this.form.standNum - this.form.standNumber = this.form.standNum + // this.form.standSn = this.form.standNum + // this.form.standNumber = this.form.standNum // this.form.standYear = this.regDate(year) + this.standSort = this.form.standSort this.form.standYear = year + if((this.standYear+'').slice(0,4) != year){ + // if((this.form.standYear+'').slice(0,4) === year){ + // this.form.standYear = year + ' X' + // }else{ + this.form.standYear = year + // } + }else{ + if((this.standYear+'').slice(0,4) == (this.form.standYear + '').slice(0,4)){ + this.form.standYear = this.standYear + ' X' + }else{ + this.form.standYear = this.standYear + } + } + + if(this.form.standYear == this.standYear){ this.form.standYear = this.form.standYear + ' X' } // 此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 - let judgeFn = new RegExp(/\s+/g); - console.log(judgeFn.test(this.form.standSort)) - if(judgeFn.test(this.form.standSort)){ - this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) - }else if(this.form.standSort === 'Q/QCBFC'){ - this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) - }else { - this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) - } + // let judgeFn = new RegExp(/\s+/g); + // console.log(judgeFn.test(this.form.standSort)) + // if(judgeFn.test(this.form.standSort)){ + // this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + // }else if(this.form.standSort === 'Q/QCBFC'){ + // this.form.standCode = this.form.standSort + '' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + // }else { + // this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + // } + this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.standCode = this.form.standCode // this.standSort = this.form.standSort @@ -2954,19 +2983,22 @@ const _index = this.standYear.indexOf(' X') // 4 this.standYear = this.standYear.slice(0,_index) // 2023 } - console.log(this.standYear) let noYearStand = this.form.standCode.slice(0, index1) // 'Q-F 101' - let index2 = noYearStand.lastIndexOf(' ') // 3 - this.standNum = noYearStand.slice(index2 + 1) // '101' + // let index2 = noYearStand.lastIndexOf(' ') // 3 + // this.standNum = noYearStand.slice(index2 + 1) // '101' + this.standNum = noYearStand.replace(this.form.standSort,'').trim() // '101' - this.standSort = noYearStand.slice(0, index2) // 'Q-F' + // this.standSort = noYearStand.slice(0, index2) // 'Q-F' + this.standSort = this.form.standSort - this.form.standSort = this.standSort + // this.form.standSort = this.standSort this.form.standNum = this.standNum // --- this.form.standYear = year + + this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) // if(this.form.standYear == this.standYear){ // this.form.standYear = this.form.standYear + ' X' // } @@ -2992,20 +3024,21 @@ _this: this }, res => { const obj = res.data - let standSn = obj.newStandSn + 1 + let standSn = (obj.newStandSn / 1) + 1 this.form.standSn = standSn this.form.standNumber = standSn this.form.standNum = standSn // this.form.standYear = this.regDate(year) // 待带入立项标准 //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 - let judgeFn = new RegExp(/\s+/g); - if(judgeFn.test(this.form.standSort)){ - this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) - }else if(this.form.standSort === 'Q/QCBFC'){ - this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) - }else { - this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) - } + // let judgeFn = new RegExp(/\s+/g); + // if(judgeFn.test(this.form.standSort)){ + // this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + // }else if(this.form.standSort === 'Q/QCBFC'){ + // this.form.standCode = this.form.standSort + '' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + // }else { + // this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + // } + this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) this.standSort = this.form.standSort this.standCode = this.form.standCode diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index e85771ce7..78f088bcf 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -1474,18 +1474,31 @@ id:attId }).then(res => { if(res){ - const editFileInfo = res - const showName = label - const editFilePath = editFileInfo.editFilePath.split("/") - editFileInfo.filePath = editFilePath[0]+'/'+editFilePath[1]+'/' - editFileInfo.fileName = editFilePath[2] - if(editFileInfo.pid){ - editFileInfo.pId = editFileInfo.pid - } - editFileInfo.fileSuffix = 'docx' + // const editFileInfo = res + // const showName = label + // const editFilePath = editFileInfo.editFilePath.split("/") + // editFileInfo.filePath = editFilePath[0]+'/'+editFilePath[1]+'/' + // editFileInfo.fileName = editFilePath[2] + // if(editFileInfo.pid){ + // editFileInfo.pId = editFileInfo.pid + // } + // editFileInfo.fileSuffix = 'docx' + // const nowTime = new Date().getTime() + // this.iframeUrl = onlyOfficeUrl+'/onlyOffice?oldFileName=' + showName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName + // this.iframeLoading = false + + const editFileInfo = res + const _index = editFileInfo.downLoadUrl.lastIndexOf('.') + editFileInfo.fileSuffix = editFileInfo.downLoadUrl.slice(_index + 1) + if(editFileInfo.fileSuffix.toLowerCase() === 'pdg'){ + this.iframeUrl = 'book://ssreader/e0?url='+editFileInfo.downLoadUrl + }else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){ + this.iframeUrl = './static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id) + }else { const nowTime = new Date().getTime() - this.iframeUrl = onlyOfficeUrl+'/onlyOffice?oldFileName=' + showName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName - this.iframeLoading = false + this.iframeUrl = kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))+'&office.preview.type=pdf'; + } + this.iframeLoading = false resolve(res) } }).catch(e => { diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 5813929e4..4994efac5 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -238,6 +238,7 @@ size="mini" :loading="searching" @click="addImportModal(1)" + v-btn-permission="'784d26f527a659eefe84d5e5a53dee99'" >导入 移动标准 - 模板下载