From 32bdb021820325f128a87ee76c15c41b207ac0d7 Mon Sep 17 00:00:00 2001
From: Jaunty <15613469426@163.com>
Date: Wed, 7 Jul 2021 17:40:49 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=A6=96=E9=A1=B5?=
=?UTF-8?q?=E4=BB=A3=E5=8A=9E=E6=A0=87=E9=A2=98=E8=B7=B3=E8=BD=AC=E5=88=B0?=
=?UTF-8?q?=E7=9B=B8=E5=BA=94=E5=8A=9E=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/home1/components/todoList/index.vue | 122 +++++++++++++++++-
1 file changed, 120 insertions(+), 2 deletions(-)
diff --git a/src/pages/home1/components/todoList/index.vue b/src/pages/home1/components/todoList/index.vue
index fbe177ea9..c0ffaa12a 100644
--- a/src/pages/home1/components/todoList/index.vue
+++ b/src/pages/home1/components/todoList/index.vue
@@ -7,7 +7,7 @@
@@ -48,7 +48,125 @@ export default {
},
toPage() {
this.$router.push(this.path)
- }
+ },
+ dealWith (row) { // 办理
+ // this.setHandleInfo(JSON.stringify(row))
+ const prcType = row.prcType
+ switch(prcType) {
+ case '1':
+ if (row.taskInfo === '标准法规业务经理审批') {
+ this.$router.push({
+ name: 'bzrkStep2',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '责任人会签'){
+ this.$router.push({
+ name: 'bzrkStep3',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '申请人修订'){
+ this.$router.push({
+ name: 'bzrkStep4',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }
+ case '2':
+ if (row.taskInfo === '责任对接人选择责任人') {
+ this.$router.push({
+ name: 'bzdyStep2',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '责任人上传调研结果') {
+ this.$router.push({
+ name: 'bzdyStep3',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }
+ break;
+ //标准清单更新/发布流程
+ case'4' :
+ if (row.taskInfo === '进行会签，填写意见') {
+ this.$router.push({
+ name: 'bzqdfbStep2',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ } else if (row.taskInfo === '根据会签意见修订') {
+ this.$router.push({
+ name: 'bzqdfbStep3',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '业务经理审批') {
+ this.$router.push({
+ name: 'bzqdfbStep4',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }
+ break;
+ //项目合规评估流程
+ case '5' :
+ if(row.taskInfo === ''){
+ this.$router.push({
+ name: '',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }
+
+ }
+ },
},
}
From 7b9e8bc02b008daeceff7bb94ed98b05e9b8e339 Mon Sep 17 00:00:00 2001
From: zhutianqi
Date: Thu, 8 Jul 2021 19:09:20 +0800
Subject: [PATCH 2/5] commit
---
src/components/navMenu/index.vue | 10 ++---
src/pages/home1/components/navMenu/index.vue | 43 ++++++++++++++-----
.../personal/pages/individual-plate/index.vue | 18 +++++---
3 files changed, 50 insertions(+), 21 deletions(-)
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index a11e76a7f..58601b3fd 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -300,11 +300,11 @@ export default {
// path: '/convertDocView',
// menuId: '3F52K25546'
// },
- {
- title: '菜单管理',
- path: '/menuManage',
- menuId: '82665e94d406c6fc0d1f627e5880230b'
- },
+ // {
+ // title: '菜单管理',
+ // path: '/menuManage',
+ // menuId: '82665e94d406c6fc0d1f627e5880230b'
+ // },
// // {
// // title: '保密管理',
// // path: '/convertDocView'
diff --git a/src/pages/home1/components/navMenu/index.vue b/src/pages/home1/components/navMenu/index.vue
index 71aa3396f..ef4c34384 100644
--- a/src/pages/home1/components/navMenu/index.vue
+++ b/src/pages/home1/components/navMenu/index.vue
@@ -3,15 +3,11 @@
@@ -25,12 +21,32 @@
mixins: [],
data() {
return {
+ list: []
}
},
computed: {},
watch: {},
- mounted() {},
+ mounted() {
+ this.getData()
+ },
methods: {
+ getData (){
+ this.$http.get('/sarPersonalCenter/sar-user-personal-menu/getList',
+ {
+ userId: this.$store.getters.userInfo.userId
+ }, {_this: this}, res => {
+ if (res.ok) {
+ res.data.records.forEach( item => {
+ if (item.state == 1) {
+ var json = {}
+ json.label = item.menuName
+ json.path = item.menuUrl
+ this.list.push(json)
+ }
+ })
+ }
+ })
+ },
toPage() {
this.$router.push(this.path)
}
@@ -42,6 +58,7 @@
.nav-menu {
.lattice {
.menu-wrap {
+ height: 324px;
display: flex;
flex-wrap: wrap;
justify-content:space-between;
@@ -55,6 +72,12 @@
width: 32%;
margin: 0 0 10px 0;
}
+ .wx-card1 {
+ width: 100%;
+ }
+ .wx-card2 {
+ width: 49%;
+ }
.menu-item {
flex: 1;
line-height: 88px;
diff --git a/src/pages/personal/pages/individual-plate/index.vue b/src/pages/personal/pages/individual-plate/index.vue
index 2852d1a19..5cfbe5636 100644
--- a/src/pages/personal/pages/individual-plate/index.vue
+++ b/src/pages/personal/pages/individual-plate/index.vue
@@ -50,11 +50,14 @@ export default {
methods: {
// 右侧列表元素变化时触发
handleChange (newTargetKeys, direction, moveKeys) {
- if (direction === 'left') {
+ if (newTargetKeys.length > 9) {
+ this.$message.warning('个人展示模块最多仅能展示9个')
+ }
+ if (direction === 'left') {
this.oldData.forEach( item => {
moveKeys.forEach( items => {
if (items === item.id) {
- item.state = 1
+ item.state = 0
}
})
})
@@ -62,7 +65,7 @@ export default {
this.oldData.forEach( item => {
moveKeys.forEach( items => {
if (items === item.id) {
- item.state = 0
+ item.state = 1
}
})
})
@@ -71,8 +74,8 @@ export default {
this.numData = []
},
selectedChange (sourceSelectedKeys, targetSelectedKeys) {
- this.numData = sourceSelectedKeys
- this.sourceSelectedKeys = targetSelectedKeys
+ this.numData = sourceSelectedKeys
+ this.sourceSelectedKeys = targetSelectedKeys
},
savePersonal () {
if (this.targetKeys.length === 0) {
@@ -81,6 +84,9 @@ export default {
type: 'warning'
})
return
+ } else if (this.targetKeys.length > 9) {
+ this.$message.warning('个人展示模块最多仅能展示9个')
+ return
}
this.$http.postData('sarPersonalCenter/sar-user-personal-menu/update',
{
@@ -107,7 +113,7 @@ export default {
res.data.records.map((item) => {
if (item.menuName === '首页') {
this.selected.push(item)
- } else if (item.state == 0) {
+ } else if (item.state == 1) {
this.selected.push(item)
}
})
From 8701bb53f92be9b8299d3843b07d32f3febdd2ec Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Thu, 8 Jul 2021 20:03:50 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/addEdit.vue | 140 ++-
.../pages/otherAddEit.vue | 114 +--
.../pages/projectAddEit.vue | 874 +++++-------------
3 files changed, 310 insertions(+), 818 deletions(-)
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index e839c14a9..293b9748f 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -189,14 +189,14 @@
清单条目
- 上移
- 下移
删除
+
+
+ 上移
+ 下移
+
+