This commit is contained in:
zhutianqi
2022-01-10 11:03:50 +08:00
parent f36cae2b5d
commit ba460a972f
2 changed files with 387 additions and 355 deletions
@@ -162,7 +162,7 @@
<el-input v-model="roleForm.ministerUser" style="display: none;"/> <el-input v-model="roleForm.ministerUser" style="display: none;"/>
<el-input <el-input
v-model="roleForm.ministerUserName" v-model="roleForm.ministerUserName"
placeholder="选择标准法规部部长·" placeholder="选择标准法规部部长"
@click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)" @click.native="choiceZRR('ministerUser', '选择标准法规部部长', roleForm.ministerUser)"
/> />
</div> </div>
@@ -12,11 +12,11 @@
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;"> <div style="flex: auto; overflow: auto;">
<el-form <el-form
ref="bzzqyjForm" ref="bzzqyjForm"
:model="form" :model="form"
:rules="formRules" :rules="formRules"
class="label-input-form" class="label-input-form"
label-width="210px" label-width="210px"
> >
<ProcessTitle> <ProcessTitle>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
@@ -26,18 +26,18 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled"> <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.cid" v-model="form.cid"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled disabled
v-model="form.endTime" v-model="form.endTime"
type="date" type="date"
placeholder="请选择结束日期"> placeholder="请选择结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled"> <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
@@ -76,6 +76,14 @@
- - - -
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="审批领导" prop="user7" class="add-form-item form-item-disabled">
<el-input
v-model="form.user7"
style="display: none;"
clearable
></el-input>
<el-input v-model="form.user7Name" placeholder="请选择审批领导" @click.native="choiceZRR"></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -96,71 +104,71 @@
</el-button> </el-button>
</div> </div>
<el-table <el-table
ref="multipleTable" ref="multipleTable"
:data="data" :data="data"
tooltip-effect="dark" tooltip-effect="dark"
border border
style="width: 100%; flex: auto;" style="width: 100%; flex: auto;"
class="drag-table" class="drag-table"
:default-sort = "{prop: 'chapterNumber', order: 'ascending'}" :default-sort = "{prop: 'chapterNumber', order: 'ascending'}"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column <el-table-column
type="index" type="index"
label="序号" label="序号"
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center" align="center"
sortable sortable
label="章条编号" label="章条编号"
width="101px"> width="101px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center" align="center"
width="200px" width="200px"
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="commentText" prop="commentText"
align="center" align="center"
label="修改意见内容(包括理由或依据)"> label="修改意见内容(包括理由或依据)">
<el-table-column <el-table-column
prop="oldText" prop="oldText"
align="center" align="center"
label="修改前"> label="修改前">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="primary" :disabled="scope.row.chapterNumber.length === 0" @click="itermsConditionsOpen(scope.row.oldText)" class="common-button-primary">查看修改前内容</el-button> <el-button size="mini" type="primary" :disabled="scope.row.chapterNumber.length === 0" @click="itermsConditionsOpen(scope.row.oldText)" class="common-button-primary">查看修改前内容</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="newText" prop="newText"
align="center" align="center"
label="修改后"> label="修改后">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="reason" prop="reason"
align="center" align="center"
label="修改理由"> label="修改理由">
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="department" prop="department"
align="center" align="center"
label="提出部门"> label="提出部门">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="responUserName" prop="responUserName"
align="center" align="center"
label="提出人"> label="提出人">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="state" prop="state"
align="center" align="center"
label="处理意见"> label="处理意见">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ stateText(scope.row.state) }}</div> <div>{{ stateText(scope.row.state) }}</div>
</template> </template>
@@ -171,11 +179,11 @@
<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"
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText6"> v-model="commentText6">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -183,24 +191,24 @@
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <el-table
height="100%" height="100%"
ref="selection" ref="selection"
:data="histortData" :data="histortData"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
border border
row-key="id" row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"> :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column <el-table-column
prop="name" prop="name"
label="任务步骤" label="任务步骤"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="assignee" prop="assignee"
label="任务受理人" label="任务受理人"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -220,17 +228,17 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="comment" prop="comment"
label="流程信息" label="流程信息"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.commentText }}</span> <span>{{ scope.row.commentText }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="completeFlag" prop="completeFlag"
label="状态" label="状态"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span> <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
</template> </template>
@@ -238,16 +246,16 @@
</el-table> </el-table>
</div> </div>
<ProcessFooter <ProcessFooter
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@submit="handleSubmit" @submit="handleSubmit"
show-back show-back
@back="handleSubmitNo" @back="handleSubmitNo"
show-transfer show-transfer
@transfer="handleTransfer" @transfer="handleTransfer"
approval approval
submitBTNText="同意" submitBTNText="同意"
> >
</ProcessFooter> </ProcessFooter>
<Role-tree <Role-tree
@@ -265,187 +273,209 @@
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button> <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div> </div>
</el-dialog> </el-dialog>
<Role-tree
check-box
is-title="选择审批领导"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole2"
:nodeList="nodeList"
></Role-tree>
</div> </div>
</template> </template>
<script> <script>
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, processCreateStand, changeAssigneeNew } from "api/process"; import { inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from "api/process";
import axios from "axios"; import axios from "axios";
export default { export default {
name: "bzzqyjStep6", name: "bzzqyjStep6",
data() { data() {
return { return {
commentText6: '', commentText6: '',
itermsConditionsFlag: false, itermsConditionsFlag: false,
itermsConditionsTitle: '', itermsConditionsTitle: '',
drawerModal: false, drawerModal: false,
histortData: [], histortData: [],
oldData: [], oldData: [],
data: [], data: [],
commentText: "", commentText: "",
oldText: "", oldText: "",
newText: "", newText: "",
reason: "", reason: "",
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId,
roleRow: {}, roleRow: {},
nodeList: [], nodeList: [],
type: "", type: "",
defaultProps: { defaultProps: {
children: "children", children: "children",
label: "name" label: "name"
},
treeData: [], // 人员数据
modalshowflag: false, // drawer开关
drawerTitle: "", //drawer标题
textarea: "", // 意见
ListModel: false, // 新增编辑抽屉开关
active: "1", // 默认显示
isSubmit: false,
saveLoading: false,
form: {
cid: "", // 编号
endTime: "", // 结束日期
cname: "", // 名称
fjList: [],
fjListId: '',
textType: '',
modelList: [],
modelNameList: '',
user7: '',
user7Name: ''
},
formRules: {
responUserList: [
{required: true, message: "请选择责任人", trigger: "change"}
]
},
json: {}
};
},
components: {
ProcessHeader,
ProcessFooter,
ProcessTitle
},
methods: {
choiceZRR () {
this.nodeList = [];
if (this.form.user7.length > 0) {
this.nodeList = this.form.user7.split(",");
}
this.modalshowflag = true;
}, },
treeData: [], // 人员数据 checkedRole2(data) {
modalshowflag: false, // drawer开关 this.form.user7 = data[0].id
drawerTitle: "", //drawer标题 this.form.user7Name = data[0].name
textarea: "", // 意见
ListModel: false, // 新增编辑抽屉开关
active: "1", // 默认显示
isSubmit: false,
saveLoading: false,
form: {
cid: "", // 编号
endTime: "", // 结束日期
cname: "", // 名称
fjList: [],
fjListId: '',
textType: '',
modelList: [],
modelNameList: '',
}, },
formRules: { filesUpload (file) { // 下载
responUserList: [ const attId = file.attId
{required: true, message: "请选择责任人", trigger: "change"} if (attId) {
] window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
} else {
this.$message.warning('文件不存在,下载失败')
}
}, },
json: {} fileLook(file) { // 预览
}; const attId = file.attId
}, this.$preview(attId)
components: { },
ProcessHeader, itermsConditionsClose () {
ProcessFooter, this.itermsConditionsFlag = false
ProcessTitle },
}, itermsConditionsOpen (row) {
methods: { this.itermsConditionsFlag = true
filesUpload (file) { // 下载 this.itermsConditionsTitle = row
const attId = file.attId },
if (attId) { downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
} else { },
this.$message.warning('文件不存在,下载失败')
}
},
fileLook(file) { // 预览
const attId = file.attId
this.$preview(attId)
},
itermsConditionsClose () {
this.itermsConditionsFlag = false
},
itermsConditionsOpen (row) {
this.itermsConditionsFlag = true
this.itermsConditionsTitle = row
},
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
handleTransfer() { handleTransfer() {
this.drawerModal = true this.drawerModal = true
}, },
checkedRole (data) { checkedRole (data) {
changeAssigneeNew({ changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id taskId: this.$route.query.taskIds, // 任务id
userId:this.$store.getters.userInfo.userId, // 委托人 userId:this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].id, // 被委托人 assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例 pId: this.$route.query.prcId, // 流程实例
}).then(res => { }).then(res => {
if (res.success) { if (res.success) {
this.drawerModal = false this.drawerModal = false
this.$message.success('调整成功') this.$message.success('调整成功')
this.processNum() this.processNum()
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
} else { } else {
this.$message.warning(res.message) this.$message.warning(res.message)
} }
}) })
}, },
// 请求转换流程图 // 请求转换流程图
processNum (row) { processNum (row) {
axios.request({ axios.request({
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(), url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
responseType: 'blob', responseType: 'blob',
method: 'get', method: 'get',
params: { params: {
prcNum: this.$route.query.prcNum prcNum: this.$route.query.prcNum
}
}).then(res => {
this.processStep = window.URL.createObjectURL(res.data)
})
},
updataFj(item) {
window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
},
getHistoryData() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum
}, {}, res => {
this.histortData = res;
}, e => {
});
},
stateText(row) {
if (row === "1") {
return "上报";
} else if (row === "2") {
return "处理后上报";
}
},
upload(row, title) {
if (row.length > 0) {
var params = {
columnName: {
chapterNumber: "章条编号",
chapterName: "章节名称",
commentText: "修改意见内容(包括理由或依据)",
oldText: "修改前",
newText: "修改后",
reason: "修改理由",
department: "提出部门",
responUserName: "提出人",
},
dataList: []
};
if (title === '上报意见.xls') {
params.columnName.stateText = "处理意见"
}
params.dataList = JSON.parse(JSON.stringify(row));
params.dataList.forEach(item => {
if (item.state === "1") {
item.stateText = "上报";
} else if (item.state === "2") {
item.stateText = "处理后上报";
} else {
item.stateText = "不上报";
} }
}).then(res => {
this.processStep = window.URL.createObjectURL(res.data)
})
},
updataFj(item) {
window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
},
getHistoryData() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum
}, {}, res => {
this.histortData = res;
}, e => {
}); });
this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => { },
}); stateText(row) {
} else { if (row === "1") {
this.$message.warning('无上报数据') return "上报";
} } else if (row === "2") {
}, return "处理后上报";
handleTabs(name) { }
this.active = name; },
}, upload(row, title) {
handleSubmit() { if (row.length > 0) {
var params = {
columnName: {
chapterNumber: "章条编号",
chapterName: "章节名称",
commentText: "修改意见内容(包括理由或依据)",
oldText: "修改前",
newText: "修改后",
reason: "修改理由",
department: "提出部门",
responUserName: "提出人",
},
dataList: []
};
if (title === '上报意见.xls') {
params.columnName.stateText = "处理意见"
}
params.dataList = JSON.parse(JSON.stringify(row));
params.dataList.forEach(item => {
if (item.state === "1") {
item.stateText = "上报";
} else if (item.state === "2") {
item.stateText = "处理后上报";
} else {
item.stateText = "不上报";
}
});
this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
});
} else {
this.$message.warning('无上报数据')
}
},
handleTabs(name) {
this.active = name;
},
handleSubmit() {
this.isSubmit = true; this.isSubmit = true;
var json = this.json; var json = this.json;
json.hqFlag = '0'; json.hqFlag = '0';
json.commentText = this.commentText6; json.commentText = this.commentText6;
json.user7 = this.form.user7;
json.user7Name = this.form.user7Name;
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
@@ -457,128 +487,130 @@ export default {
} }
this.isSubmit = false; this.isSubmit = false;
}); });
}, },
handleSubmitNo() { handleSubmitNo() {
if (this.commentText6) { if (this.commentText6) {
this.isSubmit = true; this.isSubmit = true;
var json = this.json; var json = this.json;
json.hqFlag = '1'; json.hqFlag = '1';
json.commentText = this.commentText6; json.commentText = this.commentText6;
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json), json: JSON.stringify(json),
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.userId
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success("驳回成功"); this.$message.success("驳回成功");
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false; this.isSubmit = false;
});
} else {
this.$message.warning("请输入反馈意见");
}
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg);
this.commentText6 = data.commentText6 || ''
this.form.fjList = data.fjList || data.form.fjList
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.form.user7 = data.form ? data.form.user7 : (data.user7 ? data.user7 : '')
this.form.user7Name = data.form ? data.form.user7Name : (data.user7Name ? data.user7Name : '')
this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = []
data.info.forEach(item => {
if (item.state != '3') {
arr.push(item)
}
})
this.json = data
this.data = arr
}).catch(e => {
});
}); });
} else {
this.$message.warning("请输入反馈意见");
} }
}, },
getData() { mounted() {
return new Promise((resolve, reject) => { this.getHistoryData();
inboundLiaisonDetail({ this.getData();
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg);
this.commentText6 = data.commentText6 || ''
this.form.fjList = data.fjList || data.form.fjList
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = []
data.info.forEach(item => {
if (item.state != '3') {
arr.push(item)
}
})
this.json = data
this.data = arr
}).catch(e => {
});
});
} }
}, };
mounted() {
this.getHistoryData();
this.getData();
}
};
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.bzdyStep6 { .bzdyStep6 {
/deep/ .el-drawer__container { /deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
padding: 0 20px 0; padding: 0 20px 0;
}
} }
}
.fileClass { .fileClass {
cursor: pointer;
}
.fileClass:hover {
color: #0c91e5;
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer; cursor: pointer;
} }
.active { .fileClass:hover {
border: 1px solid #E6A23C; color: #0c91e5;
color: #fff;
background: #E6A23C;
} }
}
.content { position: relative;
display: flex; height: 100%;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle { .headerTabs {
margin-bottom: 10px; height: 52px;
height: 30px; display: flex;
line-height: 30px; align-items: center;
position: relative; position: absolute;
font-size: 13px; top: 0;
font-weight: bold; right: 10px;
.tableButton { .headerTabsItem {
position: absolute; border: 1px solid #c1c1c1;
right: 0; padding: 0 5px;
top: 0; height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
} }
} }
} }
}
</style> </style>