diff --git a/src/api/getFileByAttId.js b/src/api/getFileByAttId.js new file mode 100644 index 000000000..b896e7476 --- /dev/null +++ b/src/api/getFileByAttId.js @@ -0,0 +1,28 @@ +import axios from '@/common/axiosV2' + +export function getFileAttId (data) { + this.getBusStandFileByAttId(data) + .then(res => { + if(res){ + const editFileInfo = res + if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){ + window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl) + }else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){ + window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?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) + } + } + }).catch(e => { + this.$message.warning('文件不存在,预览失败') + }) +} + +export function getBusStandFileByAttId(data) { + return axios({ + url: 'api/att/attFile/getBusStandFileByAttId', + method: 'get', + params: data + }) +} diff --git a/src/main.js b/src/main.js index b108eb878..3fbcdd304 100644 --- a/src/main.js +++ b/src/main.js @@ -107,7 +107,6 @@ router.beforeEach(function (to, from, next) { } // 返回值为登录状态 /** 判断是不是在手机端操作 */ - debugger if (isMobile()) { if(toName === 'processCenter'){ hwh5.close(); diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 4bb1ef841..cdc948f50 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -2276,7 +2276,7 @@ export default { }else { const nowTime = new Date().getTime() // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))); - // window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) + // 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('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) } diff --git a/src/pages/details/otherLawsStandDetails/index.vue b/src/pages/details/otherLawsStandDetails/index.vue index dffdfcbf3..c6c20ddff 100644 --- a/src/pages/details/otherLawsStandDetails/index.vue +++ b/src/pages/details/otherLawsStandDetails/index.vue @@ -1516,7 +1516,7 @@ export default { }else { const nowTime = new Date().getTime() // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))); - // window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) + // 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('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) } diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 173972eba..3706a9596 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -875,8 +875,9 @@ type="dates" value-format="yyyy-MM-dd" style="width: 45%" + prefix-icon="none" v-model="resolveListForm.xccssrq" - placeholder="选择一个或多个日期"> + placeholder="请选择新车型实施日期"> @@ -891,9 +892,10 @@ + placeholder="请选择在产车实施日期"> @@ -901,26 +903,38 @@ - - + + + + + + + + + + + + + + - @@ -164,6 +172,7 @@ export default { }, ch_rules: {}, nodeList: [], + modalshowflag: false, commentText: '', isBack: false, @@ -201,7 +210,6 @@ export default { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData this.uploadFileLength = this.ch_pageData.fileTextList.length - this.ch_pageData.meetingInRole = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList }) }, @@ -270,6 +278,28 @@ export default { window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; } }, + + choiceRole () { + this.nodeList = [] + if ( this.ch_pageData.meetingInRoleId.length > 0) { + this.nodeList = this.ch_pageData.meetingInRoleId.split(',') + } + this.modalshowflag = true + }, + checkedRole (data) { + var idList = '' + var nameList = '' + data.forEach( item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + }) + this.ch_pageData.meetingInRoleId = idList + this.ch_pageData.meetingInRole = nameList + }, } } diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue index 00a8159a1..b3d003239 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue @@ -96,9 +96,11 @@ + @@ -134,6 +136,13 @@ @submit="handleSubmit" > + @@ -177,6 +186,7 @@ export default { commentText: '', roleShowflag: false, nodeList: [], + modalshowflag: false, detailData: [], loading: false, @@ -210,7 +220,6 @@ export default { getFormFieldList(item) { this.$nextTick(() => { this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData - this.rh_pageData.comityOpRole = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList this.infoSourcesLength = this.rh_pageData.infoSources.length // this.rh_pageData.comityFileNum = this.fileTextList @@ -283,7 +292,28 @@ export default { }); } }) - } + }, + choiceRole () { + this.nodeList = [] + if ( this.rh_pageData.comityOpRoleId.length > 0) { + this.nodeList = this.rh_pageData.comityOpRoleId.split(',') + } + this.modalshowflag = true + }, + checkedRole (data) { + var idList = '' + var nameList = '' + data.forEach( item => { + if (nameList.length > 0) { + nameList += ',' + idList += ',' + } + idList += item.id + nameList += item.name + }) + this.rh_pageData.comityOpRoleId = idList + this.rh_pageData.comityOpRole = nameList + }, } } diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue new file mode 100644 index 000000000..159b61275 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue @@ -0,0 +1,498 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue new file mode 100644 index 000000000..338a9c788 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue @@ -0,0 +1,583 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue new file mode 100644 index 000000000..20af2e63b --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue @@ -0,0 +1,570 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue index 7b73f4751..495efdc38 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue @@ -273,6 +273,9 @@ ProcessTitle }, methods: { + dialogOk () { + this.itermsConditionsFlag = false + }, filesUpload (file) { // 下载 const attId = file.attId if (attId) { @@ -309,7 +312,7 @@ }else { const nowTime = new Date().getTime() // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl))); - window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName) + 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('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id)) } @@ -496,7 +499,7 @@