审批-提交

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

@@ -3,6 +3,7 @@
     <BasicTable @register="registerTable">
       <template #action="{ record }">
         <!-- <TableAction :actions="getActions(record)" :dropDownActions="getDropDownAction(record)" /> -->
+        <a class="table-action-link" @click="handleTo(record)">提交</a>
         <a class="table-action-link" @click="handleEdit(record)">编辑</a>
         <a-popconfirm title="确定删除?" @confirm="handleDelete(record)">
           <a class="table-action-link">删除</a>
@@ -15,313 +16,278 @@
     </BasicTable>
     <DeviceModal :editID="editID" :fileType="fileType" @register="registerDeviceModal" />
     <CADModal @register="registerCADModal" />
+    <!-- 审批-提交弹窗 -->
+    <a-modal v-model:visible="visibleTj" centered :width="600" title="提交文件" @ok="handleTjOk" @cancel="handleTjCancel">
+      <a-form :model="formStateTj" labelAlign="right" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
+        <a-form-item label="选择文件" :rules="[{ required: true, message: '请选择是否提交' }]">
+          <a-select v-model:value="formStateTj.file" style="width: 260px">
+            <a-select-option v-for="file in fileList " :key="file.label" :value="file.value">{{ file.label
+              }}</a-select-option>
+          </a-select>
+        </a-form-item>
+      </a-form>
+    </a-modal>
   </div>
 </template>
 
 <script lang="ts" name="system-user" setup>
-  //ts语法
-  import { ref, provide, reactive, toRaw, defineExpose } from 'vue';
-  import { BasicTable, TableAction } from '/@/components/Table';
-  import { useModal } from '/@/components/Modal';
-  import DeviceModal from './DeviceModal.vue';
-  import CADModal from './CADModal.vue';
-  import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
-  import { useListPage } from '/@/hooks/system/useListPage';
+//ts语法
+import { ref, provide, reactive, toRaw, defineExpose } from 'vue';
+import { BasicTable, TableAction } from '/@/components/Table';
+import { useModal } from '/@/components/Modal';
+import DeviceModal from './DeviceModal.vue';
+import CADModal from './CADModal.vue';
+import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
+import { useListPage } from '/@/hooks/system/useListPage';
+import { commit } from '../fileDetail/fileDetail.api'
 
-  const props = defineProps({
-    //各矿参数
-    selfParam: {
-      type: Object,
-      default: () => {
-        return {};
-      },
-    },
-    //查询参数
-    searchParam: {
-      type: String,
-      default: '',
-    },
-    //菜单树传递参数
-    nodeParam: {
-      type: Object,
-      default: () => {
-        return {};
-      },
-    },
-    columnsType: {
-      type: String,
-      // required: true,
-    },
-    columns: {
-      type: Array,
-      // required: true,
-      default: () => [],
-    },
 
-    list: {
-      type: Function,
-      required: true,
+const props = defineProps({
+  //文件审批-提交信息
+  submitInfo: {
+    type: Array,
+    default: () => {
+      return []
+    }
+  },
+  //各矿参数
+  selfParam: {
+    type: Object,
+    default: () => {
+      return {};
     },
-    //下载文件接口
-    downLoad: {
-      type: Function,
-      required: true,
+  },
+  //查询参数
+  searchParam: {
+    type: String,
+    default: '',
+  },
+  //菜单树传递参数
+  nodeParam: {
+    type: Object,
+    default: () => {
+      return {};
     },
+  },
+  columnsType: {
+    type: String,
+    // required: true,
+  },
+  columns: {
+    type: Array,
+    // required: true,
+    default: () => [],
+  },
 
-    deleteById: {
-      type: Function,
-      required: true,
-    },
-    pointList: {
-      type: Function,
-      // required: true,
-    },
-    designScope: {
-      type: String,
-    },
-    title: {
-      type: String,
-    },
-  });
-  let fileType = ref(''); //文件类型
-  let editID = ref(0); //文件ID
+  list: {
+    type: Function,
+    required: true,
+  },
+  //下载文件接口
+  downLoad: {
+    type: Function,
+    required: true,
+  },
 
-  const isUpdate = ref(false);
-  const record = reactive<Record<string, any>>({});
+  deleteById: {
+    type: Function,
+    required: true,
+  },
+  pointList: {
+    type: Function,
+    // required: true,
+  },
+  designScope: {
+    type: String,
+  },
+  title: {
+    type: String,
+  },
+});
 
-  provide('formData', record);
-  const [registerDeviceModal, { openModal, closeModal }] = useModal();
+let fileType = ref(''); //文件类型
+let editID = ref(0); //文件ID
+const isUpdate = ref(false);
+const record = reactive<Record<string, any>>({});
+provide('formData', record);
+const [registerDeviceModal, { openModal, closeModal }] = useModal();
+const columnList = getTableHeaderColumns(props.columnsType);
+//是否显示文件审批弹窗
+let visibleTj = ref(false)
+//文件审批-弹窗参数
+let formStateTj = reactive({
+  file: '',
+  id: '',
+})
+//文件审批-提交信息弹窗下拉选项数据
+let fileList = reactive<any[]>([])
 
-  const columnList = getTableHeaderColumns(props.columnsType);
-  console.log('aaa', columnList);
 
-  // 列表页面公共参数、方法
-  const { tableContext, doRequest } = useListPage({
-    designScope: props.designScope,
-    tableProps: {
-      title: props.title,
-      api: props.list,
-      columns: props.columns.length > 0 ? (props.columns as any[]) : columnList,
-      // size: 'small',
-      bordered: false,
-      // formConfig: {
-      //   // labelWidth: 100,
-      //   labelAlign: 'left',
-      //   labelCol: {
-      //     xs: 24,
-      //     sm: 24,
-      //     md: 24,
-      //     lg: 9,
-      //     xl: 7,
-      //     xxl: 5,
-      //   },
-      //   schemas: props.searchFormSchema as any[],
-      // },
-      striped: true,
-      showIndexColumn: true, //是否显示序列号
-      actionColumn: {
-        width: 280,
-      },
-      useSearchForm: false, //不使用查询条件
-      // pagination: false, //不使用分页组件
-      beforeFetch: (params) => {
-        params.parentId = props.nodeParam.id ? props.nodeParam.id : '';
-        params.selectFlag = props.nodeParam.id ? false : true;
-        params.likeFileName = props.searchParam ? props.searchParam : '';
-        params.bpmStatus = props.selfParam.bpmStatus ? props.selfParam.bpmStatus : '';
-        params.sysOrgCode = props.selfParam.sysOrgCode ? props.selfParam.sysOrgCode : '';
-        // return Object.assign({ column: '111', order: 'd11' }, params);
-        // return Object.assign({ parentId: '', selectFlag: true, likeFileName: '' }, params);
-      },
+// 列表页面公共参数、方法
+const { tableContext, doRequest } = useListPage({
+  designScope: props.designScope,
+  tableProps: {
+    title: props.title,
+    api: props.list,
+    columns: props.columns.length > 0 ? (props.columns as any[]) : columnList,
+    // size: 'small',
+    bordered: false,
+    scroll: { y: 620 },
+    // formConfig: {
+    //   // labelWidth: 100,
+    //   labelAlign: 'left',
+    //   labelCol: {
+    //     xs: 24,
+    //     sm: 24,
+    //     md: 24,
+    //     lg: 9,
+    //     xl: 7,
+    //     xxl: 5,
+    //   },
+    //   schemas: props.searchFormSchema as any[],
+    // },
+    striped: true,
+    showIndexColumn: true, //是否显示序列号
+    actionColumn: {
+      width: 280,
     },
-  });
-
-  //注册table数据
-  const [registerTable, { reload }, { selectedRowKeys }] = tableContext;
-  /**
-   * 编辑事件
-   */
-  function handleEdit(data) {
-    isUpdate.value = true;
-    Object.assign(record, toRaw(data));
-    console.log(record, '编辑');
-    let index = record.fileSuffix.indexOf('.');
-    fileType.value = record.fileSuffix.substring(index + 1);
-    editID.value = record.id;
-    console.log(fileType, '文件格式');
-    console.log(editID.value, '编辑文件ID');
-
-    // 根据文件后缀名打开不同的模态框
-    if (['.dwg', '.mxcad'].includes(data.fileSuffix)) {
-      openCADModal(true, {
-        record,
-      });
-    } else {
-      openModal(true, {
-        record,
-      });
-    }
-  }
+    useSearchForm: false, //不使用查询条件
+    // pagination: false, //不使用分页组件
+    beforeFetch: (params) => {
+      params.parentId = props.nodeParam.id ? props.nodeParam.id : '';
+      params.selectFlag = props.nodeParam.id ? false : true;
+      params.likeFileName = props.searchParam ? props.searchParam : '';
+      params.bpmStatus = props.selfParam.bpmStatus ? props.selfParam.bpmStatus : '';
+      params.sysOrgCode = props.selfParam.sysOrgCode ? props.selfParam.sysOrgCode : '';
+    },
+  },
+});
 
-  /**
-   * 删除事件
-   */
-  async function handleDelete(record) {
-    await props.deleteById({ id: record.id }, reload);
+//注册table数据
+const [registerTable, { reload }, { selectedRowKeys }] = tableContext;
+// 审批提交
+function handleTo(data) {
+  visibleTj.value = true
+  fileList.length = 0
+  props.submitInfo.forEach(el => {
+    fileList.push({ label: el.name, value: el.id })
+  })
+  formStateTj.id = data.id
+  console.log(data, '提交参数信息---------')
+}
+//确认提交
+async function handleTjOk() {
+  if (formStateTj.file) {
+    let res = await commit({ procDefId: formStateTj.file, tableId: formStateTj.id, firstGateway: true })
+    console.log(res, 'res--000000000')
   }
+}
+//取消提交
+function handleTjCancel() {
+  formStateTj.file = ''
+  visibleTj.value = false
+}
+/**
+ * 编辑事件
+ */
+function handleEdit(data) {
+  isUpdate.value = true;
+  Object.assign(record, toRaw(data));
+  console.log(record, '编辑');
+  let index = record.fileSuffix.indexOf('.');
+  fileType.value = record.fileSuffix.substring(index + 1);
+  editID.value = record.id;
+  console.log(fileType, '文件格式');
+  console.log(editID.value, '编辑文件ID');
 
-  //下载文件
-  function handleDownLoad(record) {
-    console.log(record, '下载');
-    props.downLoad({ id: record.id }).then((res) => {
-      console.log('11111');
-      console.log(res, '文件下载成功');
-      let filename = `${record.fileName}`;
-      downFilePublic(res, filename);
+  // 根据文件后缀名打开不同的模态框
+  if (['.dwg', '.mxcad'].includes(data.fileSuffix)) {
+    openCADModal(true, {
+      record,
+    });
+  } else {
+    openModal(true, {
+      record,
     });
   }
-  // 下载公用方法
-  function downFilePublic(content, fileName) {
-    // const blob = new Blob([content], { type: 'application/xlsx;charset=UTF-8' }); // 构造一个blob对象来处理数据
-    const blob = new Blob([content], { type: 'application/xlsx;charset=UTF-8' }); // 构造一个blob对象来处理数据
-    // 对于<a>标签，只有 Firefox 和 Chrome（内核） 支持 download 属性
-    // IE10以上支持blob但是依然不支持download
-    if ('download' in document.createElement('a')) {
-      // 支持a标签download的浏览器
-      const link = document.createElement('a'); // 创建a标签
-      link.download = fileName; // a标签添加属性
-      link.style.display = 'none';
-      link.href = URL.createObjectURL(blob);
-      document.body.appendChild(link);
-      link.click(); // 执行下载
-      URL.revokeObjectURL(link.href); // 释放url
-      document.body.removeChild(link); // 释放标签
-    } else {
-      // 其他浏览器
-      navigator.msSaveBlob(blob, fileName);
-    }
-  }
+}
 
-  // /**
-  //  * 操作列定义
-  //  * @param record
-  //  */
-  // function getActions(record) {
-  //   return [
-  //     {
-  //       label: '详情',
-  //       onClick: handleEdit.bind(null, record),
-  //     },
-  //     {
-  //       label: '编辑',
-  //       onClick: handleEdit.bind(null, record),
-  //     },
-  //     {
-  //       label: '删除',
-  //       popConfirm: {
-  //         title: '是否确认删除',
-  //         confirm: handleDelete.bind(null, record),
-  //       },
-  //     },
-  //     {
-  //       label: '下载',
-  //       onClick: handleDownLoad.bind(null, record),
-  //     },
-  //     // {
-  //     //   label: '审批',
-  //     //   onClick: handleEdit.bind(null, record),
-  //     // },
-  //     // {
-  //     //   label: '查看',
-  //     //   onClick: handleDetail.bind(null, record),
-  //     // },
-  //   ];
-  // }
-  /**
-   * 下拉操作栏
-   */
-  function getDropDownAction(record) {
-    return [
-      // {
-      //   label: '删除',
-      //   popConfirm: {
-      //     title: '是否确认删除',
-      //     confirm: handleDelete.bind(null, record),
-      //   },
-      // },
-      // {
-      //   label: '查看',
-      //   onClick: handleDetail.bind(null, record),
-      // },
-    ];
+/**
+ * 删除事件
+ */
+async function handleDelete(record) {
+  await props.deleteById({ id: record.id }, reload);
+}
+
+//下载文件
+function handleDownLoad(record) {
+  console.log(record, '下载');
+  props.downLoad({ id: record.id }).then((res) => {
+    console.log('11111');
+    console.log(res, '文件下载成功');
+    let filename = `${record.fileName}`;
+    downFilePublic(res, filename);
+  });
+}
+// 下载公用方法
+function downFilePublic(content, fileName) {
+  // const blob = new Blob([content], { type: 'application/xlsx;charset=UTF-8' }); // 构造一个blob对象来处理数据
+  const blob = new Blob([content], { type: 'application/xlsx;charset=UTF-8' }); // 构造一个blob对象来处理数据
+  // 对于<a>标签，只有 Firefox 和 Chrome（内核） 支持 download 属性
+  // IE10以上支持blob但是依然不支持download
+  if ('download' in document.createElement('a')) {
+    // 支持a标签download的浏览器
+    const link = document.createElement('a'); // 创建a标签
+    link.download = fileName; // a标签添加属性
+    link.style.display = 'none';
+    link.href = URL.createObjectURL(blob);
+    document.body.appendChild(link);
+    link.click(); // 执行下载
+    URL.revokeObjectURL(link.href); // 释放url
+    document.body.removeChild(link); // 释放标签
+  } else {
+    // 其他浏览器
+    navigator.msSaveBlob(blob, fileName);
   }
+}
 
-  // CAD预览相关的逻辑
-  const [registerCADModal, { openModal: openCADModal }] = useModal();
+// CAD预览相关的逻辑
+const [registerCADModal, { openModal: openCADModal }] = useModal();
 
-  defineExpose({
-    doRequest,
-  });
+defineExpose({
+  doRequest,
+});
 </script>
 
 <style scoped lang="less">
-  // @ventSpace: zxm;
-
-  // @vent-table-no-hover: rgba(43, 135, 255, 0.1);
+@ventSpace: zxm;
 
-  // @vent-table-hover: rgba(53, 147, 255, 0.2);
-  // :deep(.zxm-table-row) {
-  //   td {
-  //     background-color: @vent-table-hover !important;
-  //   }
-  // }
-  // :deep(.jeecg-basic-table-row__striped) {
-  //   td {
-  //     background-color: @vent-table-no-hover !important;
-  //   }
-  // }
+@vent-table-no-hover: #00bfff10;
 
-  // ::v-deep .zxm-table-title {
-  //   display: none;
-  // }
-  // ::v-deep .zxm-table-thead > tr > th {
-  //   border-top: 0px !important;
-  //   border-left: 0px !important;
-  //   border-right: 0px !important;
-  //   border-bottom: 1px solid #268bc1 !important;
-  //   color: #3beff9 !important;
-  // }
-  // ::v-deep .zxm-table-tbody > tr > td {
-  //   border: none;
-  // }
+:deep(.@{ventSpace}-table-cell-row-hover) {
+  background: #264d8833 !important;
+}
 
-  // ::v-deep .zxm-table-thead {
-  //   background: linear-gradient(to bottom, transparent, rgba(53, 147, 255, 0.5)) !important;
-  // }
+:deep(.@{ventSpace}-table-row-selected) {
+  background: #268bc522 !important;
+}
 
-  @ventSpace: zxm;
+:deep(.@{ventSpace}-table-tbody > tr > td) {
+  background-color: #0dc3ff05;
+}
 
-  @vent-table-no-hover: #00bfff10;
-
-  :deep(.@{ventSpace}-table-cell-row-hover) {
-    background: #264d8833 !important;
-  }
-
-  :deep(.@{ventSpace}-table-row-selected) {
-    background: #268bc522 !important;
-  }
-
-  :deep(.@{ventSpace}-table-tbody > tr > td) {
-    background-color: #0dc3ff05;
+:deep(.jeecg-basic-table-row__striped) {
+  td {
+    background-color: @vent-table-no-hover !important;
   }
+}
 
-  :deep(.jeecg-basic-table-row__striped) {
-    td {
-      background-color: @vent-table-no-hover !important;
-    }
-  }
+::v-deep .zxm-table-title {
+  display: none;
+}
 
-  ::v-deep .zxm-table-title {
-    display: none;
-  }
+.zxm-form {
+  padding-top: 20px!important;
+  box-sizing: border-box;
+}
 </style>

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

@@ -8,6 +8,8 @@ enum Api {
   delMenu = '/ventanaly-sharefile/fileServer/delete',
   uploadApi = '/ventanaly-sharefile/fileServer/upload',
   downLoad = '/ventanaly-sharefile/fileServer/download',
+  listData ='/activiti/activiti_process/listData',
+  commit='/safety/actBusiness/commit'
 }
 
 /**
@@ -52,3 +54,14 @@ export const deleteById = (params, handleSuccess) => {
     handleSuccess();
   });
 };
+/**
+ * 审批-提交
+ * @param params
+ */
+export const listData = (params) => defHttp.get({ url: Api.listData, params });
+
+/**
+ * 审批-确认提交
+ * @param params
+ */
+export const commit = (params) => defHttp.post({ url: Api.commit, params });

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

@@ -40,6 +40,7 @@
             <a-tab-pane key="1" tab="全部">
               <NormalTable
                 v-if="alive"
+                :submitInfo="submitInfo"
                 :selfParam="selfParam"
                 :searchParam="fileName"
                 :nodeParam="nodeParam"
@@ -99,7 +100,7 @@
   import { SvgIcon } from '/@/components/Icon';
   import { ref, onMounted, reactive, nextTick, watch } from 'vue';
   import { columns } from './fileDetail.data';
-  import { getTree, createFile, editMenu, delMenu, uploadApi, downLoad, deleteById } from './fileDetail.api';
+  import { getTree, createFile, editMenu, delMenu, uploadApi, downLoad, deleteById,listData } from './fileDetail.api';
 
   let activeKey = ref('1');
   let selfParam = reactive({
@@ -121,6 +122,8 @@
     isApprove: null,
     fileType: '',
   });
+  //文件审批-提交信息
+  let submitInfo=ref<any[]>([])
 
   //lxh 当前选中树节点
   let selected = reactive<any>({
@@ -306,6 +309,12 @@
     newFileList.splice(index, 1);
     fileList.length = 0;
   };
+  //文件-提交
+  async function getListData(){
+    let res=await listData({zx:true,column:'createTime',order:'desc',status:1})
+    console.log(res,'审批提交-----------')
+      submitInfo.value=res
+  }
   watch(
     () => router.currentRoute.value,
     (val) => {
@@ -318,6 +327,7 @@
   );
   onMounted(() => {
     getTreeList();
+    getListData()
     getTypeTableList();
   });
 </script>