diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index c2ccd263e..a504c20cb 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -833,6 +833,32 @@ @click="editResolveList" >编辑 + + 拆分结果上传 + + + 模板下载 + + +
- - @@ -2140,12 +2164,134 @@ export default { itemsText: '', itemsTextDialogs: false, textStatusMap: {}, - standMap: {} + standMap: {}, + splitResultPath: 'api/lawss/sarFileSplitItems/importSplitItemsZip', + defaultImportSplitResultFileList:[], + // 记录上传文件相关信息 + uploadFilesplitEo: { + standId: '', + fileType: '', + attId: '', + fileName: '', + standNumSplit: '', + standNameSplit: '', + defaultFileList: [], + splitType: '全部章节' + }, + headers:{ + token: localStorage.getItem('userInfo')?.token + } } }, props: {}, watch: {}, methods: { + // 模板下载 + uploadImportSplitResultModal () { + window.open('/api/lawss/sarFileSplitItems/exportTemplate') + }, + uploadSplitResultSuccess (res, file, fileList) { + if (res.ok) { + this.uploadFilesplitEo.attId = res.data.attId + this.uploadFilesplitEo.fileName = res.data.name + if (res.data.standNum != null && res.data.standNum !== '') { + this.uploadFilesplitEo.standNumSplit = res.data.standNum + } + if (res.data.standName != null && res.data.standName !== '') { + this.uploadFilesplitEo.standNameSplit = res.data.standName + } + this.defaultImportSplitResultFileList.push(file) + this.$message.success('文件上传成功') + setTimeout(()=>{ + this.handleImportSplitResult(); + },1000) + } else { + this.defaultImportSplitResultFileList = [] + this.uploadFilesplitEo.attId = '' + this.$message.error(res.message) + } + }, + handleImportSplitResult(){ + console.log(123333) + if (this.defaultImportSplitResultFileList.length) { + const file = this.defaultImportSplitResultFileList[0] + const fileTypeResult = this.beforeSplitResultImport(file.raw) + const _formData = new FormData() + _formData.append('standNumSplit', this.uploadFilesplitEo.standNumSplit) + _formData.append('standId', this.uploadFilesplitEo.standId) + _formData.append('standNameSplit', this.uploadFilesplitEo.standNameSplit) + _formData.append('fileType', this.uploadFilesplitEo.fileType) + _formData.append('file', file.raw) + if (fileTypeResult) { + this.importSplitResultLoading = true + this.$http.postData('lawss/sarFileSplitItems/importSplitItemsZip', _formData, { + }, res => { + this.importSplitResultLoading = false + if (res.ok) { + this.visibleImportSplitResultDialog = false + this.$message({ + dangerouslyUseHTMLString: true, + message: res.message, + type: 'success' + }) + } else { + this.$message({ + dangerouslyUseHTMLString: true, + message: res.message, + type: 'warning' + }) + } + }) + } + } else { + this.$message.warning('请上传文件') + } + }, + // 上传按钮 文件上传之前的钩子 + beforeSplitResultImport(file) { + if (this.sarStandardsInfoEO.standYear) { + this.sarStandardsInfoEO.lawsNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear + } else { + this.sarStandardsInfoEO.lawsNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + } + this.sarStandardsInfoEO.lawsName = this.sarStandardsInfoEO.standName + this.sarStandardsInfoEO.stateName = this.sarStandardsInfoEO.standStateShow + // this.sarStandardsInfoEO.resType = this.$route.params.pageType + this.uploadFilesplitEo.standNumSplit = this.sarStandardsInfoEO.lawsNumber + this.uploadFilesplitEo.standNameSplit = this.sarStandardsInfoEO.lawsName + this.uploadFilesplitEo.standId = this.sarStandardsInfoEO.id + this.uploadFilesplitEo.fileType = this.$route.params.pageType + + var filename = file.name + var index1 = filename.lastIndexOf('.') + var index2 = filename.length + var fileSuffix = filename.substring(index1, index2) + // const fileSuffix = file.name.split('.')[1] // 后缀名 + if (this.defaultImportSplitResultFileList.length > 1) { + this.$message.warning('只能导入一个文件') + return false + } + if (fileSuffix !== '.zip') { + this.$message.warning('文件' + file.name + '格式不正确，请上传zip文件') + return false + } + if (file.size / 1024 / 1024 > 200) { + this.$message.warning('文件大小不能超过200M') + return false + } + return true + }, + removeSplitResultFile (file, fileList) { + this.defaultImportSplitResultFileList = fileList + this.uploadFilesplitEo.attId = fileList.length > 0 ? this.uploadFilesplitEo.attId : '' + this.uploadFilesplitEo.defaultFileList = fileList + }, + // 导入拆分结果 + handleUploadChange (file, fileList) { + this.defaultImportSplitResultFileList = fileList + this.uploadFilesplitEo.defaultFileList = fileList + // this.$refs['uploadFileSplitEO'].validateField('defaultFileList') + }, filterApplyArctic(row) { if (row.applyArctic) { return row.applyArctic.replaceAll('\"', '').replaceAll('\[', '').replaceAll('\]', '') diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index d0fb3b692..f1170da41 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -16,11 +16,11 @@ size="small" class="common-button-primary" icon="el-icon-check" - @click="handleReceive(item)" v-if="(item.prcType == 25 && item.taskInfo == '技术标准起草') || (item.prcType == 3 && item.taskInfo == '意见反馈') || + @click="handleReceive(item)" v-if="item.showreceive && ((item.prcType == 25 && item.taskInfo == '技术标准起草') || (item.prcType == 3 && item.taskInfo == '意见反馈') || (item.prcType == 9 && item.taskInfo == '解读') || (item.prcType == 6 && item.taskInfo === '合规评估') || (item.prcType == 6 && item.taskInfo == '批准') || (item.prcType == 2 && item.taskInfo === '调研结果反馈') || (item.prcType == 8 && item.taskInfo === '合规排查(上传合规举证材料)') || (item.prcType == 10 && item.taskInfo === '清单完善1') || (item.prcType == 26 && item.taskInfo === '立项确认') || - (item.prcType == 'buss3' && item.taskInfo === '复审')? true : false">接受任务 + (item.prcType == 'buss3' && item.taskInfo === '复审'))? true : false">接受任务 @@ -41,6 +41,7 @@ export default { toDoTaskList: [],// 代办数据 total: 0, pageNo: 1, + showreceive:true, } }, computed: {}, @@ -1992,18 +1993,16 @@ export default { } case '27': this.$router.push({ - name: 'MyQuestions', - query:{ + name: 'MyQuestions2', + query: { taskIds: row.taskIds, prcId: row.prcId, prcNum: row.prcNum, prcName: row.prcName, prcType: row.prcType, - } }) - break - + break } }, }, diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index b1ff66376..1d9e12ba9 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -30,6 +30,7 @@
拆分 删除 + 导入拆分结果
@@ -816,7 +817,7 @@ export default { methods: { // 模板下载 uploadImportModal () { - window.open('/api/att/attFile/uploadModalFile?fileName=标准拆分导入拆分结果模板.zip') + window.open('/api/lawss/sarFileSplitItems/exportTemplate') }, // 点击手动查找标准/政策按钮，弹出抽屉事件 selectLaws () { @@ -924,6 +925,7 @@ export default { handleConfirm () { this.uploadFilesplitEo.standNumSplit = this.standSelected[0].lawsNumber this.uploadFilesplitEo.standNameSplit = this.standSelected[0].lawsName + this.uploadFilesplitEo.standId = this.standSelected[0].id this.isDrawer = false }, // 政策、标准取消关闭抽屉事件 @@ -1566,6 +1568,7 @@ export default { const fileTypeResult = this.beforeSplitResultImport(file.raw) const _formData = new FormData() _formData.append('standNumSplit', this.uploadFilesplitEo.standNumSplit) + _formData.append('standId', this.uploadFilesplitEo.standId) _formData.append('standNameSplit', this.uploadFilesplitEo.standNameSplit) _formData.append('fileType', this.uploadFilesplitEo.fileType) _formData.append('file', file.raw) diff --git a/src/pages/personal/pages/my-questions/components/answerItem2.vue b/src/pages/personal/pages/my-questions/components/answerItem2.vue new file mode 100644 index 000000000..67ba1d4ad --- /dev/null +++ b/src/pages/personal/pages/my-questions/components/answerItem2.vue @@ -0,0 +1,301 @@ + + + + + + diff --git a/src/pages/personal/pages/my-questions/index2.vue b/src/pages/personal/pages/my-questions/index2.vue new file mode 100644 index 000000000..c5ed5ae48 --- /dev/null +++ b/src/pages/personal/pages/my-questions/index2.vue @@ -0,0 +1,218 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 9889e5400..c581fb4f1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -797,7 +797,6 @@ v-show="verifySarStandard && !disabledXX" show-save show-submit - :show-receive="showreceive" :submitLoading="isSubmit" :saveLoading="saveLoading" @save="handleSave" @@ -1766,9 +1765,9 @@ issueTime: [ {required: false, message: '请选择企标发布日期', trigger: 'change'} ], - putTime: [ - {required: true, message: '请选择企标实施日期', trigger: 'change'} - ], + // putTime: [ + // {required: true, message: '请选择企标实施日期', trigger: 'change'} + // ], FBGBUSSName: [ {required: false, message: '请上传发布稿', validator: validateFBGBUSS, trigger: 'blur'} ], @@ -3452,7 +3451,7 @@ this.form.DTQBBHBUSS = processForm.rqbName this.form.CYBZ = processForm.esStandRelations this.form.YYBZ = processForm.esMatingRelations - this.form.CYCD = processForm.useLevel === '29l0zgltnq' ? 'IDT等同采用' : processForm.useLevel === '9te26649ne' ? 'NEQ非等效采用' : 'MOD修改采用' + // this.form.CYCD = processForm.useLevel === '29l0zgltnq' ? 'IDT等同采用' : processForm.useLevel === '9te26649ne' ? 'NEQ非等效采用' : 'MOD修改采用' this.$http.get('lawss/activiti/judgeAcceptTack', { nowEsId: this.nowEsId, oaFlag: '1', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue index 56799569b..714d3767d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue @@ -959,9 +959,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], - putTime: [ - { required: true, message: '请选择企标实施日期', trigger: 'change' } - ], + // putTime: [ + // { required: true, message: '请选择企标实施日期', trigger: 'change' } + // ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue index 04d392e7c..273d9a49f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue @@ -958,9 +958,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], - putTime: [ - { required: true, message: '请选择企标实施日期', trigger: 'change' } - ], + // putTime: [ + // { required: true, message: '请选择企标实施日期', trigger: 'change' } + // ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index 2341c2d5d..ac5662d05 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -666,6 +666,12 @@ } callback() }; + const validateMadelSubName = (rule, value, callback) => { + if(this.madelSubList.length === 0){ + callback(new Error('请上传培训文件！')) + } + callback() + }; const validateBZSMBUSS = (rule, value, callback) => { if(this.BZSMBUSSFileList.length === 0){ callback(new Error('请上传编辑说明文件！')) @@ -1043,6 +1049,9 @@ QCRBUSS: [ { required: true, message: '请选择起草人', trigger: 'change' } ], + madelSubName: [ + { required: true, message: '请上传培训文件',validator: validateMadelSubName, trigger: 'blur' } + ], }, zrUserIds: [], // 选择多个会签责任人 userType:'', // 选择用户ID判断 @@ -2500,7 +2509,7 @@ // this.form.country = [] // } this.fileInfoHandle() - this.$refs['formTongGuo'].validate((valid) => { + this.$refs['form'].validate((valid) => { if (valid) { this.isSubmit = true this.saveLoading = true diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index 01c34a9da..610c49573 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -1087,9 +1087,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change' } ], - putTime: [ - { required: true, message: '请选择企标实施日期', trigger: 'change' } - ], + // putTime: [ + // { required: true, message: '请选择企标实施日期', trigger: 'change' } + // ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index 313d2fcb0..7f0c1a95a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -1071,9 +1071,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], - putTime: [ - { required: true, message: '请选择企标实施日期', trigger: 'change' } - ], + // putTime: [ + // { required: true, message: '请选择企标实施日期', trigger: 'change' } + // ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue index 2bc49b527..110682d03 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue @@ -955,9 +955,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], - putTime: [ - { required: true, message: '请选择企标实施日期', trigger: 'change' } - ], + // putTime: [ + // { required: true, message: '请选择企标实施日期', trigger: 'change' } + // ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index 307dc3b97..b7f4e76ac 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -1341,9 +1341,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], - putTime: [ - { required: true, message: '请选择企标实施日期', trigger: 'change' } - ], + // putTime: [ + // { required: true, message: '请选择企标实施日期', trigger: 'change' } + // ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index 43931fd65..3f2eb9160 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -1319,9 +1319,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], - putTime: [ - { required: true, message: '请选择企标实施日期', trigger: 'change' } - ], + // putTime: [ + // { required: true, message: '请选择企标实施日期', trigger: 'change' } + // ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index b9fcc951d..c3c5d66c5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -1113,9 +1113,9 @@ issueTime: [ {required: false, message: '请选择企标发布日期', trigger: 'change'} ], - putTime: [ - {required: true, message: '请选择企标实施日期', trigger: 'change'} - ], + // putTime: [ + // {required: true, message: '请选择企标实施日期', trigger: 'change'} + // ], FBGBUSSName: [ {required: true, message: '请上传发布稿', validator: validateFBGBUSS, trigger: 'blur'} ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue index 4d61a6111..b362e16da 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue @@ -909,9 +909,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], - putTime: [ - { required: true, message: '请选择企标实施日期', trigger: 'change' } - ], + // putTime: [ + // { required: true, message: '请选择企标实施日期', trigger: 'change' } + // ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index 5f736dde6..0eeb46319 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -1102,9 +1102,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], - putTime: [ - { required: true, message: '请选择企标实施日期', trigger: 'change' } - ], + // putTime: [ + // { required: true, message: '请选择企标实施日期', trigger: 'change' } + // ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index 4f3f193cf..98025028c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -1070,9 +1070,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], - putTime: [ - { required: true, message: '请选择企标实施日期', trigger: 'change' } - ], + // putTime: [ + // { required: true, message: '请选择企标实施日期', trigger: 'change' } + // ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index b15810859..54f4f53ed 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -1320,9 +1320,9 @@ issueTime: [ { required: false, message: '请选择企标发布日期', trigger: 'change'} ], - putTime: [ - { required: true, message: '请选择企标实施日期', trigger: 'change' } - ], + // putTime: [ + // { required: true, message: '请选择企标实施日期', trigger: 'change' } + // ], FBGBUSSName: [ { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } ], diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 6832560ed..5033e3cf7 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -286,6 +286,9 @@ 移动标准 + 模板下载 +
@@ -2646,6 +2649,10 @@ export default { this.replaceLawsNumForm.pageSize = pageSize this.getReplaceLawsNumRow() }, + // 模板下载 + handlemoudel(){ + window.open('/api/lawss/sarBussionessStand/exportTemplateFile?fileName=企业标准导入模板') + }, getResetLawsNumRow () { this.replaceLawsNumForm = { standCode: '', // 标准编号 @@ -4466,7 +4473,7 @@ export default { addImportModal(flag) { this.importModalshowflag = true this.showUploadlist = true - this.importExcelUrl = '/api/lawss/sarBussionessStand/importSarBussionessStandFile' + this.importExcelUrl = '/api/lawss/sarBussionessStand/importSarBussionessStandFile?menuId=' + this.selectSarMenu.id + '&userId=' + this.$store.getters.userInfo.userId }, // 二级菜单新建，编辑，删除 clickDropMenu(name, treeNode) { diff --git a/src/router/index.js b/src/router/index.js index ce0cc379b..fa6658dbd 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -330,6 +330,15 @@ const routes = [ // menuId: '' } }, + { + path: '/questions2', + name: 'MyQuestions2', + component: resolve => require(['@/pages/personal/pages/my-questions/index2.vue'], resolve), + meta: { + requireAuth: false, + title: '我的问答' + } + }, { path: '/questionDetail', name: 'QuestionDetail',