文件审批-提交

src/views/vent/monitorManager/alarmMonitor/index.vue

@@ -230,16 +230,8 @@
           <div class="item">
             <div class="icon"></div>
             <div class="data-box" v-for="(item, index) in fireMonitor" :key="index">
-              <!-- <div :class="{
-                'value1': item.level == 0,
-                'value2': item.level == 101,
-                'value3': item.level == 102,
-                'value4': item.level == 103,
-                'value5': item.level == 104,
-                'value6': item.level == 201,
-                'value': item.level != 0 && item.level != 101 && item.level != 102 && item.level != 103 && item.level != 104 && item.level != 201,
-              }"> {{ item.value ? item.value : '-' }} </div> -->
-              <div class="value1"> {{ !item.value && item.value != '0' ? '-' : item.value == '正常' ? '低风险' : item.value
+
+              <div class="value1"> {{ !item.value  ? '-' : item.value == '正常' ? '低风险' : item.value
                 }}
               </div>
               <div class="title">{{ item.title }}</div>
@@ -423,23 +415,23 @@ async function getList() {
   fireMonitor[0].value =
     res.info.sysInfo.fireS.summaryInfo.external.temperature && res.info.sysInfo.fireS.summaryInfo.external.temperature.maxlevel == '0'
       ? '正常'
-      : '-';
+      : '';
   fireMonitor[1].value =
     res.info.sysInfo.fireS.summaryInfo.external.smokeval &&
       res.info.sysInfo.fireS.summaryInfo.external.smokeval.maxlevel &&
       res.info.sysInfo.fireS.summaryInfo.external.smokeval.maxlevel == '0'
       ? '正常'
-      : '-';
+      : '';
   fireMonitor[2].value =
     res.info.sysInfo.fireS.summaryInfo.external.fireval &&
       res.info.sysInfo.fireS.summaryInfo.external.fireval.maxlevel &&
       res.info.sysInfo.fireS.summaryInfo.external.fireval.maxlevel == '0'
       ? '正常'
-      : '-';
+      : '';
   fireMonitor[3].value =
     res.info.sysInfo.fireS.summaryInfo.external.coval && res.info.sysInfo.fireS.summaryInfo.external.coval.value
       ? res.info.sysInfo.fireS.summaryInfo.external.coval.value
-      : '-';
+      : '';
   // fireMonitor[0].level = res.info.sysInfo.fireS.summaryInfo.external.temperature ? res.info.sysInfo.fireS.summaryInfo.external.temperature.maxlevel : '';
   // fireMonitor[1].value = res.info.sysInfo.fireS.summaryInfo.external.coval ? res.info.sysInfo.fireS.summaryInfo.external.coval.value : '';
   // fireMonitor[1].level = res.info.sysInfo.fireS.summaryInfo.external.coval ? res.info.sysInfo.fireS.summaryInfo.external.coval.maxlevel : '';

src/views/vent/performance/approvalPend/approvalPend.data.ts

@@ -19,6 +19,7 @@ export const  columns:BasicColumn[]=[
     key: 'warnLevel_dictText',
     align: 'center',
     ellipsis: true,
+    width: 110,
   },
   {
     title: '文件来源',
@@ -40,6 +41,7 @@ export const  columns:BasicColumn[]=[
     key: 'remarks',
     align: 'center',
     ellipsis: true,
+    width:110
   },
   {
     title: '当前审批人',
@@ -47,11 +49,12 @@ export const  columns:BasicColumn[]=[
     key: 'suggestMsg',
     align: 'center',
     ellipsis: true,
+    width: 110,
   },
   {
     title: '操作',
     key: 'action',
-    width: 250,
+    width: 400,
     slots: { customRender: 'action' },
     align: 'center',
   },

src/views/vent/performance/comment/HistorySp.vue

@@ -1,5 +1,9 @@
 <template>
     <div class="HistorySp">
+        <div class="btn-box" v-if="isShow">
+            <a-button type="primary" style="margin-right:10px" @click="getPass">通过</a-button>
+            <a-button type="plain" @click="getReject">驳回</a-button>
+        </div>
         <div class="top-box">
             <div class="box-title">流程审批进度历史</div>
             <div class="box-content">
@@ -13,13 +17,26 @@
                 <img :src="imgSrc" alt="">
             </div>
         </div>
+        <!-- 审批通过弹窗 -->
+        <a-modal v-model:visible="visibleTg" centered :width="600" title="审批通过" @ok="handleTgOk"
+            @cancel="handleTgCancel">
+            <a-textarea v-model:value="passDes" placeholder="请输入通过原因..." :rows="4"
+                style="width:96%;margin:10px;background-color: transparent;color: #fff;" />
+        </a-modal>
+        <!-- 审批驳回弹窗 -->
+        <a-modal v-model:visible="visibleBh" centered :width="600" title="审批驳回" @ok="handleBhOk"
+            @cancel="handleBhCancel">
+            <a-textarea v-model:value="rejectDes" placeholder="请输入驳回原因..." :rows="4"
+                style="width:96%;margin:10px;background-color: transparent;color: #fff;" />
+        </a-modal>
     </div>
 </template>
 
 <script setup lang="ts">
 import { ref, reactive, defineProps, watch } from 'vue'
 import { columns } from './comment.data'
-
+import { pass, back } from './comment.api'
+import { message } from 'ant-design-vue';
 let props = defineProps({
     historySpList: {
         type: Array,
@@ -30,11 +47,20 @@ let props = defineProps({
     imgSrc: {
         type: String,
         default: ''
+    },
+    isShow: {
+        type: Boolean,
+        default: true,
+    },
+    spInfo: {
+        type: Object,
+        default: () => {
+            return {}
+        }
     }
 })
 //数据列表
 let dataSource = ref<any[]>([])
-
 //分页参数配置
 let pagination = reactive({
     current: 1, // 当前页码
@@ -45,8 +71,57 @@ let pagination = reactive({
     pageSizeOptions: ['10', '20', '50',], // 可选的每页显示条数
 })
 
+//审批通过驳回参数信息
+let spInfos = reactive({})
+//审批通过
+let visibleTg = ref(false)
+let passDes = ref('')
+//审批驳回
+let visibleBh = ref(false)
+let rejectDes = ref('')
+
+
+let emit = defineEmits(['spClose',])
+
+//审批通过
+function getPass() {
+    visibleTg.value = true
+}
+//审批通过-确认
+async function handleTgOk() {
+    let res = await pass({ comment: passDes.value, id: spInfos.id, priority: spInfos.priority, procInstId: spInfos.procInstId, sendEmail: false, sendMessage: true, sendSms: false })
+    if (res.result) {
+        visibleTg.value = false
+        emit('spClose')
+    } else {
+        message.warning(res.message);
+    }
+}
+//审批通过-取消
+function handleTgCancel() {
+    passDes.value = ''
+    visibleTg.value = false
+}
+//审批驳回
+function getReject() {
+    visibleBh.value = true
+}
+//确定驳回
+async function handleBhOk() {
+    let res = await back({ comment: rejectDes.value, id: spInfos.id, procInstId: spInfos.procInstId, sendEmail: false, sendMessage: true, sendSms: false })
+    if (res.result) {
+        visibleBh.value = false
+        emit('spClose')
+    } else {
+        message.warning(res.message);
+    }
+}
+//取消驳回
+function handleBhCancel() {
+    rejectDes.value = ''
+    visibleBh.value = false
+}
 watch(() => props.historySpList, (newV, oldV) => {
-    console.log(newV, 'newV---------------')
     if (newV.length != 0) {
         dataSource.value = newV
     }
@@ -54,6 +129,9 @@ watch(() => props.historySpList, (newV, oldV) => {
     immediate: true,
     deep: true
 })
+watch(() => props.spInfo, (newV, oldV) => {
+    spInfos = Object.assign({}, newV)
+}, { immediate: true, deep: true })
 
 </script>
 
@@ -63,12 +141,16 @@ watch(() => props.historySpList, (newV, oldV) => {
     width: 100%;
     height: 100%;
 
+    .btn-box {
+        width: 98%;
+        padding: 15px 11px 0px 11px;
+        box-sizing: border-box;
+    }
 
     .top-box {
         width: 98%;
         height: 400px;
         margin: 15px auto;
-        // background-color: rgba(255, 255, 255, 0.0666666667);
         box-shadow: 0 0 20px rgba(68, 180, 255, 0.2) inset;
         border-radius: 2px;
         border: 1px solid rgba(68, 211, 255, 0.4392156863) !important;
@@ -84,7 +166,6 @@ watch(() => props.historySpList, (newV, oldV) => {
         width: 98%;
         height: 200px;
         margin: 15px auto;
-        // background-color: rgba(255, 255, 255, 0.0666666667);
         box-shadow: 0 0 20px rgba(68, 180, 255, 0.2) inset;
         border-radius: 2px;
         border: 1px solid rgba(68, 211, 255, 0.4392156863) !important;
@@ -112,6 +193,10 @@ watch(() => props.historySpList, (newV, oldV) => {
         line-height: 40px;
         color: #fff;
     }
+}
 
+.zxm-modal .zxm-modal-body {
+    padding: 15px !important;
+    box-sizing: border-box
 }
 </style>

src/views/vent/performance/comment/NormalTable.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <BasicTable @register="registerTable">
+    <BasicTable @register="registerTable" :key="resetTable">
       <template #action="{ record }">
         <!-- <TableAction :actions="getActions(record)" :dropDownActions="getDropDownAction(record)" /> -->
         <a class="table-action-link" @click="handleTo(record)">提交</a>
@@ -10,6 +10,7 @@
         </a-popconfirm>
         <a class="table-action-link" @click="handleDownLoad(record)">下载</a>
         <a class="table-action-link" @click="handleSpDetail(record)">审批详情</a>
+        <a class="table-action-link" @click="handleSpRevoke(record)">撤回</a>
       </template>
       <template #bodyCell="{ column, record }">
         <slot name="filterCell" v-bind="{ column, record }"></slot>
@@ -30,7 +31,13 @@
     </a-modal>
     <!-- 审批详情弹窗 -->
     <a-modal v-model:visible="visibleSp" width="1000px" :footer="null" :title="titleSp" centered destroyOnClose>
-      <HistorySp :historySpList="historySpList" :imgSrc="imgSrc"></HistorySp>
+      <HistorySp :historySpList="historySpList" :imgSrc="imgSrc" :isShow="isShow" :spInfo="spInfo" @spClose="spClose">
+      </HistorySp>
+    </a-modal>
+    <!-- 审批-撤销申请弹窗 -->
+    <a-modal v-model:visible="visibleCx" centered :width="600" title="撤销申请" @ok="handleCxOk" @cancel="handleCxCancel">
+      <a-textarea v-model:value="revokeDes" placeholder="请输入撤回原因..." :rows="4"
+        style="width:96%;margin:10px;background-color: transparent;color: #fff;" />
     </a-modal>
   </div>
 </template>
@@ -46,7 +53,7 @@ import { useModal } from '/@/components/Modal';
 import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
 import { useListPage } from '/@/hooks/system/useListPage';
 import { commit } from '../fileDetail/fileDetail.api'
-import {historicFlowNew,getHighlightImgNew} from './comment.api'
+import { historicFlowNew, getHighlightImgNew, getTodoTask, getCancelNew } from './comment.api'
 import { message } from 'ant-design-vue';
 
 
@@ -113,6 +120,7 @@ const props = defineProps({
   },
 });
 
+let resetTable=ref(0)
 let fileType = ref(''); //文件类型
 let editID = ref(0); //文件ID
 const isUpdate = ref(false);
@@ -134,7 +142,17 @@ let visibleSp = ref(false)
 let titleSp = ref('审批详情')
 //审批详情历史数据
 let historySpList = reactive<any[]>([])
-let imgSrc=ref('')
+let imgSrc = ref('')
+//审批-是否显示撤回/驳回按钮
+let isShow = ref(true)
+//审批通过/驳回参数信息
+let spInfo = reactive({})
+
+//审批-撤销
+let visibleCx = ref(false)
+let revokeDes = ref('')
+let cxInfo = reactive({})
+
 
 // 列表页面公共参数、方法
 const { tableContext, doRequest } = useListPage({
@@ -194,6 +212,9 @@ async function handleTjOk() {
     if (res == '提交成功') {
       message.success(res);
       visibleTj.value = false
+      resetTable.value=new Date().getTime()
+    } else {
+      message.warning(res.message);
     }
   } else {
     message.warning('请先选择要提交的文件!');
@@ -207,25 +228,63 @@ function handleTjCancel() {
 //审批详情点击
 function handleSpDetail(data) {
   visibleSp.value = true
-  getHistoricFlowNewList({tableId:data.id,tableName:data.tableName})
-  getHighlightImgNewList({tableId:data.id,tableName:data.tableName})
+  getTodoTaskShow({ tableId: data.id, tableName: data.tableName })
+  getHistoricFlowNewList({ tableId: data.id, tableName: data.tableName })
+  getHighlightImgNewList({ tableId: data.id, tableName: data.tableName })
 }
 //审批详情-审批历史列表
 async function getHistoricFlowNewList(params) {
-    let res = await historicFlowNew({...params})
-    if (res.length != 0) {
-        historySpList.length = 0
-        res.forEach(el => {
-            historySpList.push({ name: el.name, username: el.assignees[0].username, deleteReason: el.deleteReason, comment: el.comment, startTime: el.startTime, endTime: el.endTime,status:el.status||'待处理'  })
-        })
+  let res = await historicFlowNew({ ...params })
+  if (res.length != 0) {
+    historySpList.length = 0
+    res.forEach(el => {
+      historySpList.push({ name: el.name, username: el.assignees[0].username, deleteReason: el.deleteReason, comment: el.comment, startTime: el.startTime, endTime: el.endTime, status: el.status || '待处理' })
+    })
 
-    }
+  }
 }
 //审批详情-流程轨迹
-async function getHighlightImgNewList(params){
- let res=await getHighlightImgNew({...params})
-  let imageUrl = window.URL.createObjectURL(res);               
-  imgSrc.value=imageUrl
+async function getHighlightImgNewList(params) {
+  let res = await getHighlightImgNew({ ...params })
+  let imageUrl = window.URL.createObjectURL(res);
+  imgSrc.value = imageUrl
+}
+//判断是否显示撤回/驳回按钮
+async function getTodoTaskShow(params) {
+  let res = await getTodoTask({ ...params })
+  spInfo = res.result
+  if (spInfo) {
+    isShow.value = true
+  } else {
+    isShow.value = false
+  }
+}
+//审批通过/驳回弹窗关闭
+function spClose() {
+  visibleSp.value = false
+  resetTable.value=new Date().getTime()
+}
+//审批-撤回提交
+function handleSpRevoke(data) {
+  visibleCx.value = true
+  cxInfo = Object.assign({}, data)
+}
+//审批-撤销-确定
+async function handleCxOk() {
+  let res = await getCancelNew({ reason: revokeDes.value, tableId: cxInfo.id, tableName: cxInfo.tableName })
+  if (res == '操作成功') {
+    message.success(res);
+  } else {
+    message.warning(res.message);
+  }
+  visibleCx.value = false
+  revokeDes.value = ''
+  resetTable.value=new Date().getTime()
+}
+//审批-撤销-取消
+function handleCxCancel() {
+  revokeDes.value = ''
+  visibleCx.value = false
 }
 /**
  * 编辑事件
@@ -236,7 +295,7 @@ function handleEdit(data) {
   let index = record.fileSuffix.indexOf('.');
   fileType.value = record.fileSuffix.substring(index + 1);
   editID.value = record.id;
- 
+
 
   // 根据文件后缀名打开不同的模态框
   if (['.dwg', '.mxcad'].includes(data.fileSuffix)) {
@@ -259,7 +318,6 @@ async function handleDelete(record) {
 
 //下载文件
 function handleDownLoad(record) {
-  console.log(record, '下载');
   props.downLoad({ id: record.id }).then((res) => {
     let filename = `${record.fileName}`;
     downFilePublic(res, filename);

src/views/vent/performance/comment/comment.api.ts

@@ -2,7 +2,12 @@ import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
     historicFlowNew = 'safety/actTask/historicFlowNew',
-    getHighlightImgNew='/activiti/models/getHighlightImgNew'
+    getHighlightImgNew='/activiti/models/getHighlightImgNew',
+    getTodoTask='/safety/actTask/getTodoTask',
+    pass='/safety/actTask/pass',
+    back='/safety/actTask/back',
+    getCancelNew='/safety/actBusiness/cancelNew'
+
 }
 /**
  * 审批详情-审批历史
@@ -16,3 +21,25 @@ export const historicFlowNew = (params) => defHttp.get({ url: Api.historicFlowNe
  */
 export const getHighlightImgNew = (params) => defHttp.get({ url: Api.getHighlightImgNew,params,responseType: 'blob' });
 
+/**
+ * 审批详情-控制撤回/驳回按钮显示
+ * @param params
+ */
+export const getTodoTask = (params) => defHttp.post({ url: Api.getTodoTask,params},{ joinParamsToUrl: true });
+
+/**
+ * 审批详情-通过
+ * @param params
+ */
+export const pass = (params) => defHttp.post({ url: Api.pass,params},{ joinParamsToUrl: true });
+/**
+ * 审批详情-驳回
+ * @param params
+ */
+export const back = (params) => defHttp.post({ url: Api.back,params},{ joinParamsToUrl: true });
+/**
+ * 审批详情-撤回申请
+ * @param params
+ */
+export const getCancelNew = (params) => defHttp.post({ url: Api.getCancelNew,params},{ joinParamsToUrl: true });
+

src/views/vent/performance/completeLc/completeLc.api.ts

@@ -1,25 +0,0 @@
-import { defHttp } from '/@/utils/http/axios';
-
-enum Api {
-    getFinishedProcess = '/safety/actProcessIns/getFinishedProcess',
-    getHistoricFlow='/safety/actTask/historicFlow/15053',
-    getForm='/safety/actBusiness/getForm'
-}
-
-/**
- * 列表
- * @param params
- */
-export const getFinishedProcess = (params) => defHttp.get({ url: Api.getFinishedProcess, params });
-
-/**
- * 审批历史
- * @param params
- */
-export const getHistoricFlow = () => defHttp.get({ url: Api.getHistoricFlow, });
-/**
- * 表单数据
- * @param params
- */
-export const getForm = (params) => defHttp.get({ url: Api.getForm,params });
-

src/views/vent/performance/completeLc/completeLc.data.ts

@@ -1,81 +0,0 @@
-import { BasicColumn } from '/@/components/Table';
-export const  columns:BasicColumn[]=[
-  {
-    title: '序号',
-    width: 60,
-    align: 'center',
-    customRender: ({ index }: { index: number }) => `${index + 1}`
-  },
-  {
-    title: '流程名称',
-    dataIndex: 'name',
-    key: 'name',
-    align: 'center',
-    ellipsis: true,
-  },
-  {
-    title: '申请人',
-    dataIndex: 'applyer',
-    key: 'applyer',
-    align: 'center',
-    ellipsis: true,
-  },
-  {
-    title: '标识Key',
-    dataIndex: 'key',
-    key: 'key',
-    align: 'center',
-    ellipsis: true,
-  },
-  {
-    title: '版本',
-    dataIndex: 'versionC',
-    key: 'versionC',
-    align: 'center',
-    ellipsis: true,
-  },
-  {
-    title: '审批结果',
-    dataIndex: 'remarks',
-    key: 'remarks',
-    align: 'center',
-    ellipsis: true,
-  },
-  {
-    title: '原因详情',
-    dataIndex: 'suggestMsg',
-    key: 'suggestMsg',
-    align: 'center',
-    ellipsis: true,
-  },
-  {
-    title: '总耗时',
-    dataIndex: 'suggestMsg',
-    key: 'suggestMsg',
-    align: 'center',
-    ellipsis: true,
-  },
-  {
-    title: '开始时间',
-    dataIndex: 'startTime',
-    key: 'startTime',
-    align: 'center',
-    ellipsis: true,
-    width:160 
-  },
-  {
-    title: '结束时间',
-    dataIndex: 'endTime',
-    key: 'endTime',
-    align: 'center',
-    ellipsis: true,
-    width:160
-  },
-  {
-    title: '操作',
-    key: 'action',
-    width: 300,
-    slots: { customRender: 'action' },
-    align: 'center',
-  },
-]

src/views/vent/performance/completeLc/index.vue

@@ -1,201 +0,0 @@
-<template>
-    <div class="completeLc">
-        <div class="search-box">
-            <a-form :model="formSearch" layout="inline" :label-col="labelCol">
-                <a-form-item label="流程名称：">
-                    <a-input style="width:240px" placeholder="请输入..." allowClear v-model:value="formSearch.name" />
-                </a-form-item>
-                <a-form-item label="标识Key：">
-                    <a-input style="width:240px" placeholder="请输入..." allowClear v-model:value="formSearch.key" />
-                </a-form-item>
-                <a-form-item label="结束时间：">
-                    <a-range-picker v-model:value="formSearch.timer" :forfmat="dateFormat" />
-                </a-form-item>
-                <a-form-item label="">
-                    <a-button style="margin-right:10px" type="primary" preIcon="ant-design:search-outlined"
-                        @click="getSearch">查询</a-button>
-                    <a-button type="plain" @click="reset">重置</a-button>
-                </a-form-item>
-            </a-form>
-        </div>
-        <div class="content-box">
-            <a-table size="small" :dataSource="dataSource" :columns="columns" :scroll="{ y: 730 }"
-                :pagination="pagination">
-                <template #action="{ record }">
-                    <a-button type="link" style="color:#3DF6FF" @click="getClick({ event: 'sp', row: record })">
-                        审批历史
-                    </a-button>
-                    <a-button type="link" style="color:#3DF6FF" @click="getClick({ event: 'bd', row: record })">
-                        表单数据
-                    </a-button>
-                    <a-popconfirm title="是否确认删除!" ok-text="确定" cancel-text="取消"
-                        @confirm="getClick({ event: 'del', row: record })">
-                        <a-button type="link" style="color:#3DF6FF">
-                            删除
-                        </a-button>
-                    </a-popconfirm>
-                </template>
-            </a-table>
-        </div>
-        <!-- 审批详情弹窗 -->
-        <a-modal v-model:visible="visibleSp" :footer="null" width="1000px" :title="titleSp" centered destroyOnClose>
-            <HistorySp :historySpList="historySpList"></HistorySp>
-        </a-modal>
-        <!-- 表单数据弹窗 -->
-        <a-modal v-model:visible="visibleForm" width="1000px" :footer="null" :title="titleForm" centered destroyOnClose>
-            <formSp :formSpData="formSpData"></formSp>
-        </a-modal>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive, onMounted } from 'vue'
-import HistorySp from '../progressLc/common/HistorySp.vue'
-import formSp from '../progressLc/common/formSp.vue'
-import { columns } from './completeLc.data'
-import { getFinishedProcess, getHistoricFlow, getForm } from './completeLc.api'
-
-const labelCol = { style: { width: '80px' } };
-
-let dateFormat = ref('YYYY-MM-DD')
-//查询参数
-let formSearch = reactive({
-    name: '',
-    key: '',
-    timer: [],
-})
-//数据列表
-let dataSource = ref<any[]>([])
-
-//分页参数配置
-let pagination = reactive({
-    current: 1, // 当前页码
-    pageSize: 10, // 每页显示条数
-    total: 0, // 总条目数，后端返回
-    // showTotal: (total, range) => `${range[0]}-${range[1]} 条，总共 ${total} 条`, // 分页右下角显示信息
-    showSizeChanger: true, // 是否可改变每页显示条数
-    pageSizeOptions: ['10', '20', '50',], // 可选的每页显示条数
-})
-
-//审批历史数据
-let visibleSp = ref(false)
-let titleSp = ref('审批历史')
-let historySpList = reactive<any[]>([])
-
-//表单数据
-let visibleForm = ref(false)
-let titleForm = ref('')
-let formSpData = ref({})
-
-
-//获取列表数据
-async function getFinishedProcessList() {
-    let res = await getFinishedProcess({ name: formSearch.name, key: formSearch.key, pageNumber: pagination.current, pageSize: pagination.pageSize })
-    console.log(res, '列表数据------------')
-    if (res.length != 0) {
-        res.forEach(el => {
-            el.versionC = 'v.1'
-        })
-        dataSource.value = res
-    }
-}
-
-//获取审批历史列表数据
-async function getHistoricFlowList() {
-    let res = await getHistoricFlow()
-    console.log(res, '审批历史------------')
-    if (res.length != 0) {
-        historySpList.length = 0
-        res.forEach(el => {
-            historySpList.push({ name: el.name, username: el.assignees[0].username, deleteReason: el.deleteReason, comment: el.comment, startTime: el.startTime, endTime: el.endTime })
-        })
-
-    }
-}
-//获取审批-表单数据
-async function getFormList(param) {
-    let res = await getForm(param)
-    console.log(res, '表单数据------------')
-    formSpData.value = res
-}
-
-//table操作
-function getClick(data) {
-    switch (data.event) {
-        case 'sp':
-            visibleSp.value = true
-            getHistoricFlowList()
-            break;
-        case 'bd':
-            visibleForm.value = true
-            titleForm.value = `查看流程业务信息${data.row.name}`
-            getFormList({ tableId: data.row.tableId, tableName: data.row.tableName })
-            break;
-        case 'del':
-            break;
-
-    }
-}
-//查询
-function getSearch() {
-    pagination.current = 1
-    getFinishedProcessList()
-}
-//重置
-function reset() {
-    formSearch.key = ''
-    formSearch.name = ''
-    formSearch.timer.length = 0
-    pagination.current = 1
-    getFinishedProcessList()
-}
-
-onMounted(() => {
-    getFinishedProcessList()
-})
-</script>
-
-<style lang="less" scoped>
-.completeLc {
-    position: relative;
-    width: 100%;
-    height: 100%;
-    padding: 15px;
-    box-sizing: border-box;
-
-    .search-box {
-        height: 50px;
-    }
-
-    .content-box {
-        height: calc(100% - 40px);
-    }
-}
-
-:deep(.zxm-form-item-label > label) {
-    color: #fff;
-}
-
-:deep(.zxm-input-affix-wrapper) {
-    color: #fff;
-    background-color: #ffffff00;
-    border: 1px solid #3ad8ff77 !important;
-}
-:deep(.zxm-input){
-    color: #fff !important;
-    background-color: #ffffff00 !important; 
-}
-
-:deep(.zxm-picker) {
-    color: #fff;
-    background-color: #ffffff00;
-    border: 1px solid #3ad8ff77 !important;
-}
-
-:deep(.zxm-picker-separator) {
-    color: #fff !important;
-}
-:deep(.anticon.zxm-input-clear-icon){
-    color:#fff;
-}
-</style>

src/views/vent/performance/endEd/endEd.data.ts

@@ -19,6 +19,7 @@ export const  columns:BasicColumn[]=[
     key: 'warnLevel_dictText',
     align: 'center',
     ellipsis: true,
+    width: 110,
   },
   {
     title: '文件来源',
@@ -40,6 +41,7 @@ export const  columns:BasicColumn[]=[
     key: 'remarks',
     align: 'center',
     ellipsis: true,
+    width:110
   },
   {
     title: '当前审批人',
@@ -47,11 +49,12 @@ export const  columns:BasicColumn[]=[
     key: 'suggestMsg',
     align: 'center',
     ellipsis: true,
+    width: 110,
   },
   {
     title: '操作',
     key: 'action',
-    width: 250,
+    width: 400,
     slots: { customRender: 'action' },
     align: 'center',
   },

src/views/vent/performance/fileDetail/fileDetail.data.ts

@@ -14,12 +14,12 @@ export const columns: BasicColumn[] = [
   {
     title: '文件名称',
     dataIndex: 'fileName',
-    // width: 260,
   },
 
   {
     title: '文件类型',
     dataIndex: 'fileType_dictText',
+    width: 110,
   },
   {
     title: '文件来源',
@@ -37,11 +37,12 @@ export const columns: BasicColumn[] = [
   {
     title: '审批状态',
     dataIndex: 'bpmStatus_dictText',
+    width:110
   },
   {
     title: '当前审批人',
     dataIndex: 'createBy',
-    width: 120,
+    width: 110,
   },
  
 ];

src/views/vent/performance/progressLc/HistorySp.data.ts

@@ -1,55 +0,0 @@
-import { BasicColumn } from '/@/components/Table';
-export const  columns:BasicColumn[]=[
-  {
-    title: '序号',
-    width: 60,
-    align: 'center',
-    customRender: ({ index }: { index: number }) => `${index + 1}`
-  },
-  {
-    title: '当前环节',
-    dataIndex: 'name',
-    key: 'name',
-    align: 'center',
-    ellipsis: true,
-  },
-  {
-    title: '审批人',
-    dataIndex: 'username',
-    key: 'username',
-    align: 'center',
-    ellipsis: true,
-  },
-  {
-    title: '审批结果',
-    dataIndex: 'deleteReason',
-    key: 'deleteReason',
-    align: 'center',
-    ellipsis: true,
-  },
-  {
-    title: '',
-    dataIndex: 'comment',
-    key: 'comment',
-    align: 'center',
-    ellipsis: true,
-  },
- 
-  {
-    title: '审批开始时间',
-    dataIndex: 'startTime',
-    key: 'startTime',
-    align: 'center',
-    ellipsis: true,
-    width:180,
-  },
-  {
-    title: '审批结束时间',
-    dataIndex: 'endTime',
-    key: 'endTime',
-    align: 'center',
-    ellipsis: true,
-    width:180
-  },
-
-]

src/views/vent/performance/progressLc/common/HistorySp.vue

@@ -1,105 +0,0 @@
-<template>
-    <div class="HistorySp">
-        <div class="top-box">
-            <div class="box-title">流程审批进度历史</div>
-            <div class="box-content">
-                <a-table size="small" :dataSource="dataSource" :columns="columns" :scroll="{ y: 730 }"
-                    :pagination="pagination"></a-table>
-            </div>
-        </div>
-        <div class="bottom-box">
-            <div class="box-title">实时流程图</div>
-            <div class="box-content">
-
-            </div>
-        </div>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive,defineProps,watch } from 'vue'
-import { columns } from '../HistorySp.data'
-
-let props=defineProps({
-    historySpList:{
-        type:Array,
-        default:()=>{
-            return []
-        }
-    }
-})
-//数据列表
-let dataSource = ref<any[]>([])
-
-//分页参数配置
-let pagination = reactive({
-    current: 1, // 当前页码
-    pageSize: 10, // 每页显示条数
-    total: 0, // 总条目数，后端返回
-    // showTotal: (total, range) => `${range[0]}-${range[1]} 条，总共 ${total} 条`, // 分页右下角显示信息
-    showSizeChanger: true, // 是否可改变每页显示条数
-    pageSizeOptions: ['10', '20', '50',], // 可选的每页显示条数
-})
-
-watch(()=>props.historySpList,(newV,oldV)=>{
-    console.log(newV,'newV---------------')
-    if(newV.length!=0){
-        dataSource.value=newV
-    }
-},{
-    immediate:true,
-    deep:true
-})
-
-</script>
-
-<style lang="less" scoped>
-.HistorySp {
-    position: relative;
-    width: 100%;
-    height: 100%;
-
-
-    .top-box {
-        width: 98%;
-        height: 400px;
-        margin: 15px auto;
-        // background-color: rgba(255, 255, 255, 0.0666666667);
-        box-shadow: 0 0 20px rgba(68, 180, 255, 0.2) inset;
-        border-radius: 2px;
-        border: 1px solid rgba(68, 211, 255, 0.4392156863) !important;
-        padding: 10px;
-        box-sizing: border-box;
-
-        .box-content {
-            height: calc(100% - 40px);
-        }
-    }
-
-    .bottom-box {
-        width: 98%;
-        height: 200px;
-        margin: 15px auto;
-        // background-color: rgba(255, 255, 255, 0.0666666667);
-        box-shadow: 0 0 20px rgba(68, 180, 255, 0.2) inset;
-        border-radius: 2px;
-        border: 1px solid rgba(68, 211, 255, 0.4392156863) !important;
-        padding: 10px;
-        box-sizing: border-box;
-
-        .box-content {
-            height: calc(100% - 40px);
-            background: url('../../../../../assets/images/test1.png') no-repeat center;
-            background-position: 320% 135%;
-        }
-    }
-
-    .box-title {
-        font-size: 14px;
-        height: 40px;
-        line-height: 40px;
-        color: #fff;
-    }
-
-}
-</style>

src/views/vent/performance/progressLc/common/formDel.vue

@@ -1,50 +0,0 @@
-<template>
-    <div class="formDel">
-        <div class="del-title">删除原因：</div>
-        <a-textarea :rows="4" placeholder="请输入删除原因..." v-model:value="delReason" allowClear />
-        <div class="btn-box">
-            <a-button type="primary" style="margin-right:10px" @click="confirm">确定</a-button>
-            <a-button type="plain" @click="cancel">取消</a-button>
-        </div>
-    </div>
-</template>
-
-<script setup lang="ts">
-import {ref} from 'vue'
-
-let delReason=ref('')
-let emit=defineEmits(['confirmClick','cancelClick'])
-
-function confirm(){
-    emit('confirmClick',delReason.value);
-}
-function cancel(){
-    delReason.value=''
-    emit('cancelClick');
-}
-
-</script>
-
-<style lang="less" scoped>
-.formDel{
-    position: relative;
-    width: 100%;
-    height: 100%;
-    padding: 15px;
-    box-sizing:border-box;
-    .del-title{
-        margin-bottom: 10px;
-    }
-    .btn-box{
-        width: 100%;
-        padding: 10px 0px;
-        box-sizing: border-box;
-        display: flex;
-        justify-content: flex-end;
-    }
-}
-:deep(.zxm-input-affix-wrapper) {
-    background-color: #ffffff00;
-    border: 1px solid #3ad8ff77 !important;
-}
-</style>

src/views/vent/performance/progressLc/common/formSp.vue

@@ -1,43 +0,0 @@
-<template>
-    <div class="formSp">
-        <a-form :model="formState" :label-col="{ span: 6 }" :wrapper-col="{ span: 14 }">
-            <a-form-item label="标题">
-                <a-input v-model:value="formState.name" :disabled="disabled"></a-input>
-            </a-form-item>
-        </a-form>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive,defineProps,watch } from 'vue'
-
-let props=defineProps({
-    formSpData:{
-        type:Object,
-        default:()=>{
-            return {}
-        }
-    }
-})
-//form数据
-let formState = ref({})
-//是否禁用
-let disabled=ref(true)
-
-watch(()=>props.formSpData,(newV,oldV)=>{
-    formState.value=newV
-},{
-    immediate:true
-})
-
-</script>
-
-<style lang="less" scoped>
-.formSp {
-    position: relative;
-    width: 100%;
-    height: 100%;
-    padding: 20px;
-    box-sizing: border-box
-}
-</style>

src/views/vent/performance/progressLc/index.vue

@@ -1,230 +0,0 @@
-<template>
-    <div class="progressLc">
-        <div class="search-box">
-            <a-form :model="formSearch" layout="inline" :label-col="labelCol">
-                <a-form-item label="流程名称：">
-                    <a-input style="width:240px" placeholder="请输入..." allowClear v-model:value="formSearch.name" />
-                </a-form-item>
-                <a-form-item label="标识Key：">
-                    <a-input style="width:240px" placeholder="请输入..." allowClear v-model:value="formSearch.key" />
-                </a-form-item>
-                <a-form-item label="">
-                    <a-button style="margin-right:10px" type="primary" preIcon="ant-design:search-outlined"
-                        @click="getSearch">查询</a-button>
-                    <a-button type="plain" @click="reset">重置</a-button>
-                </a-form-item>
-            </a-form>
-        </div>
-        <div class="content-box">
-            <a-table size="small" :dataSource="dataSource" :columns="columns" :scroll="{ y: 730 }"
-                :pagination="pagination">
-
-                <template #action="{ record }">
-                    <a-button type="link" style="color:#3DF6FF" @click="getClick({ event: 'gq', row: record })">
-                        挂起
-                    </a-button>
-                    <a-button type="link" style="color:#3DF6FF" @click="getClick({ event: 'sp', row: record })">
-                        审批详情
-                    </a-button>
-                    <a-button type="link" style="color:#3DF6FF" @click="getClick({ event: 'bd', row: record })">
-                        表单数据
-                    </a-button>
-                    <a-popconfirm title="是否确认删除!" ok-text="确定" cancel-text="取消"
-                        @confirm="getClick({ event: 'del', row: record })">
-                        <a-button type="link" style="color:#3DF6FF">
-                            删除
-                        </a-button>
-                    </a-popconfirm>
-                </template>
-            </a-table>
-        </div>
-        <!-- 审批详情弹窗 -->
-        <a-modal v-model:visible="visibleSp" width="1000px" :footer="null" :title="titleSp" centered destroyOnClose>
-            <HistorySp :historySpList="historySpList"></HistorySp>
-        </a-modal>
-        <!-- 表单数据弹窗 -->
-        <a-modal v-model:visible="visibleForm" width="1000px" :footer="null" :title="titleForm" centered destroyOnClose>
-            <formSp :formSpData="formSpData"></formSp>
-        </a-modal>
-        <!-- 删除弹窗 -->
-        <a-modal v-model:visible="visibleDel" :footer="null" width="600px" :title="titleDel" centered destroyOnClose>
-            <formDel @confirmClick="confirmClick" @cancelClick="cancelClick"></formDel>
-        </a-modal>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive, onMounted, createVNode } from 'vue'
-import HistorySp from './common/HistorySp.vue'
-import formSp from './common/formSp.vue'
-import formDel from './common/formDel.vue'
-import { Modal } from 'ant-design-vue';
-import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
-import { columns } from './progressLc.data'
-import { getRunningProcess, getHistoricFlow, getForm, getdelInsByIds } from './progressLc.api'
-
-const labelCol = { style: { width: '80px' } };
-//查询参数
-let formSearch = reactive({
-    name: '',
-    key: ''
-})
-//数据列表
-let dataSource = ref<any[]>([])
-
-//分页参数配置
-let pagination = reactive({
-    current: 1, // 当前页码
-    pageSize: 10, // 每页显示条数
-    total: 0, // 总条目数，后端返回
-    // showTotal: (total, range) => `${range[0]}-${range[1]} 条，总共 ${total} 条`, // 分页右下角显示信息
-    showSizeChanger: true, // 是否可改变每页显示条数
-    pageSizeOptions: ['10', '20', '50',], // 可选的每页显示条数
-})
-
-//审批详情弹窗数据
-let visibleSp = ref(false)
-let titleSp = ref('审批历史')
-//审批详情历史数据
-let historySpList = reactive<any[]>([])
-
-//表单数据
-let visibleForm = ref(false)
-let titleForm = ref('')
-let formSpData = ref({})
-
-//删除流程数据
-let visibleDel = ref(false)
-let titleDel = ref('')
-
-
-//审批详情-审批历史列表
-async function getHistoricFlowList() {
-    let res = await getHistoricFlow()
-    console.log(res, '审批历史---------------------')
-    if (res.length != 0) {
-        historySpList.length = 0
-        res.forEach(el => {
-            historySpList.push({ name: el.name, username: el.assignees[0].username, deleteReason: el.deleteReason, comment: el.comment, startTime: el.startTime, endTime: el.endTime })
-        })
-    }
-}
-
-//获取审批-表单数据
-async function getFormList(param) {
-    let res = await getForm(param)
-    console.log(res, '表单数据------------')
-    formSpData.value = res
-}
-
-//获取列表
-async function getRunningProcessList() {
-    let res = await getRunningProcess({ name: formSearch.name, key: formSearch.key, pageNumber: pagination.current, pageSize: pagination.pageSize })
-    console.log(res, 'tableList--------------')
-    if (res.length != 0) {
-        res.forEach(el => {
-            el.versionC = 'v.1'
-            el.isSuspended = el.isSuspended ? '未激活' : '已激活'
-        })
-        dataSource.value = res
-    }
-}
-
-//确认删除
-async function confirmClick(data) {
-    let res = await getdelInsByIds({ reason: data })
-    if (res.success) {
-        getRunningProcessList()
-        visibleDel.value = false
-    }
-}
-//取消删除
-function cancelClick() {
-    visibleDel.value = false
-}
-
-//table操作
-function getClick(data) {
-    console.log(data, 'data------------------')
-    switch (data.event) {
-        case 'gq':
-            Modal.confirm({
-                title: '确认暂停挂起',
-                centered: true,
-                icon: createVNode(ExclamationCircleOutlined),
-                content: createVNode('div', { style: 'color:#fff' }, `您确认要暂停挂起流程实例${data.row.name}`),
-                okText: '确认',
-                cancelText: '取消',
-                onOk: () => {
-                    Modal.destroyAll();
-                },
-            });
-            break;
-        case 'sp':
-            visibleSp.value = true
-            getHistoricFlowList()
-            break;
-        case 'bd':
-            visibleForm.value = true
-            titleForm.value = `查看流程业务信息${data.row.name}`
-            getFormList({ tableId: data.row.tableId, tableName: data.row.tableName })
-            break;
-        case 'del':
-            visibleDel.value = true
-            titleDel.value = `确认删除流程${data.row.name}`
-            break;
-    }
-}
-
-//查询
-function getSearch() {
-    pagination.current = 1
-    getRunningProcessList()
-}
-//重置
-function reset() {
-    formSearch.key = ''
-    formSearch.name = ''
-    pagination.current = 1
-    getRunningProcessList()
-}
-
-onMounted(() => {
-    getRunningProcessList()
-})
-</script>
-
-<style lang="less" scoped>
-.progressLc {
-    position: relative;
-    width: 100%;
-    height: 100%;
-    padding: 15px;
-    box-sizing: border-box;
-
-    .search-box {
-        height: 50px;
-    }
-
-    .content-box {
-        height: calc(100% - 40px);
-    }
-}
-
-:deep(.zxm-form-item-label > label) {
-    color: #fff;
-}
-
-:deep(.zxm-input-affix-wrapper) {
-    color: #fff;
-    background-color: #ffffff00;
-    border: 1px solid #3ad8ff77 !important;
-}
-:deep(.zxm-input){
-    color: #fff !important;
-    background-color: #ffffff00 !important;
-}
-:deep(.anticon.zxm-input-clear-icon){
-    color:#fff;
-}
-</style>

src/views/vent/performance/progressLc/progressLc.api.ts

@@ -1,32 +0,0 @@
-import { defHttp } from '/@/utils/http/axios';
-
-enum Api {
-    getdelInsByIds='/safety/actProcessIns/delInsByIds/15053',
-    getForm = '/safety/actBusiness/getForm',
-    getHistoricFlow = '/safety/actTask/historicFlow/15015',
-    getRunningProcess = '/safety/actProcessIns/getRunningProcess',
-}
-
-/**
- * 左侧树接口
- * @param params
- */
-export const getRunningProcess = (params) => defHttp.get({ url: Api.getRunningProcess, params });
-
-/**
- * 审批详情-审批历史
- * @param params
- */
-export const getHistoricFlow = () => defHttp.get({ url: Api.getHistoricFlow,});
-
-/**
- * 审批-表单数据
- * @param params
- */
-export const getForm = (params) => defHttp.get({ url: Api.getForm,params});
-
-/**
- * 审批-删除
- * @param params
- */
-export const getdelInsByIds = (params) => defHttp.post({ url: Api.getdelInsByIds,params});

src/views/vent/performance/progressLc/progressLc.data.ts

@@ -1,65 +0,0 @@
-import { BasicColumn } from '/@/components/Table';
-export const  columns:BasicColumn[]=[
-  {
-    title: '序号',
-    width: 60,
-    align: 'center',
-    customRender: ({ index }: { index: number }) => `${index + 1}`
-  },
-  {
-    title: '流程实例ID',
-    dataIndex: 'id',
-    key: 'id',
-    align: 'center',
-    ellipsis: true,
-  },
-  {
-    title: '流程名称',
-    dataIndex: 'name',
-    key: 'name',
-    align: 'center',
-    ellipsis: true,
-  },
-  {
-    title: '申请人',
-    dataIndex: 'applyer',
-    key: 'applyer',
-    align: 'center',
-    ellipsis: true,
-  },
-  {
-    title: '标识Key',
-    dataIndex: 'key',
-    key: 'key',
-    align: 'center',
-    ellipsis: true,
-  },
-  {
-    title: '版本',
-    dataIndex: 'versionC',
-    key: 'versionC',
-    align: 'center',
-    ellipsis: true,
-  },
-  {
-    title: '当前环节',
-    dataIndex: 'currTaskName',
-    key: 'currTaskName',
-    align: 'center',
-    ellipsis: true,
-  },
-  {
-    title: '状态',
-    dataIndex: 'isSuspended',
-    key: 'isSuspended',
-    align: 'center',
-    ellipsis: true,
-  },
-  {
-    title: '操作',
-    key: 'action',
-    width: 350,
-    slots: { customRender: 'action' },
-    align: 'center',
-  },
-]