修改 监督退役页面

src/api/process-boot/bpm.ts

@@ -64,3 +64,9 @@ export const deployModel = async (id: number) => {
 export const readXml = async (id: number) => {
     return await createAxios({ url: 'process-boot/flowable/definition/readXml?deployId=' + id, method: 'GET' })
 }
+export const assFormWithDeploy = async (data: any) => {
+    return createAxios({ url: '/process-boot/flowable/definition/assFormWithDeploy', method: 'GET', params: data })
+}
+export const deleteDeploy = async (data: any) => {
+    return createAxios({ url: 'process-boot/flowable/definition/delete', method: 'POST', data })
+}

src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="panel-tab__content">
-        <el-form label-width="90px" :model="needProps" :rules="rules">
+        <el-form label-width="90px" v-if="needProps.type != 'bpmn:Process'" :model="needProps" :rules="rules">
-            <div v-if="needProps.type == 'bpmn:Process'">
+            <!-- <div v-if="needProps.type == 'bpmn:Process'">
                 <el-form-item label="流程标识" prop="id">
                     <el-input
                         v-model="needProps.id"
@@ -10,8 +10,8 @@
                         @change="handleKeyUpdate"
                     />
                 </el-form-item>
-            </div>
+            </div> -->
-            <div v-else>
+            <div>
                 <el-form-item label="ID">
                     <el-input v-model="elementBaseInfo.id" clearable @change="updateBaseInfo('id')" />
                 </el-form-item>
@@ -70,7 +70,7 @@ const resetBaseInfo = () => {
     // console.log(elementBaseInfo.value, 'elementBaseInfo22222222222')
 }
 const handleKeyUpdate = value => {
-    // 校验 value 的值，只有 XML NCName 通过的情况下，才进行赋值。否则，会导致流程图报错，无法绘制的问题
+    //校验 value 的值，只有 XML NCName 通过的情况下，才进行赋值。否则，会导致流程图报错，无法绘制的问题
     if (!value) {
         return
     }
@@ -81,6 +81,7 @@ const handleKeyUpdate = value => {
     console.log('key 满足 XML NCName 规则，所以进行赋值')
 
     // 在 BPMN 的 XML 中，流程标识 key，其实对应的是 id 节点
+
     elementBaseInfo.value['id'] = value
 
     setTimeout(() => {
@@ -108,6 +109,14 @@ const handleClassifyUpdate = value => {
         updateBaseInfo('processCategory')
     }, 100)
 }
+onMounted(() => {
+    setTimeout(() => {
+        // if (needProps.value.id == undefined) {
+        //     // handleKeyUpdate(Math.random().toString(36).slice(-8))\
+        //     console.log(elementBaseInfo.value, '123')
+        // }
+    }, 10)
+})
 // const handleDescriptionUpdate=(value)=> {
 // TODO 芋艿：documentation 暂时无法修改，后续在看看
 // this.elementBaseInfo['documentation'] = value;

src/views/pqs/process/definition/allocation.vue

@@ -1,13 +1,12 @@
 <template>
     <el-dialog v-model="dialogVisible" title="挂载表单" width="700" :before-close="handleClose">
         <vxe-table v-bind="defaultAttribute" ref="vxeRef" height="400" :data="equipmentList">
-            <vxe-column field="formId" title="序号"></vxe-column>
+            <vxe-column field="formId" width="80" title="序号"></vxe-column>
             <vxe-column field="formName" title="功能名称"></vxe-column>
-            <vxe-column title="操作">
+            <vxe-column title="操作" width="100">
                 <template #default="{ row }">
-                        <el-button type="primary" size="small" link @click="mount(row)">挂载</el-button>
+                    <el-button type="primary" size="small" link @click="mount(row)">挂载</el-button>
-                       
+                </template>
-                    </template>
             </vxe-column>
         </vxe-table>
         <template #footer>
@@ -21,8 +20,11 @@
 <script setup lang="ts">
 import { ref, reactive } from 'vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { ElMessage } from 'element-plus'
 const dialogVisible = ref(false)
-const List = ref({})
+import { assFormWithDeploy } from '@/api/process-boot/bpm'
+const emit = defineEmits(['quit'])
+const List: any = ref({})
 const equipmentList = ref([
     { formId: '1', formName: '谐波普测计划' },
     { formId: '2', formName: '干扰源用户管理' },
@@ -34,7 +36,13 @@ const handleClose = () => {
 }
 // 挂载
 const mount = (row: any) => {
-    
+    assFormWithDeploy({
+        formId: row.formId,
+        deployId: List.value.id
+    }).then(res => {
+        ElMessage.success('挂载成功')
+        handleClose()
+    })
 }
 const open = (row: any) => {
     dialogVisible.value = true

src/views/pqs/process/definition/editor/index.vue

@@ -89,12 +89,11 @@ onMounted(async () => {
         if (!data.bpmnXml) {
             // 首次创建的 Model 模型，它是没有 bpmnXml，此时需要给它一个默认的
             data.key = Math.random().toString(36).slice(-8)
-            console.log('🚀 ~ onMounted ~ data.key:', data.key)
             data.bpmnXml = ` <?xml version="1.0" encoding="UTF-8"?>
   <definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.activiti.org/processdef">
     <process id="flow_${data.key}" name="${data.name || ''}"  />
     <bpmndi:BPMNDiagram id="BPMNDiagram">
-      <bpmndi:BPMNPlane id="${data.key}_di" bpmnElement="${data.key}" />
+      <bpmndi:BPMNPlane id="flow_${data.key}_di" bpmnElement="flow_${data.key}" />
     </bpmndi:BPMNDiagram>
   </definitions>`
         }

src/views/pqs/process/definition/index.vue

@@ -19,8 +19,7 @@
         <!-- 设计流程 -->
         <editor v-if="!addedShow" :model="model" @quit="quit" />
         <!-- 配置表单 -->
-        <Allocation ref="allocationRef" />
+        <Allocation ref="allocationRef" @quit="tableStore.index()" />
-
     </div>
 </template>
 
@@ -29,8 +28,9 @@ import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import Allocation from './allocation.vue'
+import { deleteDeploy } from '@/api/process-boot/bpm'
 import { onMounted, provide, ref } from 'vue'
-
+import { ElMessage } from 'element-plus'
 import editor from './editor/index.vue'
 
 defineOptions({
@@ -66,21 +66,7 @@ const tableStore = new TableStore({
         },
         { title: '流程版本（V）', field: 'version' },
 
-        {
+    
-            title: '状态',
-            field: 'suspensionState',
-            render: 'tag',
-            custom: {
-                0: '',
-                1: 'success',
-                2: 'warning'
-            },
-            replaceValue: {
-                0: '',
-                1: '激活',
-                2: '挂起'
-            }
-        },
         { title: '部署时间', field: 'deploymentTime' },
         {
             title: '操作',
@@ -108,36 +94,25 @@ const tableStore = new TableStore({
                         allocationRef.value.open(row)
                     }
                 },
-                {
+             
-                    name: 'edit',
-                    title: '挂起',
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: async row => {}
-                },
-                {
-                    name: 'edit',
-                    title: '激活',
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: async row => {}
-                },
                 {
                     name: 'del',
                     title: '删除',
                     type: 'danger',
                     icon: 'el-icon-Delete',
                     render: 'confirmButton',
-
                     popconfirm: {
                         confirmButtonText: '确认',
                         cancelButtonText: '取消',
                         confirmButtonType: 'danger',
                         title: '确定删除吗？'
                     },
-                    click: row => {}
+                    click: row => {
+                        deleteDeploy([row.id]).then(() => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
                 }
             ]
         }

src/views/pqs/supervise/retire/components/equipment.vue

@@ -13,7 +13,7 @@
 import { ref, reactive } from 'vue'
 const dialogVisible = ref(false)
 const title = ref('')
-const handleClose = (done: () => void) => {
+const handleClose = () => {
     dialogVisible.value = false
 }
 const open = (text: string) => {

src/views/pqs/supervise/retire/components/retire.vue

@@ -0,0 +1,180 @@
+<template>
+    <div>
+        <TableHeader area datePicker ref="TableHeaderRef">
+            <template #select>
+                <el-form-item label="问题来源">
+                    <el-select v-model="tableStore.table.params.problemSources" clearable placeholder="请选择问题来源">
+                        <el-option
+                            v-for="item in problemData"
+                            :key="item.code"
+                            :label="item.name"
+                            :value="item.code"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="填报进度">
+                    <el-select v-model="tableStore.table.params.reportProcess" clearable placeholder="请选择填报进度">
+                        <el-option
+                            v-for="item in fillingProgress"
+                            :key="item.code"
+                            :label="item.name"
+                            :value="item.code"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+    </div>
+    <!-- 新增编辑 -->
+    <Equipment ref="EquipmentRef" />
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import Equipment from './equipment.vue'
+import { ElMessage } from 'element-plus'
+import { deleteIssues } from '@/api/process-boot/electricitymanagement'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+const TableHeaderRef = ref()
+const EquipmentRef = ref()
+const problemData = dictData.getBasicData('Problem_Sources')
+const fillingProgress = dictData.getBasicData('Fill_Progress')
+const auditStatus = dictData.getBasicData('Audit_Status')
+defineOptions({
+    name: '/Processsupervision/retire'
+})
+const tableStore: any = new TableStore({
+    url: '/process-boot/electricityQuality/getIssues',
+    method: 'POST',
+    publicHeight: 65,
+    column: [
+        // { width: '60', type: 'checkbox' },
+        {
+            field: 'index',
+            title: '序号',
+            width: '60',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'orgName', title: '所属单位' },
+        {
+            field: 'problemSources',
+            title: '问题来源'
+        },
+        { field: 'powerQualityProblemNo', title: '问题编号' },
+        { field: 'problemName', title: '问题名称' },
+        { field: 'dataDate', title: '问题新建时间' },
+        
+        {
+            title: '操作',
+            width: '180',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '查看',
+                    type: 'primary',
+                    disabled: row => {
+                        return row.reportProcessStatus == 'Init'
+                    },
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: async row => {}
+                },
+                {
+                    name: 'edit',
+                    title: '填报',
+                    disabled: row => {
+                        return (
+                            row.reportProcessStatus == 'Auditt' ||
+                            (row.reportProcess == 'Insights' && row.reportProcessStatus == 'Success') ||
+                            row.reportProcess == 'Archived'
+                        )
+                    },
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {}
+                },
+                {
+                    name: 'edit',
+                    title: '归档',
+
+                    type: 'primary',
+                    icon: 'el-icon-SuccessFilled',
+                    render: 'basicButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定归档？'
+                    },
+                    click: row => {}
+                },
+                {
+                    name: 'edit',
+                    title: '审核记录',
+                    type: 'primary',
+
+                    icon: 'el-icon-PieChart',
+                    render: 'basicButton',
+                    click: row => {}
+                },
+                {
+                    name: 'del',
+                    text: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除？'
+                    },
+
+                    click: row => {
+                        deleteIssues(row.powerQualityProblemNo).then(() => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        tableStore.table.params.dataDate = tableStore.table.params.searchBeginTime
+        tableStore.table.params.dataType = TableHeaderRef.value.datePickerRef.interval
+    }
+})
+
+tableStore.table.params.problemName = ''
+tableStore.table.params.problemSources = ''
+tableStore.table.params.reportProcess = ''
+tableStore.table.params.reportProcessStatus = ''
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    TableHeaderRef.value.setDatePicker([
+        { label: '年', value: 1 },
+        { label: '季', value: 2 },
+        { label: '月', value: 3 }
+    ])
+
+    tableStore.index()
+})
+// 新增
+const add = () => {
+    EquipmentRef.value.open('新增资产')
+}
+</script>

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

@@ -1,192 +1,35 @@
 <template>
     <div class="default-main">
-        <TableHeader area datePicker ref="TableHeaderRef">
+        <el-tabs v-model="activeName" type="border-card">
-            <template #select>
+            <el-tab-pane label="退役管理" name="1">
-                <el-form-item label="问题来源">
+                <retire v-if="activeName == '1'" />
-                    <el-select v-model="tableStore.table.params.problemSources" clearable placeholder="请选择问题来源">
+            </el-tab-pane>
-                        <el-option
+            <el-tab-pane label="退役审核" name="2">
-                            v-for="item in problemData"
+                <!-- <planAudits v-if="activeName == '2'" /> -->
-                            :key="item.code"
+            </el-tab-pane>
-                            :label="item.name"
+        </el-tabs>
-                            :value="item.code"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="填报进度">
-                    <el-select v-model="tableStore.table.params.reportProcess" clearable placeholder="请选择填报进度">
-                        <el-option
-                            v-for="item in fillingProgress"
-                            :key="item.code"
-                            :label="item.name"
-                            :value="item.code"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-            </template>
-            <template #operation>
-                <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" />
     </div>
-    <!-- 新增编辑 -->
-    <Equipment ref="EquipmentRef" />
 </template>
+
 <script setup lang="ts">
-import { ref, onMounted, provide, nextTick } from 'vue'
+import { onMounted, reactive, ref, provide } from 'vue'
-import TableStore from '@/utils/tableStore'
+import { mainHeight } from '@/utils/layout'
-import Table from '@/components/table/index.vue'
+import retire from './components/retire.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import Equipment from './components/equipment.vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { deleteIssues } from '@/api/process-boot/electricitymanagement'
-import { useDictData } from '@/stores/dictData'
-const dictData = useDictData()
-const TableHeaderRef = ref()
-const EquipmentRef = ref()
-const problemData = dictData.getBasicData('Problem_Sources')
-const fillingProgress = dictData.getBasicData('Fill_Progress')
-const auditStatus = dictData.getBasicData('Audit_Status')
 defineOptions({
-    name: '/Processsupervision/retire'
+    name: 'Processsupervision/harmonicmanagement'
 })
-const tableStore: any = new TableStore({
+const activeName = ref('1')
-    url: '/process-boot/electricityQuality/getIssues',
-    method: 'POST',
-    column: [
-        // { width: '60', type: 'checkbox' },
-        {
-            field: 'index',
-            title: '序号',
-            width: '60',
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { field: 'orgName', title: '所属单位' },
-        {
-            field: 'problemSources',
-            title: '问题来源'
-        },
-        { field: 'powerQualityProblemNo', title: '问题编号' },
-        { field: 'problemName', title: '问题名称' },
-        { field: 'dataDate', title: '问题新建时间' },
-        {
-            field: 'reportProcess',
-            title: '填报进度',
-            formatter: (row: any) => {
-                return fillingProgress.filter(item => item.code == row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'reportProcessStatus',
-            title: '审核状态',
-            formatter: (row: any) => {
-                return auditStatus.filter(item => item.code == row.cellValue)[0]?.name
-            }
-        },
-        {
-            title: '操作',
-            width: '180',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '查看',
-                    type: 'primary',
-                    disabled: row => {
-                        return row.reportProcessStatus == 'Init'
-                    },
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: async row => {}
-                },
-                {
-                    name: 'edit',
-                    title: '填报',
-                    disabled: row => {
-                        return (
-                            row.reportProcessStatus == 'Auditt' ||
-                            (row.reportProcess == 'Insights' && row.reportProcessStatus == 'Success') ||
-                            row.reportProcess == 'Archived'
-                        )
-                    },
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {}
-                },
-                {
-                    name: 'edit',
-                    title: '归档',
 
-                    type: 'primary',
+const layout = mainHeight(63) as any
-                    icon: 'el-icon-SuccessFilled',
-                    render: 'basicButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定归档？'
-                    },
-                    click: row => {}
-                },
-                {
-                    name: 'edit',
-                    title: '审核记录',
-                    type: 'primary',
-
-                    icon: 'el-icon-PieChart',
-                    render: 'basicButton',
-                    click: row => {}
-                },
-                {
-                    name: 'del',
-                    text: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除？'
-                    },
-
-                    click: row => {
-                        deleteIssues(row.powerQualityProblemNo).then(() => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-        tableStore.table.params.dataDate = tableStore.table.params.searchBeginTime
-        tableStore.table.params.dataType = TableHeaderRef.value.datePickerRef.interval
-    }
-})
-
-tableStore.table.params.problemName = ''
-tableStore.table.params.problemSources = ''
-tableStore.table.params.reportProcess = ''
-tableStore.table.params.reportProcessStatus = ''
-
-provide('tableStore', tableStore)
-onMounted(() => {
-    TableHeaderRef.value.setDatePicker([
-        { label: '年', value: 1 },
-        { label: '季', value: 2 },
-        { label: '月', value: 3 }
-    ])
-
-    tableStore.index()
-})
-// 新增
-const add = () => {
-    EquipmentRef.value.open('新增资产')
-}
 </script>
+
+<style lang="scss" scoped>
+.bars_w {
+    width: 100%;
+    height: 500px;
+}
+:deep(.el-tabs__content) {
+    height: v-bind('layout.height');
+    overflow-y: auto;
+}
+</style>