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 + }) +} 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)) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index cbc6b1261..4478669ad 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -236,7 +236,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="importFileSuccess2" :on-remove="importFileRemove2" @@ -442,7 +442,7 @@ 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 === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index 7b3be3269..67eba24cf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -237,7 +237,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="importFileSuccess2" :on-remove="importFileRemove2" @@ -434,10 +434,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' || fileSuffix === '.XLS' || fileSuffix === '.XLSX') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || 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/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index c9e2b3e0d..9991a3e2e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -230,7 +230,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" :show-file-list="true" @@ -408,11 +408,11 @@ 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 === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - 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/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 56db15162..160df19ce 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -209,7 +209,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" :show-file-list="true" @@ -320,11 +320,11 @@ 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 === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - 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/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index 8d5d6233e..87da7b48f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -199,7 +199,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" :show-file-list="false" @@ -311,11 +311,11 @@ 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 === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - 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/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index 0305ec5b7..e170af563 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -199,7 +199,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" :show-file-list="false" @@ -311,11 +311,11 @@ 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 === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - 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/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index ac013d389..5024d3034 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -199,7 +199,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" :show-file-list="false" @@ -311,11 +311,11 @@ 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 === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - 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/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 9079796c2..aaaab8fb0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -199,7 +199,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" :show-file-list="false" @@ -311,11 +311,11 @@ 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 === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - 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/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 @@
+ + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + { + for (let s = 0; s < this.delNetInfos.length; s++) { + if (this.addForm.wgNetInfosDel) { + this.addForm.wgNetInfosDel += ',' + this.addForm.wgNetInfosDel += this.delNetInfos[s].id + } else { + this.addForm.wgNetInfosDel = this.delNetInfos[s].id + } + } for (let a = 0; a < this.addForm.wgNetInfos.length; a++) { this.delNetInfos.forEach(item => { if (this.addForm.wgNetInfos[a].joinId === item.joinId) { @@ -1256,6 +1268,14 @@ confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { + for (let s = 0; s < this.delDepts.length; s++) { + if (this.addForm.wgDeptsDel) { + this.addForm.wgDeptsDel += ',' + this.addForm.wgDeptsDel += this.delDepts[s].id + } else { + this.addForm.wgDeptsDel = this.delDepts[s].id + } + } for (let a = 0; a < this.addForm.wgDepts.length; a++) { this.delDepts.forEach(item => { if (this.addForm.wgDepts[a].joinId === item.joinId) { @@ -1277,6 +1297,14 @@ confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { + for (let s = 0; s < this.delPayInfos.length; s++) { + if (this.addForm.wgPayInfosDel) { + this.addForm.wgPayInfosDel += ',' + this.addForm.wgPayInfosDel += this.delPayInfos[s].id + } else { + this.addForm.wgPayInfosDel = this.delPayInfos[s].id + } + } for (let a = 0; a < this.addForm.wgPayInfos.length; a++) { this.delPayInfos.forEach(item => { if (this.addForm.wgPayInfos[a].joinId === item.joinId) { @@ -1298,6 +1326,14 @@ confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { + for (let s = 0; s < this.delMeetingInfos.length; s++) { + if (this.addForm.wgMeetingInfosDel) { + this.addForm.wgMeetingInfosDel += ',' + this.addForm.wgMeetingInfosDel += this.delMeetingInfos[s].id + } else { + this.addForm.wgMeetingInfosDel = this.delMeetingInfos[s].id + } + } for (let a = 0; a < this.addForm.wgMeetingInfos.length; a++) { this.delMeetingInfos.forEach(item => { if (this.addForm.wgMeetingInfos[a].joinId === item.joinId) { diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue index 243d764c0..5fbfb96ab 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue @@ -156,7 +156,7 @@ width="150"> - + - + { + for (let s = 0; s < this.delNetInfos.length; s++) { + if (this.addForm.wgNetInfosDel) { + this.addForm.wgNetInfosDel += ',' + this.addForm.wgNetInfosDel += this.delNetInfos[s].id + } else { + this.addForm.wgNetInfosDel = this.delNetInfos[s].id + } + } for (let a = 0; a < this.addForm.wgNetInfos.length; a++) { this.delNetInfos.forEach(item => { if (this.addForm.wgNetInfos[a].joinId === item.joinId) { @@ -1133,6 +1145,14 @@ confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { + for (let s = 0; s < this.delDepts.length; s++) { + if (this.addForm.wgDeptsDel) { + this.addForm.wgDeptsDel += ',' + this.addForm.wgDeptsDel += this.delDepts[s].id + } else { + this.addForm.wgDeptsDel = this.delDepts[s].id + } + } for (let a = 0; a < this.addForm.wgDepts.length; a++) { this.delDepts.forEach(item => { if (this.addForm.wgDepts[a].joinId === item.joinId) { @@ -1154,6 +1174,14 @@ confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { + for (let s = 0; s < this.delPayInfos.length; s++) { + if (this.addForm.wgPayInfosDel) { + this.addForm.wgPayInfosDel += ',' + this.addForm.wgPayInfosDel += this.delPayInfos[s].id + } else { + this.addForm.wgPayInfosDel = this.delPayInfos[s].id + } + } for (let a = 0; a < this.addForm.wgPayInfos.length; a++) { this.delPayInfos.forEach(item => { if (this.addForm.wgPayInfos[a].joinId === item.joinId) { @@ -1175,6 +1203,14 @@ confirmButtonClass: 'common-button-primary', roundButton: true }).then(() => { + for (let s = 0; s < this.delMeetingInfos.length; s++) { + if (this.addForm.wgMeetingInfosDel) { + this.addForm.wgMeetingInfosDel += ',' + this.addForm.wgMeetingInfosDel += this.delMeetingInfos[s].id + } else { + this.addForm.wgMeetingInfosDel = this.delMeetingInfos[s].id + } + } for (let a = 0; a < this.addForm.wgMeetingInfos.length; a++) { this.delMeetingInfos.forEach(item => { if (this.addForm.wgMeetingInfos[a].joinId === item.joinId) {