From 568f7dd46382bdd61217259b27268e3a74a1d90c Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 2 Dec 2021 15:52:19 +0800 Subject: [PATCH 1/5] commit --- .../pages/creatProcess/bzzqyj/step1-1.vue | 2 +- .../pages/creatProcess/bzzqyj/step1-9.vue | 2 +- .../pages/creatProcess/bzzqyj/step1.vue | 2 +- .../pages/creatProcess/bzzqyj/step2.vue | 2 +- .../pages/creatProcess/bzzqyj/step3.vue | 2 +- .../pages/creatProcess/bzzqyj/step4.vue | 2 +- .../pages/creatProcess/bzzqyj/step5.vue | 2 +- .../pages/creatProcess/bzzqyj/step6.vue | 2 +- .../pages/creatProcess/bzzqyj/step7.vue | 2 +- .../pages/creatProcess/bzzqyj/step8.vue | 2 +- .../pages/creatProcess/bzzqyj/step9.vue | 2 +- .../processCenter/pages/phone/bzjd/step4.vue | 50 +++++++++++++++++++ src/router/index.js | 12 ++++- 13 files changed, 72 insertions(+), 12 deletions(-) create mode 100644 src/pages/processCenter/pages/phone/bzjd/step4.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index edd83a846..7cb9d901e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -423,7 +423,7 @@ export default { } else { id = item.oriAttId } - window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.open('/static/pdf/phone/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) }, addfjList() { this.$http.get('lawss/sarStandFile/queryFileInfo', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue index b089d34bd..b8f5b7b80 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue @@ -275,7 +275,7 @@ export default { } else { id = item.oriAttId } - window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) }, getHistoryData () { this.$http.get('lawss/activiti/get_list_by_instance', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 35901c24e..d78716bf4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -422,7 +422,7 @@ export default { } else { id = item.oriAttId } - window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.open('/static/pdf/phone/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) }, addfjList() { this.$http.get('lawss/sarStandFile/queryFileInfo', { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index d1bf953cc..a6c61d6db 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -249,7 +249,7 @@ export default { } else { id = item.oriAttId } - window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + 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 1c447a791..4cfba66a0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -340,7 +340,7 @@ export default { } else { id = item.oriAttId } - window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + 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 d5933345e..56a4700cd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -313,7 +313,7 @@ export default { } else { id = item.oriAttId } - window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + 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 6beb38976..d6a4098b4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -353,7 +353,7 @@ export default { } else { id = item.oriAttId } - window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + 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 d68e7e09b..e1c15431d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -337,7 +337,7 @@ export default { } else { id = item.oriAttId } - window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + 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 66919dec5..95f444881 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -334,7 +334,7 @@ export default { } else { id = item.oriAttId } - window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + 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 8bd0319ec..c9f4c8eeb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -334,7 +334,7 @@ export default { } else { id = item.oriAttId } - window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + 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 2a9039e77..6a7f2b77f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -334,7 +334,7 @@ export default { } else { id = item.oriAttId } - window.open('/static/pdf/web/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) + window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) }, getHistoryData() { this.$http.get("lawss/activiti/get_list_by_instance", { diff --git a/src/pages/processCenter/pages/phone/bzjd/step4.vue b/src/pages/processCenter/pages/phone/bzjd/step4.vue new file mode 100644 index 000000000..42eb6cfc2 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzjd/step4.vue @@ -0,0 +1,50 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index 950677be7..c0c05e84d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1687,7 +1687,18 @@ const routes = [ title: '外部标准化会后管理流程（审批）' } }, + { + path: '/phoneBzjdStep4', + name: 'phoneBzjdStep4', + component: () => import('@/pages/processCenter/pages/phone/bzjd/step4.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '标准解读流程' + } + }, ] + }, // 本地工具 { @@ -1993,7 +2004,6 @@ const routes = [ menuId: 'PCZKM8TQJAH5UP5EAXTJ' } }, - // 工作组 { path: '/workingGroup', From bdf353da9449f36b68a987ece6175e79b48177e3 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, 2 Dec 2021 16:49:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 2 +- .../pages/creatProcess/xmqdqr/step1-1.vue | 12 +- .../pages/creatProcess/xmqdqr/step1.vue | 12 +- .../pages/creatProcess/xmqdqr/step2.vue | 844 ++++++++++++---- .../pages/creatProcess/xmqdqr/step3.vue | 853 ++++++++++++++--- .../pages/creatProcess/xmqdqr/step4.vue | 899 ++++++++++++++++++ .../pages/creatProcess/xmqdqr/step5.vue | 671 +++++++++++++ .../processCenter/pages/newProcess/index.vue | 2 +- .../tabComponents/processCenter/index.vue | 2 +- src/router/index.js | 36 +- 10 files changed, 2985 insertions(+), 348 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue create mode 100644 src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 965aa38b1..13c91226f 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -614,7 +614,7 @@ export default { break //项目清单确认流程 case '10' : - if(row.taskInfo === '确认人确认'){ + if(row.taskInfo === '产品工程经理分发清单'){ this.$router.push({ name: 'xmqdqrStep2', query: { diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue index c0a97afc7..940d01219 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue @@ -96,15 +96,15 @@ - -

确认人

+

产品经理

- +
@@ -449,7 +449,7 @@ export default { // 角色验证 roleFormRules: { confirmName: [ - { required: true, message: "请选择确认人", trigger: "change" } + { required: true, message: "请选择产品经理", trigger: "change" } ] } }; @@ -691,7 +691,7 @@ export default { _formData.append("createUserName", this.$store.getters.userInfo.userName); _formData.append("prcType", "10"); _formData.append("json", JSON.stringify({ - taskInfo: "确认人确认", + taskInfo: "产品经理分发", form: this.qdform, roleForm: this.roleForm, commentText: this.commentText diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index ff1ebb8a0..559165663 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -103,15 +103,15 @@ - -

确认人

+

产品经理

- +
@@ -461,7 +461,7 @@ export default { // 角色验证 roleFormRules: { confirmName: [ - { required: true, message: "请选择确认人", trigger: "change" } + { required: true, message: "请选择产品经理", trigger: "change" } ], approveName: [ { required: true, message: "请选择审批人", trigger: "change" } @@ -695,7 +695,7 @@ export default { _formData.append("createUserName", this.$store.getters.userInfo.userName); _formData.append("prcType", "10"); _formData.append("json", JSON.stringify({ - taskInfo: "确认人确认", + taskInfo: "产品经理分发", form: this.qdform, roleForm: this.roleForm, commentText: this.commentText diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index 90c62c85f..21c7f9d79 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -2,7 +2,7 @@
- +
基础信息
@@ -44,6 +44,14 @@ clearable > + + + @@ -252,163 +260,439 @@ + >
-
-
-
- - - - - - - - - - - - - - - - - - - 查询 - - 清空 - - - -
- + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + 清空 + + + + 数据获取中 + + + + + +
+ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
- +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + +
+ + + + +
+ 取消 + 确定
-
- 取消 - 添加 -
+ + - - - + + + + + - - + + { - // this.dataList = res.data.records; - // this.dataList.forEach(item => { - // // 责任部门转换 - // if (item.zrbm !== null || item.zrbm !== "") { - // let k = (item.zrbm || "").split(","); - // for (let i in this.zrbmOptions) { - // for (let m = 0; m < k.length; m++) { - // if (this.zrbmOptions[i].value === k[m]) { - // k[m] = this.zrbmOptions[i].label; - // } - // item.zrbm = k.join(","); - // } - // } - // } - // }); - // }); - // }, + getStandData() { + this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, { + _this: this + }, res => { + this.dataList = res.data.records; + this.dataList.forEach(item => { + // 责任部门转换 + if (item.zrbm !== null || item.zrbm !== "" ) { + let k = (item.zrbm || "").split(","); + for (let i in this.zrbmOptions) { + for (let m = 0; m < k.length; m++) { + if (this.zrbmOptions[i].value === k[m]) { + k[m] = this.zrbmOptions[i].label; + } + item.zrbm = k.join(","); + } + } + } + }); + this.dataList.map(item => { + if(item.zrbm === '[]'){ + item.zrbm = '' + } + }) + }); + }, // 接受按钮 handleAccept(){ this.isSubmit = true @@ -699,6 +1017,7 @@ export default { }); }, addList() { + this.searchLawBtn() this.standModel = true; }, //批量删除 @@ -726,12 +1045,34 @@ export default { } }, //添加标准勾选框数据 - selectStand(data) { - this.standList = data; + handleSelectTableChange (data) { + this.handleSelectTableList = data + console.log(this.handleSelectTableList); }, selectStandChange(data){ this.projectStand = data }, + choiceZRRS() { + this.nodeList2 = []; + if (this.qdform.detailPeople) { + this.nodeList2 = this.qdform.detailPeople.split(","); + } + this.modalshowflag = true; + }, + checkedRole2(data) { + var idList = ""; + var nameList = ""; + data.forEach(item => { + if (nameList.length > 0) { + nameList += ","; + idList += ","; + } + idList += item.id; + nameList += item.name; + }); + this.qdform.detailPeople = idList; + this.qdform.detailPeopleName = nameList; + }, cancelStand() { this.standModel = false; }, @@ -764,52 +1105,137 @@ export default { } }, + //手动查找的清空按钮 + clearLawBtn(){ + this.lawInfoTableLoading = true + this.handleSelectForm.lawNumber = '' + this.handleSelectForm.standNumber = '' + this.handleSelectForm.lawsNumber = '' + this.handleSelectForm.standCode = '' + //清空标准名称/政策名称的查询 + this.handleSelectForm.lawName = '' + this.handleSelectForm.standName = '' + this.handleSelectForm.numberName = '' + this.searchLawBtn() + }, //添加标准的查询按钮 - search() { - this.page = 1; - this.getStand(); - }, - clearSearch() { - this.standCommonlySearch = { - standSort: "", - standNumber: "", - standType: "" - }; - this.getStand(); - }, - pageChange(page) { - this.page = page; - this.getStand(); - }, - pageSizeChange(pageSize) { - this.pageSize = pageSize; - this.getStand(); - }, - //查询清单下的标准 - getStand() { - this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { - id: this.detailedId, - page: this.page, - Size: this.pageSize, - ...this.standCommonlySearch - }, { - _this: this - }, res => { - if (res.data === null) { - this.standardData = ""; - this.totalDo = ""; - } - this.standardData = res.data.records; - this.standardData.forEach(item => { - if (item.zccssrqgj === "-" || item.zccssrqgj === 'null' || item.zccssrqgj === 'undefined') { - item.zccssrqgj = ""; + searchLawBtn(){ + this.lawInfoTableLoading = true + if (this.handleSelectForm.dataSource === 'INLAND'){ + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{ + _this: this + },res=>{ + console.log('国内标准库数据',res) + if (res.ok){ + this.lawInfoTable = res.data.list + this.handleSelectForm.total = res.data.count + if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) { + this.lawInfoTableLoading = true + this.handleSelectPageChange(1) + }else { + this.lawInfoTableLoading = false + this.lawInfoTableLoading = false + } + }else { + this.$message.error(res.message) } - if (item.xcxssrqgj === "-" || item.xcxssrqgj === 'null' || item.xcxssrqgj === 'undefined' ) { - item.xcxssrqgj = ""; + },e=>{ + this.lawInfoTable = [] + this.handleSelectForm.total = 0 + }) + }else if(this.handleSelectForm.dataSource === 'FOREIGN'){ + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{ + _this: this + },res=>{ + if (res.ok){ + this.lawInfoTable = res.data.list + this.handleSelectForm.total = res.data.count + if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) { + this.lawInfoTableLoading = true + this.handleSelectPageChange(1) + }else { + this.lawInfoTableLoading = false + } + }else { + this.$message.error(res.message) + this.lawInfoTableLoading = false } - }); - this.total = res.data.total; - }); + },e=>{ + this.lawInfoTable = [] + this.handleSelectForm.total = 0 + }) + }else if(this.handleSelectForm.dataSource === 'BUSINESS_STAND'){ + this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',this.handleSelectForm,{ + _this: this + },res=>{ + if (res.ok){ + this.lawInfoTable = res.data.list + this.handleSelectForm.total = res.data.count + if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) { + this.lawInfoTableLoading = true + this.handleSelectPageChange(1) + }else { + this.lawInfoTableLoading = false + } + }else { + this.$message.error(res.message) + this.lawInfoTableLoading = false + } + },e=>{ + this.lawInfoTable = [] + this.handleSelectForm.total = 0 + }) + }else { + this.$message.warning('请先选择标准/政策来源') + } + }, + handleSelectConfirm(){ + if(this.handleSelectTableList.length < 1){ + this.$message.warning('请至少选择一条数据进行添加') + }else{ + this.standList.forEach(item =>{ + if(item.ssrq === "-"){ + item.ssrq = '' + } + if(item.zrbm === '[]'){ + item.zrbm ='' + } + }) + this.handleSelectTableList.map(item => { + let addIndex + addIndex = this.dataList.findIndex(items =>{ + return items.id === item.id + }) + if(addIndex > -1){ + this.$message.warning('请勿重复添加数据') + }else{ + this.dataList.push(item) + } + }) + this.standModel = false + } + }, + dataSourceChange() { + this.handleSelectForm.page = 1 + this.lawInfoTableLoading = true + this.handleSelectForm.standType = this.handleSelectForm.dataSource + this.searchLawBtn() + }, + //根据标准编号的查询 + lawNumberSearch() { + this.handleSelectForm.standNumber = this.handleSelectForm.lawNumber + this.handleSelectForm.lawsNumber = this.handleSelectForm.lawNumber + this.handleSelectForm.standCode = this.handleSelectForm.lawNumber + }, + handleSelectPageChange(page){ + this.lawInfoTableLoading = true + this.handleSelectForm.page = page + this.searchLawBtn() + }, + handleSelectPageSizeChange(pageSize){ + this.lawInfoTableLoading = true + this.handleSelectForm.pageSize = pageSize + this.searchLawBtn() }, }, computed: { diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index 50bfeb2b3..d9a30164e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -2,7 +2,7 @@
- +
基础信息
@@ -50,6 +50,12 @@ +
+
+ 添加 + 批量删除 +
+
- +
流程列表加载中
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + 查询 + + + + + 清空 + + + + 数据获取中 + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + +
+ + + + +
+ 取消 + 确定 +
+
+ + + + + + + + + + + + + + + + + + { + this.energyKindOptions = res.data.ENERGYTYPES; //适用车型 + this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别 + this.setMap(res.data.WBZTCLASS);// 文本状态 + this.setMap(this.zrbmMap, res.data.ZRBMCLASS); + this.showLocalProductData(this.getLocalPro); + }, e => { + }); + }, methods: { + formatIssueDate(str) { + const momentDate = this.$moment(str) + if (momentDate.isValid()) { + return this.$moment(str).format('YYYY-MM-DD') + } else { + return str + } + }, //确认转办 checkedTransferRole (data) { this.assigneeNewLoading = true @@ -350,7 +828,7 @@ export default { }) }, // 请求转换流程图 - processNum () { + processNum (row) { axios.request({ url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(), responseType: 'blob', @@ -364,6 +842,18 @@ export default { this.processStep = window.URL.createObjectURL(res.data) }) }, + //转办事件 + handleTransfer(){ + this.drawerModal = true + this.drawerTitle = '转办处理人' + this.selectPeople = row + }, + // 将文本状态的id与name对应 + setMap(data) { + data.forEach(item => { + this.$set(this.textStatusMap, item.value, item.label) + }) + }, processTable() { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, @@ -401,6 +891,15 @@ export default { }).then(res => { if (res) { const processForm = JSON.parse(res.mesg); + let commitStatus = res.commitStatus + if(commitStatus && commitStatus > 0){ + this.acceptShow = true + this.submitShow = false + }else { + this.acceptShow = false + this.submitShow = true + } + this.todoId = res.id this.getFormFieldList(processForm); } }).catch(e => { @@ -414,22 +913,81 @@ export default { this.qdform = JSON.parse(JSON.stringify(item)); this.qdform.prcNum = this.prcNum; this.qdform.prcName = this.prcName; - this.dataList = item.dataList this.qdform["id"] = item.id; - this.projectId = item.projectId - // this.getStandData(); + this.projectId = item.projectId; + //获取清单id 查询对应清单下的标准 + this.detailedId = item.detailedListId; + this.getStandData(); }else{ this.qdform = item.form this.dataList =item.form.dataList - this.projectId = item.form.projectId - // this.getStandData(); + this.detailedId = item.form.detailedListId; } }); }, + //查询清单下的标准 + getStandData() { + this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId, cars: '1', }, { + _this: this + }, res => { + this.dataList = res.data.records; + this.dataList.forEach(item => { + // 责任部门转换 + if (item.zrbm !== null || item.zrbm !== "" ) { + let k = (item.zrbm || "").split(","); + for (let i in this.zrbmOptions) { + for (let m = 0; m < k.length; m++) { + if (this.zrbmOptions[i].value === k[m]) { + k[m] = this.zrbmOptions[i].label; + } + item.zrbm = k.join(","); + } + } + } + }); + this.dataList.map(item => { + if(item.zrbm === '[]'){ + item.zrbm = '' + } + }) + }); + }, + // 接受按钮 + handleAccept(){ + this.isSubmit = true + execTask({ + todoId: this.todoId // 当前节点ID + }).then(res => { + if (res.sign && res.sign === '0') { + this.$message.success('接收成功') + this.$router.push('/processCenter') + } + this.isSubmit = false + }) + }, + //保存事件 + handleSave() { + this.saveLoading = true; + let _formData = new FormData(); + this.qdform.dataList = this.dataList + _formData.append("id", this.bpnId || ""); + _formData.append("prcType", "10"); + _formData.append('taskIds', this.taskIds) + _formData.append("json", JSON.stringify({ + form: this.qdform, + commentText: this.commentText + })); + saveTaskForPub(_formData).then(res => { + this.saveLoading = false; + this.$message.success("保存成功"); + this.bpnId = res.result; + }).catch(e => { + this.saveLoading = false; + }); + }, //提交事件 handleSubmit() { this.isSubmit = true; - this.qdform.passFlag = "0"; this.qdform.commentText = this.commentText; this.qdform.dataList = this.dataList const json = JSON.stringify(this.qdform); @@ -448,38 +1006,38 @@ export default { }, e => { }); }, - //转办事件 - handleTransfer(){ - this.drawerModal = true - this.drawerTitle = '转办处理人' - this.selectPeople = row + addList() { + this.searchLawBtn() + this.standModel = true; }, - //驳回事件 - beforeBack() { - if (this.commentText === null || this.commentText === undefined || this.commentText === "") { - this.$message.warning("请填写审批意见"); + //批量删除 + delectList(){ + if (this.projectStand.length < 1) { + this.$message.warning("请选择一条数据进行删除"); } else { - this.qdform.passFlag = "1"; - this.qdform.commentText = this.commentText; - const json = JSON.stringify(this.qdform); - 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"); - } - }, e => { + this.$confirm("您确认删除这些数据?", "提示", { + confirmButtonText: "确认", + confirmButtonClass: "common-button-primary", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + this.projectStand.map(item => { + let index; + index = this.dataList.findIndex(items => { + return items.standId === item.standId; + }); + if (index > -1) { + this.dataList.splice(index, 1); + } + }); + }).catch(() => { }); } }, //添加标准勾选框数据 - selectStand(data) { - this.standList = data; + handleSelectTableChange (data) { + this.handleSelectTableList = data + console.log(this.handleSelectTableList); }, selectStandChange(data){ this.projectStand = data @@ -503,7 +1061,7 @@ export default { this.standList.map(item => { let addIndex addIndex = this.dataList.findIndex(items =>{ - return items.standId === item.id + return items.id === item.id }) if(addIndex > -1){ this.$message.warning('请勿重复添加数据') @@ -516,56 +1074,137 @@ export default { } }, + //手动查找的清空按钮 + clearLawBtn(){ + this.lawInfoTableLoading = true + this.handleSelectForm.lawNumber = '' + this.handleSelectForm.standNumber = '' + this.handleSelectForm.lawsNumber = '' + this.handleSelectForm.standCode = '' + //清空标准名称/政策名称的查询 + this.handleSelectForm.lawName = '' + this.handleSelectForm.standName = '' + this.handleSelectForm.numberName = '' + this.searchLawBtn() + }, //添加标准的查询按钮 - search() { - this.getStand(); - }, - clearSearch() { - this.standCommonlySearch = { - standSort: "", - standNumber: "", - standType: "" - }; - this.getStand(); - }, - pageChange(page) { - this.page = page; - this.getStand(); - }, - pageSizeChange(pageSize) { - this.pageSize = pageSize; - this.getStand(); - }, - getStand(data) { - this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { - id: this.detailedId, - page: this.page, - Size: this.pageSize, - ...this.standCommonlySearch - }, { - _this: this - }, res => { - if (res.data === null) { - this.standardData = ""; - this.totalDo = ""; - } - this.standardData = res.data.records; - this.standardData.forEach(item => { - if (item.zccssrqgj === "-") { - item.zccssrqgj = ""; + searchLawBtn(){ + this.lawInfoTableLoading = true + if (this.handleSelectForm.dataSource === 'INLAND'){ + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{ + _this: this + },res=>{ + console.log('国内标准库数据',res) + if (res.ok){ + this.lawInfoTable = res.data.list + this.handleSelectForm.total = res.data.count + if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) { + this.lawInfoTableLoading = true + this.handleSelectPageChange(1) + }else { + this.lawInfoTableLoading = false + this.lawInfoTableLoading = false + } + }else { + this.$message.error(res.message) } - if (item.xcxssrqgj === "-") { - item.xcxssrq = ""; + },e=>{ + this.lawInfoTable = [] + this.handleSelectForm.total = 0 + }) + }else if(this.handleSelectForm.dataSource === 'FOREIGN'){ + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',this.handleSelectForm,{ + _this: this + },res=>{ + if (res.ok){ + this.lawInfoTable = res.data.list + this.handleSelectForm.total = res.data.count + if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) { + this.lawInfoTableLoading = true + this.handleSelectPageChange(1) + }else { + this.lawInfoTableLoading = false + } + }else { + this.$message.error(res.message) + this.lawInfoTableLoading = false } - }); - this.total = res.data.total; - }); + },e=>{ + this.lawInfoTable = [] + this.handleSelectForm.total = 0 + }) + }else if(this.handleSelectForm.dataSource === 'BUSINESS_STAND'){ + this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage',this.handleSelectForm,{ + _this: this + },res=>{ + if (res.ok){ + this.lawInfoTable = res.data.list + this.handleSelectForm.total = res.data.count + if ((this.lawInfoTable.length === 0 || this.lawInfoTable === []) && this.handleSelectForm.page !== 1) { + this.lawInfoTableLoading = true + this.handleSelectPageChange(1) + }else { + this.lawInfoTableLoading = false + } + }else { + this.$message.error(res.message) + this.lawInfoTableLoading = false + } + },e=>{ + this.lawInfoTable = [] + this.handleSelectForm.total = 0 + }) + }else { + this.$message.warning('请先选择标准/政策来源') + } }, - // 将文本状态的id与name对应 - setMap(data) { - data.forEach(item => { - this.$set(this.textStatusMap, item.value, item.label); - }); + handleSelectConfirm(){ + if(this.handleSelectTableList.length < 1){ + this.$message.warning('请至少选择一条数据进行添加') + }else{ + this.standList.forEach(item =>{ + if(item.ssrq === "-"){ + item.ssrq = '' + } + if(item.zrbm === '[]'){ + item.zrbm ='' + } + }) + this.handleSelectTableList.map(item => { + let addIndex + addIndex = this.dataList.findIndex(items =>{ + return items.id === item.id + }) + if(addIndex > -1){ + this.$message.warning('请勿重复添加数据') + }else{ + this.dataList.push(item) + } + }) + this.standModel = false + } + }, + dataSourceChange() { + this.handleSelectForm.page = 1 + this.lawInfoTableLoading = true + this.handleSelectForm.standType = this.handleSelectForm.dataSource + this.searchLawBtn() + }, + //根据标准编号的查询 + lawNumberSearch() { + this.handleSelectForm.standNumber = this.handleSelectForm.lawNumber + this.handleSelectForm.lawsNumber = this.handleSelectForm.lawNumber + this.handleSelectForm.standCode = this.handleSelectForm.lawNumber + }, + handleSelectPageChange(page){ + this.lawInfoTableLoading = true + this.handleSelectForm.page = page + this.searchLawBtn() + }, + handleSelectPageSizeChange(pageSize){ + this.lawInfoTableLoading = true + this.handleSelectForm.pageSize = pageSize + this.searchLawBtn() }, }, computed: { @@ -573,23 +1212,7 @@ export default { return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; } }, - mounted() { - this.processTable(); - this.getData(); - // 查询各下拉框数据 - this.$http.get("sys/dictype/getDicTypeListCode", "", { - _this: this, - loading: "loading" - }, res => { - this.energyKindOptions = res.data.ENERGYTYPES; //适用车型 - this.standSortOptions = res.data.STANDCLASSIFY; // 标准类别 - this.standStateOptions = res.data.WBZTCLASS; // 文本状态 - this.setMap(this.zrbmMap, res.data.ZRBMCLASS); - this.setMap(this.standStateOptions); - this.showLocalProductData(this.getLocalPro); - }, e => { - }); - } + }; diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue new file mode 100644 index 000000000..7c4768cf9 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue @@ -0,0 +1,899 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue new file mode 100644 index 000000000..85f9184d6 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue @@ -0,0 +1,671 @@ + + + + + + diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index efdfb9cb1..d45ee8087 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -127,7 +127,7 @@
- +
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index f31618145..ae048f454 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -868,7 +868,7 @@ export default { } break case '10': - if (row.taskInfo === '确认人确认') { + if (row.taskInfo === '产品工程经理分发清单') { this.$router.push({ name: 'xmqdqrStep2', query: { diff --git a/src/router/index.js b/src/router/index.js index 950677be7..69fa9ae24 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -736,6 +736,33 @@ const routes = [ title: '项目清单确认流程' } }, + { + path: '/xmqdqrStep3', + name: 'xmqdqrStep3', + component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue'), + meta: { + requireAuth: true, + title: '项目清单确认流程' + } + }, + { + path: '/xmqdqrStep4', + name: 'xmqdqrStep4', + component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue'), + meta: { + requireAuth: true, + title: '项目清单确认流程' + } + }, + { + path: '/xmqdqrStep5', + name: 'xmqdqrStep5', + component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue'), + meta: { + requireAuth: true, + title: '项目清单确认流程' + } + }, { path: '/xmqdqrStep1-1', name: 'xmqdqrStep1-1', @@ -763,15 +790,6 @@ const routes = [ title: '项目清单确认流程' } }, - { - path: '/xmqdqrStep3', - name: 'xmqdqrStep3', - component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue'), - meta: { - requireAuth: true, - title: '项目清单确认流程' - } - }, { path: '/wfhxzgStep1', name: 'wfhxzgStep1', From 9bfb13deee1e745fd547a2f2d134ed6cdc4be88e Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 2 Dec 2021 17:11:53 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=A6=96=E9=A1=B5UI=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home/components/EnterCard.vue | 12 ++++++------ src/pages/home2/components/empennage/index.vue | 2 ++ src/pages/home2/components/navMenu/index.vue | 6 +++--- src/pages/home2/components/release/index.vue | 8 +++++++- src/pages/home2/components/searchGroup/index.vue | 6 +++--- src/pages/home2/components/solicitopinions/index.vue | 8 +++++++- src/pages/home2/components/todoList/index.vue | 5 +++-- src/pages/home2/index.vue | 2 +- 8 files changed, 32 insertions(+), 17 deletions(-) diff --git a/src/pages/home/components/EnterCard.vue b/src/pages/home/components/EnterCard.vue index fe2ef511c..4f533f55d 100644 --- a/src/pages/home/components/EnterCard.vue +++ b/src/pages/home/components/EnterCard.vue @@ -3,7 +3,7 @@
- + {{ label }} @@ -67,7 +67,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index ecf021766..fca2bdbc0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -325,12 +325,6 @@ submitBTNText="同意" > -
- 123 + + + + +
+
基础信息
+
审批历史
+
+
+
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
+ + 隐藏基础信息 + 展开基础信息 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + +
+
+ + + + + + + + + + + + + + + + + + +
+ +
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index f31618145..2840cdbb3 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -834,7 +834,7 @@ export default { }) } else if (row.taskInfo === '责任人审核') { this.$router.push({ - name: 'bzjdStep4', + name: 'phoneBzjdStep4', query: { taskIds: row.taskIds, prcId: row.prcId,