Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
1f60e8e5 by renchao@pashanhoo.com
Options

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents cc58aaa2 3f23e484
Expand all
Inline Side-by-side
Showing 37 changed files with 911 additions and 340 deletions
var qlxxPage = [
{ qllx: "A01", id: "jsydsyq", form: "jsydsyq.vue", label: "集体土地所有权" },
{ qllx: "A02", id: "jsydsyq", form: "jsydsyq.vue", label: "国家土地所有权" },
{ qllx: "A03", id: "jsydsyq", form: "jsydsyq.vue", label: "国有建设用地使用权" },
{ qllx: "A04", id: "", form: "", label: "国有建设用地使用权/房屋所有权" },
{ qllx: "A05", id: "jsydsyq", form: "jsydsyq.vue", label: "宅基地使用权" },
{ qllx: "A06", id: "", form: "", label: "宅基地使用权/房屋所有权" },
{ qllx: "A07", id: "jsydsyq", form: "jsydsyq.vue", label: "集体建设用地使用权" },
{ qllx: "A08", id: "", form: "", label: "集体建设用地使用权/房屋所有权" },
{ qllx: "A09", id: "jsydsyq", form: "jsydsyq.vue", label: "土地承包经营权" },
{ qllx: "A11", id: "jsydsyq", form: "jsydsyq.vue", label: "林地使用权" },
{ qllx: "A12", id: "jsydsyq", form: "jsydsyq.vue", label: "林地使用权/森林、林木使用权" },
{ qllx: "A13", id: "jsydsyq", form: "jsydsyq.vue", label: "草原使用权" },
{ qllx: "A14", id: "jsydsyq", form: "jsydsyq.vue", label: "水域滩涂养殖权" },
{ qllx: "A15", id: "jsydsyq", form: "jsydsyq.vue", label: "海域使用权" },
{ qllx: "A16", id: "jsydsyq", form: "jsydsyq.vue", label: "海域使用权/建（构）筑物所有权" },
{ qllx: "A17", id: "jsydsyq", form: "jsydsyq.vue", label: "海域使用权（无居民海岛）" },
{ qllx: "A18", id: "jsydsyq", form: "jsydsyq.vue", label: "海域使用权（无居民海岛）/建筑物（设施）使用权" },
{ qllx: "A19", id: "diyiq", form: "diyiq.vue", label: "地役权" },
{ qllx: "A23", id: "jsydsyq", form: "jsydsyq.vue", label: "国有农用地的使用权" },
{ qllx: "A24", id: "jsydsyq", form: "jsydsyq.vue", label: "国有建设用地使用权/构筑物所有权" },
{ qllx: "A25", id: "jsydsyq", form: "jsydsyq.vue", label: "宅基地使用权/构筑物所有权" },
{ qllx: "A26", id: "jsydsyq", form: "jsydsyq.vue", label: "集体建设用地使用权/构筑物所有权" },
{ qllx: "A29", id: "jsydsyq", form: "jsydsyq.vue", label: "国有未利用地的使用权" },
{ qllx: "A30", id: "jsydsyq", form: "jsydsyq.vue", label: "集体农用地使用权" },
{ qllx: "A31", id: "jsydsyq", form: "jsydsyq.vue", label: "土地承包经营权/森林、林木使用权" },
{ qllx: "A33", id: "jsydsyq", form: "jsydsyq.vue", label: "林地经营权/林木所有权" },
{ qllx: "A34", id: "jsydsyq", form: "jsydsyq.vue", label: "林地经营权/林木使用权" },
{ qllx: "A35", id: "jsydsyq", form: "jsydsyq.vue", label: "林地承包经营权/林木所有权" },
{ qllx: "A36", id: "jsydsyq", form: "jsydsyq.vue", label: "林地使用权/林木所有权" },
{ qllx: "A37", id: "diyaq", form: "diyaq.vue", label: "抵押权" },
{ qllx: "B37", id: "diyaq", form: "diyaq.vue", label: "抵押权" },
{ qllx: "B38", id: "yydj", form: "yydj.vue", label: "异议登记" },
{ qllx: "B39", id: "cfdj", form: "cfdj.vue", label: "查封登记" },
{ qllx: "B40", id: "ygdj", form: "ygdj.vue", label: "预告登记" },
{ qllx: "B41", id: "ygdj", form: "ygdj.vue", label: "预告登记" },
];
//组装登记簿树形结构
export function loadTreeData(qlxxData, bdcdyh) {
let treedata = [];
//加载封面
treedata.push({ id: "djbfm", form: "djbfm.vue", label: "登记簿封面" });
treedata.push({ id: "zdjbxx", form: "zdjbxx.vue", label: "宗地基本信息\n(" + bdcdyh.substring(0, 19) + ")", children: [] });
treedata[1].children.push({ id: "bdcqldjml", form: "bdcqldjml.vue", label: "不动产权利登记目录", children: [] });
treedata[1].children[0].children.push({
id: "bdcqljqtsx", form: "bdcqljqtsx.vue", label: "不动产权利及其他事项\n (" + bdcdyh.slice(19) + ")", children: [],
});
//主体权利
treedata[1].children[0].children[0].children.push(getNode(qlxxData.ztqllx, qlxxData.ztql, qlxxData.bdcdylx));
//抵押权
treedata[1].children[0].children[0].children.push(getNode("A37", qlxxData.diyaq, ''));
//地役权
treedata[1].children[0].children[0].children.push(getNode("A19", qlxxData.diyiq, ''));
//预告登记
treedata[1].children[0].children[0].children.push(getNode("B40", qlxxData.ygdj, ''));
//异议登记
treedata[1].children[0].children[0].children.push(getNode("B38", qlxxData.yydj, ''));
//查封登记
treedata[1].children[0].children[0].children.push(getNode("B39", qlxxData.cfdj, ''));
return treedata;
}
//获取权利类型、不动产单元类型对应的树形节点信息
export function getNode(qllx, qlxx, bdcdylx) {
let node;
for (var i = 0; i < qlxxPage.length; i++) {
if (qlxxPage[i].qllx == qllx) {
if (qllx == "A04" || qllx == "A06" || qllx == "A08") {
if (bdcdylx == "4") {
node = { id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi +")"};
} else {
node = { id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi +")"};
}
} else {
node = { id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi +")"};
}
break;
}
};
return node;
}
<!--
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:40:46
-->
......@@ -533,4 +533,4 @@
}
}
}
</style>
\ No newline at end of file
</style>
......
......@@ -43,7 +43,7 @@ export function loadTreeData(qlxxData, bdcdyh) {
let treedata = [];
//加载封面
treedata.push({ id: "djbfm", form: "djbfm.vue", label: "登记簿封面" });
treedata.push({ id: "zdjbxx", form: "zdjbxx.vue", label: "宗地基本信息\n(" + bdcdyh.substring(0, 19) + ")", children: [] });
treedata.push({ id: "zdjbxx", form: "zdjbxx.vue", label: "宗地基本信息", children: [] });
treedata[1].children.push({ id: "bdcqldjml", form: "bdcqldjml.vue", label: "不动产权利登记目录", children: [] });
treedata[1].children[0].children.push({
id: "bdcqljqtsx", form: "bdcqljqtsx.vue", label: "不动产权利及其他事项\n (" + bdcdyh.slice(19) + ")", children: [],
......@@ -71,12 +71,12 @@ export function getNode(qllx, qlxx, bdcdylx) {
if (qlxxPage[i].qllx == qllx) {
if (qllx == "A04" || qllx == "A06" || qllx == "A08") {
if (bdcdylx == "4") {
node = { id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi +")"};
node = { id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label};
} else {
node = { id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi +")"};
node = { id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label};
}
} else {
node = { id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi +")"};
node = { id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label};
}
break;
}
......
......@@ -6,12 +6,28 @@
<template>
<div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
<div v-if="this.isShowdrawer">
<div class="title">
登记簿补录业务列表
</div>
<el-tree ref="tree" :data="treedata" :props="defaultProps" @node-click="handleNodeClick"
:default-expand-all="true" :expand-on-click-node="false" node-key="id" :default-checked-keys="[showTab]">
</el-tree>
<el-menu :default-active="activeIndex" @select="djbClick" class="title-batch">
<el-menu-item index="-1" key="-1" class="menus">
<div>登记簿</div>
</el-menu-item>
</el-menu>
<div class="blxx">
<el-menu :default-active="activeIndex" @select="blxxClick" class="title-batch">
<el-menu-item index="-1" key="-1" class="menus">
<div>补录信息</div>
</el-menu-item>
</el-menu>
<el-menu :default-active="activeIndex" @select="unitClick">
<el-menu-item v-for="(item, index) in supplementarylist" :index="index.toString()" :key="index">
<div>
<p>{{ item.bdcdyh }}</p>
<p class="title-detail">{{ item.zl }}</p>
</div>
<i class="el-icon-delete" v-if="supplementarylist.length > 1" @click.stop="handleDel(item)"></i>
</el-menu-item>
</el-menu>
</div>
</div>
<div class="map-drawer-click map-drawer" v-if="!isShowdrawer" @click="
() => {
......@@ -34,6 +50,7 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
export default {
data () {
return {
supplementarylist:[],
//受理申请标识码
bsmSlsq: this.$route.query.bsmSlsq,
//当前流程所在环节
......@@ -47,8 +64,6 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
activeIndex: '0',
// 折叠
isShowdrawer: true,
// 批量操作
showBatch: false,
//批量操作按钮名称
batchButtonName: '',
//左侧菜单数据集合
......@@ -87,26 +102,97 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
},
// 获取登记簿菜单
loadData () {
getBdcqljqtsx({
bdcdyid: this.bdcdyid,
bdcdyh: this.bdcdyh,
}).then((res) => {
if (res.code === 200) {
this.treedata = loadTreeData(res.result, this.bdcdyh);
this.$nextTick(function () {
this.defaultNode = getNode(this.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
this.$parent.loadComponent(this.currentSelectProps,this.defaultNode);
});
}
});
this.currentSelectProps = {
bdcdyid: this.bdcdyid,
bdcdyh: this.bdcdyh,
qllx: this.qllx,
bsmQlxx: this.bsmQlxx,
bestepid:this.bestepid
};
this.supplementarylist=[{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
},{
"zl": "抵押权",
}]
// getBdcqljqtsx({
// bdcdyid: this.bdcdyid,
// bdcdyh: this.bdcdyh,
// }).then((res) => {
// if (res.code === 200) {
// this.treedata = loadTreeData(res.result, this.bdcdyh);
// this.$nextTick(function () {
// this.defaultNode = getNode(this.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
// this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
// this.$parent.loadComponent(this.currentSelectProps,this.defaultNode);
// });
// }
// });
// this.currentSelectProps = {
// bdcdyid: this.bdcdyid,
// bdcdyh: this.bdcdyh,
// qllx: this.qllx,
// bsmQlxx: this.bsmQlxx,
// bestepid:this.bestepid
// };
// this.$parent.stepForm();
},
handleNodeClick (data, node, elem) {
......@@ -115,7 +201,28 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
this.$parent.loadComponent(this.currentSelectProps,data);
this.$parent.tabset();
},
//申请单元点击事件
unitClick (index) {
this.$parent.tabset()
// this.currentSelectProps = this.unitData[index];
// this.currentSelectProps.batchOperation = false;
// this.activeIndex = index.toString();
// //选中表单传递数据
// this.$emit('getCurrentSelectProps', this.currentSelectProps);
// this.$parent.stepForm(index);
// this.$store.dispatch('user/refreshPage', false);
},
//登记簿点击事件
djbClick () {
this.currentSelectProps.batchOperation = true;
this.$parent.getdjblist()
},
//补录信息点击事件
blxxClick () {
this.$parent.tabset()
},
}
}
</script>
......@@ -177,8 +284,10 @@ import { loadTreeData, getNode } from "./djbFrameData.js";
color: #0079fe;
border-right: 4px solid #0079fe;
}
.title-batch{
background-color: salmon;
.menus{
background-color: #e7f4fe;
}
.blxx{
border:#b0d9f8 solid 1px;
}
</style>
......
......@@ -63,7 +63,7 @@
<div v-else>已完结</div>
</template>
</el-table-column>
<el-table-column label="环节名称" prop="taskName" minWidth="100" align="center" />
<el-table-column label="环节名称" prop="name" minWidth="100" align="center" />
<el-table-column label="办理人" prop="agent" minWidth="120" align="center" />
<el-table-column label="处理时间" prop="createTime" width="160" align="center" />
<el-table-column label="办结时间" prop="finishTime" width="160" align="center" />
......@@ -76,7 +76,6 @@
<script>
import '@/styles/package/theme/index.scss'
import BpmnViewer from 'bpmn-js/lib/Viewer'
import { getusername } from "@/api/getusername.js";
import MoveCanvasModule from 'diagram-js/lib/navigation/movecanvas'
export default {
props: {
......@@ -107,7 +106,6 @@
}
},
created () {
this.$nextTick(() => {
// 获取流程记录
this.getCommentList()
......@@ -177,18 +175,18 @@
this.dlgTitle = element.businessObject ? element.businessObject.name : undefined
// 计算当前悬浮任务审批记录，如果记录为空不显示弹窗
this.taskCommentList = (this.taskList || []).filter(item => {
return item.taskDefKey === this.selectTaskId
return item.taskDefinitionKey === this.selectTaskId
})
if (this.selectTaskId.length > 3) {
if (this.taskCommentList.length==0) {
this.taskCommentList = this.taskList;
}
},
// 下拉列表切换
handleSelect (val) {
this.taskCommentList = (this.taskList || []).filter(item => {
return item.taskDefKey === val
return item.taskDefinitionKey === val
})
if (val.length > 3) {
if (this.taskCommentList.length==0) {
this.taskCommentList = this.taskList;
}
},
......@@ -239,32 +237,13 @@
// 获取流程记录
getCommentList() {
this.formData.allCommentList.forEach(async (item,index) => {
var arr=item.assigneeName.split(",");
// 获取用户名
let res = await getusername(arr)
if(res){
let str=""
res.data.content.forEach((el,i) => {
if(str==""){
str=el.name;
}else{
str += ","+el.name;
}
this.formData.allCommentList[index].agent=str
})
}
this.formData.allCommentList[index].agent=item.assignee.name
})
setTimeout(() => {
this.taskList =this.formData.allCommentList;
// 处理数据之后赋值
this.taskCommentList=this.taskList
}, 100)
// this.$nextTick(() => {
// this.taskList =this.formData.allCommentList;
// this.taskCommentList=this.taskList
// })
},
// 设置流程图元素状态
......
<!--
* @Description :查封登记信息
* @Autor : miaofang
* @LastEditTime : 2023-06-02 14:41:22
* @LastEditTime : 2023-06-08 17:04:19
-->
<template>
<div class="djxxTable">
......@@ -113,13 +113,13 @@ export default {
return name;
},
AddDialog(row){
this.$popupDialog("新增", "djbBook/components/djbeditDialog", {
this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: ''
})
},
editDialog(row){
this.$popupDialog("编辑", "djbBook/components/djbeditDialog", {
this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: row,
......
......@@ -5,11 +5,11 @@
-->
<template>
<div class="clmlmx-box">
<div class="title">申请材料目录</div>
<div class="title">申请材料目录1111</div>
<lb-table :column="column" :key="key" :heightNumSetting="true" :pagination="false" :data="formData.data">
</lb-table>
<div class="text-center">
<el-button @click="$popupCacel">取消</el-button>
<el-button @click="$popupCacel">取消11111</el-button>
</div>
</div>
</template>
......
......@@ -249,7 +249,7 @@
import imagePreview from '@/views/components/imagePreview.vue'
import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
export default {
components: { clxxAddDialog},
components: { clxxAddDialog, imagePreview },
props: {
formData: {
type: Object,
......@@ -326,7 +326,6 @@ export default {
this.datalist = JSON.parse(JSON.stringify(this.formData.datalist));
this.datalist.shift();
this.datalist.shift();
console.log("this.datalist", this.datalist);
},
methods: {
......@@ -523,7 +522,7 @@ export default {
//查看明细
viewDetail () {
console.log("查看明细");
this.$popupDialog("查看明细", "djbBook/components/clxxDetailDialog", {
this.$popupDialog("查看明细", "djbworkflow/djbBook/components/clxxDetailDialog", {
data: this.tableData
}, "60%")
},
......
......@@ -4,7 +4,7 @@
* @LastEditTime: 2023-05-09 09:20:10
-->
<template>
<dialogBox title="新建材料信息" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
<dialogBox title="新建材料信息1111111" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
:isFullscreen="false">
<el-form :model="ruleForm" ref="ruleForm" label-width="70px">
<el-row>
......@@ -48,6 +48,7 @@
},
watch: {
value (val) {
console.log("进去新增材料弹框");
this.myValue = val;
},
},
......
......@@ -9,7 +9,7 @@
<!-- 材料预览 -->
<div class="clyl-box">
<div class="menu-tree">
<el-button type="primary" native-type="submit" @click="viewDetail" style="width:100%;margin-top:10px;">查看明细</el-button>
<el-button type="primary" native-type="submit" @click="viewDetail" style="width:100%;margin-top:10px;">查看明细111111</el-button>
<div class="item">
材料目录({{tableData.length}})
<div style="margin-top:10px">
......
......@@ -6,7 +6,7 @@
<template>
<div class='spyj loadingtext'>
<div class="box">
<b class="spyj_title">审批表</b>
<b class="spyj_title">审批表11112222</b>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
<div class="spyj_form" v-for="(item, index) in tableData" :key="index">
<div class="item_left">
......
......@@ -106,12 +106,12 @@ export default {
return name;
},
AddDialog(row){
this.$popupDialog("新增", "djbBook/components/djbeditDialog", {
this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
data: ''
})
},
editDialog(row){
this.$popupDialog("编辑", "djbBook/components/djbeditDialog", {
this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: row,
......
<!--
* @Description : 地役权登记信息
* @Autor : miaofang
* @LastEditTime : 2023-06-02 14:45:17
* @LastEditTime : 2023-06-08 08:46:10
-->
<template>
<div class="djxxTable">
......@@ -106,12 +106,12 @@ export default {
return name;
},
AddDialog(row){
this.$popupDialog("新增", "djbBook/components/djbeditDialog", {
this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
data: ''
})
},
editDialog(row){
this.$popupDialog("编辑", "djbBook/components/djbeditDialog", {
this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: row,
......
......@@ -111,12 +111,12 @@
return name;
},
AddDialog(row){
this.$popupDialog("新增", "djbBook/components/djbeditDialog", {
this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
data: ''
})
},
editDialog(row){
this.$popupDialog("编辑", "djbBook/components/djbeditDialog", {
this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: row,
......
......@@ -106,12 +106,12 @@ export default {
return name;
},
AddDialog(row){
this.$popupDialog("新增", "djbBook/components/djbeditDialog", {
this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
data: ''
})
},
editDialog(row){
this.$popupDialog("编辑", "djbBook/components/djbeditDialog", {
this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: row,
......
<!--
* @Description :国有建设用地使用权
* @Autor : miaofang
* @LastEditTime : 2023-06-05 15:40:51
* @LastEditTime : 2023-06-09 13:33:38
-->
<template>
<div class="djxxTable">
......@@ -86,6 +86,7 @@
}).then((res) => {
if (res.code === 200) {
this.tableData = res.result;
console.log("111111111111this.tableDat1",this.tableData);
if (this.tableData.length < datas.columns().emptycolNum) {
this.emptycolNum =
datas.columns().emptycolNum - this.tableData.length;
......@@ -94,6 +95,7 @@
}
}
});
},
checkChange () {
if (this.checkList.length === 0) {
......@@ -114,14 +116,14 @@
return name;
},
AddDialog(row){
this.$popupDialog("新增", "djbBook/components/djbeditDialog", {
this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: ''
})
},
editDialog(row){
this.$popupDialog("编辑", "djbBook/components/djbeditDialog", {
this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: row,
......
......@@ -140,12 +140,12 @@
return name;
},
AddDialog(row){
this.$popupDialog("新增", "djbBook/components/djbeditDialog", {
this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
data: ''
})
},
editDialog(row){
this.$popupDialog("编辑", "djbBook/components/djbeditDialog", {
this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: row,
......
......@@ -209,4 +209,4 @@
margin-left: 2px;
}
}
}
\ No newline at end of file
}
......
<template>
<div class="from-clues-header">
<div>受理信息</div>
<el-form ref="form" :model="form" label-width="160px">
<el-row>
<el-col :span="12">
<el-form-item label="权属状态" label-width="140px">
<el-select v-model="form.qszt">
<el-option
v-for="item in qsztList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" v-for="item in datalist" :key="item.bdcdyh">
<el-form-item
:prop="item.prop"
:label="item.label"
label-width="140px"
>
<el-input v-model="form[item.prop]"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="btn">
<el-button type="primary" @click="slxxsubmitForm">保存</el-button>
<el-button @click="closeDialog">取消</el-button>
</div>
</div>
</template>
<script>
import { mapGetters } from "vuex";
export default {
props: {
formData: {
type: Object,
default: () => {},
},
},
data() {
return {
//传递参数
propsParam: this.$attrs,
activeName: "slxx",
form: {},
datalist: [],
qsztList: [
{
value: "1",
label: "现势",
},
{
value: "2",
label: "历史",
},
],
label: "",
isshow: true,
};
},
computed: {
...mapGetters(["dictData"])
},
created () {
console.log("this.propsParam",this.propsParam);
// this.clmlInitList(1)
},
mounted() {
if (this.formData.data) {
this.$nextTick(() => {
this.form = Object.assign({}, this.formData.data);
// this.datalist = Object.assign([], this.formData.datalist)
this.form.qszt =
this.form.qszt == "0"
? "临时"
: this.form.qszt == "1"
? "现势"
: "历史";
});
}
// this.datalist = this.formData.datalist
this.datalist = JSON.parse(JSON.stringify(this.formData.datalist));
this.datalist.shift();
this.datalist.shift();
console.log("this.datalist", this.datalist);
},
methods: {
// 受理信息保存
slxxsubmitForm() {
this.$refs.form.validate((valid) => {
if (valid) {
// addUserCommonOpinion({ commonOpinion: this.form.commonOpinion }).then(res => {
// if (res.code == 200) {
// this.$message.success("新增成功")
// this.closeaddDiglog();
// this.getList()
// } else {
// this.$message.error(res.message)
// }
// })
} else {
return false;
}
});
this.isshow = false;
},
closeDialog(){
}
},
};
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
@import "~@/styles/public.scss";
.from-clues-header {
@include flex;
flex-direction: column;
overflow-y: hidden;
height: 620px;
padding: 0 2px;
.btn {
margin-top: 40px;
margin-bottom: 20px;
text-align: center;
}
}
// 审批意见样式
.spyj {
.box {
overflow-x: auto;
width: 100%;
height: 95%;
background: #fff;
text-align: center;
padding: 4px;
overflow-y: scroll;
padding-top: 20px;
padding: 20px 40px;
/deep/.el-input__inner {
width: 200px;
border:none;
}
}
.spyj_title {
line-height: 68px;
border: 1px solid $borderColor;
text-align: center;
font-size: 22px;
font-weight: 400;
background-color: #eceef2;
display: block;
border-bottom: none;
}
/deep/.el-form-item {
margin-bottom: 0;
}
.bottom10 {
margin-bottom: 15px;
}
.spyj_form {
display: flex;
border: 1px solid $borderColor;
.item_left {
width: 150px;
background-color: #f8f8fa;
color: #606266;
display: flex;
font-size: 14px;
text-indent: 80px;
align-items: center;
border-right: 1px solid $borderColor;
}
.item_right {
flex: 1;
width: 100%;
/deep/.el-form-item__label {
background-color: #f8f8fa;
}
/deep/.el-form-item__content {
display: block;
text-align: left;
text-indent: 10px;
}
.opinion_item {
/deep/.el-form-item__error {
margin-top: -16px !important;
left: 3px;
}
border-bottom: 1px solid $borderColor;
}
.opinion {
position: relative;
font-size: 14px;
/deep/.el-textarea__inner {
border: none;
}
}
.opinion_btn {
position: absolute;
right: 15px;
bottom: 10px;
}
}
}
.submit_button {
text-align: center;
margin: 15px 0;
}
}
// 材料信息样式
.active {
background: $light-blue !important;
color: #fff;
}
.required {
font-size: 12px;
color: $pink;
float: left;
}
.cl_number {
float: right;
}
.clxx {
width: 100%;
display: flex;
padding-left: 5px;
height: calc(100vh - 125px);
.left {
display: flex;
flex-direction: column;
justify-content: space-between;
.item {
width: 28px;
height: 49%;
@include flex-center;
background-color: #e4e7ed;
border-bottom-right-radius: 10px;
padding: 5px;
cursor: pointer;
transition: all 0.3s;
&:hover {
@extend .active;
}
}
}
.right {
width: 100%;
height: 100%;
.clmlmx-box {
margin: 0 auto;
.title {
text-align: center;
height: 60px;
line-height: 60px;
border: 1px solid #dfe6ec;
font-size: 20px;
background: #81d3f81a;
margin-bottom: -1px;
}
}
.clyl-box {
width: 100%;
height: 100%;
display: flex;
.menu-tree {
width: 20%;
min-width: 160px;
height: 100%;
margin-right: 10px;
border-right: 1px dotted #d9d9d9;
padding: 0 15px;
.item {
line-height: 30px;
padding-top: 5px;
border-bottom: 1px solid #e8e8e8;
font-size: 16px;
text-align: center;
color: $light-blue;
.itemIcon {
float: right;
line-height: 60px;
cursor: pointer;
}
.child {
line-height: 32px;
border-bottom: 1px solid #e8e8e8;
padding-left: 10px;
color: #6b6b6b;
cursor: pointer;
box-sizing: border-box;
border-radius: 6px;
line-height: 20px;
transition: all 0.3s;
padding: 8px 0;
}
.child:hover {
color: $light-blue;
transform: scale(1.1);
}
.checked {
border: 1px solid $light-blue;
color: $light-blue;
}
}
}
.clyl-img {
width: 75%;
height: 100%;
background: #f3f4f7;
margin: 0 auto;
position: relative;
}
}
}
}
</style>
<!--
* @Description: 审批意见
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:41:24
-->
<template>
<div class='spyj loadingtext'>
<div class="box">
<b class="spyj_title">审批表11111111111111111111</b>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
<div class="spyj_form" v-for="(item, index) in tableData" :key="index">
<div class="item_left">
{{ item.jdmc }}意见
</div>
<div class="item_right">
<el-row>
<el-col :span="24">
<el-form-item label-width="0" class="opinion_item" prop="shyj">
<el-input type="textarea" :rows="4" class="opinion" placeholder="请输入审批意见"
v-if="item.stepShjy == '1' && ableOperation" v-model="ruleForm.shyj"></el-input>
<el-input type="textarea" :rows="4" class="opinion" v-model="item.shyj" v-else :disabled="true">
</el-input>
<el-button class="opinion_btn" @click="commonOpinion"
v-if="item.stepShjy == '1' && ableOperation">常用意见</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<el-form-item label="审查人" prop="shryxm">
{{ item.shryxm }}
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="审核时间" prop="shjssj" :key="refresh">
{{ item.shjssj }}
</el-form-item>
</el-col>
</el-row>
</div>
</div>
<div class="submit_button" v-if="ableOperation">
<el-button type="primary" @click="onSubmit">保存</el-button>
</div>
</el-form>
</div>
<el-empty v-if="isNoData" description="暂无数据"></el-empty>
</div>
</template>
<script>
import { getSpyjList, saveSpyj, saveSpyjBySlsq } from "@/api/fqsq.js";
import { mapGetters } from 'vuex'
export default {
computed: {
...mapGetters(['userData', 'yjsqOptions'])
},
data () {
return {
isNoData: false,
bsmSlsq: '',
//刷新值
refresh: 10,
ableOperation: true,
bsmSlsq: this.$route.query.bsmSlsq,
bestepid: this.$route.query.bestepid,
ruleForm: {},
rules: {
shyj: [
{ required: true, message: '请输入审批意见', trigger: 'blur' }
],
},
tableData: [],
propsParam: {}
}
},
watch: {
yjsqOptions: {
handler (val) {
this.ruleForm.shyj = val
},
deep: true,
immediate: true
},
},
mounted () {
this.propsParam = this.$attrs;
if (this.$route.query.viewtype) {
this.ableOperation = false
}
this.list();
},
methods: {
//审批意见数据初始化
list () {
let that = this
this.$startLoading()
var formdata = new FormData();
formdata.append("bsmBusiness", this.propsParam.bsmBusiness);
formdata.append("bestepid", this.$route.query.bestepid);
formdata.append("ableOperation", this.ableOperation)
getSpyjList(formdata).then((res) => {
this.$endLoading()
if (res.code === 200 && res.result) {
this.tableData = res.result ? res.result : []
if (res.result.length == 0) {
that.isNoData = true
}
this.ruleForm = res.result[res.result.length - 1]
}
})
},
onSubmit () {
this.ruleForm.bsmSlsq = this.bsmSlsq
this.ruleForm.bestepid = this.bestepid
saveSpyjBySlsq(this.ruleForm).then(res => {
if (res.code === 200) {
this.$message.success("保存成功")
this.refresh += 1
} else {
this.$message.error(res.message)
}
})
},
//打开常用意见列表弹窗
commonOpinion () {
this.$popupDialog("常用意见", "workflow/components/dialog/commonOpinion", {}, "70%", true)
},
//使用常用意见
useOpinion (opinion) {
this.ruleForm.shyj = opinion
}
}
}
</script>
<style scoped lang='scss'>
@import "~@/styles/mixin.scss";
.spyj {
width: 100%;
height: 100%;
background-color: #f5f5f5;
padding: 5px;
.box {
overflow-x: auto;
width: 100%;
height: 95%;
background: #fff;
text-align: center;
padding: 4px;
overflow-y: scroll;
padding-top: 20px;
padding: 20px 40px;
}
.spyj_title {
line-height: 68px;
border: 1px solid $borderColor;
text-align: center;
font-size: 22px;
font-weight: 400;
background-color: #eceef2;
display: block;
border-bottom: none;
}
/deep/.el-form-item {
margin-bottom: 0;
}
.bottom10 {
margin-bottom: 15px;
}
.spyj_form {
display: flex;
border: 1px solid $borderColor;
.item_left {
width: 150px;
background-color: #f8f8fa;
color: #606266;
display: flex;
font-size: 14px;
text-indent: 80px;
align-items: center;
border-right: 1px solid $borderColor;
}
.item_right {
flex: 1;
width: 100%;
/deep/.el-form-item__label {
background-color: #f8f8fa;
}
/deep/.el-form-item__content {
display: block;
text-align: left;
text-indent: 10px;
}
.opinion_item {
/deep/.el-form-item__error {
margin-top: -16px !important;
left: 3px;
}
border-bottom: 1px solid $borderColor;
}
.opinion {
position: relative;
font-size: 14px;
/deep/.el-textarea__inner {
border: none;
}
}
.opinion_btn {
position: absolute;
right: 15px;
bottom: 10px;
}
}
}
.submit_button {
text-align: center;
margin: 15px 0;
}
}
</style>
<!--
* @Description :预告登记信息
* @Description :预告登记
* @Autor : miaofang
* @LastEditTime : 2023-06-02 14:44:18
* @LastEditTime : 2023-06-12 09:17:17
-->
<template>
<div class="djxxTable">
......@@ -106,12 +106,12 @@ export default {
return name;
},
AddDialog(row){
this.$popupDialog("新增", "djbBook/components/djbeditDialog", {
this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
data: ''
})
},
editDialog(row){
this.$popupDialog("编辑", "djbBook/components/djbeditDialog", {
this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: row,
......
<!--
* @Description :异议登记信息
* @Description :异议登记
* @Autor : miaofang
* @LastEditTime : 2023-06-02 14:41:03
* @LastEditTime : 2023-06-09 13:55:42
-->
<template>
<div class="djxxTable">
......@@ -67,6 +67,7 @@ export default {
};
},
created () {
console.log("异议登记");
this.loadData();
},
methods: {
......@@ -106,12 +107,12 @@ export default {
return name;
},
AddDialog(row){
this.$popupDialog("新增", "djbBook/components/djbeditDialog", {
this.$popupDialog("新增", "djbworkflow/djbBook/components/djbeditDialog", {
data: ''
})
},
editDialog(row){
this.$popupDialog("编辑", "djbBook/components/djbeditDialog", {
this.$popupDialog("编辑", "djbworkflow/djbBook/components/djbeditDialog", {
datalist:this.columns,
data: row,
......
......@@ -33,7 +33,7 @@ export function getForm (tabName, djywbm) {
break;
case "diyaqSlxx":
form = require("@/views/ywbl/slsqxx/diyaq/slxx.vue");
break;
break;
case "clxx":
form = require("@/views/djbworkflow/components/clxxUnify.vue");
break;
......@@ -41,7 +41,7 @@ export function getForm (tabName, djywbm) {
form = require("@/views/djbworkflow/components/spyj.vue");
break;
case "zdjbxx":
form = require("@/views/djbBook/zdjbxx.vue");
form = require("@/views/djbworkflow/djbBook/zdjbxx.vue");
break;
case "ygmm100":
form = require("@/views/ywbl/slsqxx/ygdj/slxx.vue");
......@@ -56,24 +56,33 @@ export function getForm (tabName, djywbm) {
case "zjgcdyqSlxx":
form = require("@/views/ywbl/slsqxx/zjgcdy/slxx.vue");
break;
case "cfdjxx":
form = require("@/views/djbBook/cfdj.vue");
case "cfdj":
form = require("@/views/djbworkflow/djbBook/cfdj.vue");
break;
case "jsydsyq":
form = require("@/views/djbworkflow/djbBook/jsydsyq.vue");
break;
case "jsydsyqQlxx":
form = require("@/views/djbBook/jsydsyq.vue");
case "nydsyq":
form = require("@/views/djbworkflow/djbBook/nydsyq.vue");
break;
case "nydsyqQlxx":
form = require("@/views/djbBook/nydsyq.vue");
case "fdcq2":
form = require("@/views/djbworkflow/djbBook/fdcq2.vue");
break;
case "fdcq2Qlxx":
form = require("@/views/djbBook/fdcq2.vue");
case "diyaq":
form = require("@/views/djbworkflow/djbBook/diyaq.vue");
break;
case "diyaqQlxx":
form = require("@/views/djbBook/diyaq.vue");
case "ygdj":
form = require("@/views/djbworkflow/djbBook/ygdj.vue");
break;
case "ygdjQlxx":
form = require("@/views/djbBook/ygdj.vue");
case "diyiq":
form = require("@/views/djbworkflow/djbBook/diyiq.vue");
break;
case "djbfm":
form = require("@/views/djbworkflow/djbBook/djbfm.vue");
break;
case "yydj":
form = require("@/views/djbworkflow/djbBook/yydj.vue");
break;
case "szxx":
form = require("@/views/djbworkflow/components/szxx.vue");
break;
......@@ -83,6 +92,15 @@ export function getForm (tabName, djywbm) {
case "zdt":
form = require("@/views/djbworkflow/components/zdt.vue");
break;
case "slxx":
form = require("@/views/djbworkflow/djbBook/slxx.vue");
break;
// case "spyj":
// form = require("@/views/djbworkflow/djbBook/spyj.vue");
// break;
// case "clxx":
// form = require("@/views/djbworkflow/djbBook/clxx.vue");
// break;
default:
form = require("@/views/error-page/404.vue");
break;
......
/*
* @Description:
* @Description:workFramezu.vue组件的方法
* @Autor: renchao
* @LastEditTime: 2023-05-18 15:01:31
*/
......@@ -16,6 +16,7 @@ import {
getNextLinkInfo,
} from "@/api/fqsq.js";
import { mapGetters } from 'vuex'
import { log } from "bpmn-js-token-simulation";
export default {
data () {
return {
......@@ -48,9 +49,12 @@ export default {
formdata.append("bestepid", this.bestepid);
stepExpandInfo(formdata).then((res) => {
if (res.code === 200) {
this.leftButtonList = res.result.button;
this.leftButtonList =[];
this.rightButtonList = res.result.operation;
this.slsq = res.result.slsq
console.log("this.slsq",this.slsq);
console.log("this.rightButtonList",this.rightButtonList);
this.rightButtonList.splice(0,2)
}
})
......@@ -70,10 +74,10 @@ export default {
this.$popupDialog("流程图", "workflow/components/processViewer", {
xml: result.xml,
finishedInfo: {
finishedTaskSet: result.finishedTaskSet,
unfinishedTaskSet: result.unfinishedTaskSet,
finishedTaskSet: result.finishedActivityIds,
unfinishedTaskSet: result.runningActivityIds,
rejectedTaskSet: result.rejectedTaskSet,
finishedSequenceFlowSet: result.finishedSequenceFlowSet
finishedSequenceFlowSet: result.finishedSequenceFlowIds
},
allCommentList: result.historyTaskList
}, '80%', true)
......
......@@ -26,23 +26,11 @@ export default {
getHomeNoticeList().then(res => {
if (res.result) {
this.noticeList = res.result.noticeList
console.log("this.noticeList11111111111111111111111111111111111",this.noticeList);
}
})
},
//右侧表单选项卡事件
beforeLeave (activeName, oldActiveName) {
if (activeName && activeName != 0) this.getFromRouter(activeName)
},
//切换选项卡内容组件
getFromRouter (tabname) {
//根据tabname获取选中的表单 此操作为了获取后端返回的表单对象，使用里面的是否可操作的属性
for (let item of this.tabList) {
if (item.value === tabname) {
this.currentSelectTab = item
break;
}
}
this.componentTag = getForm(tabname, this.$route.query.sqywbm);
}
}
}
......
......@@ -28,11 +28,11 @@
<span class="iconName">{{ item.name }}</span>
</li>
</ul>
<NoticeBar
<!-- <NoticeBar
class="NoticeBar"
:noticeList="noticeList"
v-if="noticeList.length > 0"
/>
/> -->
</div>
<!-- 内容框架 -->
<div class="containerFrame">
......@@ -70,16 +70,16 @@
</style>
<script>
import WorkFlow from "./mixin/index";
import publicFlow from "./mixin/public.js";
// import publicFlow from "./mixin/public.js";
// import { getStepFormInfo } from "@/api/fqsq.js"
// import { getForm } from "./flowform"
import { getForm } from "./flowform"
import NoticeBar from "@/components/NoticeBar/index";
import { unClaimTask } from "@/api/ywbl.js";
import ProcessViewer from "./components/processViewer.vue";
// 引入左侧菜单
import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData";
import { loadTreeData, getNode } from "./components/leftmenu/djbFrameData.js";
// 登记簿数据信息
import { getBdcqljqtsx } from "@/api/registerBook.js";
......@@ -90,10 +90,9 @@ export default {
ProcessViewer,
ordinaryMenu,
},
mixins: [WorkFlow, publicFlow],
mixins: [WorkFlow],
data() {
return {
isDialog: false,
bsmSlsq: this.$route.query.bsmSlsq,
//当前流程所在环节
bestepid: this.$route.query.bestepid,
......@@ -104,124 +103,109 @@ export default {
qllx: this.$route.query.qllx,
//设置那个表单选中
tabName: "",
//设置那个表单选择
currentSelectTab: {},
//表单集合
tabList: [],
//选择加载哪一个组件
componentTag: "",
//设置表单传递数据
currentSelectProps: {},
//材料分屏表单
clxxForm: "",
//材料信息选择卡索引
clxxIndex: "",
//材料信息选项卡对象
clxxTab: {},
//页面监听时间
_beforeUnload_time: "",
treedata:{},
tabdata:[],
defaultNode:{}
};
},
mounted() {
this.$store.dispatch("user/refreshPage", false);
//添加页面监听事件
window.addEventListener("beforeunload", (e) => this.beforeunloadHandler(e));
window.addEventListener("unload", (e) => this.unloadHandler(e));
this.tabset()
this.getdjblist()
},
destroyed() {
window.removeEventListener("beforeunload", (e) =>
this.beforeunloadHandler(e)
);
window.removeEventListener("unload", (e) => this.unloadHandler(e));
},
methods: {
getCurrentSelectProps(val) {
// this.loadData();
},
getCurrentSelectProps (val) {
this.currentSelectProps = val
},
getdjblist(){
getBdcqljqtsx({
bdcdyid: this.bdcdyid,
bdcdyh: this.bdcdyh,
}).then((res) => {
if (res.code === 200) {
this.treedata = loadTreeData(res.result, this.bdcdyh);
this.$nextTick(function () {
this.defaultNode = getNode(this.qllx, { linShi: 0, xianShi: 0, liShi: 0 }, "");
console.log("this.defaultNode.idssssssssssssssssss",this.defaultNode.id);
this.tabName =this.defaultNode.id; //data[0].id为默认选中的节点
});
}
});
this.currentSelectProps = {
bdcdyid: this.bdcdyid,
bdcdyh: this.bdcdyh,
qllx: this.qllx,
bsmQlxx: this.bsmQlxx,
bestepid:this.bestepid
};
setTimeout(() => {
let settree=JSON.parse(JSON.stringify(this.treedata))
console.log("settreesettreesettree",settree);
this.tabdata=
this.tabdata=[...settree,...settree[1].children[0].children[0].children]
console.log("this.tabdata",this.tabdata);
this.tabdata.forEach((item,index,arr) => {
arr[index].name=item.label;
arr[index].value=item.id
})
this.tabList=this.tabdata
beforeunloadHandler() {
this._beforeUnload_time = new Date().getTime();
},
unloadHandler(e) {
this._gap_time = new Date().getTime() - this._beforeUnload_time;
//判断是窗口关闭还是刷新
if (this._gap_time <= 10) {
//取消认领
unClaimTask(this.bsmSlsq, this.bestepid);
}
}, 200)
// this.tabdatalet
},
tabset(){
console.log("补录信息");
this.tabList = [
{
name: "受理情况",
value: "plfdcq2",
name: "受理信息",
value: "slxx",
sort: 1,
},
{
name: "审批意见",
value: "spyj",
sort: 2,
},
{
name: "材料信息",
value: "clxx",
sort: 2,
},
];
this.tabName = 'plfdcq2';
this.tabName = 'slxx';
},
// 获取登记簿菜单
// loadData() {
// getBdcqljqtsx({
// bdcdyid: this.bdcdyid,
// bdcdyh: this.bdcdyh,
// }).then((res) => {
// if (res.code === 200) {
// this.treedata = loadTreeData(res.result, this.bdcdyh);
// this.$nextTick(function () {
// this.defaultNode = getNode(
// this.qllx,
// { linShi: 0, xianShi: 0, liShi: 0 },
// ""
// );
// this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
// // this.$parent.loadComponent(this.currentSelectProps,this.defaultNode);
// });
// }
// });
// this.currentSelectProps = {
// bdcdyid: this.bdcdyid,
// bdcdyh: this.bdcdyh,
// qllx: this.qllx,
// bsmQlxx: this.bsmQlxx,
// };
// // this.$parent.stepForm();
// },
loadComponent(currentSelectProps, data) {
this.tabset()
this.currentSelectProps = currentSelectProps;
this.componentTag = (r) =>
require.ensure([], () => r(require("@/views/djbBook/" + data.form)));
// stepForm(index){
// console.log("stepForm()",11111111111111111,index);
// },
//右侧表单选项卡事件
beforeLeave (activeName, oldActiveName) {
if (activeName && activeName != 0) this.getFromRouter(activeName)
},
// openDialog() {
// this.$store.dispatch("user/refreshPage", false);
// let data = JSON.parse(localStorage.getItem("ywbl"));
// let title;
// if (data?.sqywmc) {
// title = "申请业务：" + data?.sqywmc;
// } else {
// title = "申请业务：" + data?.djywmc;
// }
// this.$popupDialog(
// title,
// "ywbl/ywsq/selectBdc",
// { djywbm: this.$route.query.sqywbm, isJump: true, sqywInfo: data },
// "80%",
// true
// );
// },
//切换选项卡内容组件
getFromRouter (tabname) {
for (let item of this.tabList) {
if (item.value === tabname) {
this.currentSelectTab = item
break;
}
}
this.componentTag = getForm(tabname, this.$route.query.sqywbm);
}
},
};
</script>
......
......@@ -86,6 +86,7 @@ export default {
leftMenu(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.unitData = res.result;
console.log("this.unitData",this.unitData);
this.currentSelectProps = res.result[0];
this.$emit('getCurrentSelectProps', this.currentSelectProps);
this.judgeBatchShow();
......
......@@ -63,7 +63,7 @@
<div v-else>已完结</div>
</template>
</el-table-column>
<el-table-column label="环节名称" prop="taskName" minWidth="100" align="center" />
<el-table-column label="环节名称" prop="name" minWidth="100" align="center" />
<el-table-column label="办理人" prop="agent" minWidth="120" align="center" />
<el-table-column label="处理时间" prop="createTime" width="160" align="center" />
<el-table-column label="办结时间" prop="finishTime" width="160" align="center" />
......@@ -76,7 +76,6 @@
<script>
import '@/styles/package/theme/index.scss'
import BpmnViewer from 'bpmn-js/lib/Viewer'
import { getusername } from "@/api/getusername.js";
import MoveCanvasModule from 'diagram-js/lib/navigation/movecanvas'
export default {
props: {
......@@ -107,7 +106,6 @@
}
},
created () {
this.$nextTick(() => {
// 获取流程记录
this.getCommentList()
......@@ -177,18 +175,18 @@
this.dlgTitle = element.businessObject ? element.businessObject.name : undefined
// 计算当前悬浮任务审批记录，如果记录为空不显示弹窗
this.taskCommentList = (this.taskList || []).filter(item => {
return item.taskDefKey === this.selectTaskId
return item.taskDefinitionKey === this.selectTaskId
})
if (this.selectTaskId.length > 3) {
if (this.taskCommentList.length==0) {
this.taskCommentList = this.taskList;
}
},
// 下拉列表切换
handleSelect (val) {
this.taskCommentList = (this.taskList || []).filter(item => {
return item.taskDefKey === val
return item.taskDefinitionKey === val
})
if (val.length > 3) {
if (this.taskCommentList.length==0) {
this.taskCommentList = this.taskList;
}
},
......@@ -239,32 +237,13 @@
// 获取流程记录
getCommentList() {
this.formData.allCommentList.forEach(async (item,index) => {
var arr=item.assigneeName.split(",");
// 获取用户名
let res = await getusername(arr)
if(res){
let str=""
res.data.content.forEach((el,i) => {
if(str==""){
str=el.name;
}else{
str += ","+el.name;
}
this.formData.allCommentList[index].agent=str
})
}
this.formData.allCommentList[index].agent=item.assignee.name
})
setTimeout(() => {
this.taskList =this.formData.allCommentList;
// 处理数据之后赋值
this.taskCommentList=this.taskList
}, 100)
// this.$nextTick(() => {
// this.taskList =this.formData.allCommentList;
// this.taskCommentList=this.taskList
// })
},
// 设置流程图元素状态
......
......@@ -71,12 +71,12 @@ export default {
this.$popupDialog("流程图", "workflow/components/processViewer", {
xml: result.xml,
finishedInfo: {
finishedTaskSet: result.finishedTaskSet,
unfinishedTaskSet: result.unfinishedTaskSet,
rejectedTaskSet: result.rejectedTaskSet,
finishedSequenceFlowSet: result.finishedSequenceFlowSet
finishedTaskSet: result.finishedActivityIds,
unfinishedTaskSet: result.runningActivityIds,
rejectedTaskSet: {},
finishedSequenceFlowSet: result.finishedSequenceFlowIds
},
allCommentList: result.historyTaskList
allCommentList: result.finishedTasks
}, '80%', true)
})
break;
......