修改按钮

添加汇总页面 (标准调研流程 标准征求意见流程 标准合规评估流程 项目评估流程 项目清单确认流程)
This commit is contained in:
zyn
2022-12-13 18:07:12 +08:00
parent 9addec248c
commit c2206f0a69
6 changed files with 1940 additions and 35 deletions
@@ -76,8 +76,8 @@
</el-row>
</div>
</el-collapse-transition>
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
<el-button :disabled="disabledXX" v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button :disabled="disabledXX" v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
</el-form>
<ProcessTitle>
<template slot="title">调研信息</template>
@@ -132,8 +132,8 @@
</el-table>
</div>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse accordion v-model="activeNames">
<el-collapse-item title="回执说明" name="1">
<div style="margin: 10px 0;">
<el-input
:disabled="disabledXX"
@@ -256,6 +256,7 @@
data() {
return {
disabledXX:!!this.$route.query.disabledXX,
activeNames:'1',
commentText5: '',
newDocUser: '',
drawerModal: false,
@@ -79,8 +79,8 @@
</el-row>
</el-form>
</el-collapse-transition>
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
<el-button :disabled="disabledXX" v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button :disabled="disabledXX" v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
<el-form
v-if="foldFormFlag === true"
style="display: none"
@@ -206,7 +206,7 @@
show-overflow-tooltip
align="center">
<template slot-scope="scope">
<el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row)" class="common-button-primary">
<el-button :disabled="disabledXX" size="mini" type="primary" @click="itermsConditionsOpen(scope.row)" class="common-button-primary">
查看条款内容
</el-button>
</template>
@@ -283,10 +283,10 @@
label="评估人"
/>
</el-table>
<el-collapse accordion>
<el-collapse-item title="审批意见">
<el-collapse accordion v-model="activeNames">
<el-collapse-item title="审批意见" name="1">
<div style="margin: 10px 0;">
<el-input
<el-input :disabled="disabledXX"
type="textarea"
:rows="3"
resize="none"
@@ -366,7 +366,7 @@
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<ProcessFooter
<ProcessFooter v-show="!disabledXX"
show-submit
show-transfer
:submitLoading="isSubmit"
@@ -378,7 +378,7 @@
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree
<Role-tree v-if="!disabledXX"
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@@ -413,8 +413,9 @@ export default {
},
data() {
return {
//折叠的标志,true为折叠,false为不折叠
disabledXX:this.$route.query.disabledXX,
activeNames: '1',
//折叠的标志,true为折叠,false为不折叠
activeName: '',
foldFormFlag: false,
changePoint: false,
@@ -0,0 +1,658 @@
<template>
<div class="xmpg-step5-1">
<ProcessHeader toggle>
<template slot="proName">项目合规评估流程-项目</template>
<template slot="proNode">批准</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<process-title>
<template slot="title">基础信息</template>
</process-title>
<el-form
:model="listForm"
class="label-input-form prc-content-border"
label-width="150px"
>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
:picker-options="pickerOptions"
v-model="listForm.endTime"
type="date"
placeholder="请选择截止日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<process-title style="margin-top:5px; margin-bottom: 5px">
<template slot="title">填写信息</template>
</process-title>
<el-table
:data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
style="width: 100%; border: 1px solid #cccccc;height: 400px"
height="70%"
border
highlight-current-row
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold'}"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center"
>
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
fixed="left"
width="180"
align="center"
label="标准名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="itemsNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="ssrq"
width="200"
align="center"
label="实施日期">
</el-table-column>
<el-table-column
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zccssrq"
width="200"
align="center"
label="在产车实施日期">
</el-table-column>
<!-- <el-table-column-->
<!-- prop="productType"-->
<!-- align="center"-->
<!-- label="在研产品">-->
<el-table-column
prop="complianceReasons"
align="center"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="170"
label="不合规项">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
}}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column
prop="remarks"
align="center"
width="200"
label="不涉及理由">
</el-table-column>
<el-table-column
prop="workPeople"
align="center"
width="200"
label="责任人">
</el-table-column>
</el-table>
<el-pagination
layout="total,sizes, prev, pager, next"
background
:page-sizes="[20, 40, 60]"
:total="total"
:page-size="pageSize"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
>
</el-pagination>
</div>
<div>
<el-collapse accordion v-model="activeNames">
<el-collapse-item title="审批意见" name="1">
<div style="margin: 10px 0;">
<el-input :disabled="disabledXX"
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="name"
label="任务步骤"
align="center"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="流程信息"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
</template>
</el-table-column>
</el-table>
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<ProcessFooter v-show="!disabledXX"
show-transfer
show-submit
:submitLoading="isSubmit"
:transfer-loading="isTransfer"
:saveLoading="saveLoading"
:approval="true"
@transfer="handleTransfer"
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 福田全公司选人解决方案 -->
<Role-tree v-if="!disabledXX"
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
</div>
</template>
<script>
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew } from "api/process";
export default {
name: "xmpgStep5-1",
components: {
ProcessTitle,
ProcessHeader,
ProcessFooter
},
data() {
return {
disabledXX:this.$route.query.disabledXX,
activeNames:'1',
total: 0,
currentPage: 1,
pageSize: 20,
nodeList:[],
drawerTitle:'',
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
active: "1",
loading: false,
// 当前流程类型(1待办/2已办)
processType: 1,
isSubmit: false,
saveLoading: false,
//表单的数据
listForm: {
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
breakdownList: [] //标准下的分解单数据
},
dataList: [], //展示的标准数据
commentText: "", //审批意见
detailData: [],//流程历史数据
userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId
};
},
methods: {
//确认转办
checkedTransferRole (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) {
axios.request({
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
responseType: 'blob',
method: 'get',
params: {
prcNum: this.$route.query.prcNum
}
}).then(res => {
// let blob = new Blob([res.data], {type: 'image/jpg'})
// let url = window.URL.createObjectURL(res.data)
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
},
// 点击查看
handlePreview(item) {
let replaceStandInfoEO ={}
replaceStandInfoEO.standNumber = item.standNumber
this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
_this: this
}, res => {
if (res.data != null) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: res.data.id,
pageType:item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
} else {
this.$message.error(res.message)
}
}, e => {
})
// let routeUrl = this.$router.resolve({
// name: "OtherStandardDetails",
// params: {
// id: item.key || item.standId,
// pageType: item.standType + '_STAND'
// }
// });
// window.open(routeUrl.href, "_blank");
},
//查询项目下的标准
getStandData() {
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
standType: this.standardSearch.standType,
standNumber: this.standardSearch.standNumber,
page: this.pageNo,
pageSize: this.pageSizeNo
}, {
_this: this
}, res => {
this.standardData = res.data.list;
this.standardData.forEach(item => {
if (item.attrInfoMap === null) {
this.$set(item, "ZCCSSRQ", "");
this.$set(item, "XCXSSRQ", "");
} else {
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
}
});
this.totalNo = res.data.count;
}, e => {
});
},
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : "",
shunxu: this.shunxu
}, {
loading: "loading",
_this: this
}, res => {
this.detailData = res;
}, e => {
});
},
//tab改变
handleTabs(type) {
this.active = type;
},
//获取数据
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
}
}).catch(e => {
});
});
},
//动态表单读取
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
let dataChildren = []
let dataListChildren = []
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.dataList = item.dataList;
let titleList = [];
let ordelTitleList = [];
this.dataList.forEach(data=>{
data.title = data.standSort + data.standNumber + data.standYear
let isReal = ""
// if (titleList !== []){
titleList.forEach(tl => {
if (tl === data.title){
isReal = data.title
}
})
// }
if (isReal === ""){
titleList.push(data.title);
}
})
console.log(titleList,"titleList!!!!")
console.log(this.dataList,"dataList 进入方法前 !!!!")
titleList.forEach(tl => {
this.dataList.forEach(data=>{
if (data.title === tl){
console.log(data.title,"方法中的title !!!!")
ordelTitleList.push(data)
}
})
})
this.dataList = ordelTitleList
this.dataList.forEach(item =>{
if(item.children){
item.children.forEach(items =>{
dataChildren.push(items)
})
}
})
this.dataList.forEach(item => {
dataChildren.forEach(items =>{
if (items.key === item.standId) {
this.$set(items, "standName", item.standName);
this.$set(items, "standEnName", item.standEnName);
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
}
})
})
dataChildren.forEach((item, index) => {
dataListChildren = dataListChildren.concat(item);
});
dataListChildren = this.dataList.concat(dataListChildren);
let newDataListChildren = []
dataListChildren.forEach(item => {
if(!item.people){
newDataListChildren.push(item)
}
})
this.dataList = newDataListChildren;
this.total = this.dataList.length;
});
},
//提交事件
handleSubmit() {
this.isSubmit = true;
this.listForm.dataList = this.dataList
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
}, e => {
});
},
// 分页
handleCurrentChange(currentPage) {
this.currentPage = currentPage;
},
handleSizeChange(size) {
this.pageSize = size;
},
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
mounted() {
this.processTable();
this.getData();
}
};
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
.xmpg-step5-1 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.choiceBtn {
.el-button--primary {
width: 150px;
}
}
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;
}
.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;
}
.accessStandardsAndRegulations {
height: 100%;
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 14px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
File diff suppressed because it is too large Load Diff
@@ -31,11 +31,11 @@
@click="adjustmentHandler"
round
>调整处理人</el-button>
<el-button
<el-button v-if="approveShow"
class="common-button-default"
@click="approveHandler"
round
>流程审批</el-button>
>汇总流程</el-button>
<!--临时屏蔽 start-->
<!--<el-button-->
<!-- class="common-button-default"-->
@@ -147,6 +147,8 @@ export default {
name: 'processDetail',
data () {
return {
approveShow:false,
approveRowIndex:0,
assigneeNewLoading: false, // 调整处理人确定loading
loginPeople: '',
// 调整处理人抽屉状态
@@ -199,11 +201,11 @@ export default {
}
})
},
// 流程审批
// 汇总流程
approveHandler(){
let index = this.detailData.length - 1 // 当前流程任务最后一步index
let isEnd = true
let row = {...this.detailData[0]}
let row = {...this.detailData[this.approveRowIndex]}//汇总页数据
row.taskIds = row.id
row.taskInfo = row.name
row.tabsName = this.$route.query.tabsName
@@ -220,16 +222,13 @@ export default {
this.setPrcLastDetail((JSON.stringify(row)))
// 根据type判断跳转具体流程页面
if (prcType === '1') {
row = {...this.detailData[0]}
// 标准入库流程数据 //第一步
this.toProcessDetail('bzrkStep1',row)
}else if(prcType === '2'){
//标准调研流程 //第五步
row = {...this.detailData[4]}
this.toProcessDetail('bzdyStep5-1',row)
}else if(prcType === '3'){
//标准征求意见 第七步
row = {...this.detailData[6]}
this.toProcessDetail('bzzqyjStep5-1',row)
}else if(prcType === '4'){
//标准清单发布流程数据 第一步
@@ -239,47 +238,36 @@ export default {
// this.toProcessDetail('bzjdStep1', row)
}else if (prcType === '5'){
//标准合规评估流程 最后一步
row = {...this.detailData[index]}
this.toProcessDetail('bzpgStep8-2',row)
}else if(prcType === '6'){
//项目合规评估流程 最后一步
row = {...this.detailData[index]}
this.toProcessDetail('xmpg2Step12',row)
// this.toProcessDetail('xmpg2Step12-1',row)
this.toProcessDetail('xmpgStep5-1',row)
}else if(prcType === '10'){
//项目清单确认 最后一步
row = {...this.detailData[index]}
this.toProcessDetail('xmqdqrStep4',row)
this.toProcessDetail('xmqdqrStep4-1',row)
}else if (prcType === '8') {
// 未符合项整改 3
row = {...this.detailData[2]}
this.toProcessDetail('wfhxzgStep3',row)
}else if(prcType === 'buss1'){
//企标制修订 技术标准 第9
row = {...this.detailData[8]}
this.toProcessDetail('bussLibrary9',row)
}else if(prcType === 'buss2'){
//企标 产品标准 6
row = {...this.detailData[5]}
this.toProcessDetail('bussLibraryProduct6',row)
}else if(prcType === 'buss3'){
//企标复审 4
row = {...this.detailData[3]}
this.toProcessDetail('qbfsStep4',row)
}else if(prcType === '24'){
//企标废止 3
row = {...this.detailData[2]}
this.toProcessDetail('qbfzStep1',row)
}else if(prcType === '25'){
//企标制修订计划管控 1
row = {...this.detailData[0]}
this.toProcessDetail('qbzxdjhgkStep1',row)
}else if(prcType === '26'){
//企标制修订计划立项 1
row = {...this.detailData[0]}
this.toProcessDetail('qbzxdlxStep1',row)
}
} else {
this.$message.warning('当前流程未全部办理完成,无法查看')
}
},
/**
@@ -1177,7 +1165,8 @@ export default {
loading: 'loading',
_this: this
}, res => {
console.log(res)
this.approveShow = res[res.length-1].isGather
this.approveRowIndex = res[res.length-1].index
}, e => {})
}
},
+18
View File
@@ -791,6 +791,15 @@ const routes = [
title: '项目合规评估流程'
}
},
{
path: '/xmpgStep5-1',
name: 'xmpgStep5-1',
component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue'),
meta: {
requireAuth: true,
title: '项目合规评估流程'
}
},
{
path: '/xmpgStep1-5',
name: 'xmpgStep1-5',
@@ -971,6 +980,15 @@ const routes = [
title: '项目清单确认流程'
}
},
{
path: '/xmqdqrStep4-1',
name: 'xmqdqrStep4-1',
component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue'),
meta: {
requireAuth: true,
title: '项目清单确认流程'
}
},
{
path: '/xmqdqrStep1-4',
name: 'xmqdqrStep1-4',