This commit is contained in:
zhutianqi
2021-12-27 20:25:26 +08:00
parent 4d4e92dc9c
commit 482c09aa38
4 changed files with 64 additions and 32 deletions
@@ -127,19 +127,19 @@
</div>
</el-form>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
<!-- <el-collapse accordion>-->
<!-- <el-collapse-item title="回执说明">-->
<!-- <div style="margin: 10px 0;">-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- :rows="3"-->
<!-- resize="none"-->
<!-- placeholder="请输入意见"-->
<!-- v-model="commentText">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-collapse-item>-->
<!-- </el-collapse>-->
</div>
<div class="content" v-show="active === '2'">
<el-table
@@ -397,7 +397,7 @@
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
commentText: this.commentText,
// commentText: this.commentText,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
@@ -425,7 +425,7 @@
this.json.dyhz = this.form.dyhz
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
// json.commentText = this.commentText
json.fileId = this.form.fileId
json.fileName = this.form.fileName
this.$http.post('lawss/activiti/completeTask', {
@@ -3,7 +3,7 @@
<!-- 标准调研流程-->
<ProcessHeader toggle>
<template slot="proName">标准调研流程</template>
<template slot="proNode">工程研究总院院长审批</template>
<template slot="proNode">工程研究总院院长或标准法规主管副院长审批</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -137,7 +137,7 @@
<el-input
v-model="roleForm.dockUserListName"
placeholder="选择责任部门对接人"
@click.native="choiceZRRS">
@click.native="choiceZRRS('1')">
</el-input>
</div>
</el-form-item>
@@ -167,7 +167,7 @@
<el-input
v-model="roleForm.directorUserName"
placeholder="选择技术管理中心主任"
@click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"
@click.native="choiceZRRS('2')"
/>
</div>
</el-form-item>
@@ -287,7 +287,7 @@
</div>
</el-drawer>
<Role-tree
is-title="选择责任部门对接人"
:is-title="drawerTitle2"
:is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
@@ -365,6 +365,8 @@ export default {
name: "bzzqyjStep1-1",
data() {
return {
drawerTitle: '',
type2: '',
activeNames: '1',
fileUrl: 'api/att/attFile/upload',
fileMadel: false,
@@ -738,8 +740,13 @@ export default {
idList += item.id
nameList += item.name
})
this.roleForm.dockUserList = idList
this.roleForm.dockUserListName = nameList
if (this.type2 === '1') {
this.roleForm.dockUserList = idList
this.roleForm.dockUserName = nameList
} else {
this.roleForm.directorUser = idList
this.roleForm.directorUserName = nameList
}
},
checkedRole(data) {
if (this.type === 'ministerUser') {
@@ -753,10 +760,19 @@ export default {
this.roleForm.presidentUserName = data[0].name
}
},
choiceZRRS() {
choiceZRRS(type) {
this.type2 = type
this.nodeList2 = []
if (this.roleForm.dockUserList.length > 0) {
this.nodeList2 = this.roleForm.dockUserList.split(',')
if (type === '1') {
this.drawerTitle2 = '选择责任部门对接人'
if ( this.roleForm.dockUserList.length > 0) {
this.nodeList2 = this.roleForm.dockUserList.split(',')
}
} else {
this.drawerTitle2 = '选择技术管理中心主任'
if (this.roleForm.directorUser.length > 0) {
this.nodeList2 = this.roleForm.directorUser.split(',')
}
}
this.modalshowflag2 = true
},
@@ -138,7 +138,7 @@
<el-input
v-model="roleForm.dockUserListName"
placeholder="选择责任部门对接人"
@click.native="choiceZRRS">
@click.native="choiceZRRS('1')">
</el-input>
</div>
</el-form-item>
@@ -168,7 +168,7 @@
<el-input
v-model="roleForm.directorUserName"
placeholder="选择技术管理中心主任"
@click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"
@click.native="choiceZRRS('2')"
/>
</div>
</el-form-item>
@@ -289,7 +289,7 @@
</div>
</el-drawer>
<Role-tree
is-title="选择责任部门对接人"
:is-title="drawerTitle2"
:is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
@@ -375,6 +375,8 @@ export default {
name: "bzzqyjStep1",
data() {
return {
drawerTitle2: '',
type2: '',
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
@@ -745,8 +747,13 @@ export default {
idList += item.id
nameList += item.name
})
this.roleForm.dockUserList = idList
this.roleForm.dockUserListName = nameList
if (this.type2 === '1') {
this.roleForm.dockUserList = idList
this.roleForm.dockUserName = nameList
} else {
this.roleForm.directorUser = idList
this.roleForm.directorUserName = nameList
}
},
checkedRole(data) {
if (this.type === 'ministerUser') {
@@ -760,10 +767,19 @@ export default {
this.roleForm.presidentUserName = data[0].name
}
},
choiceZRRS() {
choiceZRRS(type) {
this.type2 = type
this.nodeList2 = []
if (this.roleForm.dockUserList.length > 0) {
this.nodeList2 = this.roleForm.dockUserList.split(',')
if (type === '1') {
this.drawerTitle2 = '选择责任部门对接人'
if ( this.roleForm.dockUserList.length > 0) {
this.nodeList2 = this.roleForm.dockUserList.split(',')
}
} else {
this.drawerTitle2 = '选择技术管理中心主任'
if (this.roleForm.directorUser.length > 0) {
this.nodeList2 = this.roleForm.directorUser.split(',')
}
}
this.modalshowflag2 = true
},