FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-07-14 21:02:16 +08:00
parent 9be9f1664d de627ca1db
commit 5c46f8a86b
19 changed files with 115 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/mechanismManage/index.vue
+4 -1
View File
@@ -70,9 +70,12 @@
label="所属岗位">
</el-table-column>
<el-table-column
prop="state"
label="状态"
width="170px">
<template slot-scope="scope">
<div v-if="scope.row.disableFlag === '1'">已禁用</div>
<div v-else>已启用</div>
</template>
</el-table-column>
<el-table-column
label="操作"
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+59 -4
View File
@@ -91,7 +91,7 @@
<h4>流程发起人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.startUser" style="display: none;"></el-input>
<el-input v-model="roleForm.startUserName" placeholder="流程发起人"></el-input>
<el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled></el-input>
</div>
</el-form-item>
</el-card>
@@ -101,8 +101,8 @@
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>责任部门对接人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择责任人" @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
<el-input v-model="roleForm.dockUserList" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择责任人" @click.native="choiceZRRS">
</el-input>
</div>
</el-form-item>
@@ -154,6 +154,31 @@
@submit="handleSubmit"
>
</ProcessFooter>
<el-drawer
title="选择责任部门对接人"
:visible.sync="modalshowflag2"
:wrapperClosable="false"
size="800px">
<el-tree
v-if="modalshowflag2"
style="height: 100%; overflow: auto;"
node-key="id"
class="filter-tree"
:data="treeData"
:props="defaultProps"
:default-checked-keys="nodeList2"
highlight-current
check-strictly
default-expand-all
:expand-on-click-node="false"
show-checkbox
ref="tree2">
</el-tree>
<div id="roleFormButton2" class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>
</div>
</el-drawer>
<el-drawer
:title="drawerTitle"
:visible.sync="modalshowflag"
@@ -247,7 +272,7 @@ export default {
roleForm: {
startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.userId,
dockUser: '',
dockUserList: '',
responUserList: '',
ministerUser: '',
directorUser: '',
@@ -274,6 +299,9 @@ export default {
},
fileUrl: 'api/att/attFile/upload',
fileMadel: false,
nodeList2: [],
modalshowflag2: false,
}
},
components: {
@@ -282,6 +310,31 @@ export default {
ProcessTitle
},
methods: {
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.dockUserName = nameList
this.modalshowflag2 = false
},
cancleUserInfo2 () {
this.modalshowflag2 = false
},
// 导入按钮 上传之前的钩子
beginImportFile (file) {
var filename = file.name
@@ -372,6 +425,7 @@ export default {
if (valid) {
this.$refs['Form'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
type: '2'
}, {}, res => {
@@ -391,6 +445,7 @@ export default {
} else {
this.$message.warning('流程启动失败')
}
this.isSubmit = false
})
} else {
return this.$message.warning('请完善人员信息')
src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
+2
View File
@@ -200,6 +200,7 @@
handleSubmit() {
this.$refs['qbkwForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.responUserList = this.form.responUserList
@@ -213,6 +214,7 @@
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
return this.$message.warning('请完善基础信息')
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+2
View File
@@ -209,6 +209,7 @@
handleSubmit() {
this.$refs['qbkwForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.fileId = this.form.fileId
@@ -222,6 +223,7 @@
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
return this.$message.warning('请完善基础信息')
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+4
View File
@@ -141,6 +141,7 @@
},
handleSave() {},
handleSubmit() { // 同意
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
@@ -153,10 +154,12 @@
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
handleSubmitNo() {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.actionFlag = 1
json.commentText = this.commentText
@@ -169,6 +172,7 @@
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+2
View File
@@ -233,6 +233,7 @@
handleSubmit() {
this.$refs['qbkwForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.hzfileId = this.form.hzfileId
@@ -246,6 +247,7 @@
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
}
})
src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+4
View File
@@ -229,6 +229,7 @@
},
handleSave() {},
handleSubmit() {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
@@ -241,10 +242,12 @@
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
handleSubmitNo() {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.actionFlag = 1
json.commentText = this.commentText
@@ -257,6 +260,7 @@
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+4
View File
@@ -229,6 +229,7 @@
},
handleSave() {},
handleSubmit() {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
@@ -241,10 +242,12 @@
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
handleSubmitNo() {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.actionFlag = 1
@@ -257,6 +260,7 @@
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+4
View File
@@ -229,6 +229,7 @@
},
handleSave() {},
handleSubmit() {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
@@ -241,10 +242,12 @@
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
handleSubmitNo() {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.actionFlag = 1
@@ -257,6 +260,7 @@
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+4
View File
@@ -229,6 +229,7 @@
},
handleSave() {},
handleSubmit() {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
@@ -241,10 +242,12 @@
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
handleSubmitNo() {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.actionFlag = 1
@@ -257,6 +260,7 @@
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+2
View File
@@ -557,6 +557,7 @@ export default {
if (valid) {
this.$refs['Form'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
type: '3'
}, {}, res => {
@@ -576,6 +577,7 @@ export default {
} else {
this.$message.warning('流程启动失败')
}
this.isSubmit = false
})
} else {
return this.$message.warning('请完善人员信息')
src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+2
View File
@@ -197,6 +197,7 @@
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.responUserList = this.form.responUserList
@@ -210,6 +211,7 @@
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
return this.$message.warning('请完善基础信息')
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+2
View File
@@ -257,6 +257,7 @@
} else if (c > 0) {
this.$message.warning('请输入意见内容')
} else {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.info = this.data
@@ -270,6 +271,7 @@
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
}
}
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+2
View File
@@ -175,6 +175,7 @@
},
handleSave() {},
handleSubmit() {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
@@ -187,6 +188,7 @@
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
handleSubmitNo () {
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+2
View File
@@ -241,6 +241,7 @@
} else if (c > 0) {
this.$message.warning('请输入意见内容')
} else {
this.isSubmit = true
var json = this.json
json.oldinfo = this.oldData
json.commentText = this.commentText
@@ -253,6 +254,7 @@
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
}
}
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+4
View File
@@ -238,6 +238,7 @@
} else if (c > 0) {
this.$message.warning('请输入意见内容')
} else {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
@@ -250,12 +251,14 @@
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
}
}
},
handleSubmitNo() {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.actionFlag = 1
json.commentText = this.commentText
@@ -268,6 +271,7 @@
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+4
View File
@@ -241,6 +241,7 @@
} else if (c > 0) {
this.$message.warning('请输入意见内容')
} else {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
@@ -253,12 +254,14 @@
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
}
}
},
handleSubmitNo() {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.actionFlag = 1
json.commentText = this.commentText
@@ -271,6 +274,7 @@
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+4
View File
@@ -241,6 +241,7 @@
} else if (c > 0) {
this.$message.warning('请输入意见内容')
} else {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
@@ -253,12 +254,14 @@
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
}
}
},
handleSubmitNo() {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.actionFlag = 1
json.commentText = this.commentText
@@ -271,6 +274,7 @@
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+4
View File
@@ -241,6 +241,7 @@
} else if (c > 0) {
this.$message.warning('请输入意见内容')
} else {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
@@ -253,12 +254,14 @@
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
}
}
},
handleSubmitNo() {
if (this.commentText) {
this.isSubmit = true
var json = this.json
json.actionFlag = 1
json.commentText = this.commentText
@@ -271,6 +274,7 @@
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')