From 2a12b08489e25179633328956ec432534019b0d6 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 16 Dec 2021 14:16:39 +0800 Subject: [PATCH 01/14] commit --- src/pages/home2/components/todoList/index.vue | 34 +++++++++++++++---- .../pages/creatProcess/bzzqyj/step4-1.vue | 4 ++- .../pages/creatProcess/bzzqyj/step4.vue | 2 ++ .../pages/creatProcess/bzzqyj/step5.vue | 3 +- .../pags/consultationDetails.vue | 10 ++++++ 5 files changed, 45 insertions(+), 8 deletions(-) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index b7faa2136..b3b911791 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -185,7 +185,7 @@ export default { } break; case '3': - if (row.taskInfo === '责任对接人选择责任人') { + if (row.taskInfo === '责任部门对接人选择责任人') { this.$router.push({ name: 'bzzqyjStep2', query: { @@ -196,7 +196,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '责任人填写征求意见'){ + } else if (row.taskInfo === '责任人反馈'){ this.$router.push({ name: 'bzzqyjStep3', query: { @@ -207,7 +207,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '责任对接人审批') { + } else if (row.taskInfo === '责任部门对接人汇总并选择审批人') { this.$router.push({ name: 'bzzqyjStep4', query: { @@ -218,7 +218,29 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo === '标准法规工程师汇总填写处理意见') { + } else if (row.taskInfo === '审批人审批') { + this.$router.push({ + name: 'bzzqyjStep4-1', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '标准法规工程师分线审核') { + this.$router.push({ + name: 'bzzqyjStep4-2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '标准法规工程师汇总') { this.$router.push({ name: 'bzzqyjStep5', query: { @@ -251,7 +273,7 @@ export default { prcType: row.prcType } }) - } else if (row.taskInfo.indexOf('技术委员会相关专委会主任') == 0 ) { + } else if (row.taskInfo === '技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定' ) { this.$router.push({ name: 'bzzqyjStep8', query: { @@ -262,7 +284,7 @@ export default { prcType: row.prcType } }) - } else { + } else if (row.taskInfo === '工程研究总院院长批准') { this.$router.push({ name: 'bzzqyjStep9', query: { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 6cbadc4ec..7bbca524c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -62,7 +62,7 @@ - - - + { res.data.forEach(item => { item.chapterNumber = item.partCode; item.responUserName = item.userName; + item.state = '1' this.data.push(item); }); }); diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index 76eb6ce52..7e8329ead 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -80,6 +80,12 @@ align="center" width="120"> + + + + +
@@ -260,6 +269,7 @@ export default { for (let a = 0; a < this.options.length; a++) { if (data === this.options[a].itemsNum) { this.opinionContent.oldText = this.options[a].termsConditions + this.opinionContent.chapterName = this.options[a].itemsName } } }, From 9bc1166dfa350892997d7c23df956e1d97951ab4 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 16 Dec 2021 14:40:12 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=92=A4=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/process.js | 8 ++++++++ .../pages/creatProcess/bzhHd-rh/step1.vue | 17 ++++++++++++----- .../pages/creatProcess/bzhHy-ch/step1.vue | 18 +++++++++++++----- .../pages/creatProcess/wfhxzg/step1.vue | 17 ++++++++++++----- 4 files changed, 45 insertions(+), 15 deletions(-) diff --git a/src/api/process.js b/src/api/process.js index 87fc515ef..414496639 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -689,6 +689,14 @@ export function getStandInfoById (data) { params: data }) } +// 流程撤回接口 +export function processBack(data) { + return axios({ + url: 'api/lawss/activiti/startProcessRollBack', + method: 'post', + data + }) +} // 标准法规工作组接口 export function workGroup(data) { return axios({ diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 946f33d86..792560783 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -395,7 +395,7 @@ import ProcessTitle from '../../components/ProcessTitle' import { startProcess, saveTaskFirst, completeTask, queryTaskFirst, - taskDel, workGroup + taskDel, workGroup,processBack } from '@/api/process.js' export default { @@ -742,10 +742,17 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true - const paramsInfo = { - type: '20' - } - startProcess(paramsInfo).then(res => { + let paramsInfo = new FormData() + paramsInfo.append('id', this.bpnId || '') + paramsInfo.append('createUser', this.$store.getters.userInfo.userId) + paramsInfo.append('createUserName', this.$store.getters.userInfo.userName) + paramsInfo.append('type', '20') + paramsInfo.append('json', JSON.stringify({ + roleForm: this.roleForm, + rh_pageData: this.rh_pageData, + commentText: this.commentText + })) + processBack(paramsInfo).then(res => { this.taskID = res.data const params = new FormData(); params.set('json', JSON.stringify(json)) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index ef76e0fb6..96510f1c9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -338,7 +338,7 @@ import ProcessTitle from '../../components/ProcessTitle' import { startProcess, queryTaskFirst, saveTaskFirst, completeTask, - taskDel, workGroup} from '@/api/process.js' + taskDel, workGroup, processBack} from '@/api/process.js' export default { components: { @@ -658,10 +658,18 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true - const paramsInfo = { - type: '21' - } - startProcess(paramsInfo).then(res => { + let paramsInfo = new FormData() + paramsInfo.append('id', this.bpnId || '') + paramsInfo.append('createUser', this.$store.getters.userInfo.userId) + paramsInfo.append('createUserName', this.$store.getters.userInfo.userName) + paramsInfo.append('type', '21') + paramsInfo.append('json', JSON.stringify({ + roleForm: this.roleForm, + ch_pageData: this.ch_pageData, + commentText: this.commentText + + })) + processBack(paramsInfo).then(res => { this.taskID = res.data const params = new FormData(); params.set('json', JSON.stringify(json)) diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 6533ae6c2..e312fcbca 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -266,7 +266,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel } from '@/api/process.js' +import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel,processBack } from '@/api/process.js' import { standUnqualified, dicTypeData } from '@/api/unqualProcess.js' export default { name: "wfhxzgStep1", @@ -509,10 +509,17 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true - const paramsInfo = { - type: '8' - } - startProcess(paramsInfo).then(res => { + let paramsInfo = new FormData() + paramsInfo.append('id', this.bpnId || '') + paramsInfo.append('createUser', this.$store.getters.userInfo.userId) + paramsInfo.append('createUserName', this.$store.getters.userInfo.userName) + paramsInfo.append('type', '8') + paramsInfo.append('json', JSON.stringify({ + roleForm: this.roleForm, + dataList: this.dataList, + commentText: this.commentText + })) + processBack(paramsInfo).then(res => { this.taskID = res.data const params = new FormData(); params.set('json', JSON.stringify(json)) From c1da95333313a5dfcabfd2668855e7d0937caeda Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 16 Dec 2021 15:09:55 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=92=A4=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1.vue | 13 ++++++++++++- .../pages/creatProcess/cywbbzzxd/step1.vue | 11 ++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index d3a13061a..cf9ecbb40 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1062,7 +1062,18 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "4"}, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '4', + json: JSON.stringify({ + taskInfo: '引入法规标准清单', + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue index f46d88d82..c1af624bd 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue @@ -186,7 +186,16 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true - this.$http.get("lawss/activiti/startProcess", {type: "14"}, { + this.$http.post("lawss/activiti/startProcessRollBack", { + id: this.bpnId || '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '14', + json: JSON.stringify({ + taskInfo: '责任部门对接人选择责任人', + roleForm: this.roleForm, + }) + }, { _this: this }, res => { if (res.ok) { From 8ae24764fc5cda2c838ae9ae1ec4c58c7b3e02c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 16 Dec 2021 15:18:02 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B9=98=E7=94=A8?= =?UTF-8?q?=E8=BD=A6vpps=E7=BC=96=E7=A0=81=20=E6=A8=A1=E5=9D=97=E5=8F=98?= =?UTF-8?q?=E5=9E=8B=E5=8F=B7=20=20=E4=BC=81=E6=A0=87=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 203 ++++++++++++++---- 1 file changed, 166 insertions(+), 37 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 59b78eea8..4a3ab6e41 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -610,16 +610,63 @@ - @@ -290,6 +309,11 @@ name: "bzjdStep5", data() { return { + similarityDegree: '', + BDmodel: false, + oldNumber: '', + leftData: '', + rightData: '', drawerModal: false, //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, @@ -321,6 +345,72 @@ ProcessTitle }, methods: { + getBDList () { + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'LEFT' + }, { + _this: this + }, res => { + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId = res.data[b].itemsId + } + } + } + }, e => { + }) + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'RIGHT' + }, { + _this: this + }, res => { + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId2 = res.data[b].itemsId + } + } + } + }, e => { + }) + }, + checkBD (id,id2) { + let itemsEoPage = { + oldItemId: id, + newItemId: id2, + flag: 1 + } + this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { + _this: this + }, res => { + if (res.data.leftString === '' && res.data.rightString === '') { + this.$message.warning('暂无找到相似的文本') + } else { + this.leftData = res.data.leftString + this.rightData = res.data.rightString + this.BDmodel = true + this.similarityDegree = res.data.similarityDegree + } + }) + }, + itemEdit (row) { + this.itemId = row.id + this.modalshowflag2 = true + this.editForm = { + technicalRequir: row.technicalRequir, // 核心技术要求 + changePoint: row.changePoint, // 国内标准的差异点 + complianceRequir: row.complianceRequir || '1', // 符合性要求 + complianceState: row.complianceState, // 合规性分析 + newData: row.newData, // 新车型实施日期 + onlineData: row.onlineData, // 在产车实施日期 + applyArctic: row.applyArctic, // 适用车型 + itemsId: row.itemsId, + itemsId2: row.itemsId2 + } + }, handleTransfer() { this.drawerModal = true }, diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index a521f2e7f..e063a5855 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -102,6 +102,7 @@ show-overflow-tooltip prop="technicalRequir" width="200" + v-if="!form.itemsNum1" label="核心技术要求" align="center"> @@ -174,6 +175,14 @@ prop="zrUserIdName" align="center"> + + + @@ -274,6 +283,16 @@ 关闭 + +
相似度:{{ similarityDegree }}
+
+
+
+
+ 加载中... @@ -289,6 +308,11 @@ name: "bzjdStep6", data() { return { + similarityDegree: '', + BDmodel: false, + oldNumber: '', + leftData: '', + rightData: '', drawerModal: false, //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, @@ -320,6 +344,72 @@ ProcessTitle }, methods: { + getBDList () { + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'LEFT' + }, { + _this: this + }, res => { + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId = res.data[b].itemsId + } + } + } + }, e => { + }) + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'RIGHT' + }, { + _this: this + }, res => { + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsNum === res.data[b].itemsNum) { + this.itemList[a].itemsId2 = res.data[b].itemsId + } + } + } + }, e => { + }) + }, + checkBD (id,id2) { + let itemsEoPage = { + oldItemId: id, + newItemId: id2, + flag: 1 + } + this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { + _this: this + }, res => { + if (res.data.leftString === '' && res.data.rightString === '') { + this.$message.warning('暂无找到相似的文本') + } else { + this.leftData = res.data.leftString + this.rightData = res.data.rightString + this.BDmodel = true + this.similarityDegree = res.data.similarityDegree + } + }) + }, + itemEdit (row) { + this.itemId = row.id + this.modalshowflag2 = true + this.editForm = { + technicalRequir: row.technicalRequir, // 核心技术要求 + changePoint: row.changePoint, // 国内标准的差异点 + complianceRequir: row.complianceRequir || '1', // 符合性要求 + complianceState: row.complianceState, // 合规性分析 + newData: row.newData, // 新车型实施日期 + onlineData: row.onlineData, // 在产车实施日期 + applyArctic: row.applyArctic, // 适用车型 + itemsId: row.itemsId, + itemsId2: row.itemsId2 + } + }, handleTransfer() { this.drawerModal = true }, From 161364a52b1b206ee29efed3081af057e0ebd11d Mon Sep 17 00:00:00 2001 From: "wangxiahui@91isoft.com" <140316hui> Date: Thu, 16 Dec 2021 18:05:57 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E9=80=89=E4=BA=BA?= =?UTF-8?q?=E5=92=8C=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHd-rh/step1.vue | 21 ++++++++++++------- .../pages/creatProcess/bzhHd-rh/step2.vue | 2 +- .../pages/creatProcess/bzhHd-rh/step3.vue | 6 +++--- .../pages/creatProcess/bzhHh-hh/step1.vue | 18 ++++++++-------- .../pages/creatProcess/bzhHy-ch/step1.vue | 6 +++--- 5 files changed, 29 insertions(+), 24 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 792560783..13f2883aa 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -110,7 +110,7 @@ :action="uploadPath" name="file" :file-list="fileTextList" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" :on-success="handleOnsuccess" @@ -341,7 +341,7 @@

技术委员会常务副主任/总院院长

- +
@@ -352,8 +352,8 @@

总院技术委员会主任

- - + +
@@ -477,7 +477,8 @@ export default { feeUserId: '', engineerUser: '', engineerUserId: '', - + directorUserId: '', + directorUserName: '', }, rh_rules: {}, roleFormRules: { @@ -486,6 +487,7 @@ export default { leaderUser: [{required: true, message: "请选择标准法规部主管领导", trigger: ['blur', 'change']}], feeUser: [{required: true, message: "请选择费用管理部门人员", trigger: ['blur', 'change']}], engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}], + directorUserName: [{required: true, message: "请选择总院技术委员会主任", trigger: ['blur', 'change']}], }, roleShowflag: false, roleShowflagOne: false, @@ -556,11 +558,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 @@ -699,9 +701,12 @@ export default { if (this.type === 'leaderUser') { this.roleForm.leaderUser = data[0].name this.roleForm.leaderUserId = data[0].id - } else { + } else if(this.type === 'ngineerUser'){ this.roleForm.engineerUser = data[0].name this.roleForm.engineerUserId = data[0].id + } else { + this.roleForm.directorUserName = data[0].name + this.roleForm.directorUserId = data[0].id } this.roleShowflagOne = false }, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index 0c1ce8d08..41be31d75 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index c0b71a1bd..61cf5efe7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -184,7 +184,7 @@ :action="uploadPath" name="file" :file-list="fillFileList" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" :on-success="handleOnsuccess" @@ -506,11 +506,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue index 275d52ffd..321baa576 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue @@ -127,7 +127,7 @@ ref="uploadOtherFile" name="file" :file-list="upOtherData" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beforeUploadOther" :before-remove="beforeRemoveOther" :on-success="onsuccessOther" @@ -202,7 +202,7 @@ :action="actionPath" name="file" :file-list="reData" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" :on-success="handleOnsuccess" @@ -223,7 +223,7 @@ :action="actionPath" name="file" :file-list="themeData" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="beforeUploadTheme" :before-remove="beforeRemoveTheme" :on-success="onsuccessTheme" @@ -420,11 +420,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 @@ -493,11 +493,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 @@ -553,11 +553,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 96510f1c9..939f0d879 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -124,7 +124,7 @@ :action="uploadPath" name="file" :file-list="ch_pageData.fileTextList" - accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" + accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" :before-upload="handleBeforeUpload" :before-remove="handleBeforeRemove" :on-success="handleOnsuccess" @@ -484,11 +484,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件') return false } // 判断文件上传大小