Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
a6a815fd by tianhaohao@pashanhoo.com
Options

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

2 parents 50ff4b6e 692e4005
Inline Side-by-side
Showing 32 changed files with 179 additions and 79 deletions
// 封装axios请求
import axios from "axios";
// 创建axios的对象
const instance = axios.create({
baseURL: "http://192.168.2.235/management/rest/users",
})
export const getusername = (data) => instance({
url: '', // 请求地址
method: 'get',
params:{
queryOptions: {
conditionGroup: {
conditions: [
{
property: "loginName",
value:data,
operator: "IN",
},
],
queryRelation: "AND",
},
orderBys:[{"property":"sort","direction":"desc"}]
},
},
})
<!--
* @Description: workFrame左侧菜单列表-普通
* @Autor: renchao
* @LastEditTime: 2023-05-24 16:02:39
* @LastEditTime: 2023-05-25 10:42:50
-->
<template>
<div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
......@@ -72,9 +72,9 @@
watch: {
isRefresh: {
handler (newVal, oldVal) {
console.log(newVal, 'newVal');
if (newVal) this.loadBdcdylist()
}
},
immediate: true
}
},
methods: {
......
<!--
* @Description: workFrame左侧菜单列表-分割
* @Autor: renchao
* @LastEditTime: 2023-05-24 15:48:34
* @LastEditTime: 2023-05-25 10:18:02
-->
<template>
<div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
......@@ -90,7 +90,8 @@
isRefresh: {
handler (newVal, oldVal) {
if (newVal) this.loadBdcdylist()
}
},
immediate: true
}
},
methods: {
......
<!--
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:41:15
-->
......@@ -64,7 +64,7 @@
</template>
</el-table-column>
<el-table-column label="环节名称" prop="taskName" minWidth="100" align="center" />
<el-table-column label="办理人" prop="assigneeName" minWidth="120" 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" />
<el-table-column label="操作方式" align="center">
......@@ -76,6 +76,7 @@
<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: {
......@@ -96,6 +97,7 @@
// 当前任务id
selectTaskId: undefined,
// 任务节点审批记录
taskList:[],
taskCommentList: [],
// 已完成任务悬浮延迟Timer
hoverTimer: null,
......@@ -105,9 +107,13 @@
}
},
created () {
this.$nextTick(() => {
// 获取流程记录
this.getCommentList()
this.setProcessStatus(this.formData.finishedInfo);
this.importXML(this.formData.xml)
this.setProcessStatus(this.formData.finishedInfo);
})
},
destroyed () {
......@@ -170,20 +176,20 @@
this.selectValue = element.id
this.dlgTitle = element.businessObject ? element.businessObject.name : undefined
// 计算当前悬浮任务审批记录，如果记录为空不显示弹窗
this.taskCommentList = (this.formData.allCommentList || []).filter(item => {
this.taskCommentList = (this.taskList || []).filter(item => {
return item.taskDefKey === this.selectTaskId
})
if (this.selectTaskId.length > 3) {
this.taskCommentList = this.formData.allCommentList;
this.taskCommentList = this.taskList;
}
},
// 下拉列表切换
handleSelect (val) {
this.taskCommentList = (this.formData.allCommentList || []).filter(item => {
this.taskCommentList = (this.taskList || []).filter(item => {
return item.taskDefKey === val
})
if (val.length > 3) {
this.taskCommentList = this.formData.allCommentList;
this.taskCommentList = this.taskList;
}
},
// 显示流程图
......@@ -230,9 +236,39 @@
}
}
},
// 获取流程记录
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
})
}
})
setTimeout(() => {
this.taskList =this.formData.allCommentList;
// 处理数据之后赋值
this.taskCommentList=this.taskList
}, 100)
// this.$nextTick(() => {
// this.taskList =this.formData.allCommentList;
// this.taskCommentList=this.taskList
// })
},
// 设置流程图元素状态
setProcessStatus (processNodeInfo) {
this.taskCommentList = this.formData.allCommentList;
this.processNodeInfo = processNodeInfo
if (this.isLoading || this.processNodeInfo == null || this.bpmnViewer == null) return
const { finishedTaskSet, rejectedTaskSet, unfinishedTaskSet, finishedSequenceFlowSet } = this.processNodeInfo
......@@ -268,6 +304,7 @@
}
})
}
}
}
}
......
......@@ -35,17 +35,6 @@ export default {
slsq: {}
}
},
computed: {
...mapGetters(['isRefresh'])
},
watch: {
isRefresh: {
handler (newVal, oldVal) {
if (newVal) this.loadBdcdylist()
},
immediate: true
}
},
mounted () {
this.flowInitParam();
},
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-24 17:11:21
* @LastEditTime: 2023-05-25 08:51:13
-->
<template>
<!-- 受理信息 -->
......@@ -238,7 +238,7 @@
</el-row>
</div>
<el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'">
<el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
<el-form-item>
<el-button type="primary" @click="onSubmitClick()">保存</el-button>
</el-form-item>
......@@ -252,6 +252,7 @@
import { mapGetters } from "vuex";
export default {
mounted () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
var formdata = new FormData();
this.$startLoading();
......@@ -272,6 +273,8 @@
},
data () {
return {
//表单是否可操作
ableOperation: true,
disabled: true,
czrOptions: [],
ruleForm: {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-24 17:12:40
* @LastEditTime: 2023-05-25 08:56:17
-->
<template>
<!-- 受理信息 -->
......@@ -234,7 +234,7 @@
</el-row>
</div>
<el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'">
<el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
<el-form-item>
<el-button type="primary" @click="onSubmitClick()">保存</el-button>
</el-form-item>
......@@ -248,6 +248,7 @@
import { mapGetters } from "vuex";
export default {
mounted () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
var formdata = new FormData();
this.$startLoading();
......@@ -268,6 +269,8 @@
},
data () {
return {
//表单是否可操作
ableOperation: true,
disabled: true,
czrOptions: [],
ruleForm: {
......
<!--
* @Description: 受理信息
* @Autor: renchao
* @LastEditTime: 2023-05-24 17:07:59
* @LastEditTime: 2023-05-25 08:41:40
-->
<template>
<div class="slxx">
......@@ -197,7 +197,7 @@
</el-col>
</el-row>
</div>
<el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'">
<el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
<el-form-item>
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
......@@ -211,6 +211,7 @@
import { mapGetters } from "vuex";
export default {
created () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
var formdata = new FormData();
formdata.append("bsmSldy", this.propsParam.bsmSldy);
......@@ -236,8 +237,10 @@
ruleForm: {},
//传递参数
propsParam: this.$attrs,
rules: {},
};
//表单是否可操作
ableOperation: true,
rules: {}
}
},
methods: {
// 更新权利人信息
......
<!--
* @Description: 受理信息
* @Autor: renchao
* @LastEditTime: 2023-05-24 17:08:05
* @LastEditTime: 2023-05-25 08:41:33
-->
<template>
<div class="slxx">
......@@ -181,7 +181,7 @@
</el-col>
</el-row>
</div>
<el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'">
<el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
<el-form-item>
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
......@@ -195,6 +195,7 @@
import { mapGetters } from "vuex";
export default {
async created () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
var formdata = new FormData();
formdata.append("bsmSldy", this.propsParam.bsmSldy);
......@@ -216,6 +217,8 @@
},
data () {
return {
//表单是否可操作
ableOperation: true,
disabled: true,
tdytOption: [],
czrOptions: [],
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:45:21
* @LastEditTime: 2023-05-25 08:58:04
-->
<template>
<!-- 受理信息 -->
......@@ -169,7 +169,7 @@
</el-col>
</el-row>
</div>
<el-row class="btn" v-if="!$route.query.viewtype">
<el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
<el-form-item>
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
......@@ -183,6 +183,7 @@
import { mapGetters } from "vuex";
export default {
async created () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
var formdata = new FormData();
formdata.append("bsmSldy", this.propsParam.bsmSldy);
......@@ -203,6 +204,8 @@
},
data () {
return {
//表单是否可操作
ableOperation: true,
disabled: true,
tdytOption: [],
czrOptions: [],
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-24 14:33:47
* @LastEditTime: 2023-05-25 08:59:02
-->
<template>
<!-- 受理信息 -->
......@@ -183,7 +183,7 @@
</el-col>
</el-row>
</div>
<el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'">
<el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
<el-form-item>
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
......@@ -197,6 +197,7 @@
import qlrCommonTable from "@/views/workflow/components/qlrCommonTable"
export default {
mounted () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
var formdata = new FormData();
let that = this
......@@ -218,6 +219,8 @@
},
data () {
return {
//表单是否可操作
ableOperation: true,
key: 0,
isShow: false,
disabled: true,
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-24 15:09:45
* @LastEditTime: 2023-05-25 08:59:49
-->
<template>
<!-- 受理信息 -->
......@@ -178,7 +178,7 @@
</el-col>
</el-row>
</div>
<el-row class="btn" v-if="!$route.query.viewtype=='1' && propsParam.issave=='0'">
<el-row class="btn" v-if="!$route.query.viewtype=='1' && ableOperation">
<el-form-item>
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
......@@ -192,6 +192,7 @@
import { Init, saveData } from "@/api/workflow/jsydsyqFlow.js";
export default {
mounted () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
var formdata = new FormData();
this.$startLoading();
......@@ -210,6 +211,8 @@
},
data () {
return {
//表单是否可操作
ableOperation: true,
disabled: true,
czrOptions: [],
ruleForm: {
......
......@@ -223,7 +223,7 @@
</el-col>
</el-row>
</div>
<el-row class="btn" v-if="!$route.query.viewtype && ableOperation && propsParam.issave=='0'">
<el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
<el-form-item>
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
......@@ -258,9 +258,6 @@
computed: {
...mapGetters(["dictData", "flag"])
},
watch: {
},
data () {
return {
disabled: true,
......
......@@ -229,7 +229,7 @@
</el-col>
</el-row>
</div>
<el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'">
<el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
<el-form-item>
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
......@@ -244,6 +244,7 @@
import JtcyTable from "@/views/workflow/components/JtcyTable"
export default {
mounted () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
var formdata = new FormData();
this.$startLoading();
......@@ -263,11 +264,10 @@
computed: {
...mapGetters(["dictData", "flag"])
},
watch: {
},
data () {
return {
//表单是否可操作
ableOperation: true,
disabled: true,
czrOptions: [],
ruleForm: {},
......
......@@ -164,7 +164,7 @@
</el-col>
</el-row>
</div>
<el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'">
<el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
<el-form-item>
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
......@@ -178,6 +178,7 @@
import { mapGetters } from "vuex";
export default {
mounted () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.$startLoading();
var formdata = new FormData();
formdata.append("bsmSldy", this.propsParam.bsmSldy);
......@@ -196,6 +197,8 @@
},
data () {
return {
//表单是否可操作
ableOperation: true,
disabled: true,
tdytOption: [],
czrOptions: [],
......
......@@ -167,7 +167,7 @@
</el-col>
</el-row>
</div>
<el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'">
<el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
<el-form-item>
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
......@@ -181,6 +181,7 @@
import { mapGetters } from "vuex";
export default {
mounted () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
var formdata = new FormData();
this.$startLoading();
......@@ -199,6 +200,8 @@
},
data () {
return {
//表单是否可操作
ableOperation: true,
disabled: true,
tdytOption: [],
czrOptions: [],
......
......@@ -171,7 +171,7 @@
</el-col>
</el-row>
</div>
<el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'">
<el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
<el-form-item>
<el-button type="primary" @click="onSubmit">保存</el-button>
</el-form-item>
......@@ -185,6 +185,7 @@
import { mapGetters } from "vuex";
export default {
created () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
var formdata = new FormData();
let that = this
......@@ -207,6 +208,8 @@
},
data () {
return {
//表单是否可操作
ableOperation: true,
loading: false,
disabled: true,
tdytOption: [],
......
......@@ -235,7 +235,7 @@
</el-row>
</div>
<el-row class="btn" v-if="!$route.query.viewtype && propsParam.issave=='0'">
<el-row class="btn" v-if="!$route.query.viewtype && ableOperation">
<el-form-item>
<el-button type="primary" @click="onSubmitClick()">保存</el-button>
</el-form-item>
......@@ -249,6 +249,7 @@
import { mapGetters } from "vuex";
export default {
mounted () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
var formdata = new FormData();
this.$startLoading();
......@@ -269,6 +270,8 @@
},
data () {
return {
//表单是否可操作
ableOperation: true,
disabled: true,
czrOptions: [],
ruleForm: {
......
......@@ -129,6 +129,7 @@
} else {
this.$message.error(res.message);
}
this.$popupCacel()
})
}
},
......
......@@ -120,7 +120,8 @@
} else {
this.$message.error(res.message);
}
});
this.$popupCacel()
})
},
handleSelectionChange (val) {
val.forEach((item, index) => {
......
......@@ -256,6 +256,7 @@
}
})
}
this.$popupCacel()
},
handleSelectionChange (val) {
val.forEach((item, index) => {
......
......@@ -109,6 +109,7 @@
} else {
this.$message.error(res.message);
}
this.$popupCacel()
})
},
handleSelectionChange (val) {
......
......@@ -106,6 +106,7 @@
} else {
this.$message.error(res.message);
}
this.$popupCacel()
})
},
handleSelectionChange (val) {
......
......@@ -134,7 +134,8 @@
} else {
this.$alert(res.message);
}
});
this.$popupCacel()
})
},
handleSelectionChange (val) {
val.forEach((item, index) => {
......
......@@ -111,7 +111,8 @@
} else {
this.$message.error(res.message);
}
});
this.$popupCacel()
})
},
handleSelectionChange (val) {
val.forEach((item, index) => {
......
......@@ -106,13 +106,13 @@
if (!this.isJump) {
this.jump(res.result, this.sqywInfo.djywbm);
} else {
this.$popupCacel()
store.dispatch('user/refreshPage', true);
}
} else {
this.$message.error(res.message);
}
});
this.$popupCacel()
})
},
handleSelectionChange (val) {
val.forEach((item, index) => {
......
......@@ -119,7 +119,8 @@
} else {
this.$message.error(res.message);
}
});
this.$popupCacel()
})
},
handleSelectionChange (val) {
val.forEach((item, index) => {
......
......@@ -157,6 +157,7 @@
} else {
this.$message.error(res.message)
}
this.$popupCacel()
})
},
openBook (row) {
......
......@@ -27,7 +27,7 @@
</div>
<!-- 表格 -->
<div class="from-clues-content loadingtext">
<lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
<lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
:current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange"
@p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
:data="tableData.data">
......@@ -46,7 +46,7 @@
import { defaultParameters } from "../javascript/publicDefaultPar.js";
import table from "@/utils/mixin/table";
import jump from "./mixin/jump";
import { startBusinessFlow, selectZdjbxx} from "@/api/ywbl.js";
import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js";
export default {
mixins: [table, jump],
props: {
......@@ -56,12 +56,12 @@
data () {
return {
queryForm: defaultParameters.defaultParameters(),
tableData: {
tableData: {
total: 0,
columns: datas.columns(),
data: [],
},
radioVal: "",
radioVal: "",
bdcdysz: [],
bsmSqyw:
this.sqywInfo.nodetype === "djlx"
......@@ -82,19 +82,19 @@
let { total, records } = res.result;
this.tableData.total = total;
this.tableData.data = records;
// this.tableData.columns.splice(0, 1,{
// label: '选择',
// width: '50px',
// render: (h, scope) => {
// return (
// <div class="orgColumn">
// <el-radio v-model={this.radioVal} label={scope.row.bdcdyh}>
// &ensp;
// </el-radio>
// </div>
// )
// }
// })
// this.tableData.columns.splice(0, 1,{
// label: '选择',
// width: '50px',
// render: (h, scope) => {
// return (
// <div class="orgColumn">
// <el-radio v-model={this.radioVal} label={scope.row.bdcdyh}>
// &ensp;
// </el-radio>
// </div>
// )
// }
// })
}
});
},
......@@ -124,7 +124,8 @@
} else {
this.$alert(res.message);
}
});
this.$popupCacel()
})
},
handleSelectionChange (val) {
this.bdcdysz = val;
......
......@@ -111,7 +111,8 @@
} else {
this.$message.error(res.message);
}
});
this.$popupCacel()
})
},
handleSelectionChange (val) {
val.forEach((item, index) => {
......
......@@ -111,7 +111,8 @@
} else {
this.$message.error(res.message);
}
});
this.$popupCacel()
})
},
handleSelectionChange (val) {
val.forEach((item, index) => {
......
......@@ -111,7 +111,8 @@
} else {
this.$message.error(res.message);
}
});
this.$popupCacel()
})
},
handleSelectionChange (val) {
val.forEach((item, index) => {
......