1

src/views/process/flowExample/index.vue

@@ -1,355 +1,261 @@
 <template>
-	<div class="tenant">
-		<!-- <Banner /> -->
-		<div class="content">
-			<byTable
-				:source="sourceList.data"
-				:pagination="sourceList.pagination"
-				:config="config"
-				:loading="loading"
-				highlight-current-row
-				:selectConfig="selectConfig"
-				:table-events="{
-					//element talbe事件都能传
-					select: select,
-				}"
-				@get-list="getList"
-			>
-				<template #slotName="{ item }">
-					{{ item.createTime }}
-				</template>
-			</byTable>
-		</div>
-		<el-dialog
-			:title="modalType == 'add' ? '新增' : '编辑'"
-			v-model="dialogVisible"
-			width="400"
-			v-loading="loading"
-		>
-			<byForm
-				:formConfig="formConfig"
-				:formOption="formOption"
-				v-model="formData.data"
-				:rules="rules"
-				ref="byform"
-			>
-			</byForm>
-			<template #footer>
-				<el-button @click="dialogVisible = false" size="large"
-					>取 消</el-button
-				>
-				<el-button
-					type="primary"
-					@click="submitForm('byform')"
-					size="large"
-					:loading="submitLoading"
-				>
-					确 定
-				</el-button>
-			</template>
-		</el-dialog>
-	</div>
+  <el-card class="box-card">
+    <byTable
+      :source="sourceList.data"
+      :pagination="sourceList.pagination"
+      :config="config"
+      :loading="loading"
+      highlight-current-row
+      :selectConfig="selectConfig"
+      :table-events="{
+        select: select,
+      }"
+      @get-list="getList">
+      <template #slotName="{ item }">
+        {{ item.createTime }}
+      </template>
+    </byTable>
+
+    <el-dialog :title="modalType == 'add' ? '新增' : '编辑'" v-model="dialogVisible" width="400" v-loading="loading">
+      <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform"> </byForm>
+      <template #footer>
+        <el-button @click="dialogVisible = false" size="large">取 消</el-button>
+        <el-button type="primary" @click="submitForm('byform')" size="large" :loading="submitLoading"> 确 定 </el-button>
+      </template>
+    </el-dialog>
+  </el-card>
 </template>
-    
-  <script setup>
-/* eslint-disable vue/no-unused-components */
-import { ElMessage, ElMessageBox } from 'element-plus'
-import byTable from '@/components/byTable/index'
-import byForm from '@/components/byForm/index'
-import { computed, defineComponent, ref } from 'vue'
-const loading = ref(false)
-const submitLoading = ref(false)
-const dictCommonModal = ref(false)
+
+<script setup>
+import { ElMessage } from "element-plus";
+import byTable from "@/components/byTable/index";
+import byForm from "@/components/byForm/index";
+
+const loading = ref(false);
+const submitLoading = ref(false);
 const sourceList = ref({
-	data: [],
-	pagination: {
-		total: 3,
-		pageNum: 1,
-		pageSize: 10,
-	},
-})
-let dialogVisible = ref(false)
-let roomDialogVisible = ref(false)
-let modalType = ref('add')
+  data: [],
+  pagination: {
+    total: 3,
+    pageNum: 1,
+    pageSize: 10,
+  },
+});
+let dialogVisible = ref(false);
+let roomDialogVisible = ref(false);
+let modalType = ref("add");
 let rules = ref({
-	classifyName: [
-		{ required: true, message: '请输入功能模块', trigger: 'blur' },
-	],
-	flowKey: [{ required: true, message: '请输入流程标识', trigger: 'blur' }],
-	flowName: [{ required: true, message: '请输入流程名称', trigger: 'blur' }],
-})
-const { proxy } = getCurrentInstance()
+  classifyName: [{ required: true, message: "请输入功能模块", trigger: "blur" }],
+  flowKey: [{ required: true, message: "请输入流程标识", trigger: "blur" }],
+  flowName: [{ required: true, message: "请输入流程名称", trigger: "blur" }],
+});
+const { proxy } = getCurrentInstance();
 const selectConfig = computed(() => {
-	return [
-        {
-			label: '流程类型',
-			prop: 'flowInfoId',
-			data: [],
-		},
-		{
-			label: '流程状态',
-			prop: 'status',
+  return [
+    {
+      label: "流程类型",
+      prop: "flowInfoId",
+      data: [],
+    },
+    {
+      label: "流程状态",
+      prop: "status",
 
-			data: [
-				{
-					label: '进行中',
-					value: '1',
-				},
-				{
-					label: '已结束',
-					value: '2',
-				},
-			],
-		},
-	]
-})
+      data: [
+        {
+          label: "进行中",
+          value: "1",
+        },
+        {
+          label: "已结束",
+          value: "2",
+        },
+      ],
+    },
+  ];
+});
 const config = computed(() => {
-	return [
-		{
-			attrs: {
-				label: '流程类型',
-				prop: 'title',
-			},
-		},
-		{
-			attrs: {
-				label: '流程标题',
-				prop: 'title',
-			},
-		},
+  return [
+    {
+      attrs: {
+        label: "流程类型",
+        prop: "title",
+      },
+    },
+    {
+      attrs: {
+        label: "流程标题",
+        prop: "title",
+      },
+    },
 
-		{
-			attrs: {
-				label: '流程状态',
-				width: 100,
-				prop: 'status',
-			},
-			render(status) {
-				//1审核中 2审核通过 3审核不通过
-				return status == 0 || status == 1 ? '待处理' : '已结束'
-			},
-		},
-		{
-			attrs: {
-				label: '发起人',
-				prop: 'createUserName',
-			},
-		},
-		{
-			attrs: {
-				label: '发起时间',
-				prop: 'createTime',
-			},
-		},
-		{
-			attrs: {
-				label: '操作',
-				width: '200',
-				align: 'right',
-			},
-			// 渲染 el-button，一般用在最后一列。
-			renderHTML(row) {
-				return [
-					row.status != 1
-						? {
-								attrs: {
-									label: '重新审批',
-									type: 'primary',
-									text: true,
-									bg: true,
-									disabled: false,
-								},
-								el: 'button',
-								click() {
-									
-								},
-						  }: {},
-                    row.status == 1?   
-						{
-								attrs: {
-									label: '退回上一步',
-									text: true,
-									bg: true,
-									type: 'primary',
-									disabled: false,
-									style: {
-										color: '#e6a23c',
-									},
-								},
-								el: 'button',
-								click() {
-									flowJump(row,3)
-								},
-						  }:{},
-                    row.status == 1?      
-                          {
-								attrs: {
-									label: '向下流转',
-									text: true,
-									bg: true,
-									type: 'primary',
-									disabled: false,
-									style: {
-										color: '#e6a23c',
-									},
-								},
-								el: 'button',
-								click() {
-									flowJump(row,1)
-								},
-						  }:{},
-				]
-			},
-		},
-	]
-})
-let dtlData = reactive({
-	data: {},
-})
+    {
+      attrs: {
+        label: "流程状态",
+        width: 100,
+        prop: "status",
+      },
+      render(status) {
+        //1审核中 2审核通过 3审核不通过
+        return status == 0 || status == 1 ? "待处理" : "已结束";
+      },
+    },
+    {
+      attrs: {
+        label: "发起人",
+        prop: "createUserName",
+      },
+    },
+    {
+      attrs: {
+        label: "发起时间",
+        prop: "createTime",
+      },
+    },
+    {
+      attrs: {
+        label: "操作",
+        width: "200",
+        align: "right",
+      },
+      renderHTML(row) {
+        return [
+          row.status != 1
+            ? {
+                attrs: {
+                  label: "重新审批",
+                  type: "primary",
+                  text: true,
+                  bg: true,
+                  disabled: false,
+                },
+                el: "button",
+                click() {},
+              }
+            : {},
+          row.status == 1
+            ? {
+                attrs: {
+                  label: "退回上一步",
+                  text: true,
+                  bg: true,
+                  type: "primary",
+                  disabled: false,
+                  style: {
+                    color: "#e6a23c",
+                  },
+                },
+                el: "button",
+                click() {
+                  flowJump(row, 3);
+                },
+              }
+            : {},
+          row.status == 1
+            ? {
+                attrs: {
+                  label: "向下流转",
+                  text: true,
+                  bg: true,
+                  type: "primary",
+                  disabled: false,
+                  style: {
+                    color: "#e6a23c",
+                  },
+                },
+                el: "button",
+                click() {
+                  flowJump(row, 1);
+                },
+              }
+            : {},
+        ];
+      },
+    },
+  ];
+});
 let formData = reactive({
-	data: {},
-	treeData: [],
-})
+  data: {},
+  treeData: [],
+});
 const formOption = reactive({
-	inline: true,
-	labelWidth: 100,
-	itemWidth: 100,
-	rules: [],
-})
-const byform = ref(null)
-const treeData = ref([])
+  inline: true,
+  labelWidth: 100,
+  itemWidth: 100,
+  rules: [],
+});
+const byform = ref(null);
 const formConfig = computed(() => {
-	return [
-		{
-			type: 'input',
-			prop: 'classifyName',
-			label: '功能模块',
-		},
-		{
-			type: 'input',
-			prop: 'flowKey',
-			label: '流程标识',
-			isHide: modalType.value == 'edit',
-		},
-		{
-			type: 'input',
-			prop: 'flowName',
-			label: '流程名称',
-		},
-	]
-})
-
-const flowJump = (row,type) => {
-    proxy.post('/flowProcess/jump', {flowId:row.id,handleType:type,version:row.version,data:{}}).then((message) => {
-        console.log(message)
-        if(message){
-            ElMessage.success('操作成功')
-            getList()
-        }
-    })
-}
-
+  return [
+    {
+      type: "input",
+      prop: "classifyName",
+      label: "功能模块",
+    },
+    {
+      type: "input",
+      prop: "flowKey",
+      label: "流程标识",
+      isHide: modalType.value == "edit",
+    },
+    {
+      type: "input",
+      prop: "flowName",
+      label: "流程名称",
+    },
+  ];
+});
+const flowJump = (row, type) => {
+  proxy.post("/flowProcess/jump", { flowId: row.id, handleType: type, version: row.version, data: {} }).then((message) => {
+    if (message) {
+      ElMessage.success("操作成功");
+      getList();
+    }
+  });
+};
 const getFlowType = () => {
-    proxy
-        .post('/flowExample/getFlowType')
-            .then((message) => {
-                console.log(message)
-                selectConfig.value[0].data = message.map((item) => {
-                    return {
-                        label: item.flowName,
-                        value: item.id,
-                    }
-                })
-            })
-        
-}
-getFlowType()
-
+  proxy.post("/flowExample/getFlowType").then((message) => {
+    selectConfig.value[0].data = message.map((item) => {
+      return {
+        label: item.flowName,
+        value: item.id,
+      };
+    });
+  });
+};
+getFlowType();
 const getList = async (req) => {
-	sourceList.value.pagination = { ...sourceList.value.pagination, ...req }
-	loading.value = true
-	proxy
-		.post('/flowExample/page', sourceList.value.pagination)
-		.then((message) => {
-			console.log(message)
-			sourceList.value.data = message.rows
-			sourceList.value.pagination.total = message.total
-			setTimeout(() => {
-				loading.value = false
-			}, 200)
-		})
-}
-
-const openModal = () => {
-	dialogVisible.value = true
-	modalType.value = 'add'
-	formData.data = {}
-}
+  sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
+  loading.value = true;
+  proxy.post("/flowExample/page", sourceList.value.pagination).then((message) => {
+    sourceList.value.data = message.rows;
+    sourceList.value.pagination.total = message.total;
+    setTimeout(() => {
+      loading.value = false;
+    }, 200);
+  });
+};
 const selection = ref({
-	data: [],
-})
-const select = (_selection, row) => {
-	selection.value.data = _selection
-	console.log(_selection.length)
-}
-
-const tree = ref(null)
-const submitTree = () => {
-	proxy
-		.post('/tenantInfo/bindingMenu', {
-			tenantId: selection.value.data[0].tenantId,
-			menuIdList: tree.value.getCheckedKeys(),
-		})
-		.then((res) => {
-			ElMessage({
-				message: '保存成功',
-				type: 'success',
-			})
-			roomDialogVisible.value = false
-		})
-}
-
+  data: [],
+});
+const select = (_selection) => {
+  selection.value.data = _selection;
+};
 const submitForm = () => {
-	byform.value.handleSubmit((valid) => {
-		submitLoading.value = true
-		proxy
-			.post('/flowInfo/' + modalType.value, formData.data)
-			.then((res) => {
-				ElMessage({
-					message: modalType.value == 'add' ? '添加成功' : '编辑成功',
-					type: 'success',
-				})
-				dialogVisible.value = false
-				submitLoading.value = false
-				getList()
-			})
-	})
-}
-
-const getDtl = (row) => {
-	formData.data = { ...row }
-	modalType.value = 'edit'
-	dialogVisible.value = true
-}
-
-const changeStatus = (row) => {
-	modalType.value = 'edit'
-	proxy
-		.post('/flowInfo/edit', { ...row, status: row.status === 0 ? 1 : 0 })
-		.then((res) => {
-			ElMessage({
-				message: '操作成功',
-				type: 'success',
-			})
-			getList()
-		})
-}
-
-getList()
+  byform.value.handleSubmit(() => {
+    submitLoading.value = true;
+    proxy.post("/flowInfo/" + modalType.value, formData.data).then(() => {
+      ElMessage({
+        message: modalType.value == "add" ? "添加成功" : "编辑成功",
+        type: "success",
+      });
+      dialogVisible.value = false;
+      submitLoading.value = false;
+      getList();
+    });
+  });
+};
+getList();
 </script>
-    
-  <style lang="scss" scoped>
-.tenant {
-	padding: 20px;
-}
-</style>
+
+<style lang="scss" scoped></style>

src/views/process/processConfig/index.vue

@@ -30,7 +30,7 @@
       </el-col>
     </el-row>
 
-    <el-dialog :title="modalType == 'add' ? '新增' : '编辑'" v-model="dialogVisible" width="500" v-loading="loading">
+    <el-dialog :title="modalType == 'add' ? '新增' : '编辑'"  v-if="dialogVisible" v-model="dialogVisible" width="500" v-loading="loading">
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform"> </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
@@ -39,7 +39,7 @@
     </el-dialog>
 
     <!-- 版本切换模态框 -->
-    <el-dialog title="版本切换" v-model="versionVisible" width="500" v-loading="loading">
+    <el-dialog title="版本切换" v-if="versionVisible" v-model="versionVisible" width="500" v-loading="loading">
       <el-form>
         <el-form-item label="流程名称">
           <el-input v-model="formData.flowName" disabled placeholder="请输入流程名称"></el-input>