commit
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
|
||||
</div>
|
||||
<div class="content" v-show="active === '1'">
|
||||
<div style="flex: auto; overflow: auto;">
|
||||
<div style="overflow: auto;">
|
||||
<el-form
|
||||
ref="bzzqyjForm"
|
||||
:model="form"
|
||||
@@ -49,6 +49,52 @@
|
||||
</div>
|
||||
</el-form>
|
||||
</div>
|
||||
<ProcessTitle>
|
||||
<template slot="title">拆分信息</template>
|
||||
</ProcessTitle>
|
||||
<div class="action-bar">
|
||||
<el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
|
||||
</div>
|
||||
<el-table border
|
||||
ref="selection"
|
||||
:data="itemList"
|
||||
tooltip-effect="dark"
|
||||
style="width: 100%;"
|
||||
height="100%"
|
||||
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
|
||||
fontWeight: 'bold', height: '48px'}"
|
||||
@selection-change="handleSelectionChange"
|
||||
row-key="id">
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column
|
||||
prop="itemsNum"
|
||||
label="条款号"
|
||||
width="170"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itemsName"
|
||||
label="条款名称"
|
||||
width="170"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="itermsConditions"
|
||||
label="条款内容"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="责任人"
|
||||
width="170"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.zrUserId" style="display: none;"/>
|
||||
<el-input v-model="scope.row.zrUserIdName" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<loading :loading="loading">数据获取中</loading>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="意见填写">
|
||||
<div style="margin: 10px 0;">
|
||||
@@ -82,21 +128,6 @@
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="对接部门责任人" placement="top" :color="roleForm.zrUserId ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="zrUserId" style="margin-bottom: 0">
|
||||
<h4>对接部门责任人</h4>
|
||||
<div style="margin-top: 10px;width: 300px;">
|
||||
<el-input v-model="roleForm.zrUserId" style="display: none;"/>
|
||||
<el-input
|
||||
v-model="roleForm.zrUserIdName"
|
||||
placeholder="选择责任部门对接人"
|
||||
@click.native="choiceZRRS">
|
||||
</el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="批准解读流程" placement="top" :color="roleForm.deptUserId ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="deptUserId" style="margin-bottom: 0">
|
||||
@@ -126,7 +157,7 @@
|
||||
>
|
||||
</ProcessFooter>
|
||||
<el-drawer
|
||||
title="标准征求意见数据库"
|
||||
title="标准拆分数据库"
|
||||
:visible.sync="listModel"
|
||||
size="900px"
|
||||
custom-class="demo-drawer"
|
||||
@@ -234,14 +265,15 @@
|
||||
size="800px">
|
||||
<el-tree
|
||||
v-if="modalshowflag2"
|
||||
style="height: 100%; overflow: auto;"
|
||||
node-key="id"
|
||||
style="height: 100%; overflow: auto;"
|
||||
class="filter-tree"
|
||||
:data="treeData"
|
||||
:props="defaultProps"
|
||||
:default-checked-keys="nodeList2"
|
||||
highlight-current
|
||||
check-strictly
|
||||
@check="drawerCheck2"
|
||||
default-expand-all
|
||||
:expand-on-click-node="false"
|
||||
show-checkbox
|
||||
@@ -265,6 +297,7 @@
|
||||
name: "bzjdStep1",
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
standId: '',
|
||||
commentText: '',
|
||||
textarea: '', // 意见
|
||||
@@ -303,8 +336,6 @@
|
||||
roleForm: {
|
||||
applyUserIdName: this.$store.getters.userInfo.userName,
|
||||
applyUserId: this.$store.getters.userInfo.userId,
|
||||
zrUserId: '',
|
||||
zrUserIdName: '',
|
||||
deptUserId: '',
|
||||
deptUserIdName: ''
|
||||
},
|
||||
@@ -328,7 +359,10 @@
|
||||
label: 'name'
|
||||
},
|
||||
roleRow: {},
|
||||
itemList: []
|
||||
itemList: [],
|
||||
zrType: '',
|
||||
zrIndex: '',
|
||||
zrIdList: []
|
||||
}
|
||||
},
|
||||
components: {
|
||||
@@ -401,6 +435,7 @@
|
||||
},
|
||||
enterDrawer() {
|
||||
if (this.selectedList.length === 1) {
|
||||
this.loading = true
|
||||
let deposit = new Map();
|
||||
this.standInfoList.forEach(item => {
|
||||
deposit.set(item.id, item);
|
||||
@@ -427,9 +462,13 @@
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
res.data.list.forEach(item => {
|
||||
item.zrUserId = ''
|
||||
item.zrUserIdName= ''
|
||||
})
|
||||
this.itemList = res.data.list
|
||||
console.log(res);
|
||||
}
|
||||
this.loading = false
|
||||
})
|
||||
} else if (this.selectedList.length > 1) {
|
||||
this.$message.warning("只能选择一条数据进行带入");
|
||||
@@ -470,12 +509,37 @@
|
||||
this.roleRow = this.$refs.tree.getCheckedNodes()[0]
|
||||
}
|
||||
},
|
||||
choiceZRRS () {
|
||||
this.nodeList2 = []
|
||||
if ( this.roleForm.zrUserId.length > 0) {
|
||||
this.nodeList2 = this.roleForm.zrUserId.split(',')
|
||||
drawerCheck2 (data) {
|
||||
var getlist = this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes());
|
||||
if(getlist.length == 1) {
|
||||
this.roleRow = getlist[0]
|
||||
}else {
|
||||
this.$refs.tree2.setCheckedKeys([data.id]);
|
||||
this.roleRow = this.$refs.tree2.getCheckedNodes()[0]
|
||||
}
|
||||
},
|
||||
handleSelectionChange (val) {
|
||||
this.zrIdList = []
|
||||
val.forEach( item => {
|
||||
this.zrIdList.push(item.id)
|
||||
})
|
||||
},
|
||||
choiceZRRS (row, type, index) {
|
||||
if (type === 1) {
|
||||
this.zrIndex= index
|
||||
this.zrType = type
|
||||
this.nodeList2.push(row)
|
||||
this.modalshowflag2 = true
|
||||
} else {
|
||||
// 批量
|
||||
if (this.zrIdList.length > 0) {
|
||||
this.zrType = type
|
||||
this.nodeList2 = []
|
||||
this.modalshowflag2 = true
|
||||
} else {
|
||||
this.$message.warning('请选择要编辑的数据')
|
||||
}
|
||||
}
|
||||
this.modalshowflag2 = true
|
||||
},
|
||||
saveUserInfo2 () {
|
||||
var idList = ''
|
||||
@@ -488,8 +552,19 @@
|
||||
idList += item.id
|
||||
nameList += item.name
|
||||
})
|
||||
this.roleForm.zrUserId = idList
|
||||
this.roleForm.zrUserIdName = nameList
|
||||
if (this.zrType == 1) {
|
||||
this.itemList[this.zrIndex].zrUserId = idList
|
||||
this.itemList[this.zrIndex].zrUserIdName = nameList
|
||||
} else {
|
||||
this.itemList.forEach( item => {
|
||||
this.zrIdList.forEach( items => {
|
||||
if (item.id === items) {
|
||||
item.zrUserId = idList
|
||||
item.zrUserIdName = nameList
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
this.modalshowflag2 = false
|
||||
},
|
||||
cancleUserInfo2 () {
|
||||
@@ -504,28 +579,38 @@
|
||||
if (valid) {
|
||||
this.$refs['Form'].validate((valid) => {
|
||||
if (valid) {
|
||||
this.$http.get('lawss/activiti/startProcess', {
|
||||
type: '9'
|
||||
}, {}, res => {
|
||||
if (res.ok) {
|
||||
var json = Object.assign(this.form, this.roleForm)
|
||||
json.commentText = this.commentText
|
||||
json.standInData = this.standId
|
||||
json.itemList = this.itemList
|
||||
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('流程启动失败')
|
||||
let b = 0
|
||||
for (let a = 0; a < this.itemList.length; a++) {
|
||||
if (!this.itemList[a].zrUserId) {
|
||||
b++
|
||||
}
|
||||
})
|
||||
}
|
||||
if (b > 0) {
|
||||
this.$message.warning('请选择责任人')
|
||||
} else {
|
||||
this.$http.get('lawss/activiti/startProcess', {
|
||||
type: '9'
|
||||
}, {}, res => {
|
||||
if (res.ok) {
|
||||
var json = Object.assign(this.form, this.roleForm)
|
||||
json.commentText = this.commentText
|
||||
json.standInData = this.standId
|
||||
json.itemList = this.itemList
|
||||
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('请完善人员信息')
|
||||
}
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
<template>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "step4"
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
@@ -0,0 +1,13 @@
|
||||
<template>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "step5"
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
@@ -0,0 +1,13 @@
|
||||
<template>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "step6"
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
</style>
|
||||
@@ -613,6 +613,39 @@ export default {
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '4') {
|
||||
this.$router.push({
|
||||
name: 'bzjdStep4',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '5') {
|
||||
this.$router.push({
|
||||
name: 'bzjdStep5',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
} else if (row.taskInfo === '6') {
|
||||
this.$router.push({
|
||||
name: 'bzjdStep6',
|
||||
query: {
|
||||
taskIds: row.taskIds,
|
||||
prcId: row.prcId,
|
||||
prcNum: row.prcNum,
|
||||
prcName: row.prcName,
|
||||
prcType: row.prcType
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -618,6 +618,33 @@ const routes = [
|
||||
title: '标准解读流程'
|
||||
}
|
||||
},
|
||||
{
|
||||
path: '/bzjdStep4',
|
||||
name: 'bzjdStep4',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step4.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '标准解读流程'
|
||||
}
|
||||
},
|
||||
{
|
||||
path: '/bzjdStep5',
|
||||
name: 'bzjdStep5',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step5.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '标准解读流程'
|
||||
}
|
||||
},
|
||||
{
|
||||
path: '/bzjdStep6',
|
||||
name: 'bzjdStep6',
|
||||
component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step6.vue'),
|
||||
meta: {
|
||||
requireAuth: true,
|
||||
title: '标准解读流程'
|
||||
}
|
||||
},
|
||||
]
|
||||
},
|
||||
// 本地工具
|
||||
|
||||
Reference in New Issue
Block a user