From 8f30e36ec5f37716f73bd798cfb00f67f65198da Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 15 Dec 2021 10:16:49 +0800 Subject: [PATCH 01/27] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/process.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/api/process.js b/src/api/process.js index 132ac33b5..1d8b7a763 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -681,3 +681,11 @@ export function getStandInfoById (data) { params: data }) } +// 标准法规工作组接口 +export function workGroup(data) { + return axios({ + url: 'api/wg_work_group/researchData', + method: 'get', + params: data + }) +} From 4703d2d42531c31ec88af7f0ecd4313c7ddf6e80 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 15 Dec 2021 10:30:37 +0800 Subject: [PATCH 02/27] =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=A9=BA=E7=99=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 84fe82c79..970392e3e 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3235,41 +3235,41 @@ export default { }, { _this: this }, res => { - displayLocation.map(item => { - if (item.value === '2URVBGR2Y4UG77KZ5YPL') { - item.child.forEach(items =>{ - let accessCountry = JSON.parse(sessionStorage.getItem("accessCountry")); - if (accessCountry.country === undefined) { - accessCountry.country = '文本' - } - if(items.attrField === 'SSRQ') { - items.attrName = '实施日期' + '(' + accessCountry.country + ')' + ':' - if (accessCountry.ssrq !== undefined) { - item.value = accessCountry.ssrq - } - } else if (items.attrField === 'ZCCSSRQ') { - items.attrName = '在产车实施日期' + '(' + accessCountry.country + ')' + ':' - if (accessCountry.zccssrqgj !== undefined) { - item.value = accessCountry.zccssrqgj - } - } else if(items.attrField === 'XCXSSRQ') { - items.attrName = '新车型实施日期' + '(' + accessCountry.country + ')' + ':' - if (accessCountry.xcxssrqgj !== undefined) { - item.value = accessCountry.xcxssrqgj - } - - } - }) - for (let key in res.data) { - item.one.push({ - attrName: key, - value: res.data[key].join(','), - isShowImp: '0', - id: key - }) - } - } - }) + // displayLocation.map(item => { + // if (item.value === '2URVBGR2Y4UG77KZ5YPL') { + // item.child.forEach(items =>{ + // let accessCountry = JSON.parse(sessionStorage.getItem("accessCountry")); + // if (accessCountry.country === undefined) { + // accessCountry.country = '文本' + // } + // if(items.attrField === 'SSRQ') { + // items.attrName = '实施日期' + '(' + accessCountry.country + ')' + ':' + // if (accessCountry.ssrq !== undefined) { + // item.value = accessCountry.ssrq + // } + // } else if (items.attrField === 'ZCCSSRQ') { + // items.attrName = '在产车实施日期' + '(' + accessCountry.country + ')' + ':' + // if (accessCountry.zccssrqgj !== undefined) { + // item.value = accessCountry.zccssrqgj + // } + // } else if(items.attrField === 'XCXSSRQ') { + // items.attrName = '新车型实施日期' + '(' + accessCountry.country + ')' + ':' + // if (accessCountry.xcxssrqgj !== undefined) { + // item.value = accessCountry.xcxssrqgj + // } + // + // } + // }) + // for (let key in res.data) { + // item.one.push({ + // attrName: key, + // value: res.data[key].join(','), + // isShowImp: '0', + // id: key + // }) + // } + // } + // }) this.dynamicFormField = displayLocation }) sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) From a6f0ee7322b516134828ae17dadf6d28b1fe978d Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 15 Dec 2021 10:35:00 +0800 Subject: [PATCH 03/27] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E9=80=82=E7=94=A8=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=EF=BC=8C=E8=83=BD=E6=BA=90=E7=B1=BB=E5=9E=8B=EF=BC=8C=E9=80=82?= =?UTF-8?q?=E7=94=A8=E4=BA=A7=E5=93=81=E7=BA=BF=EF=BC=8C=E9=80=82=E7=94=A8?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=EF=BC=8C=E8=B4=A3=E4=BB=BB=E9=83=A8=E9=97=A8?= =?UTF-8?q?=EF=BC=8C=E8=B4=A3=E4=BB=BB=E5=B7=A5=E7=A8=8B=E5=B8=88=EF=BC=9A?= =?UTF-8?q?=E5=8D=95=E9=80=89=E6=94=B9=E5=A4=9A=E9=80=89=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=A8=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step4.vue | 180 ++++++++++++------ 1 file changed, 124 insertions(+), 56 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 7cdc5ac8b..d96aa2ad4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -704,6 +704,14 @@
+ + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + Date: Wed, 15 Dec 2021 14:30:55 +0800 Subject: [PATCH 07/27] commit --- .../pages/creatProcess/bzzqyj/step1-1.vue | 6 ++--- .../pages/creatProcess/bzzqyj/step1.vue | 6 ++--- .../pages/creatProcess/bzzqyj/step2.vue | 9 +------- .../pages/creatProcess/bzzqyj/step3.vue | 9 +------- .../pages/creatProcess/bzzqyj/step4-1.vue | 9 +------- .../pages/creatProcess/bzzqyj/step4-2.vue | 9 +------- .../pages/creatProcess/bzzqyj/step4.vue | 9 +------- .../pages/creatProcess/bzzqyj/step5.vue | 9 +------- .../pages/creatProcess/bzzqyj/step6.vue | 9 +------- .../pages/creatProcess/bzzqyj/step7.vue | 9 +------- .../pages/creatProcess/bzzqyj/step8.vue | 9 +------- .../pages/creatProcess/bzzqyj/step9.vue | 9 +------- .../components/workingGroup1/index.vue | 22 +++++++++++++++---- .../components/workingGroup2/index.vue | 21 +++++++++++------- 14 files changed, 47 insertions(+), 98 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index c82eb09dd..811f5d5b1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -327,7 +327,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess" :on-remove="importFileRemove" @@ -476,10 +476,10 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index bb5f72f62..6c38bb7cb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -342,7 +342,7 @@ :action="fileUrl" ref="importfile" name="file" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beginImportFile" :on-success="importFileSuccess" :on-remove="importFileRemove" @@ -489,10 +489,10 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { - this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 3a573f99c..028661cc1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -255,14 +255,7 @@ export default { }) }, updataFj (item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get("lawss/activiti/get_list_by_instance", { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 5dc8a02c7..e0062beed 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -464,14 +464,7 @@ }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 8a5edbd2d..6cbadc4ec 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -365,14 +365,7 @@ }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue index 5caae05e7..7eaad4088 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue @@ -357,14 +357,7 @@ }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 9ec1b19d8..1468ea86b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -550,14 +550,7 @@ export default { }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 995ed952d..5e1e6bcca 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -473,14 +473,7 @@ }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get("lawss/activiti/get_list_by_instance", { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index b95419445..884d04912 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -364,14 +364,7 @@ export default { }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get("lawss/activiti/get_list_by_instance", { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 6e959ee91..3fe206cb5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -361,14 +361,7 @@ export default { }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 31006296c..b3d4a40f9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -361,14 +361,7 @@ export default { }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 95c0b267d..6055e3d72 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -361,14 +361,7 @@ export default { }) }, updataFj(item) { - let id - let type = item.fileName.split('.') - if (type[1] === 'pdf') { - id = item.attId - } else { - id = item.oriAttId - } - window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, getHistoryData() { this.$http.get("lawss/activiti/get_list_by_instance", { diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue index 40e39f1ab..09b62375f 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue @@ -290,7 +290,7 @@ align="center">