流程标识管理功能新增

src/api/bpm-boot/sign.ts

@@ -0,0 +1,63 @@
+import createAxios from '@/utils/request'
+
+import { BPM_BOOT } from '@/utils/constantRequest'
+
+const MAPPING_PATH = BPM_BOOT + '/bpmSign'
+
+/**
+ * 查询流程分类数据
+ */
+export const listSign = (data: any) => {
+    return createAxios({
+        url: MAPPING_PATH + '/list',
+        method: 'POST',
+        data: data
+    })
+}
+
+/**
+ * 新增流程分类
+ */
+export const addSign = (data: any) => {
+    return createAxios({
+        url: MAPPING_PATH + '/add',
+        method: 'POST',
+        data: data
+    })
+}
+
+
+/**
+ * 更新流程分类
+ */
+export const updateSign = (data: any) => {
+    return createAxios({
+        url: MAPPING_PATH + '/update',
+        method: 'POST',
+        data: data
+    })
+}
+
+
+/**
+ * 删除流程分类
+ */
+export const deleteSign = (data: any) => {
+    let ids = [data]
+    return createAxios({
+        url: MAPPING_PATH + '/delete',
+        method: 'POST',
+        data: ids
+    })
+}
+
+/**
+ * 查询所有流程分类
+ */
+export const getSignSimpleList = () => {
+    return createAxios({
+        url: MAPPING_PATH + '/simpleList',
+        method: 'GET'
+    })
+}
+

src/views/pqs/supervise/harmonicSurvey/detail.vue

@@ -0,0 +1,7 @@
+<template>
+  <!--工作流view的路径：/pqs/supervise/harmonicSurvey/detail-->
+  <h1>详细信息回显</h1>
+</template>
+<script setup lang='ts'>
+
+</script>

src/views/pqs/supervise/interfere/index.vue

@@ -5,7 +5,7 @@
                 <undocumented v-if="activeName == '1'" />
             </el-tab-pane>
 <!--            <el-tab-pane label="入网评估报告审核" name="2"><network v-if="activeName == '2'" /></el-tab-pane>-->
-            <el-tab-pane label="常态化干扰源用户" name="3"><normal v-if="activeName == '3'" /></el-tab-pane>
+            <el-tab-pane label="常态化干扰源用户管理" name="3"><normal v-if="activeName == '3'" /></el-tab-pane>
 <!--            <el-tab-pane label="实测报告审核" name="4"><report v-if="activeName == '4'" /></el-tab-pane>-->
         </el-tabs>
     </div>

src/views/system/bpm/category/categoryPopup.vue

@@ -40,7 +40,6 @@ const tableStore = inject('tableStore') as TableStore
 const machineVisible = ref(false)
 const title = ref('')
 const formRef = ref()
-const regex = /^[+]?(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?$/
 
 // 注意不要和表单ref的命名冲突
 const form = reactive({

src/views/system/bpm/category/index.vue

@@ -28,7 +28,6 @@ import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { onMounted, provide, ref } from 'vue'
 import { useRouter } from 'vue-router'
-import { deleteSgMachine } from '@/api/advance-boot/sgGroven/sgMachine'
 import { ElMessage } from 'element-plus'
 import { Plus } from '@element-plus/icons-vue'
 import CategoryPopup from '@/views/system/bpm/category/categoryPopup.vue'
@@ -103,7 +102,7 @@ onMounted(() => {
   // 加载数据
   tableStore.index()
 })
-tableStore.table.params.searchValue = ''
+tableStore.table.params.name = ''
 provide('tableStore', tableStore)
 
 const add = () => {

src/views/system/bpm/form/index.vue

@@ -40,7 +40,7 @@ defineOptions({
 const formJson = reactive({"widgetList":[],"formConfig":{"modelName":"formData","refName":"vForm","rulesName":"rules","labelWidth":80,"labelPosition":"left","size":"","labelAlign":"label-left-align","cssCode":"","customClass":"","functions":"","layoutType":"PC","jsonVersion":3,"onFormCreated":"","onFormMounted":"","onFormDataChange":"","onFormValidate":""}})
 const formData = reactive({})
 const optionData = reactive({})
-const vfRenderRef = ref(null)
+const vfRenderRef = ref()
 const render = reactive({
     visible: false,
     title: ''
@@ -91,7 +91,7 @@ const tableStore = new TableStore({
                 },
                 {
                     name: 'update',
-                    title: '设计',
+                    title: '设计表单',
                     type: 'primary',
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',

src/views/system/bpm/model/index.vue

@@ -58,7 +58,7 @@ const tableStore = new TableStore({
         { title: '模型标识', field: 'key', width: 160 },
         { title: '模型名称', field: 'name', width: 160 },
         { title: '流程分类', field: 'categoryName', width: 150 },
-        { title: '表单信息', field: 'formName', width: 170 },
+        { title: '表单信息', field: 'formName', width: 170, },
         {
             title: '创建时间',
             field: 'createTime',

src/views/system/bpm/model/modelPopup.vue

@@ -6,20 +6,11 @@
 
         <el-form-item label='表单类型' prop='formType'>
           <el-radio-group v-model='formData.formType'>
-            <el-radio border label='10'>流程表单</el-radio>
             <el-radio border label='20'>业务表单</el-radio>
+            <el-radio border label='10'>流程表单</el-radio>
           </el-radio-group>
         </el-form-item>
 
-        <el-form-item label='流程标识' prop='key'>
-          <el-input
-              v-model='formData.key'
-              :disabled='!!formData.id'
-              clearable
-              placeholder='请输入流程标识'
-          />
-        </el-form-item>
-
         <el-form-item label='流程名称' prop='name'>
           <el-input
               v-model='formData.name'
@@ -49,8 +40,17 @@
         <!--          <UploadImg v-model='formData.icon' :limit='1' height='128px' width='128px' />-->
         <!--        </el-form-item>-->
 
-        <el-form-item label='流程描述' prop='description'>
-          <el-input v-model='formData.description' clearable type='textarea' />
+        <el-form-item label='流程标识' prop='key'>
+          <el-select v-model='formData.key' clearable style='width: 100%' @change='changeSign'>
+            <el-option
+                v-for='item in flowInfo'
+                :key='item.id'
+                :label='item.name'
+                :value='item.signKey'
+                placeholder='请选择流程标识'
+            />
+          </el-select>
+
         </el-form-item>
 
         <el-form-item label='流程表单' prop='formId' v-if='formData.formType == "10"'>
@@ -67,7 +67,11 @@
         <!--          <el-input v-model='formData.description' clearable type='textarea' />-->
         <!--        </el-form-item>-->
         <el-form-item v-else label='表单查看路由' prop='formCustomViewPath'>
-          <el-input v-model='formData.formCustomViewPath' />
+          <el-input v-model='formData.formCustomViewPath' disabled />
+        </el-form-item>
+
+        <el-form-item label='流程描述' prop='description'>
+          <el-input v-model='formData.description' clearable type='textarea' />
         </el-form-item>
 
       </el-form>
@@ -88,10 +92,11 @@ import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删
 import { getFormSimpleList } from '@/api/bpm-boot/form'
 import { getCategorySimpleList } from '@/api/bpm-boot/category'
 import { addModel, updateModel } from '@/api/bpm-boot/model'
-
+import { getSignSimpleList } from '@/api/bpm-boot/sign'
 
 //传入type的名称
 const categoryList = ref()
+const flowInfo = ref()
 const formList = ref()
 
 const title = ref('')
@@ -115,7 +120,7 @@ const formData = reactive({
 
 //form表单校验规则
 const rules = {
-  key: [{ required: true, message: '流程标识不能为空', trigger: 'blur' }],
+  key: [{ required: true, message: '流程标识不能为空', trigger: 'change' }],
   name: [{ required: true, message: '流程名称不能为空', trigger: 'blur' }],
   category: [{ required: true, message: '流程分类不能为空', trigger: 'change' }],
   formType: [{ required: true, message: '表单类型不能为空', trigger: 'change' }]
@@ -135,6 +140,10 @@ const open = async (text: string, data?: any) => {
   await getCategorySimpleList().then(res => {
     categoryList.value = res.data
   })
+
+  await getSignSimpleList().then(res => {
+    flowInfo.value = res.data
+  })
   //默认选中第一个tab
   if (data) {
     // 表单赋值
@@ -180,6 +189,14 @@ const submit = () => {
 }
 
 defineExpose({ open })
+
+const changeSign = (event:any) => {
+  //根据选择的流程标识回显查看路径
+  const path = flowInfo.value.filter(item => item.signKey == event)[0].viewPath
+  formData.formCustomCreatePath = path
+  formData.formCustomViewPath = path
+}
+
 </script>
 
 <style scoped>

src/views/system/bpm/processInstance/detail/index.vue

@@ -122,7 +122,7 @@
           </div>
         </el-card>
       </el-tab-pane>
-            <el-tab-pane label='审批记录' name='流程审核'>
+      <el-tab-pane label='审批记录' name='审批记录'>
         <!-- 审批记录 -->
         <ProcessInstanceTaskList
             :loading='tasksLoad'
@@ -131,15 +131,15 @@
             @refresh='getTaskList'
         />
       </el-tab-pane>
-<!--            <el-tab-pane label='流程图'>-->
-<!--                &lt;!&ndash; 高亮流程图 &ndash;&gt;-->
-<!--                &lt;!&ndash;    <ProcessInstanceBpmnViewer&ndash;&gt;-->
-<!--                &lt;!&ndash;      :id="`${id}`"&ndash;&gt;-->
-<!--                &lt;!&ndash;      :bpmn-xml="bpmnXml"&ndash;&gt;-->
-<!--                &lt;!&ndash;      :loading="processInstanceLoading"&ndash;&gt;-->
-<!--                &lt;!&ndash;      :process-instance="processInstance"&ndash;&gt;-->
-<!--                &lt;!&ndash;      :tasks="tasks"&ndash;&gt;-->
-<!--                &lt;!&ndash;    />&ndash;&gt;</el-tab-pane>-->
+      <!--            <el-tab-pane label='流程图'>-->
+      <!--                &lt;!&ndash; 高亮流程图 &ndash;&gt;-->
+      <!--                &lt;!&ndash;    <ProcessInstanceBpmnViewer&ndash;&gt;-->
+      <!--                &lt;!&ndash;      :id="`${id}`"&ndash;&gt;-->
+      <!--                &lt;!&ndash;      :bpmn-xml="bpmnXml"&ndash;&gt;-->
+      <!--                &lt;!&ndash;      :loading="processInstanceLoading"&ndash;&gt;-->
+      <!--                &lt;!&ndash;      :process-instance="processInstance"&ndash;&gt;-->
+      <!--                &lt;!&ndash;      :tasks="tasks"&ndash;&gt;-->
+      <!--                &lt;!&ndash;    />&ndash;&gt;</el-tab-pane>-->
     </el-tabs>
     <ContentWrap>
       <!-- 弹窗：转派审批人 -->
@@ -251,6 +251,7 @@ const handleAudit = async (task, pass) => {
     ElMessage.success('审批通过成功')
   } else {
     await rejectTask(data)
+    tab.value = '审批记录'
     ElMessage.success('审批不通过成功')
   }
   // 2.2 加载最新数据
@@ -263,7 +264,7 @@ const openTaskUpdateAssigneeForm = (id: string) => {
   taskTransferFormRef.value.open(id)
 }
 
-/** 处理审批退回的操作 */
+/** 处理审批委托的操作 */
 const taskDelegateForm = ref()
 const handleDelegate = async (task) => {
   taskDelegateForm.value.open(task.id)
@@ -415,7 +416,6 @@ const tab = ref('')
 const userOptions = ref([]) // 用户列表
 onMounted(async () => {
   getDetail()
-
   // 获得用户列表
   await getUserSimpleList().then(res => {
     userOptions.value = res.data
@@ -425,6 +425,5 @@ onMounted(async () => {
   } else {
     tab.value = '申请信息'
   }
-
 })
 </script>

src/views/system/bpm/sign/index.vue

@@ -0,0 +1,120 @@
+<!--流程分类页面-->
+<template>
+  <div class='default-main'>
+    <TableHeader>
+      <template v-slot:select>
+        <el-form-item label='标识名称'>
+          <el-input
+              v-model='tableStore.table.params.name'
+              clearable
+              placeholder='请输入名称'
+          />
+        </el-form-item>
+        <el-form-item label='标识key'>
+          <el-input
+              v-model='tableStore.table.params.signKey'
+              clearable
+              placeholder='请输入key'
+          />
+        </el-form-item>
+      </template>
+      <template v-slot:operation>
+        <el-button type='primary' class='ml10' @click='add' :icon='Plus'>新增</el-button>
+      </template>
+    </TableHeader>
+    <!--表格-->
+    <Table ref='tableRef'></Table>
+    <!--弹出框-->
+    <sign-popup ref='signPopup' />
+  </div>
+</template>
+
+<script setup lang='ts'>
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { onMounted, provide, ref } from 'vue'
+import { useRouter } from 'vue-router'
+import { ElMessage } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+import SignPopup from '@/views/system/bpm/sign/signPopup.vue'
+import { deleteSign } from '@/api/bpm-boot/sign'
+
+defineOptions({
+  name: 'bpmSign'
+})
+
+const { push } = useRouter()
+const signPopup = ref()
+
+const tableStore = new TableStore({
+  url: '/bpm-boot/bpmSign/list',
+  method: 'POST',
+  column: [
+    { title: '序号', type: 'seq', width: 80 },
+    { title: '标识名称', field: 'name', minWidth: 130 },
+    { title: '标识key', field: 'signKey', minWidth: 130 },
+    { title: '表单查看地址', field: 'viewPath', minWidth: 200 },
+    { title: '创建时间', field: 'createTime', minWidth: 170 },
+    {
+      title: '操作',
+      align: 'center',
+      minWidth: '150',
+      fixed: 'right',
+      render: 'buttons',
+      buttons: [
+        {
+          name: 'update',
+          title: '编辑',
+          type: 'primary',
+          icon: 'el-icon-EditPen',
+          render: 'basicButton',
+          click: row => {
+            signPopup.value.open('修改流程标识', row)
+          }
+        },
+        {
+          name: 'update',
+          title: '删除',
+          type: 'danger',
+          icon: 'el-icon-Delete',
+          render: 'confirmButton',
+          popconfirm: {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            confirmButtonType: 'danger',
+            title: '确定删除吗？'
+          },
+          click: row => {
+            deleteSign(row.id).then(res => {
+              ElMessage.success('删除成功')
+              tableStore.index()
+            })
+          }
+        }
+      ]
+    }
+  ],
+  beforeSearchFun: () => {
+    for (let key in tableStore.table.params) {
+      if (tableStore.table.params[key] === '') {
+        delete tableStore.table.params[key]
+      }
+    }
+
+  }
+})
+
+onMounted(() => {
+  // 加载数据
+  tableStore.index()
+})
+tableStore.table.params.name = ''
+tableStore.table.params.signKey = ''
+provide('tableStore', tableStore)
+
+const add = () => {
+  signPopup.value.open('新增流程标识')
+}
+
+</script>

src/views/system/bpm/sign/signPopup.vue

@@ -0,0 +1,112 @@
+<!--模型分类的新增编辑弹出框-->
+<template>
+  <el-dialog
+      draggable
+      class='cn-operate-dialog'
+      v-model='machineVisible'
+      :title='title'
+      style='width: 415px; height: 350px'
+      top='30vh'
+  >
+    <el-scrollbar>
+      <el-form :inline='false' :model='form' label-width='120px' :rules='rules' ref='formRef'>
+        <el-form-item label='标识名称' prop='name'>
+          <el-input v-model='form.name' placeholder='请输入标识名' clearable />
+        </el-form-item>
+        <el-form-item label='分类key' prop='signKey'>
+          <el-input v-model='form.signKey' placeholder='请输入标识key' clearable />
+        </el-form-item>
+        <el-form-item label='查看表单路径' prop='viewPath'>
+          <el-input v-model='form.viewPath' placeholder='请输入查看表单路径' clearable>
+          </el-input>
+        </el-form-item>
+      </el-form>
+    </el-scrollbar>
+    <template #footer>
+            <span class='dialog-footer'>
+                <el-button @click='machineVisible = false'>取消</el-button>
+                <el-button type='primary' @click='submit'>确认</el-button>
+            </span>
+    </template>
+  </el-dialog>
+</template>
+<script lang='ts' setup>
+import { ref, reactive, inject } from 'vue'
+import { ElMessage } from 'element-plus'
+import TableStore from '@/utils/tableStore'
+import { addSign, updateSign } from '@/api/bpm-boot/sign'
+
+const tableStore = inject('tableStore') as TableStore
+const machineVisible = ref(false)
+const title = ref('')
+const formRef = ref()
+
+// 注意不要和表单ref的命名冲突
+const form = reactive({
+  id: '',
+  name: '',
+  signKey: '',
+  viewPath: ''
+})
+
+//form表单校验规则
+const rules = {
+  name: [{ required: true, message: '标识名不能为空', trigger: 'blur' }],
+  signKey: [{ required: true, message: '标识key不能为空', trigger: 'blur' }],
+  viewPath: [{ required: true, message: '查看表单路径不能为空', trigger: 'blur' }],
+}
+
+const open = (text: string, data?: any) => {
+  title.value = text
+  if (data) {
+    // 表单赋值
+    for (let key in form) {
+      form[key] = data[key]
+    }
+  } else {
+    resetForm()
+    // 在此处恢复默认表单
+    for (let key in form) {
+      form[key] = ''
+    }
+  }
+  machineVisible.value = true
+}
+
+//重置表单内容
+const resetForm = () => {
+  if (formRef.value) {
+    formRef.value.resetFields()
+  }
+}
+
+/**
+ * 提交用户表单数据
+ */
+const submit = () => {
+  formRef.value.validate(async (valid: any) => {
+    if (valid) {
+      if (form.id) {
+        await updateSign(form)
+      } else {
+        await addSign(form)
+      }
+      ElMessage.success('保存成功')
+      tableStore.index()
+      machineVisible.value = false
+    }
+  })
+}
+
+defineExpose({ open })
+</script>
+
+<style scoped>
+.el-upload-list__item {
+  transition: none !important;
+}
+
+.el-select {
+  min-width: 180px;
+}
+</style>