From af0a69132536dabb2b53d7fd69052573d6ac1dba Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 31 Jan 2026 09:33:21 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/task-work-order/src/views/flow/follow.vue | 199 ++++++++
applications/task-work-order/src/views/orderView/organizational/agenciesManagement/FormDiaLog.vue | 5
applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue | 6
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue | 24
applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue | 46 +
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue | 30 +
applications/task-work-order/src/views/flow/model.vue | 548 ++++++++++++++++++++++
applications/task-work-order/src/views/flow/deploy.vue | 160 ++++++
applications/task-work-order/src/views/flow/manager.vue | 369 +++++++++++++++
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue | 13
applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue | 5
11 files changed, 1,355 insertions(+), 50 deletions(-)
diff --git a/applications/task-work-order/src/views/flow/deploy.vue b/applications/task-work-order/src/views/flow/deploy.vue
new file mode 100644
index 0000000..9fac645
--- /dev/null
+++ b/applications/task-work-order/src/views/flow/deploy.vue
@@ -0,0 +1,160 @@
+<template>
+ <basic-container>
+ <avue-form
+ ref="form"
+ :option="option"
+ v-model="form"
+ :upload-before="uploadBefore"
+ :upload-after="uploadAfter"
+ />
+ </basic-container>
+</template>
+
+<script>
+import { deployUpload } from '@/api/flow/flow';
+import { flowCategory } from '@/utils/flow';
+
+export default {
+ data() {
+ return {
+ form: {
+ flowCategory: '',
+ tenantId: '',
+ flowFile: [],
+ file: {},
+ },
+ option: {
+ labelWidth: 120,
+ menuBtn: false,
+ column: [
+ {
+ label: '流程类型',
+ prop: 'flowCategory',
+ type: 'select',
+ dicUrl: `/blade-system/dict/dictionary?code=flow`,
+ props: {
+ label: 'dictValue',
+ value: 'dictKey',
+ },
+ row: true,
+ span: 12,
+ dataType: 'number',
+ rules: [
+ {
+ required: true,
+ message: '请选择流程类型',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '流程模式',
+ prop: 'flowMode',
+ type: 'radio',
+ dicData: [
+ {
+ label: '通用流程',
+ value: 1,
+ },
+ {
+ label: '定制流程',
+ value: 2,
+ },
+ ],
+ value: 1,
+ row: true,
+ span: 12,
+ rules: [
+ {
+ required: true,
+ message: '请选择流程模式',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '所属租户',
+ prop: 'tenantId',
+ type: 'tree',
+ multiple: true,
+ dicUrl: '/blade-system/tenant/select',
+ props: {
+ label: 'tenantName',
+ value: 'tenantId',
+ },
+ display: false,
+ row: true,
+ span: 12,
+ rules: [
+ {
+ required: true,
+ message: '请选择所属租户',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '附件上传',
+ prop: 'flowFile',
+ type: 'upload',
+ loadText: '附件上传中，请稍等',
+ span: 24,
+ propsHttp: {
+ res: 'data',
+ },
+ tip: '请上传 bpmn20.xml 标准格式文件',
+ action: '/blade-flow/manager/check-upload',
+ },
+ ],
+ },
+ };
+ },
+ watch: {
+ 'form.flowMode'() {
+ this.$refs.form.option.column.filter(item => {
+ if (item.prop === 'tenantId') {
+ item.display = this.form.flowMode === 2;
+ }
+ });
+ },
+ },
+ methods: {
+ uploadBefore(file, done) {
+ this.$message.success('部署提交');
+ this.file = file;
+ done();
+ },
+ uploadAfter(res, done, loading) {
+ if (!this.form.flowCategory) {
+ this.$message.warning('清先选择流程类型');
+ loading();
+ return false;
+ }
+ if (this.form.flowMode === 2 && !this.form.tenantId) {
+ this.$message.warning('清先选择对应租户');
+ loading();
+ return false;
+ }
+ if (res.success) {
+ deployUpload(
+ flowCategory(this.form.flowCategory),
+ this.form.tenantId ? this.form.tenantId.join(',') : '',
+ [this.file]
+ ).then(res => {
+ const data = res.data;
+ if (data.success) {
+ done();
+ } else {
+ this.$message.error(data.msg);
+ loading();
+ }
+ });
+ } else {
+ this.$message.warning('请上传 bpmn20.xml 标准格式文件');
+ loading();
+ return false;
+ }
+ },
+ },
+};
+</script>
diff --git a/applications/task-work-order/src/views/flow/follow.vue b/applications/task-work-order/src/views/flow/follow.vue
new file mode 100644
index 0000000..f600bce
--- /dev/null
+++ b/applications/task-work-order/src/views/flow/follow.vue
@@ -0,0 +1,199 @@
+<template>
+ <basic-container>
+ <avue-crud
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ ref="crud"
+ v-model="form"
+ v-model:page="page"
+ :permission="permissionList"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ >
+ <template #suspensionState="{ row }">
+ <el-tag>{{ row.suspensionState === 1 ? '激活' : '挂起' }}</el-tag>
+ </template>
+ </avue-crud>
+ <el-dialog title="流程删除" append-to-body v-model="followBox" width="20%">
+ <el-form :model="form" ref="form" label-width="80px">
+ <el-form-item label="删除理由">
+ <el-input v-model="deleteReason" placeholder="请输入删除理由" />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="followBox = false">关 闭</el-button>
+ <el-button type="primary" @click="handleDelete">确 定</el-button>
+ </span>
+ </template>
+ </el-dialog>
+ </basic-container>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { followList, deleteProcessInstance } from '@/api/flow/flow';
+
+export default {
+ data() {
+ return {
+ form: {},
+ selectionId: '',
+ processInstanceId: '',
+ selectionList: [],
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ followBox: false,
+ deleteReason: '',
+ option: {
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ selection: true,
+ editBtn: false,
+ addBtn: false,
+ viewBtn: false,
+ dialogWidth: 900,
+ menuWidth: 100,
+ dialogClickModal: false,
+ column: [
+ {
+ label: '执行id',
+ prop: 'executionId',
+ search: true,
+ width: 320,
+ },
+ {
+ label: '流程key',
+ prop: 'processDefinitionKey',
+ search: true,
+ },
+ {
+ label: '实例id',
+ prop: 'processInstanceId',
+ search: true,
+ width: 320,
+ },
+ {
+ label: '状态',
+ prop: 'suspensionState',
+ slot: true,
+ width: 80,
+ },
+ {
+ label: '发起人',
+ prop: 'startUser',
+ width: 100,
+ },
+ {
+ label: '开始时间',
+ prop: 'startTime',
+ width: 170,
+ },
+ ],
+ },
+ data: [],
+ };
+ },
+ computed: {
+ ...mapGetters(['permission']),
+ permissionList() {
+ return {
+ delBtn: this.validData(this.permission.flow_follow_delete, false),
+ };
+ },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach(ele => {
+ ids.push(ele.id);
+ });
+ return ids.join(',');
+ },
+ },
+ methods: {
+ rowDel(row) {
+ this.followBox = true;
+ this.selectionId = row.id;
+ this.processInstanceId = row.processInstanceId;
+ },
+ handleDelete() {
+ this.$confirm('确定将选择数据删除?', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(() => {
+ return deleteProcessInstance({
+ deleteReason: this.deleteReason,
+ processInstanceId: this.processInstanceId,
+ });
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.followBox = false;
+ this.$message({
+ type: 'success',
+ message: '操作成功!',
+ });
+ });
+ },
+ searchReset() {
+ this.query = {};
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ this.$refs.crud.toggleSelection();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ this.loading = true;
+ followList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.selectionClear();
+ });
+ },
+ },
+};
+</script>
+
+<style>
+.none-border {
+ border: 0;
+ background-color: transparent !important;
+}
+</style>
diff --git a/applications/task-work-order/src/views/flow/manager.vue b/applications/task-work-order/src/views/flow/manager.vue
new file mode 100644
index 0000000..09ff99a
--- /dev/null
+++ b/applications/task-work-order/src/views/flow/manager.vue
@@ -0,0 +1,369 @@
+<template>
+ <basic-container>
+ <avue-crud
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ ref="crud"
+ v-model="form"
+ v-model:page="page"
+ :permission="permissionList"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ >
+ <template #menu-left>
+ <el-radio-group v-model="mode">
+ <el-radio-button label="1">通用流程</el-radio-button>
+ <el-radio-button label="2">定制流程</el-radio-button>
+ </el-radio-group>
+ </template>
+ <template #menu="scope">
+ <el-button
+ type="primary"
+ text
+ icon="el-icon-refresh"
+ v-if="permission.flow_manager_state"
+ @click.stop="handleState(scope.row, scope.index)"
+ >变更状态
+ </el-button>
+ <el-button
+ type="primary"
+ text
+ icon="el-icon-search"
+ v-if="permission.flow_manager_image"
+ @click.stop="handleImage(scope.row, scope.index)"
+ >流程图
+ </el-button>
+ <el-button
+ type="primary"
+ text
+ icon="el-icon-delete"
+ v-if="permission.flow_manager_remove"
+ @click.stop="handleSlotDelete(scope.row, scope.index)"
+ >删除
+ </el-button>
+ </template>
+ <template #tenantId="{ row }">
+ <el-tag>{{ row.tenantId === '' ? '通用' : row.tenantId }}</el-tag>
+ </template>
+ <template #version="{ row }">
+ <el-tag>v{{ row.version }}</el-tag>
+ </template>
+ <template #suspensionState="{ row }">
+ <el-tag>{{ row.suspensionState === 1 ? '激活' : '挂起' }}</el-tag>
+ </template>
+ <template #category="{ row }">
+ <el-tag>{{ row.categoryName }}</el-tag>
+ </template>
+ </avue-crud>
+ <flow-design
+ v-if="this.website.design.designMode"
+ is-dialog
+ v-model:is-display="flowBox"
+ :process-definition-id="processDefinitionId"
+ ></flow-design>
+ <el-dialog v-else title="流程图" append-to-body v-model="flowBox" :fullscreen="true">
+ <iframe
+ :src="flowUrl"
+ width="100%"
+ height="700"
+ title="流程图"
+ frameBorder="no"
+ border="0"
+ marginWidth="0"
+ marginHeight="0"
+ scrolling="no"
+ allowTransparency="yes"
+ >
+ </iframe>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="flowBox = false">关 闭</el-button>
+ </span>
+ </template>
+ </el-dialog>
+ <el-dialog title="流程变更" append-to-body v-model="stateBox" width="20%">
+ <el-form :model="form" ref="form" label-width="80px">
+ <el-form-item label="流程状态">
+ <el-select v-model="flowState" placeholder="请选择" value="">
+ <el-option
+ v-for="item in stateOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="stateBox = false">关 闭</el-button>
+ <el-button type="primary" @click="handleDoState">确 定</el-button>
+ </span>
+ </template>
+ </el-dialog>
+ </basic-container>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { managerList, changeState, deleteDeployment } from '@/api/flow/flow';
+import { flowCategory } from '@/utils/flow';
+
+export default {
+ data() {
+ return {
+ form: {},
+ mode: '1',
+ selectionId: '',
+ selectionList: [],
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ processDefinitionId: '',
+ flowBox: false,
+ flowUrl: '',
+ stateBox: false,
+ flowState: '',
+ stateOptions: [
+ {
+ value: 'active',
+ label: '激活',
+ },
+ {
+ value: 'suspend',
+ label: '挂起',
+ },
+ ],
+ option: {
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ selection: true,
+ editBtn: false,
+ addBtn: false,
+ viewBtn: false,
+ delBtn: false,
+ dialogWidth: 900,
+ menuWidth: 250,
+ dialogClickModal: false,
+ column: [
+ {
+ label: '租户编号',
+ prop: 'tenantId',
+ slot: true,
+ width: 120,
+ },
+ {
+ label: '流程主键',
+ prop: 'id',
+ },
+ {
+ label: '流程标识',
+ prop: 'key',
+ search: true,
+ width: 150,
+ },
+ {
+ label: '流程名称',
+ prop: 'name',
+ width: 150,
+ },
+ {
+ label: '流程分类',
+ type: 'select',
+ row: true,
+ dicUrl: '/blade-system/dict/dictionary?code=flow',
+ props: {
+ label: 'dictValue',
+ value: 'dictKey',
+ },
+ dataType: 'number',
+ slot: true,
+ prop: 'category',
+ search: true,
+ width: 100,
+ },
+ {
+ label: '流程版本',
+ prop: 'version',
+ slot: true,
+ width: 85,
+ },
+ {
+ label: '状态',
+ prop: 'suspensionState',
+ slot: true,
+ width: 80,
+ },
+ {
+ label: '部署时间',
+ prop: 'deploymentTime',
+ width: 170,
+ },
+ ],
+ },
+ data: [],
+ };
+ },
+ watch: {
+ mode() {
+ this.onLoad(this.page);
+ },
+ },
+ computed: {
+ ...mapGetters(['permission']),
+ permissionList() {
+ return {
+ delBtn: this.validData(this.permission.flow_manager_remove, false),
+ };
+ },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach(ele => {
+ ids.push(ele.id);
+ });
+ return ids.join(',');
+ },
+ deploymentIds() {
+ let ids = [];
+ this.selectionList.forEach(ele => {
+ ids.push(ele.deploymentId);
+ });
+ return ids.join(',');
+ },
+ },
+ methods: {
+ searchReset() {
+ this.query = {};
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ this.$refs.crud.toggleSelection();
+ },
+ handleDelete() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning('请选择至少一条数据');
+ return;
+ }
+ this.$confirm('确定将选择数据删除?', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(() => {
+ return deleteDeployment(this.deploymentIds);
+ })
+ .then(() => {
+ this.$message({
+ type: 'success',
+ message: '操作成功!',
+ });
+ this.$refs.crud.toggleSelection();
+ this.onLoad(this.page);
+ });
+ },
+ handleSlotDelete(row) {
+ this.$confirm('确定将选择数据删除?', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(() => {
+ return deleteDeployment(row.deploymentId);
+ })
+ .then(() => {
+ this.$message({
+ type: 'success',
+ message: '操作成功!',
+ });
+ this.$refs.crud.toggleSelection();
+ this.onLoad(this.page);
+ });
+ },
+ handleState(row) {
+ this.stateBox = true;
+ this.selectionId = row.id;
+ },
+ handleDoState() {
+ if (!this.flowState) {
+ this.$message({
+ type: 'warn',
+ message: '请先选择流程状态!',
+ });
+ return;
+ }
+ changeState({ processId: this.selectionId, state: this.flowState }).then(res => {
+ const data = res.data;
+ if (data.success) {
+ this.$message({
+ type: 'success',
+ message: data.msg,
+ });
+ this.stateBox = false;
+ this.onLoad(this.page);
+ } else {
+ this.$message({
+ type: 'warn',
+ message: data.msg,
+ });
+ }
+ });
+ },
+ handleImage(row) {
+ if (this.website.design.designMode) {
+ this.processDefinitionId = row.id;
+ } else {
+ this.flowUrl = `/blade-flow/process/resource-view?processDefinitionId=${row.id}`;
+ }
+ this.flowBox = true;
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ const values = {
+ ...params,
+ category: params.category ? flowCategory(params.category) : null,
+ mode: this.mode,
+ };
+ this.loading = true;
+ managerList(page.currentPage, page.pageSize, Object.assign(values, this.query)).then(res => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.selectionClear();
+ });
+ },
+ },
+};
+</script>
diff --git a/applications/task-work-order/src/views/flow/model.vue b/applications/task-work-order/src/views/flow/model.vue
new file mode 100644
index 0000000..fa06a03
--- /dev/null
+++ b/applications/task-work-order/src/views/flow/model.vue
@@ -0,0 +1,548 @@
+<template>
+ <basic-container>
+ <avue-crud
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ ref="crud"
+ v-model="form"
+ v-model:page="page"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ >
+ <template #menu-left>
+ <el-button
+ type="primary"
+ size="default"
+ icon="el-icon-circle-plus"
+ v-if="permission.flow_model_create"
+ plain
+ @click="handleCreate"
+ >创 建
+ </el-button>
+ <el-button
+ type="danger"
+ size="default"
+ icon="el-icon-delete"
+ v-if="permission.flow_model_delete"
+ plain
+ @click="handleDelete"
+ >删 除
+ </el-button>
+ </template>
+ <template #menu="scope">
+ <el-button
+ type="primary"
+ text
+ size="default"
+ icon="el-icon-setting"
+ v-if="permission.flow_model_update"
+ @click.stop="handleUpdate(scope.row, scope.index)"
+ >配置
+ </el-button>
+ <el-button
+ type="primary"
+ text
+ size="default"
+ icon="el-icon-upload"
+ v-if="permission.flow_model_deploy"
+ @click.stop="handleDeploy(scope.row, scope.index)"
+ >部署
+ </el-button>
+ <el-button
+ type="primary"
+ text
+ size="default"
+ icon="el-icon-delete"
+ v-if="permission.flow_model_delete"
+ @click.stop="handleSlotDelete(scope.row, scope.index)"
+ >删除
+ </el-button>
+ </template>
+ <template #version="{ row }">
+ <el-tag>v{{ row.version }}</el-tag>
+ </template>
+ </avue-crud>
+ <el-dialog
+ v-if="this.website.design.designMode"
+ title="流程配置"
+ append-to-body
+ destroy-on-close
+ v-model="flowBox"
+ :close-on-press-escape="false"
+ :fullscreen="true"
+ :before-close="handleNutflowClose"
+ class="nf-dialog"
+ >
+ <nf-design-base
+ v-if="nutflowOption.step === 1"
+ class="animated fadeIn"
+ style="height: calc(100vh - 108px)"
+ ref="nf-design"
+ :options="nutflowOption.step1"
+ ></nf-design-base>
+ <nf-design-base
+ v-if="nutflowOption.step === 2"
+ class="animated fadeIn"
+ style="height: calc(100vh - 108px)"
+ ref="nf-design-view"
+ :options="nutflowOption.step2"
+ ></nf-design-base>
+ <template #footer>
+ <span class="avue-dialog__footer">
+ <el-button @click="handleNutflowClose(() => {}, true)">取 消</el-button>
+ <el-button v-if="nutflowOption.step === 1" type="success" @click="handleStep(1)"
+ >下 一 步</el-button
+ >
+ <el-button v-if="nutflowOption.step === 2" type="success" @click="handleStep(-1)"
+ >上 一 步</el-button
+ >
+ <el-button v-if="nutflowOption.step === 2" type="primary" @click="handleSubmitModel"
+ >确 定</el-button
+ >
+ </span>
+ </template>
+ </el-dialog>
+ <el-dialog v-else title="流程配置" append-to-body v-model="flowBox" :fullscreen="true">
+ <iframe
+ :src="flowUrl"
+ width="100%"
+ height="700"
+ title="流程设计器"
+ frameBorder="no"
+ border="0"
+ marginWidth="0"
+ marginHeight="0"
+ scrolling="no"
+ allowTransparency="yes"
+ >
+ </iframe>
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="flowBox = false">取 消</el-button>
+ <el-button type="primary" @click="handleRefresh">确 定</el-button>
+ </span>
+ </template>
+ </el-dialog>
+ <el-dialog title="流程部署" append-to-body v-model="deployBox" width="20%">
+ <avue-form ref="form" :option="optionDeploy" v-model="form" @submit="handleSubmit" />
+ <template #footer>
+ <span class="dialog-footer">
+ <el-button @click="deployBox = false">取 消</el-button>
+ <el-button type="primary" @click="handleDoDeploy" :loading="deployLoading"
+ >确 定</el-button
+ >
+ </span>
+ </template>
+ </el-dialog>
+ </basic-container>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import { modelList, removeModel, deployModel, submitModel, detail } from '@/api/flow/flow';
+import { flowCategory } from '@/utils/flow';
+
+export default {
+ data() {
+ return {
+ form: {},
+ optionDeploy: {
+ menuBtn: false,
+ column: [
+ {
+ label: '流程类型',
+ type: 'select',
+ dicUrl: '/blade-system/dict/dictionary?code=flow',
+ props: {
+ label: 'dictValue',
+ value: 'dictKey',
+ },
+ dataType: 'number',
+ slot: true,
+ prop: 'categoryValue',
+ search: true,
+ span: 24,
+ rules: [
+ {
+ required: true,
+ message: '请选择流程类型',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '流程模式',
+ prop: 'flowMode',
+ type: 'radio',
+ dicData: [
+ {
+ label: '通用流程',
+ value: 1,
+ },
+ {
+ label: '定制流程',
+ value: 2,
+ },
+ ],
+ value: 1,
+ span: 24,
+ rules: [
+ {
+ required: true,
+ message: '请选择流程模式',
+ trigger: 'blur',
+ },
+ ],
+ },
+ {
+ label: '所属租户',
+ prop: 'tenantId',
+ type: 'tree',
+ multiple: true,
+ dicUrl: '/blade-system/tenant/select',
+ props: {
+ label: 'tenantName',
+ value: 'tenantId',
+ },
+ display: false,
+ span: 24,
+ rules: [
+ {
+ required: true,
+ message: '请选择所属租户',
+ trigger: 'blur',
+ },
+ ],
+ },
+ ],
+ },
+ selectionId: '',
+ selectionList: [],
+ query: {},
+ loading: true,
+ deployLoading: false,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ deployBox: false,
+ flowBox: false,
+ flowUrl: '',
+ option: {
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ selection: true,
+ editBtn: false,
+ addBtn: false,
+ viewBtn: false,
+ delBtn: false,
+ dialogWidth: 900,
+ menuWidth: 220,
+ dialogClickModal: false,
+ size: 'default',
+ searchSize: 'default',
+ column: [
+ {
+ label: '模型主键',
+ prop: 'id',
+ },
+ {
+ label: '模型标识',
+ prop: 'modelKey',
+ search: true,
+ overHidden: true,
+ },
+ {
+ label: '模型名称',
+ prop: 'name',
+ search: true,
+ overHidden: true,
+ },
+ {
+ label: '流程版本',
+ prop: 'version',
+ slot: true,
+ overHidden: true,
+ },
+ {
+ label: '创建时间',
+ prop: 'created',
+ overHidden: true,
+ },
+ {
+ label: '更新时间',
+ prop: 'lastUpdated',
+ overHidden: true,
+ },
+ ],
+ },
+ data: [],
+ nutflowOption: {
+ process: {},
+ step: 1,
+ step1: {
+ toolbar: [
+ 'open',
+ 'create',
+ 'fit',
+ 'zoom-in',
+ 'zoom-out',
+ 'undo',
+ 'redo',
+ 'import',
+ 'preview',
+ ],
+ },
+ step2: {
+ mode: 'view',
+ simulation: true,
+ minimap: true,
+ },
+ },
+ };
+ },
+ watch: {
+ 'form.flowMode'() {
+ this.$refs.form.option.column.filter(item => {
+ if (item.prop === 'tenantId') {
+ item.display = this.form.flowMode === 2;
+ }
+ });
+ },
+ },
+ computed: {
+ ...mapGetters(['permission']),
+ ids() {
+ let ids = [];
+ this.selectionList.forEach(ele => {
+ ids.push(ele.id);
+ });
+ return ids.join(',');
+ },
+ },
+ methods: {
+ handleSubmitModel() {
+ const registry = this.$refs['nf-design-view'].getElementRegistry().getAll();
+ const { businessObject } = registry[0];
+ const { id, name, documentation } = businessObject;
+ const description = documentation && documentation.length > 0 ? documentation[0].text : null;
+ const params = {
+ ...this.nutflowOption.process,
+ modelKey: id,
+ name,
+ description,
+ modelEditorXml: this.nutflowOption.process.xml,
+ };
+ submitModel(params).then(() => {
+ this.$message.success('操作成功');
+ this.handleNutflowClose();
+ this.onLoad(this.page, this.query);
+ });
+ },
+ handleStep(step) {
+ if (step === 1) {
+ // 下一步
+ this.$refs['nf-design'].getData('xml').then(data => {
+ this.nutflowOption.step1.xml = data;
+ this.nutflowOption.step2.xml = data;
+ this.nutflowOption.process.xml = data;
+ this.nutflowOption.step = 2;
+ });
+ } else this.nutflowOption.step = 1;
+ },
+ handleNutflowClose(done, flag) {
+ const initOption = {
+ process: {},
+ step: 1,
+ step1: {
+ toolbar: [
+ 'open',
+ 'create',
+ 'fit',
+ 'zoom-in',
+ 'zoom-out',
+ 'undo',
+ 'redo',
+ 'import',
+ 'preview',
+ ],
+ },
+ step2: {
+ mode: 'view',
+ simulation: true,
+ minimap: true,
+ },
+ };
+ if (done || flag) {
+ this.$confirm('确定要关闭吗？关闭未保存的修改都会丢失。', '警告', {
+ type: 'warning',
+ })
+ .then(() => {
+ this.nutflowOption = initOption;
+ if (typeof done == 'function') done();
+ this.flowBox = false;
+ })
+ .catch(() => {});
+ } else {
+ this.nutflowOption = initOption;
+ this.flowBox = false;
+ }
+ },
+ handleSubmit(form, done) {
+ this.deployLoading = true;
+ deployModel({
+ modelId: this.selectionId,
+ category: flowCategory(form.categoryValue),
+ tenantIds: form.tenantId ? form.tenantId.join(',') : '',
+ }).then(res => {
+ const data = res.data;
+ if (data.success) {
+ this.$message({
+ type: 'success',
+ message: data.msg,
+ });
+ done();
+ this.$refs.form.resetForm();
+ this.deployBox = false;
+ this.deployLoading = false;
+ } else {
+ done();
+ this.deployLoading = false;
+ this.$message({
+ type: 'warn',
+ message: data.msg,
+ });
+ }
+ });
+ },
+ searchReset() {
+ this.query = {};
+ this.onLoad(this.page);
+ },
+ searchChange(params, done) {
+ this.query = params;
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
+ done();
+ },
+ selectionChange(list) {
+ this.selectionList = list;
+ },
+ selectionClear() {
+ this.selectionList = [];
+ this.$refs.crud.toggleSelection();
+ },
+ handleDelete() {
+ if (this.selectionList.length === 0) {
+ this.$message.warning('请选择至少一条数据');
+ return;
+ }
+ this.$confirm('确定将选择数据删除?', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(() => {
+ return removeModel(this.ids);
+ })
+ .then(() => {
+ this.$message({
+ type: 'success',
+ message: '操作成功!',
+ });
+ this.$refs.crud.toggleSelection();
+ this.onLoad(this.page);
+ });
+ },
+ handleCreate() {
+ if (!this.website.design.designMode) {
+ this.flowUrl = `${this.website.design.designUrl}/index.html`;
+ }
+ this.flowBox = true;
+ },
+ handleRefresh() {
+ this.flowBox = false;
+ this.onLoad(this.page);
+ },
+ handleUpdate(row) {
+ if (this.website.design.designMode) {
+ detail({ id: row.id }).then(res => {
+ const data = res.data.data;
+ const { modelEditorXml } = data;
+ this.nutflowOption.step1.xml = modelEditorXml;
+ this.nutflowOption.process = data;
+ });
+ } else {
+ this.flowUrl = `${this.website.design.designUrl}/index.html#/editor/${row.id}`;
+ }
+ this.flowBox = true;
+ },
+ handleDeploy(row) {
+ this.deployBox = true;
+ this.selectionId = row.id;
+ },
+ handleDoDeploy() {
+ this.$refs.form.submit();
+ },
+ handleSlotDelete(row) {
+ this.$confirm('确定将选择数据删除?', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then(() => {
+ return removeModel(row.id);
+ })
+ .then(() => {
+ this.$message({
+ type: 'success',
+ message: '操作成功!',
+ });
+ this.$refs.crud.toggleSelection();
+ this.onLoad(this.page);
+ });
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ this.loading = true;
+ modelList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.selectionClear();
+ });
+ },
+ },
+};
+</script>
+
+<style lang="scss">
+.nf-dialog {
+ .el-dialog__body {
+ padding: 5px;
+ }
+
+ .avue-dialog__footer {
+ text-align: center;
+ }
+}
+</style>
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
index c83c0c7..408579a 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/FormDiaLog.vue
@@ -246,9 +246,7 @@
deviceId: null,
taskDesc: '',
})
-// todo 时间线
const dictObj = inject('dictObj')
-
const emit = defineEmits(['success'])
const visible = defineModel() // 弹框显隐
const dialogMode = ref('add') // 弹框模式
@@ -326,14 +324,6 @@
workOrderList.value = res?.data?.data?.records ?? []
}
-// 处理巡查任务类型变化
-async function handlePatrolTaskTypeChange(index, skilledTaskType) {
- // 清空该行已选择的飞手
- taskList.value[index].recommendFlyerName = ''
- // 获取对应的飞手列表
- await getFlyerList(index, skilledTaskType)
-}
-
// 获取飞手列表
async function getFlyerList(index, skilledTaskType) {
const res = await gdFlyerPageApi({
@@ -363,18 +353,6 @@
// 判断一行是否已填写（至少填写了任务名称）
function isTaskRowFilled(task) {
return !!(task.patrolTaskName || task.executeTime || task.patrolRouteUrl || task.recommendFlyerName || task.deviceId)
-}
-
-// 判断一行是否完整填写（所有必填项都有值）
-function isTaskRowComplete(task) {
- return !!(
- task.patrolTaskName &&
- task.patrolTaskType &&
- task.executeTime &&
- task.patrolRouteUrl &&
- task.recommendFlyerName &&
- task.deviceId
- )
}
// 提交新增
@@ -480,6 +458,6 @@
}
.grayText {
- color: #9f9f9f;
+ color: #9f9f9f !important;
}
</style>
diff --git a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
index e4b90d0..e50d0aa 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/index.vue
@@ -1,8 +1,8 @@
<template>
<basic-container>
<el-tabs class="gd-tabs" v-model="activeName" @tab-click="tabsClick">
- <el-tab-pane label="全部 " name="all"></el-tab-pane>
- <el-tab-pane label="我的巡查任务" name="my"></el-tab-pane>
+ <el-tab-pane :label="`全部（${allTotal}）`" name="all"></el-tab-pane>
+ <el-tab-pane :label="`我的巡查任务（${myTotal}）`" name="my"></el-tab-pane>
</el-tabs>
<el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
<el-form-item label="任务名称" prop="patrolTaskName">
@@ -72,7 +72,9 @@
</el-form>
<div class="gd-table-toolbar">
- <el-button v-if="permission.flyOrder_add" :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">拆分工单</el-button>
+ <el-button v-if="permission.flyOrder_add" :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">
+ 拆分工单
+ </el-button>
</div>
<div class="gd-table-container" v-loading="loading">
@@ -98,7 +100,7 @@
<el-table-column prop="taskDesc" show-overflow-tooltip label="巡查任务描述" />
<el-table-column label="操作" class-name="operation-btns">
<template v-slot="{ row }">
- <el-link type="primary" @click="viewDiaLogView(row)">查看</el-link>
+ <el-link type="primary" @click="viewDiaLogView(row)">查看</el-link>
</template>
</el-table-column>
</el-table>
@@ -154,6 +156,8 @@
const searchParams = ref(initSearchParams()) // 查询参数
const dateRange = ref([]) // 执行时间范围
const total = ref(0) // 总条数
+const allTotal = ref(0) // 全部tab总条数
+const myTotal = ref(0) // 我的巡查任务tab总条数
const loading = ref(true) // 列表加载中
const list = ref([]) // 列表数据
const selectedIds = ref([]) // 勾选的ID列表
@@ -258,7 +262,25 @@
})
}
+// 获取两个tab的总条数
+async function getTabTotals() {
+ const allRes = await gdPatrolTaskPageApi({
+ current: 1,
+ size: 1,
+ createUser: '',
+ })
+ allTotal.value = allRes?.data?.data?.total ?? 0
+
+ const myRes = await gdPatrolTaskPageApi({
+ current: 1,
+ size: 1,
+ createUser: store.state.user.userInfo.user_id,
+ })
+ myTotal.value = myRes?.data?.data?.total ?? 0
+}
+
onMounted(() => {
+ getTabTotals()
getList()
getDictList()
getAirList()
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
index d7bc9c3..b1f6689 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
@@ -90,6 +90,7 @@
:disabled="dialogReadonly"
label-width="90px"
>
+ <div class="detail-title">工单详情</div>
<el-row>
<el-col :span="12">
<el-form-item label="工单名称" prop="workOrderName">
@@ -161,7 +162,10 @@
</el-col>
</el-row>
</el-form>
- <div class="detail-title" :style="{ marginTop: pxToRem(20) }">工单执行范围</div>
+ <div class="detail-title" :style="{ marginTop: pxToRem(20) }">
+ <span class="required-star" v-if="!dialogReadonly">*</span>
+ 工单执行范围
+ </div>
<CommonCesiumMap
ref="mapRef"
class="gd-cesium"
@@ -175,7 +179,7 @@
/>
</div>
<div class="rightBox" v-if="!dialogReadonly">
- <div class="detail-title">推荐设备</div>
+ <div class="detail-title"><span class="required-star" v-if="!dialogReadonly">*</span>推荐设备</div>
<el-table
class="separateTable"
:empty-text="(formData.deviceLoadDemand && pointList.length) ? '暂无数据' : '请先选择设备需求并在地图上绘制工单范围'"
@@ -701,4 +705,9 @@
height: 200px;
line-height: 200px;
}
+
+.required-star {
+ color: #f56c6c;
+ margin-right: 4px;
+}
</style>
diff --git a/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
index cde7336..7a07a85 100644
--- a/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderManage/orderManage/index.vue
@@ -1,8 +1,8 @@
<template>
<basic-container>
<el-tabs class="gd-tabs" v-model="activeName" @tab-click="tabsClick">
- <el-tab-pane label="全部 " name="all"></el-tab-pane>
- <el-tab-pane label="我的任务工单" name="my"></el-tab-pane>
+ <el-tab-pane :label="`全部（${allTotal}）`" name="all"></el-tab-pane>
+ <el-tab-pane :label="`我的任务工单（${myTotal}）`" name="my"></el-tab-pane>
</el-tabs>
<el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
<el-form-item label="工单名称" prop="workOrderName">
@@ -72,25 +72,9 @@
</el-form>
<div class="gd-table-toolbar">
-
- <el-button
- v-if="permission.order_release"
- :icon="Plus"
- color="#4C34FF"
- type="primary"
- @click="openForm('add')"
- >
+ <el-button v-if="permission.order_release" :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">
新增工单
</el-button>
-<!-- <el-button
- :icon="Delete"
- color="#4C34FF"
- :disabled="!selectedIds.length"
- @click="handleDelete()"
- v-if="permission.order_delete"
- >
- 删除
- </el-button>-->
</div>
<div class="gd-table-container" v-loading="loading">
@@ -126,8 +110,6 @@
<el-table-column label="操作" class-name="operation-btns">
<template v-slot="{ row }">
<el-link type="primary" @click="openFormChange(row)">查看</el-link>
- <!--<el-link type="primary" @click="openForm('edit', row)">编辑</el-link>-->
-<!-- <el-link type="primary" @click="handleDelete(row)" v-if="permission.order_delete">删除</el-link>-->
</template>
</el-table-column>
</el-table>
@@ -182,6 +164,8 @@
const searchParams = ref(initSearchParams()) // 查询参数
const dateRange = ref([]) // 执行时间范围
const total = ref(0) // 总条数
+const allTotal = ref(0) // 全部tab总条数
+const myTotal = ref(0) // 我的任务工单tab总条数
const loading = ref(true) // 列表加载中
const list = ref([]) // 列表数据
const selectedIds = ref([]) // 勾选的ID列表
@@ -281,7 +265,27 @@
})
}
+// 获取两个tab的总条数
+async function getTabTotals() {
+ // 获取全部tab的总数
+ const allRes = await gdWorkOrderPageApi({
+ current: 1,
+ size: 1,
+ createUser: '',
+ })
+ allTotal.value = allRes?.data?.data?.total ?? 0
+
+ // 获取我的任务工单tab的总数
+ const myRes = await gdWorkOrderPageApi({
+ current: 1,
+ size: 1,
+ createUser: store.state.user.userInfo.user_id,
+ })
+ myTotal.value = myRes?.data?.data?.total ?? 0
+}
+
onMounted(() => {
+ getTabTotals()
getList()
getDictList()
})
diff --git a/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/FormDiaLog.vue
index 44f488c..6a4411e 100644
--- a/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/FormDiaLog.vue
@@ -245,6 +245,11 @@
// 懒加载获取区域节点数据
async function loadRegionNode(node, resolve) {
try {
+ // 限制只加载两级，当前节点 level >= 1 时不加载子节点
+ if (node.level >= 2) {
+ resolve([])
+ return
+ }
// 初始化加载时传递 code 参数，加载子节点时传递 parentCode 参数
const params = node.data?.id ? { parentCode: node.data.id } : { code: '360800000000' }
const parentCode = node.data?.id || '360800000000'
diff --git a/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue b/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue
index df75267..8a14cad 100644
--- a/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue
+++ b/applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue
@@ -213,6 +213,12 @@
async function loadRegionNode(node, resolve) {
try {
+ // 限制只加载两级，当前节点 level >= 1 时不加载子节点
+ if (node.level >= 2) {
+ resolve([])
+ return
+ }
+
// 初始化加载时传递 code 参数，加载子节点时传递 parentCode 参数
const params = node.data?.id ? { parentCode: node.data.id } : { code: '360800000000' }
const res = await regionLazyTreeApi(params)
diff --git a/applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue
index d54e7a0..2781012 100644
--- a/applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/organizational/zoningManagement/FormDiaLog.vue
@@ -276,6 +276,11 @@
// 懒加载获取区域节点数据
async function loadRegionNode(node, resolve) {
try {
+ // 限制只加载两级，当前节点 level >= 1 时不加载子节点
+ if (node.level >= 2) {
+ resolve([])
+ return
+ }
// 初始化加载时传递 code 参数，加载子节点时传递 parentCode 参数
const params = node.data?.id ? { parentCode: node.data.id } : { code: '360800000000' }
const parentCode = node.data?.id || '360800000000'
--
Gitblit v1.9.3