diff --git a/src/pages/details/otherStandardDetails/components/ResolveTable.vue b/src/pages/details/otherStandardDetails/components/ResolveTable.vue new file mode 100644 index 000000000..cd6c49b41 --- /dev/null +++ b/src/pages/details/otherStandardDetails/components/ResolveTable.vue @@ -0,0 +1,390 @@ + + + + + diff --git a/src/pages/phone/domesticDetails.vue b/src/pages/phone/domesticDetails.vue index 32bdeecc4..aa56b0568 100644 --- a/src/pages/phone/domesticDetails.vue +++ b/src/pages/phone/domesticDetails.vue @@ -2803,17 +2803,17 @@ const nowTime = new Date().getTime() this.loadingText = true if (editFileInfo.fileSuffix.toLowerCase() === 'pdf') { - if (/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) { - //alert(navigator.userAgent); - this.getFileInfo(editFileInfo.id) - } else if (/(Android)/i.test(navigator.userAgent)) { - //alert(navigator.userAgent); + // if (/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) { + // //alert(navigator.userAgent); + // this.getFileInfo(editFileInfo.id) + // } else if (/(Android)/i.test(navigator.userAgent)) { + // //alert(navigator.userAgent); + // 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)) - } else { - this.loadingText = false - 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() diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index 89d232ba1..281de6f8c 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -141,8 +141,12 @@ export default { * @date: 2020-11-25 15:47:12 * @auth: chenxiaoxi */ - getPrcName(prcType) { + getPrcName(prcType, taskInfo) { let prcName = ""; + if(prcType === '25' && taskInfo === '技术标准起草'){ + prcName = '企标制修订-技术标准' + return prcName + } this.processTypeList.map(item => { if (item.value === prcType) { prcName = item.label; diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue index 11352d498..aed3af715 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -134,7 +134,7 @@
- + - +