+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 清空
+
+
+
+
@@ -229,6 +300,7 @@ export default {
name: "bzzqyjStep1",
data() {
return {
+ commentText: '',
textarea: '', // 意见
title: '', // 新增抽屉标题
listModel: false, // 新增抽屉开关
@@ -241,6 +313,17 @@ export default {
endTime: '', // 结束日期
cname: '', // 名称
},
+ formRules: {
+ cid: [
+ { required: true, message: '请输入标准编号', trigger: 'change' },
+ ],
+ endTime: [
+ { required: true, message: '请输入标准结束日期', trigger: 'change' },
+ ],
+ cname: [
+ { required: true, message: '请输入标准名称', trigger: 'change' },
+ ],
+ },
// 标准征求意见数据可库
standCommonlySearch: {
categorg: '',
@@ -259,15 +342,41 @@ export default {
roleForm: {
startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.userId,
- dockUser: '',
- dockUserName: '',
- mainUser: '',
- mainUserName: '',
- engineerUser: '',
- engineerUserName: '',
- checkUser: '',
- checkUserName: '',
- }
+ dockUserList: '',
+ dockUserListName: '',
+ ministerUser: '',
+ ministerUserName: '',
+ directorUser: '',
+ directorUserName: '',
+ presidentUser: '',
+ presidentUserName: '',
+ },
+ roleFormRules: {
+ dockUserList: [
+ { required: true, message: '请选择责任部门对接人', trigger: 'change' },
+ ],
+ ministerUser: [
+ { required: true, message: '请选择标准法规部部长', trigger: 'change' },
+ ],
+ directorUser: [
+ { required: true, message: '请选择技术管理中心主任', trigger: 'change' },
+ ],
+ presidentUser: [
+ { required: true, message: '请选择工程研究院院长', trigger: 'change' },
+ ]
+ },
+ treeData: [],
+ nodeList: [],
+ nodeList2: [],
+ type: '',
+ drawerTitle: '',
+ modalshowflag: false,
+ modalshowflag2: false,
+ defaultProps: {
+ children: 'children',
+ label: 'name'
+ },
+ roleRow: {},
}
},
components: {
@@ -276,6 +385,7 @@ export default {
ProcessTitle
},
mounted () {
+ this.getTree()
this.sarStandCompareHis()
this.tableHeight = $('.content').height() - 44
window.onresize = () => {
@@ -287,7 +397,6 @@ export default {
this.title = '标准征求意见库'
this.listModel = true
},
-
/** 标准征求意见库方法*
* **********************************************/
// 清空
@@ -348,7 +457,6 @@ export default {
for (let i = 0; i < this.selectedList.length; i++) {
bringData.push(deposit.get(this.selectedList[i]));
}
- console.log(bringData)
this.form.cid = bringData[0].cid
this.form.cname = bringData[0].cname;
this.form.endTime = bringData[0].endTime;
@@ -360,18 +468,107 @@ export default {
}
},
/*** **********************************************/
-
/** 流程节点负责人的选择 *****************************/
- choiceZRR() {
- // this.choice
+ choiceZRR (type, title, id) {
+ this.nodeList = []
+ this.nodeList.push(id)
+ this.type = type
+ this.drawerTitle = title
+ this.modalshowflag = true
+ },
+ getTree () {
+ this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
+ this.treeData = res.data
+ })
+ },
+ saveUserInfo () {
+ if (this.type === 'ministerUser') {
+ this.roleForm.ministerUser = this.roleRow.id
+ this.roleForm.ministerUserName = this.roleRow.name
+ } else if (this.type === 'directorUser') {
+ this.roleForm.directorUser = this.roleRow.id
+ this.roleForm.directorUserName = this.roleRow.name
+ } else if (this.type === 'presidentUser') {
+ this.roleForm.presidentUser = this.roleRow.id
+ this.roleForm.presidentUserName = this.roleRow.name
+ }
+ this.modalshowflag = false
+ },
+ cancleUserInfo () {
+ this.modalshowflag = false
+ },
+ drawerCheck (data) {
+ var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+ if(getlist.length == 1) {
+ this.roleRow = getlist[0]
+ }else {
+ this.$refs.tree.setCheckedKeys([data.id]);
+ this.roleRow = this.$refs.tree.getCheckedNodes()[0]
+ }
+ },
+ choiceZRRS () {
+ this.nodeList2 = []
+ if ( this.roleForm.dockUserList.length > 0) {
+ this.nodeList2 = this.roleForm.dockUserList.split(',')
+ }
+ this.modalshowflag2 = true
+ },
+ saveUserInfo2 () {
+ var idList = ''
+ var nameList = ''
+ this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => {
+ if (nameList.length > 0) {
+ nameList += ','
+ idList += ','
+ }
+ idList += item.id
+ nameList += item.name
+ })
+ this.roleForm.dockUserList = idList
+ this.roleForm.dockUserListName = nameList
+ this.modalshowflag2 = false
+ },
+ cancleUserInfo2 () {
+ this.modalshowflag2 = false
},
-
handleTabs(name) {
this.active = name
},
- // 流程也的提交按钮和保存按钮操作
handleSave() {},
- handleSubmit() {}
+ handleSubmit() {
+ this.$refs['bzzqyjForm'].validate((valid) => {
+ if (valid) {
+ this.$refs['Form'].validate((valid) => {
+ if (valid) {
+ this.$http.get('lawss/activiti/startProcess', {
+ type: '3'
+ }, {}, res => {
+ if (res.ok) {
+ var json = Object.assign(this.form, this.roleForm)
+ json.commentText = this.commentText
+ this.$http.post('lawss/activiti/completeTask', {
+ json: JSON.stringify(json),
+ taskId: res.data,
+ userId: this.$store.getters.userInfo.userId
+ }, {}, res => {
+ if (res.success) {
+ this.$message.success('流程发起成功')
+ this.$router.push('/processCenter')
+ }
+ })
+ } else {
+ this.$message.warning('流程启动失败')
+ }
+ })
+ } else {
+ return this.$message.warning('请完善人员信息')
+ }
+ })
+ } else {
+ return this.$message.warning('请完善基础信息')
+ }
+ })
+ }
}
}
@@ -412,7 +609,7 @@ export default {
display: flex;
flex-direction: column;
justify-content: space-between;
- height: calc(~'100% - 103px');
+ height: calc(~'100% - 107px');
overflow: auto;
}
.standardForComments {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
index 6258074e3..b3580f59a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
@@ -1,13 +1,300 @@
-
+
+
+
+ 标准征求意见流程
+ 对接人选择责任人
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index fe474ca29..5557de462 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -252,6 +252,7 @@ export default {
}
})
}
+ break
case '2':
if (row.taskInfo === '责任对接人选择责任人') {
this.$router.push({
@@ -343,43 +344,59 @@ export default {
})
}
break;
+ break
+ case '3':
+ if (row.taskInfo === '责任对接人选择责任人') {
+ this.$router.push({
+ name: 'bzzqyjStep2',
+ 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'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;
+ break
//项目合规评估流程
case '5' :
if(row.taskInfo === ''){
@@ -394,6 +411,7 @@ export default {
}
})
}
+ break
}
},
From 7b9e8bc02b008daeceff7bb94ed98b05e9b8e339 Mon Sep 17 00:00:00 2001
From: zhutianqi
Date: Thu, 8 Jul 2021 19:09:20 +0800
Subject: [PATCH 3/7] 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 4/7] =?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 @@
清单条目
- 上移
- 下移
删除
+
+
+ 上移
+ 下移
+
+
@@ -41,16 +44,18 @@ export default {
newWebSite: 'http://www.mee.gov.cn/',
webName: '中华人民共和国生态环境部'
},
- {
- newWebSite: '',
- webName: '更多链接>'
- }
+ // {
+ // newWebSite: '',
+ // webName: '更多链接>'
+ // }
]
}
},
computed: {},
watch: {},
- mounted() {},
+ mounted() {
+ this.getLink();
+ },
methods: {
// 跳转链接
openLinkUrl (linkUri) {
@@ -62,7 +67,17 @@ export default {
window.open('https://' + linkUri)
}
},
+ getLink () {
+ this.$http.get('sarUrl/tsUrl', {}, {
+ _this: this,
+ loading: 'Loading'
+ }, res=> {
+ this.data = res.data
+ console.log(data);
+ })
+ }
},
+
}
diff --git a/src/pages/home1/index.vue b/src/pages/home1/index.vue
index e7aa380ab..c7e545203 100644
--- a/src/pages/home1/index.vue
+++ b/src/pages/home1/index.vue
@@ -21,21 +21,21 @@
class="home-tabs"
@tab-click="handleTabClick"
>
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+