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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2021-12-22 16:49:03 +08:00
parent 30400120bf 86a2d0fc49
commit 2c47e66911
14 changed files with 980 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/phone.js
+1
View File
@@ -1,5 +1,6 @@
import axios from "@/common/axiosV2"; import axios from "@/common/axiosV2";
// 手机端查询人
export function phoneUser(params) { export function phoneUser(params) {
return axios({ return axios({
url: "api/sys/user/getUserByPhone", url: "api/sys/user/getUserByPhone",
src/api/process.js
+18 -1
View File
@@ -713,7 +713,7 @@ export function workGroup(data) {
params: data params: data
}) })
} }
// // 手机端查询token
export function loginMobile(data) { export function loginMobile(data) {
return axios({ return axios({
url: 'api/lawss/activiti/loginMobile', url: 'api/lawss/activiti/loginMobile',
@@ -721,3 +721,20 @@ export function loginMobile(data) {
params: data params: data
}) })
} }
// 日历信息编辑
export function updateMeet(data) {
return axios({
url: '/api/sapMeetInfo/updateMeeting',
method: 'post',
params: data
})
}
export function upFile(data) {
return axios({
url: '/api/att/attFile/upload',
method: 'post',
data
})
}
src/pages/localTool/standCalendar/index.vue
+516 -39
View File
@@ -17,8 +17,8 @@
</el-select> </el-select>
</span> </span>
</div> </div>
<div style="float: right;display: inline;height: 30px;"> <div style="float: right;display: inline;height: 30px;padding-right: 5px">
<el-button size="mini" @click="today">今天</el-button> <el-button size="mini" type="primary" plain @click="today">今天</el-button>
</div> </div>
</div> </div>
<el-calendar v-model="value"> <el-calendar v-model="value">
@@ -61,41 +61,228 @@
<el-tag v-if="userId === res.fillPeopleId" type="success" size="mini">会议</el-tag> <el-tag v-if="userId === res.fillPeopleId" type="success" size="mini">会议</el-tag>
<el-tag v-else type="warning" size="mini">会议</el-tag> <el-tag v-else type="warning" size="mini">会议</el-tag>
</span> </span>
<span style="float: right;padding-right: 5px">
<el-button type="primary" size="mini" plain @click="edit_meeting(item)">编辑会议内容</el-button>
</span>
<i style="margin-left: 10px;font-weight: bold">{{ item.title }}</i> <i style="margin-left: 10px;font-weight: bold">{{ item.title }}</i>
<div class="content_text"> <div class="content_style">
<span>会议时间 : {{ $moment(item.date).format('YYYY-MM-DD HH:mm') }} </span> <div class="content_text">
</div> <span>会议时间 : {{ $moment(item.date).format('YYYY-MM-DD HH:mm:ss') }} </span>
<div class="content_text"> </div>
<span>参与人 : {{ item.partPeople.join('、') }} </span> <div class="content_text">
</div> <span>参与人 : {{ item.partPeople.join('、') }} </span>
<div class="content_text2"> </div>
<span>会议内容 : {{ item.content }}</span> <div class="content_text2">
</div> <span>会议内容 : {{ item.content }}</span>
<div class="content_text2"> </div>
<span>会议地点 : {{ item.place }}</span> <div class="content_text2">
</div> <span>会议地点 : {{ item.place }}</span>
<div class="content_text"> </div>
<div class="content_text">
<span>会议附件 : <span>会议附件 :
<span v-if="item.files.length === 0">{{ '-' }}</span> <span v-if="item.files.length === 0">{{ '-' }}</span>
<span v-else v-for="res in item.files" :key="res.id" style="color: #409EFF;" @click="previews(res.id)"> <div v-else v-for="res in item.files" :key="res.id" style="color: #409EFF;margin-left: 55px;margin-top: -25px;line-height: 35px" @click="previews(res.id)">
<a v-if="res.name.length > 30" style="cursor: pointer"> <a v-if="res.name.length > 30" style="cursor: pointer">
{{ res.name.slice(0, 30) + '...' }} {{ ';' }} {{ res.name.slice(0, 30) + '...' }} {{ ';' }}
</a> </a>
<a v-else style="cursor: pointer"> <a v-else style="cursor: pointer">
{{ res.name }} {{ ';' }} {{ res.name }} {{ ';' }}
</a> </a>
</span> </div>
</span> </span>
</div>
</div> </div>
</el-card> </el-card>
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
<!-- 会议编辑抽屉 -->
<el-drawer
title="编辑人员信息"
:visible.sync="meetFlag"
size="600px"
>
<div class="content_form" style="height: calc(100% - 20px);overflow-y: auto">
<el-form class="label-input-form" ref="editMeetForm" :model="editMeetForm" label-width="80px">
<el-form-item class="add-form-item" label="会议标题:">
<el-input v-model="editMeetForm.title" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="参与人员:">
<div class="myPart_btn">
<el-button
type="primary"
size="small"
@click="add_partForm">
新增
</el-button>
<el-button
type="danger"
size="small"
@click="del_partForm">
批量删除
</el-button>
</div>
<el-table
:data="editMeetForm.attend"
border
ref="entryTable"
@selection-change="selectedDelete"
height="49%"
style="width: 100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '20px'}">
<el-table-column type="selection" width="55"/>
<el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column prop="fillPeople" align="center" label="人员">
<template slot-scope="scope">
{{ scope.row.fillPeople || '' }}
</template>
</el-table-column>
<el-table-column prop="fillUnit" align="center" label="单位">
<template slot-scope="scope">
{{ scope.row.fillUnit || '' }}
</template>
</el-table-column>
<el-table-column prop="fillDept" align="center" label="部门">
<template slot-scope="scope">
{{ scope.row.fillDept || '' }}
</template>
</el-table-column>
<el-table-column prop="fillTel" align="center" label="电话">
<template slot-scope="scope">
{{ scope.row.fillTel || '' }}
</template>
</el-table-column>
<el-table-column prop="fillMail" align="center" label="邮箱">
<template slot-scope="scope">
{{ scope.row.fillMail || '' }}
</template>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
align="center"
width="100">
<template slot-scope="scope">
<el-button type="primary" plain size="mini" @click="edit_partForm(scope.row)">编辑</el-button>
</template>
</el-table-column>
</el-table>
</el-form-item>
<el-form-item class="add-form-item" label="会议时间:">
<el-date-picker
v-model="editMeetForm.date"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间"
align="right">
</el-date-picker>
</el-form-item>
<el-form-item class="add-form-item" label="会议内容:">
<div class="table_btn">
<el-button type="primary" size="small" @click="meeting_add">添加</el-button>
<el-button type="danger" size="small" @click="meeting_delete">批量删除</el-button>
</div>
<el-table
class="meeting_table"
:data="editMeetForm.contents"
border
ref="entryTable"
style="width: 100%"
@selection-change="selectedTable"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '20px'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column
label="议题"
align="center"
prop="meetingTheme">
<template slot-scope="scope">
<el-input v-model="scope.row.meetingTheme"/>
</template>
</el-table-column>
</el-table>
</el-form-item>
<el-form-item class="add-form-item" label="会议地点:">
<el-input v-model="editMeetForm.place" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="会议附件:">
<el-upload
multiple
ref="uploadFile"
:action="actionPath"
name="file"
:file-list="reData"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
:before-upload="handleBeforeUpload"
:before-remove="handleBeforeRemove"
:on-success="handleOnsuccess"
>
<el-button type="primary" size="small">
上传文件
</el-button>
</el-upload>
</el-form-item>
</el-form>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="falseDrawer">取消</el-button>
<el-button type="primary" :loading="loading" size="mini" @click="OkDrawer">确认</el-button>
</div>
</el-drawer>
<el-drawer
title="编辑人员信息"
:visible.sync="editFlag"
size="500px"
:before-close="falseDrawerTab"
custom-class="demo-drawer"
>
<div class="content_form" style="height: 100%">
<el-form class="label-input-form" ref="editForm" :model="editForm" label-width="80px">
<el-form-item class="add-form-item" label="参与人员:">
<el-input v-model="editForm.fillPeopleId" style="display: none;"></el-input>
<el-input
placeholder="请选择参与人员"
style="width: 50%"
@click.native="choiceRole('fillPeopleId','请选择入会成员',editForm.fillPeopleId,)"
v-model="editForm.fillPeople"
/>
</el-form-item>
<el-form-item class="add-form-item" label="单位:">
<el-input v-model="editForm.fillUnit" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="部门:">
<el-input v-model="editForm.fillDept" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="电话:">
<el-input v-model="editForm.fillTel" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="邮箱:">
<el-input v-model="editForm.fillMail" placeholder=""></el-input>
</el-form-item>
</el-form>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="falseDrawerTab">取消</el-button>
<el-button type="primary" size="mini" @click="OkDrawerTab">确认</el-button>
</div>
</el-drawer>
<Role-tree
check-box
is-title="选择入会人员"
:is-visible.sync="roleShowflag"
:nodeList="nodeList"
@checkedRole="drawerCheck"
/>
</div> </div>
</template> </template>
<script> <script>
import {meetingByMonth} from '@/api/unqualProcess.js' import {meetingByMonth} from '@/api/unqualProcess.js'
import {updateMeet} from '@/api/process.js'
export default { export default {
name: "calendar", name: "calendar",
@@ -122,6 +309,29 @@ export default {
value: new Date(), value: new Date(),
// 当前时间 // 当前时间
nowDate: '', nowDate: '',
meetFlag: false,
editMeetForm: {},
reData: [],
actionPath: 'api/att/attFile/upload',
roleShowflag: false,
nodeList: [],
deleteDataList: [],
upDialog: false,
reDataTable: [],
editFlag: false,
content: [],
editForm: {
fillPeople: '',
fillUnit: '',
fillDept: '',
fillTel: '',
fillMail: '',
},
// 议题选中时储存数组
deleteTable: [],
loading: false
} }
}, },
mounted() { mounted() {
@@ -285,7 +495,268 @@ export default {
if (attId != null && attId !== "") { if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId; window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
} }
} },
/** 每个会议对应的编辑按钮 */
edit_meeting(item) {
this.editMeetForm.contents = []
console.log(item)
localStorage.setItem('objs', JSON.stringify(item))
this.fileListData = item
this.reData = item.files
this.editMeetForm = item
this.editMeetForm.contents
this.editMeetForm.contents = []
if (this.editMeetForm.content !== '') {
this.editMeetForm.content.split(';').forEach(item => {
this.editMeetForm.contents.push({
meetingTheme: item
})
})
}
this.meetFlag = true
},
// 文件上传成功
handleOnsuccess(res, file, fileList) {
if (res.ok) {
if (this.reData !== undefined) {
this.newDataList = this.reData
this.newDataList.push({
id: res.data.attId,
name: res.data.name
})
} else {
this.newDataList.push({
id: res.data.attId,
name: res.data.name
})
}
this.fileListData.files = this.newDataList
this.$message({
showClose: true,
message: res.message,
type: 'success'
})
this.newDataList = []
this.fileMadel = false
}
},
// 文件上传限制条件
handleBeforeUpload(file) {
var filename = file.name
var index1 = filename.lastIndexOf('.')
var index2 = filename.length
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件')
return false
}
// 判断文件上传大小
// eslint-disable-next-line no-unreachable
if (file.size / 1024 / 1024 <= 200) {
return true
} else {
this.$message.error('文件' + file.name + '大小不超过200M')
return false
}
return true
},
// 移除上传的文件
handleBeforeRemove(file, fileList) {
this.reData.forEach((item, index) => {
if (item.name === file.name || item.id === file.id) {
this.reData.splice(index, 1)
}
})
this.fileListData.files = this.reData
},
add_partForm() {
var list = {
fillPeople: this.fillPeople,
fillUnit: this.fillUnit,
fillDept: this.fillDept,
fillPost: this.fillPost,
fillTel: this.fillTel,
fillMail: this.fillMail,
fillFile: this.fillFile = []
}
this.editMeetForm.attend.push(list)
},
// 编辑按钮
edit_partForm(row) {
// 用来储存取消时原来的数据，防止取消时修改
localStorage.setItem('obj', JSON.stringify(row))
this.editForm = row
this.editFlag = true
},
selectedDelete(val) {
this.deleteDataList = val
},
/** 批量删除 */
del_partForm() {
if (this.deleteDataList.length < 1) {
this.$message.warning("请选择一条数据进行删除");
} else {
this.$confirm("您确认删除这些数据?", "提示", {
confirmButtonText: "确认",
confirmButtonClass: "common-button-primary",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
let exits = [];
this.deleteDataList.map(item => {
let index;
index = this.editMeetForm.attend.findIndex(items => {
return items === item;
});
if (index > -1) {
this.editMeetForm.attend.splice(index, 1);
}
exits.push(item);
});
this.deleteDataList = [];
}).catch(() => {
});
}
},
// 编辑框选人
choiceRole(type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.type = type
this.roleShowflag = true
},
drawerCheck(data) {
if (data.length > 0) {
this.editForm.fillPeopleId = data[0].id
this.editForm.fillPeople = data[0].name
}
this.roleShowflag = false
},
// 编辑框确认按钮
OkDrawerTab() {
this.editFlag = false
},
falseDrawerTab() {
let Item = JSON.parse(localStorage.getItem('obj'))
this.editForm.fillPeopleId = Item.fillPeopleId
this.editForm.fillPeople = Item.fillPeople
this.editForm.fillUnit = Item.fillUnit
this.editForm.fillDept = Item.fillDept
this.editForm.fillTel = Item.fillTel
this.editForm.fillMail = Item.fillMail
this.editFlag = false
},
selectedTable(val) {
this.deleteTable = val
},
// 编辑框内议题相关
meeting_add() {
var list = {
meetingTheme: this.meetingTheme,
}
this.editMeetForm.contents.push(list)
},
meeting_delete() {
if (this.deleteTable.length < 1) {
this.$message.warning("请选择一条数据进行删除");
} else {
this.$confirm("您确认删除这些数据?", "提示", {
confirmButtonText: "确认",
confirmButtonClass: "common-button-primary",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
let exits = [];
this.deleteTable.map(item => {
let index
index = this.content.findIndex(items => {
return items === item
})
if (index > -1) {
this.content.splice(index, 1)
}
exits.push(item)
})
this.deleteTable = []
}).catch(() => {
})
}
},
falseDrawer() {
let Items = JSON.parse(localStorage.getItem('objs'))
this.editMeetForm.attend = Items.attend
this.editMeetForm.content = Items.content
this.editMeetForm.date = Items.date
this.editMeetForm.files = Items.files
this.editMeetForm.id = Items.id
this.editMeetForm.partPeople = Items.partPeople
this.editMeetForm.place = Items.place
this.editMeetForm.title = Items.title
this.editMeetForm.type = Items.type
this.meetFlag = false
},
OkDrawer() {
let contentData = []
if (this.editMeetForm.contents.length > 0) {
this.editMeetForm.contents.forEach(item => {
if (item.meetingTheme.length > 0){
contentData.push(item.meetingTheme)
}
})
}
let editForm = {
attend: JSON.stringify( this.editMeetForm.attend),
content: contentData.join(';'),
id: this.editMeetForm.id,
date: this.editMeetForm.date,
title: this.editMeetForm.title,
type: 1,
files: JSON.stringify(this.editMeetForm.files),
place: this.editMeetForm.place
}
this.loading = true
updateMeet(editForm).then(res=>{
if (true) {
this.$message.success("编辑成功");
this.meetFlag = false
this.loading = false
/** 获取当前日期*/
let yy = new Date().getFullYear();
let mm = new Date().getMonth() + 1;
let dd = new Date().getDate();
if (mm < 10) {
mm = this.padding0(mm, 2)
}
if (dd < 10) {
dd = this.padding0(dd, 2)
}
this.nowDate = yy + '-' + mm + '-' + dd
this.formData.year = yy + '年'
this.formData.month = mm + '月'
this.lastYear = yy
this.lastMonth = mm
this.getMonthData()
this.init()
} else {
this.$message.warning("编辑失败");
this.loading = false
}
})
},
} }
} }
</script> </script>
@@ -343,7 +814,7 @@ export default {
} }
/deep/ .el-card__body { /deep/ .el-card__body {
padding: 10px; padding: 5px 0px 10px 10px;
} }
.card_info_empty { .card_info_empty {
@@ -354,27 +825,33 @@ export default {
height: 190px; height: 190px;
margin-top: 10px; margin-top: 10px;
.content_text { .content_style {
white-space: nowrap; height: 150px;
text-overflow: ellipsis; overflow-y: auto;
overflow: hidden; width: 100%;
word-break: break-all;
line-height: normal;
margin-top: 10px;
font-size: 5px;
}
.content_text2 { .content_text {
text-overflow: ellipsis; white-space: nowrap;
overflow: hidden; text-overflow: ellipsis;
text-overflow: ellipsis; overflow: hidden;
display: -webkit-box; word-break: break-all;
-webkit-line-clamp: 4; line-height: normal;
line-clamp: 4; margin-top: 10px;
-webkit-box-orient: vertical; font-size: 5px;
line-height: normal; }
margin-top: 10px;
font-size: 5px; .content_text2 {
text-overflow: ellipsis;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 4;
line-clamp: 4;
-webkit-box-orient: vertical;
line-height: normal;
margin-top: 10px;
font-size: 5px;
}
} }
} }
} }
src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue
+3 -8
View File
@@ -359,14 +359,9 @@ export default {
}, },
//驳回 //驳回
beforeBack(){ beforeBack(){
if (this.participantsData.length < 1) { if(!this.commentText){
this.$message.warning("项目信息不能为空"); this.$message.warning('请填写审批意见')
} else { }else{
this.participantsData.forEach(item => {
if (item.projectNumber === undefined) {
this.$message.warning("请完善项目信息");
}
});
this.wbbzform.commentText = this.commentText; this.wbbzform.commentText = this.commentText;
let json = { let json = {
participantsData: this.participantsData, participantsData: this.participantsData,
src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue
+3 -8
View File
@@ -359,19 +359,14 @@ export default {
}, },
//驳回 //驳回
beforeBack(){ beforeBack(){
if (this.participantsData.length < 1) { if (!this.commentText) {
this.$message.warning("项目信息不能为空"); this.$message.warning("请填写审批意见");
} else { } else {
this.participantsData.forEach(item => {
if (item.projectNumber === undefined) {
this.$message.warning("请完善项目信息");
}
});
this.wbbzform.commentText = this.commentText; this.wbbzform.commentText = this.commentText;
let json = { let json = {
participantsData: this.participantsData, participantsData: this.participantsData,
wbbzform: this.wbbzform, wbbzform: this.wbbzform,
signFlag: '2', signFlag: "2"
}; };
this.$refs["wbbzForm"].validate((valid) => { this.$refs["wbbzForm"].validate((valid) => {
if (valid) { if (valid) {
src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue
+3 -8
View File
@@ -359,14 +359,9 @@ export default {
}, },
//驳回 //驳回
beforeBack(){ beforeBack(){
if (this.participantsData.length < 1) { if(!this.commentText){
this.$message.warning("项目信息不能为空"); this.$message.warning('请填写审批意见')
} else { }else{
this.participantsData.forEach(item => {
if (item.projectNumber === undefined) {
this.$message.warning("请完善项目信息");
}
});
this.wbbzform.commentText = this.commentText; this.wbbzform.commentText = this.commentText;
let json = { let json = {
participantsData: this.participantsData, participantsData: this.participantsData,
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+4
View File
@@ -199,6 +199,7 @@
</div> </div>
</div> </div>
<el-table <el-table
class="table_info"
ref="searchTable" ref="searchTable"
:data="unqualidiedData" :data="unqualidiedData"
tooltip-effect="dark" tooltip-effect="dark"
@@ -593,6 +594,9 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.wfhxzgStep1 { .wfhxzgStep1 {
/deep/.el-table--scrollable-y .el-table__body-wrapper {
height: calc(100% - 80px) !important;
}
/deep/.el-drawer__container { /deep/.el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+2
View File
@@ -262,6 +262,8 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
if (item.passInfo !== 0) { if (item.passInfo !== 0) {
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
let fileData = JSON.parse(JSON.stringify(item)).dockUserList
this.dataList = fileData[0].standardInfoList
} else { } else {
let fileData = JSON.parse(JSON.stringify(item)).dockUserList let fileData = JSON.parse(JSON.stringify(item)).dockUserList
for (let i = 0; i<fileData.length; i++) { for (let i = 0; i<fileData.length; i++) {
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+1 -2
View File
@@ -84,9 +84,8 @@
</el-collapse> </el-collapse>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<div class="flow-list"> <div>
<el-table <el-table
height="100%"
ref="selection" ref="selection"
:data="detailData" :data="detailData"
tooltip-effect="dark" tooltip-effect="dark"
src/pages/processCenter/pages/phone/bzqdfb/step4.vue
+37 -24
View File
@@ -122,6 +122,9 @@
width="100px" width="100px"
align="center" align="center"
label="文本状态"> label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
@@ -206,6 +209,7 @@
<ProcessFooter <ProcessFooter
show-back show-back
show-submit show-submit
show-transfer
:transfer-loading="isTransfer" :transfer-loading="isTransfer"
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@@ -223,6 +227,12 @@
@checkedRole="checkedRole" @checkedRole="checkedRole"
:nodeList="nodeList" :nodeList="nodeList"
></Role-tree> ></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="modalshowflag"
@checkedRole="drawerCheck"
/>
</div> </div>
</template> </template>
@@ -232,7 +242,7 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail ,changeAssigneeNew} from "api/process"; import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js"
export default { export default {
name: "phoneBzqdfbStep4", name: "phoneBzqdfbStep4",
@@ -244,6 +254,9 @@ export default {
}, },
data() { data() {
return { return {
modalshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
nodeList:[], nodeList:[],
isTransfer: false, isTransfer: false,
drawerTitle:'', drawerTitle:'',
@@ -304,26 +317,6 @@ export default {
}; };
}, },
methods: { methods: {
//确认转办
checkedRole (data) {
this.assigneeNewLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
} else {
this.$message.warning(res.message)
}
})
},
// 请求转换流程图 // 请求转换流程图
processNum (row) { processNum (row) {
axios.request({ axios.request({
@@ -341,9 +334,29 @@ export default {
}, },
//转办事件 //转办事件
handleTransfer(){ handleTransfer(){
this.drawerModal = true this.modalshowflag = true
this.drawerTitle = '转办处理人' this.phoneRoleList = this.roleTransfer
this.selectPeople = row this.phoneDrawerTitle = '转办处理人'
},
drawerCheck (data) {
this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({
taskId: this.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.userId, // 委托人
pId: this.pId // 流程实例
}).then(res =>{
if (res.success) {
this.turnLoading = false
this.$message.success('调整成功')
this.$router.push("/processCenter")
} else {
this.$message.warning(res.message)
}
})
this.modalshowflag = false
}, },
processTable() { processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", { this.$http.get("lawss/activiti/get_list_by_instance", {
src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue
+125 -116
View File
@@ -10,109 +10,112 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : '' " @click="handleTabs('3')">审批历史</div> <div class="headerTabsItem" :class="active === '3' ? 'active' : '' " @click="handleTabs('3')">审批历史</div>
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div> <div style="overflow: auto">
<el-form <ProcessTitle>
ref="wbbzForm" <template slot="title">基础信息</template>
:model="wbbzform" </ProcessTitle>
:rules="formRules" <el-collapse-transition>
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border" v-if="foldFormFlag"> <div class="prc-content-border" v-if="foldFormFlag">
<el-row :gutter="24"> <el-form
<el-col :span="24"> ref="wbbzForm"
<el-form-item label="提报单位" prop="reportingUnit" class="add-form-item "> :model="wbbzform"
<el-input :rules="formRules"
v-model="wbbzform.reportingUnit" class="label-input-form"
placeholder="请输入提报单位" label-width="120px"
readonly >
clearable> <el-row :gutter="24">
</el-input> <el-col :span="24">
</el-form-item> <el-form-item label="提报单位" prop="reportingUnit" class="add-form-item ">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item "> <el-input
<el-input v-model="wbbzform.reportingUnit"
v-model="wbbzform.standNumber" placeholder="请输入提报单位"
readonly readonly
placeholder="请输入标准编号" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="标准编号" prop="standNumber" class="add-form-item ">
<el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item "> <el-input
<el-input v-model="wbbzform.standNumber"
v-model="wbbzform.hostOrTask" readonly
readonly placeholder="请输入标准编号"
placeholder="请选择主持或参与" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item ">
<el-form-item label="参与人" prop="participants" class="add-form-item "> <el-input
<el-input v-model="wbbzform.hostOrTask"
v-model="wbbzform.participants" readonly
readonly placeholder="请选择主持或参与"
placeholder="请选择参与人" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="参与人" prop="participants" class="add-form-item ">
<el-form-item label="标准制定机构" prop="standMechanism" class="add-form-item "> <el-input
<el-input v-model="wbbzform.participants"
v-model="wbbzform.standMechanism" readonly
placeholder="请选择标准制定机构" placeholder="请选择参与人"
readonly clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="标准制定机构" prop="standMechanism" class="add-form-item ">
<el-form-item label="参与时间" prop="partakeTime" class="add-form-item form-item-disabled"> <el-input
<el-input v-model="wbbzform.standMechanism"
v-model="wbbzform.partakeTime" placeholder="请选择标准制定机构"
readonly readonly
placeholder="请选择参与时间" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="参与时间" prop="partakeTime" class="add-form-item form-item-disabled">
<el-form-item label="标准名称" prop="standName" class="add-form-item "> <el-input
<el-input v-model="wbbzform.partakeTime"
v-model="wbbzform.standName" readonly
placeholder="请输入标准名称" placeholder="请选择参与时间"
readonly clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="标准名称" prop="standName" class="add-form-item ">
<el-form-item label="标准类型" prop="standType" class="add-form-item "> <el-input
<el-input v-model="wbbzform.standName"
v-model="wbbzform.standType" placeholder="请输入标准名称"
readonly readonly
placeholder="请选择标准类型" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="标准类型" prop="standType" class="add-form-item ">
<el-form-item label="标准制修订" prop="standRevise" class="add-form-item "> <el-input
<el-input v-model="wbbzform.standType"
v-model="wbbzform.standRevise" readonly
readonly placeholder="请选择标准类型"
placeholder="请选择标准制修订" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="标准制修订" prop="standRevise" class="add-form-item ">
<el-form-item label="标准(拟)发布时间" prop="releaseTime" class="add-form-item form-item-disabled"> <el-input
<el-input v-model="wbbzform.standRevise"
v-model="wbbzform.releaseTime" readonly
readonly placeholder="请选择标准制修订"
placeholder="请选择标准(拟)发布时间" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="标准(拟)发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
</el-col> <el-input
</el-row> v-model="wbbzform.releaseTime"
readonly
placeholder="请选择标准(拟)发布时间"
clearable>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div> </div>
</el-collapse-transition>
<el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button> <el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
</el-form>
<ProcessTitle> <ProcessTitle>
<template slot="title">参与人信息</template> <template slot="title">参与人信息</template>
</ProcessTitle> </ProcessTitle>
<el-table border <el-table border
height="100%"
ref="selection" ref="selection"
:data="participantsData" :data="participantsData"
tooltip-effect="dark" tooltip-effect="dark"
@@ -148,7 +151,7 @@
</el-table> </el-table>
</div> </div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="回执说明"> <el-collapse-item title="审批意见">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-input <el-input
type="textarea" type="textarea"
@@ -223,6 +226,7 @@
</el-table> </el-table>
</div> </div>
<ProcessFooter <ProcessFooter
show-transfer
show-back show-back
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
@@ -249,6 +253,12 @@
@checkedRole="checkedTransferRole" @checkedRole="checkedTransferRole"
:nodeList="nodeList" :nodeList="nodeList"
></Role-tree> ></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div> </div>
</template> </template>
@@ -258,7 +268,7 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle"; import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter"; import ProcessFooter from "process/components/ProcessFooter";
import { changeAssigneeNew,inboundLiaisonDetail } from "api/process"; import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js"
export default { export default {
name: "phoneCywbbzzxdStep4", name: "phoneCywbbzzxdStep4",
@@ -270,6 +280,9 @@ export default {
}, },
data() { data() {
return { return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
//切换tab //切换tab
active: "1", active: "1",
foldFormFlag: true, foldFormFlag: true,
@@ -371,14 +384,9 @@ export default {
}, },
//驳回 //驳回
beforeBack(){ beforeBack(){
if (this.participantsData.length < 1) { if(!this.commentText){
this.$message.warning("项目信息不能为空"); this.$message.warning('请填写审批意见')
} else { }else{
this.participantsData.forEach(item => {
if (item.projectNumber === undefined) {
this.$message.warning("请完善项目信息");
}
});
this.wbbzform.commentText = this.commentText; this.wbbzform.commentText = this.commentText;
let json = { let json = {
participantsData: this.participantsData, participantsData: this.participantsData,
@@ -445,29 +453,30 @@ export default {
}, },
//转办按钮 //转办按钮
handleTransfer(){ handleTransfer(){
this.drawerModal = true this.phoneshowflag = true
this.drawerTitle = '转办处理人' this.phoneRoleList = this.roleTransfer
this.selectPeople = row this.phoneDrawerTitle = '转办处理人'
}, },
//确认转办 //确认转办
checkedTransferRole (data) { drawerCheck (data) {
this.assigneeNewLoading = true this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res => { }).then(res =>{
this.isTransfer = false
if (res.success) { if (res.success) {
this.drawerModal = false this.turnLoading = false
this.$message.success('调整成功') this.$message.success('调整成功')
this.$router.push("/processCenter"); this.$router.push("/processCenter")
this.processNum()
} else { } else {
this.$message.warning(res.message) this.$message.warning(res.message)
} }
}) })
this.modalshowflag = false
}, },
}, },
computed: { computed: {
src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue
+126 -117
View File
@@ -10,109 +10,112 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : '' " @click="handleTabs('3')">审批历史</div> <div class="headerTabsItem" :class="active === '3' ? 'active' : '' " @click="handleTabs('3')">审批历史</div>
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div> <div style="overflow: auto">
<el-form <ProcessTitle>
ref="wbbzForm" <template slot="title">基础信息</template>
:model="wbbzform" </ProcessTitle>
:rules="formRules" <el-collapse-transition>
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border" v-if="foldFormFlag"> <div class="prc-content-border" v-if="foldFormFlag">
<el-row :gutter="24"> <el-form
<el-col :span="24"> ref="wbbzForm"
<el-form-item label="提报单位" prop="reportingUnit" class="add-form-item "> :model="wbbzform"
<el-input :rules="formRules"
v-model="wbbzform.reportingUnit" class="label-input-form"
placeholder="请输入提报单位" label-width="120px"
readonly >
clearable> <el-row :gutter="24">
</el-input> <el-col :span="24">
</el-form-item> <el-form-item label="提报单位" prop="reportingUnit" class="add-form-item ">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item "> <el-input
<el-input v-model="wbbzform.reportingUnit"
v-model="wbbzform.standNumber" placeholder="请输入提报单位"
readonly readonly
placeholder="请输入标准编号" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="标准编号" prop="standNumber" class="add-form-item ">
<el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item "> <el-input
<el-input v-model="wbbzform.standNumber"
v-model="wbbzform.hostOrTask" readonly
readonly placeholder="请输入标准编号"
placeholder="请选择主持或参与" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item ">
<el-form-item label="参与人" prop="participants" class="add-form-item "> <el-input
<el-input v-model="wbbzform.hostOrTask"
v-model="wbbzform.participants" readonly
readonly placeholder="请选择主持或参与"
placeholder="请选择参与人" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="参与人" prop="participants" class="add-form-item ">
<el-form-item label="标准制定机构" prop="standMechanism" class="add-form-item "> <el-input
<el-input v-model="wbbzform.participants"
v-model="wbbzform.standMechanism" readonly
placeholder="请选择标准制定机构" placeholder="请选择参与人"
readonly clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="标准制定机构" prop="standMechanism" class="add-form-item ">
<el-form-item label="参与时间" prop="partakeTime" class="add-form-item form-item-disabled"> <el-input
<el-input v-model="wbbzform.standMechanism"
v-model="wbbzform.partakeTime" placeholder="请选择标准制定机构"
readonly readonly
placeholder="请选择参与时间" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="参与时间" prop="partakeTime" class="add-form-item form-item-disabled">
<el-form-item label="标准名称" prop="standName" class="add-form-item "> <el-input
<el-input v-model="wbbzform.partakeTime"
v-model="wbbzform.standName" readonly
placeholder="请输入标准名称" placeholder="请选择参与时间"
readonly clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="标准名称" prop="standName" class="add-form-item ">
<el-form-item label="标准类型" prop="standType" class="add-form-item "> <el-input
<el-input v-model="wbbzform.standName"
v-model="wbbzform.standType" placeholder="请输入标准名称"
readonly readonly
placeholder="请选择标准类型" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="标准类型" prop="standType" class="add-form-item ">
<el-form-item label="标准制修订" prop="standRevise" class="add-form-item "> <el-input
<el-input v-model="wbbzform.standType"
v-model="wbbzform.standRevise" readonly
readonly placeholder="请选择标准类型"
placeholder="请选择标准制修订" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="标准制修订" prop="standRevise" class="add-form-item ">
<el-form-item label="标准(拟)发布时间" prop="releaseTime" class="add-form-item form-item-disabled"> <el-input
<el-input v-model="wbbzform.standRevise"
v-model="wbbzform.releaseTime" readonly
readonly placeholder="请选择标准制修订"
placeholder="请选择标准(拟)发布时间" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="标准(拟)发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
</el-col> <el-input
</el-row> v-model="wbbzform.releaseTime"
readonly
placeholder="请选择标准(拟)发布时间"
clearable>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div> </div>
<el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button> </el-collapse-transition>
</el-form> <el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
<ProcessTitle> <ProcessTitle>
<template slot="title">参与人信息</template> <template slot="title">参与人信息</template>
</ProcessTitle> </ProcessTitle>
<el-table border <el-table border
height="100%"
ref="selection" ref="selection"
:data="participantsData" :data="participantsData"
tooltip-effect="dark" tooltip-effect="dark"
@@ -148,7 +151,7 @@
</el-table> </el-table>
</div> </div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="回执说明"> <el-collapse-item title="审批意见">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-input <el-input
type="textarea" type="textarea"
@@ -223,6 +226,7 @@
</el-table> </el-table>
</div> </div>
<ProcessFooter <ProcessFooter
show-transfer
show-back show-back
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
@@ -249,6 +253,12 @@
@checkedRole="checkedTransferRole" @checkedRole="checkedTransferRole"
:nodeList="nodeList" :nodeList="nodeList"
></Role-tree> ></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div> </div>
</template> </template>
@@ -258,7 +268,7 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle"; import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter"; import ProcessFooter from "process/components/ProcessFooter";
import { changeAssigneeNew,inboundLiaisonDetail } from "api/process"; import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js"
export default { export default {
name: "phoneCywbbzzxdStep5", name: "phoneCywbbzzxdStep5",
@@ -270,6 +280,9 @@ export default {
}, },
data() { data() {
return { return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
//切换tab //切换tab
active: "1", active: "1",
foldFormFlag: true, foldFormFlag: true,
@@ -371,14 +384,9 @@ export default {
}, },
//驳回 //驳回
beforeBack(){ beforeBack(){
if (this.participantsData.length < 1) { if(!this.commentText){
this.$message.warning("项目信息不能为空"); this.$message.warning('请填写审批意见')
} else { }else {
this.participantsData.forEach(item => {
if (item.projectNumber === undefined) {
this.$message.warning("请完善项目信息");
}
});
this.wbbzform.commentText = this.commentText; this.wbbzform.commentText = this.commentText;
let json = { let json = {
participantsData: this.participantsData, participantsData: this.participantsData,
@@ -445,29 +453,30 @@ export default {
}, },
//转办按钮 //转办按钮
handleTransfer(){ handleTransfer(){
this.drawerModal = true this.phoneshowflag = true
this.drawerTitle = '转办处理人' this.phoneRoleList = this.roleTransfer
this.selectPeople = row this.phoneDrawerTitle = '转办处理人'
}, },
//确认转办 //确认转办
checkedTransferRole (data) { drawerCheck (data) {
this.assigneeNewLoading = true this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res => { }).then(res =>{
this.isTransfer = false
if (res.success) { if (res.success) {
this.drawerModal = false this.turnLoading = false
this.$message.success('调整成功') this.$message.success('调整成功')
this.$router.push("/processCenter"); this.$router.push("/processCenter")
this.processNum()
} else { } else {
this.$message.warning(res.message) this.$message.warning(res.message)
} }
}) })
this.modalshowflag = false
}, },
}, },
computed: { computed: {
src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue
+126 -117
View File
@@ -10,109 +10,112 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : '' " @click="handleTabs('3')">审批历史</div> <div class="headerTabsItem" :class="active === '3' ? 'active' : '' " @click="handleTabs('3')">审批历史</div>
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div> <div style="overflow: auto">
<el-form <ProcessTitle>
ref="wbbzForm" <template slot="title">基础信息</template>
:model="wbbzform" </ProcessTitle>
:rules="formRules" <el-collapse-transition>
class="label-input-form"
label-width="210px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="prc-content-border" v-if="foldFormFlag"> <div class="prc-content-border" v-if="foldFormFlag">
<el-row :gutter="24"> <el-form
<el-col :span="24"> ref="wbbzForm"
<el-form-item label="提报单位" prop="reportingUnit" class="add-form-item "> :model="wbbzform"
<el-input :rules="formRules"
v-model="wbbzform.reportingUnit" class="label-input-form"
placeholder="请输入提报单位" label-width="120px"
readonly >
clearable> <el-row :gutter="24">
</el-input> <el-col :span="24">
</el-form-item> <el-form-item label="提报单位" prop="reportingUnit" class="add-form-item ">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item "> <el-input
<el-input v-model="wbbzform.reportingUnit"
v-model="wbbzform.standNumber" placeholder="请输入提报单位"
readonly readonly
placeholder="请输入标准编号" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="标准编号" prop="standNumber" class="add-form-item ">
<el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item "> <el-input
<el-input v-model="wbbzform.standNumber"
v-model="wbbzform.hostOrTask" readonly
readonly placeholder="请输入标准编号"
placeholder="请选择主持或参与" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item ">
<el-form-item label="参与人" prop="participants" class="add-form-item "> <el-input
<el-input v-model="wbbzform.hostOrTask"
v-model="wbbzform.participants" readonly
readonly placeholder="请选择主持或参与"
placeholder="请选择参与人" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="参与人" prop="participants" class="add-form-item ">
<el-form-item label="标准制定机构" prop="standMechanism" class="add-form-item "> <el-input
<el-input v-model="wbbzform.participants"
v-model="wbbzform.standMechanism" readonly
placeholder="请选择标准制定机构" placeholder="请选择参与人"
readonly clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="标准制定机构" prop="standMechanism" class="add-form-item ">
<el-form-item label="参与时间" prop="partakeTime" class="add-form-item form-item-disabled"> <el-input
<el-input v-model="wbbzform.standMechanism"
v-model="wbbzform.partakeTime" placeholder="请选择标准制定机构"
readonly readonly
placeholder="请选择参与时间" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="参与时间" prop="partakeTime" class="add-form-item form-item-disabled">
<el-form-item label="标准名称" prop="standName" class="add-form-item "> <el-input
<el-input v-model="wbbzform.partakeTime"
v-model="wbbzform.standName" readonly
placeholder="请输入标准名称" placeholder="请选择参与时间"
readonly clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="标准名称" prop="standName" class="add-form-item ">
<el-form-item label="标准类型" prop="standType" class="add-form-item "> <el-input
<el-input v-model="wbbzform.standName"
v-model="wbbzform.standType" placeholder="请输入标准名称"
readonly readonly
placeholder="请选择标准类型" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="标准类型" prop="standType" class="add-form-item ">
<el-form-item label="标准制修订" prop="standRevise" class="add-form-item "> <el-input
<el-input v-model="wbbzform.standType"
v-model="wbbzform.standRevise" readonly
readonly placeholder="请选择标准类型"
placeholder="请选择标准制修订" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="标准制修订" prop="standRevise" class="add-form-item ">
<el-form-item label="标准(拟)发布时间" prop="releaseTime" class="add-form-item form-item-disabled"> <el-input
<el-input v-model="wbbzform.standRevise"
v-model="wbbzform.releaseTime" readonly
readonly placeholder="请选择标准制修订"
placeholder="请选择标准(拟)发布时间" clearable>
clearable> </el-input>
</el-input> </el-form-item>
</el-form-item> <el-form-item label="标准(拟)发布时间" prop="releaseTime" class="add-form-item form-item-disabled">
</el-col> <el-input
</el-row> v-model="wbbzform.releaseTime"
readonly
placeholder="请选择标准(拟)发布时间"
clearable>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div> </div>
<el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button> </el-collapse-transition>
</el-form> <el-button style="width: 100%" :icon=" foldFormFlag ? 'el-icon-caret-top': 'el-icon-caret-bottom'" @click="foldForm">{{ foldFormFlag ? '隐藏基础信息' : '展开基础信息' }}</el-button>
<ProcessTitle> <ProcessTitle>
<template slot="title">参与人信息</template> <template slot="title">参与人信息</template>
</ProcessTitle> </ProcessTitle>
<el-table border <el-table border
height="100%"
ref="selection" ref="selection"
:data="participantsData" :data="participantsData"
tooltip-effect="dark" tooltip-effect="dark"
@@ -148,7 +151,7 @@
</el-table> </el-table>
</div> </div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="回执说明"> <el-collapse-item title="审批意见">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-input <el-input
type="textarea" type="textarea"
@@ -223,6 +226,7 @@
</el-table> </el-table>
</div> </div>
<ProcessFooter <ProcessFooter
show-transfer
show-back show-back
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
@@ -249,6 +253,12 @@
@checkedRole="checkedTransferRole" @checkedRole="checkedTransferRole"
:nodeList="nodeList" :nodeList="nodeList"
></Role-tree> ></Role-tree>
<phone-role
:role-title="drawerTitle"
:result-list="phoneRoleList"
:is-show-phone.sync="phoneshowflag"
@checkedRole="drawerCheck"
/>
</div> </div>
</template> </template>
@@ -258,7 +268,7 @@ import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessTitle from "process/components/ProcessTitle"; import ProcessTitle from "process/components/ProcessTitle";
import ProcessFooter from "process/components/ProcessFooter"; import ProcessFooter from "process/components/ProcessFooter";
import { changeAssigneeNew,inboundLiaisonDetail } from "api/process"; import {completeTask, inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "@/api/process.js"
export default { export default {
name: "phoneCywbbzzxdStep6", name: "phoneCywbbzzxdStep6",
@@ -270,6 +280,9 @@ export default {
}, },
data() { data() {
return { return {
phoneshowflag: false,
phoneRoleList: [],
phoneDrawerTitle: '',
//切换tab //切换tab
active: "1", active: "1",
foldFormFlag: true, foldFormFlag: true,
@@ -371,14 +384,9 @@ export default {
}, },
//驳回 //驳回
beforeBack(){ beforeBack(){
if (this.participantsData.length < 1) { if(!this.commentText){
this.$message.warning("项目信息不能为空"); this.$message.warning('请填写审批意见')
} else { }else{
this.participantsData.forEach(item => {
if (item.projectNumber === undefined) {
this.$message.warning("请完善项目信息");
}
});
this.wbbzform.commentText = this.commentText; this.wbbzform.commentText = this.commentText;
let json = { let json = {
participantsData: this.participantsData, participantsData: this.participantsData,
@@ -445,29 +453,30 @@ export default {
}, },
//转办按钮 //转办按钮
handleTransfer(){ handleTransfer(){
this.drawerModal = true this.phoneshowflag = true
this.drawerTitle = '转办处理人' this.phoneRoleList = this.roleTransfer
this.selectPeople = row this.phoneDrawerTitle = '转办处理人'
}, },
//确认转办 //确认转办
checkedTransferRole (data) { drawerCheck (data) {
this.assigneeNewLoading = true this.roleTransfer = data
this.phoneRoleList = this.roleTransfer
this.turnLoading = true
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人 userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例 pId: this.$route.query.prcId // 流程实例
}).then(res => { }).then(res =>{
this.isTransfer = false
if (res.success) { if (res.success) {
this.drawerModal = false this.turnLoading = false
this.$message.success('调整成功') this.$message.success('调整成功')
this.$router.push("/processCenter"); this.$router.push("/processCenter")
this.processNum()
} else { } else {
this.$message.warning(res.message) this.$message.warning(res.message)
} }
}) })
this.modalshowflag = false
}, },
}, },
computed: { computed: {
src/pages/processCenter/pages/phone/jrbzhxh/step3.vue
+15
View File
@@ -478,6 +478,21 @@ export default {
console.log(item); console.log(item);
this.$nextTick(() => { this.$nextTick(() => {
this.wbbzform = JSON.parse(JSON.stringify(item)); this.wbbzform = JSON.parse(JSON.stringify(item));
this.wbbzform.comityOptionsOne.forEach(item =>{
if(this.wbbzform.associationName === item.id){
this.wbbzform.associationName = item.name
}
})
this.wbbzform.comityOptionsTwo.forEach(item =>{
if(this.wbbzform.committee === item.id){
this.wbbzform.committee = item.name
}
})
this.wbbzform.comityOptionsOneThree.forEach(item =>{
if(this.wbbzform.workingGroup === item.id){
this.wbbzform.workingGroup = item.name
}
})
this.associationData = item.associationData this.associationData = item.associationData
this.participantsData = item.participantsData this.participantsData = item.participantsData
item.fileName.forEach(itemId => { item.fileName.forEach(itemId => {