diff --git a/src/components/treeSelect/treeSelectStand.vue b/src/components/treeSelect/treeSelectStand.vue index 0e5e9db88..79c384bdf 100644 --- a/src/components/treeSelect/treeSelectStand.vue +++ b/src/components/treeSelect/treeSelectStand.vue @@ -167,7 +167,7 @@ export default { methods: { filterNode(value, data) { if (!value) return true; - return data.label.indexOf(value) !== -1; + return data.menuName.indexOf(value) !== -1; }, loadNode(node, resolve) { const that = this; diff --git a/src/pages/config/pages/mechanismManage/pages/mechanism.vue b/src/pages/config/pages/mechanismManage/pages/mechanism.vue index e9036a7f7..b4d34386a 100644 --- a/src/pages/config/pages/mechanismManage/pages/mechanism.vue +++ b/src/pages/config/pages/mechanismManage/pages/mechanism.vue @@ -450,7 +450,7 @@ export default { this.page = 1 } this.peopleType = 2; - this.$http.post('SarInstitution/institution/user', { + this.$http.post('SarInstitution/institution/userUnderInstitution', { current: this.page, size: this.pageSize, uname: this.searchForm.uname, @@ -475,7 +475,7 @@ export default { }, getData() { this.peopleType = 1; - this.$http.post('SarInstitution/institution/user', { + this.$http.post('SarInstitution/institution/userUnderInstitution', { current: this.page, size: this.pageSize, institutionId: this.id, diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue index 97ca8a8a8..eb3a7428d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue @@ -312,11 +312,49 @@ export default { }, //提交 handleSubmit(){ - + this.listForm.commentText = this.commentText + this.listForm.stepFlag = '0' + const json = JSON.stringify(this.listForm); + this.isSubmit = true + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.taskIds, + userId: this.userId, + json: json, + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); }, //驳回 beforeBack(){ - + if(!this.commentText){ + this.$message.warning('请填写审批意见') + }else{ + this.listForm.commentText = this.commentText + this.listForm.stepFlag = '1' + const json = JSON.stringify(this.listForm); + this.isSubmit = true + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.taskIds, + userId: this.userId, + json: json, + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); + } }, //确认转办 checkedRole (data) { diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue index bd421b4c4..9ead05378 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue @@ -1,13 +1,660 @@ + - diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 4748b0395..a07cb7537 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1505,6 +1505,7 @@ export default { fileType: '', countryArr: '', form: { + standId: '', // 基础信息 country: '', textStatus: '', // 文本状态 @@ -2156,6 +2157,7 @@ export default { const json = Object.assign(bringData, bringData.attrInfoCaseMap); this.form = JSON.parse(JSON.stringify(json)) this.getListTree(bringData) + this.form.standId = bringData.id this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw : '' this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr : '' this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs : '' @@ -2280,17 +2282,20 @@ export default { }, {}, reson => { if (reson.ok) { let treeList = '' + let treeListId = '' reson.data.forEach(item=>{ this.treeCheckedKeys.push(item.menuId) - if (item.menuId.length > 0) { + if (treeList.length > 0) { treeList += ',' + treeListId += ',' } - treeList = item.menuName - this.treeListName = treeList + treeList += item.menuName + treeListId += item.menuId }) + this.form.treeListName = treeList + this.form.treeListId = treeListId } }) - this.form.treeListId = this.treeCheckedKeys.join(',') } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 7f1d4843d..31130d429 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -1,1414 +1,1381 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index 011c25da2..0b54282f6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -1,1051 +1,1048 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 3879ff8a5..b2df99568 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -2323,10 +2323,10 @@ // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ - name: 'OtherLawsStandDetails', + name: 'OtherBussStandardDetails', params: { id: item.id, - pageType: 'LAWS_STAND' + pageType: 'BUSINESS_STAND' } }) window.open(routeUrl.href, '_blank') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index ff9b6b392..c9d3d826c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -1908,10 +1908,10 @@ // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ - name: 'OtherLawsStandDetails', + name: 'OtherBussStandardDetails', params: { id: item.id, - pageType: 'LAWS_STAND' + pageType: 'BUSINESS_STAND' } }) window.open(routeUrl.href, '_blank') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 1575d1ed8..c8f39b0ca 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -1875,10 +1875,10 @@ // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ - name: 'OtherLawsStandDetails', + name: 'OtherBussStandardDetails', params: { id: item.id, - pageType: 'LAWS_STAND' + pageType: 'BUSINESS_STAND' } }) window.open(routeUrl.href, '_blank') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 1b2fd9b50..2cefdfb5f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -1966,10 +1966,10 @@ // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ - name: 'OtherLawsStandDetails', + name: 'OtherBussStandardDetails', params: { id: item.id, - pageType: 'LAWS_STAND' + pageType: 'BUSINESS_STAND' } }) window.open(routeUrl.href, '_blank') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 9d5efda2f..3e609621e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -1875,10 +1875,10 @@ // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ - name: 'OtherLawsStandDetails', + name: 'OtherBussStandardDetails', params: { id: item.id, - pageType: 'LAWS_STAND' + pageType: 'BUSINESS_STAND' } }) window.open(routeUrl.href, '_blank') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 3fa557c3e..0d2956be1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -1966,10 +1966,10 @@ // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ - name: 'OtherLawsStandDetails', + name: 'OtherBussStandardDetails', params: { id: item.id, - pageType: 'LAWS_STAND' + pageType: 'BUSINESS_STAND' } }) window.open(routeUrl.href, '_blank') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 15834749c..11ecfc9e0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -2371,10 +2371,10 @@ // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ - name: 'OtherLawsStandDetails', + name: 'OtherBussStandardDetails', params: { id: item.id, - pageType: 'LAWS_STAND' + pageType: 'BUSINESS_STAND' } }) window.open(routeUrl.href, '_blank') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index 4f7511337..d3479545c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -1861,10 +1861,10 @@ // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ - name: 'OtherLawsStandDetails', + name: 'OtherBussStandardDetails', params: { id: item.id, - pageType: 'LAWS_STAND' + pageType: 'BUSINESS_STAND' } }) window.open(routeUrl.href, '_blank') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 95a442fb6..0a4007d5b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -1862,10 +1862,10 @@ // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ - name: 'OtherLawsStandDetails', + name: 'OtherBussStandardDetails', params: { id: item.id, - pageType: 'LAWS_STAND' + pageType: 'BUSINESS_STAND' } }) window.open(routeUrl.href, '_blank') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index 1baea5462..a3dd414bc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -1912,10 +1912,10 @@ // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ - name: 'OtherLawsStandDetails', + name: 'OtherBussStandardDetails', params: { id: item.id, - pageType: 'LAWS_STAND' + pageType: 'BUSINESS_STAND' } }) window.open(routeUrl.href, '_blank') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index ed1784a5b..bac5a25b2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -2253,10 +2253,10 @@ // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ - name: 'OtherLawsStandDetails', + name: 'OtherBussStandardDetails', params: { id: item.id, - pageType: 'LAWS_STAND' + pageType: 'BUSINESS_STAND' } }) window.open(routeUrl.href, '_blank') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index 0511d41a1..c138124b7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -1912,10 +1912,10 @@ // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ - name: 'OtherLawsStandDetails', + name: 'OtherBussStandardDetails', params: { id: item.id, - pageType: 'LAWS_STAND' + pageType: 'BUSINESS_STAND' } }) window.open(routeUrl.href, '_blank') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index 62412b2d7..fe2493472 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -2253,10 +2253,10 @@ // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ - name: 'OtherLawsStandDetails', + name: 'OtherBussStandardDetails', params: { id: item.id, - pageType: 'LAWS_STAND' + pageType: 'BUSINESS_STAND' } }) window.open(routeUrl.href, '_blank') diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 3611a6938..334b7b9c1 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -876,11 +876,11 @@ export default { }) } break - //项目合规评估流程 + //标准合规评估 case '5' : - if(row.taskInfo === '标准法规部业务经理审批'){ + if(row.taskInfo === '审核(标准法规业务经理)'){ this.$router.push({ - name: 'xmpgStep2', + name: 'bzpgStep2', query: { taskIds: row.taskIds, prcId: row.prcId, @@ -889,9 +889,9 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '标准评估任务下发'){ + }else if(row.taskInfo === '项目分发(项目群负责人/标准法规工程师)'){ this.$router.push({ - name: 'xmpgStep3', + name: 'bzpgStep3', query: { taskIds: row.taskIds, prcId: row.prcId,