Merge remote-tracking branch 'origin/master'

src/api/approvalConfiguration/approvalConfiguration.js

+import request from '@/utils/request'
+
+// 查询项目费用申请列表
+export function getList(query) {
+    return request({
+        url: '/approvalConfiguration/getList',
+        method: 'get',
+        params:query
+    })
+}

src/views/approvalConfiguration/index.vue

+<template>
+  <div class="app-container">
+    <div class="formSearch">
+      <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="120px">
+        <!-- 默认显示的查询条件 -->
+        <el-form-item label="审批流程名称" prop="projectName">
+          <el-input
+              v-model="queryParams.projectName"
+              placeholder="请输入项目名称"
+              clearable
+              style="width: 220px"
+          />
+        </el-form-item>
+        <el-form-item label="审批类型" prop="projectManagerId">
+          <el-select
+              v-model="queryParams.projectManagerId"
+              placeholder="请选择项目经理"
+              style="width: 220px"
+              clearable
+          >
+
+          </el-select>
+        </el-form-item>
+        <el-form-item label="创建人" prop="projectStatus">
+          <el-select
+              v-model="queryParams.projectStatus"
+              placeholder="请选择项目状态"
+              style="width: 220px"
+              clearable
+          >
+          </el-select>
+        </el-form-item>
+        <!-- 操作按钮 -->
+        <el-form-item style="padding-left: 5.4%">
+          <el-button  @click="resetQuery" class="el-button-defalut">
+            <template #icon>
+              <img src="../../assets/icons/common/reset.png" height="25" width="24"/>
+            </template>
+            重置
+          </el-button>
+          <el-button type="primary"  @click="handleQuery" class="el-button-primary">
+            <template #icon>
+              <img src="../../assets/icons/common/search.png" height="24" width="24"/>
+            </template>
+            查询
+          </el-button>
+
+        </el-form-item>
+
+      </el-form>
+    </div>
+    <div class="contentTable">
+      <div style="" class="topDiv">
+        <span class="bold-text1" style="">审批配置</span>
+        <span style="padding-left: 80%">
+      <el-button
+          class="el-button-primary-pain"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          style="width: auto;"
+      >新增审批节点</el-button>
+
+        </span>
+      </div>
+
+      <el-table v-loading="loading" :data="tableDataList.value" border  >
+        <el-table-column label="序号" align="center" type="index" width="90"/>
+
+        <el-table-column label="审批流程名称" align="center" prop="approvalName" />
+        <el-table-column label="审批编号" align="center" prop="approvalNumber" />
+        <el-table-column label="审批类型" align="center" prop="approveType"  >
+          <template #default="scope">
+                        <dict-tag :options="approve_type" :value="scope.row.approveType"/></template>
+        </el-table-column>
+        <el-table-column label="创建人" align="center" prop="createBy"  >
+<!--          <template #default="scope">-->
+<!--            <dict-tag :options="project_type" :value="scope.row.projectType"/>-->
+<!--          </template>-->
+        </el-table-column>
+        <el-table-column label="创建人角色" align="center" prop="createRoleName" width="150">
+
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+
+        </el-table-column>
+        <el-table-column label="最后更改时间" align="center" prop="updateTime" width="200">
+
+        </el-table-column>
+
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="100">
+          <template #default="scope">
+            <el-tooltip content="编辑" placement="top">
+              <el-button link type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:project:edit']">
+                <img src="../../assets/icons/common/edit.png" height="32" width="32"/>
+              </el-button>
+            </el-tooltip>
+            <el-tooltip content="详情" placement="top">
+              <el-button link type="text"  @click="handleView(scope.row)" v-hasPermi="['system:project:view']">
+                <img src="../../assets/icons/common/check.png" height="32" width="32"/>
+              </el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="text"  @click="handleDelete(scope.row)" v-hasPermi="['system:project:logicRemove']">
+                <img src="../../assets/icons/common/delete.png" height="32" width="32"/>
+              </el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination-containerA">
+
+      </div>
+    </div>
+  </div>
+
+</template>
+<script setup>
+import {ref,onMounted} from 'vue'
+import { getList } from "../../api/approvalConfiguration/approvalConfiguration.js";
+const { proxy } = getCurrentInstance();
+const { approve_type} = proxy.useDict('approve_type');
+
+
+//变量定义
+const  loading = ref(false)
+const tableDataList = reactive([])
+
+const queryParams = reactive({
+  userName:'',
+  projectName:null,
+  status:null
+})
+
+//方法定义
+const getTableDataList = ()=>{
+  getList().then(res => {
+    tableDataList.value = res.data
+    console.log("res",tableDataList.value)
+  })
+}
+
+
+onMounted(()=>{
+  getTableDataList()
+})
+
+
+
+</script>
+
+
+
+<style scoped lang="scss">
+.topDiv{
+  margin-bottom: 30px;
+  padding-left: 8px ;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.bold-text1 {
+  border-bottom: 4px solid #0062FF;
+  padding-bottom: 25px;
+  height: 15px;
+  font-family: PingFangSC-Medium;
+  font-weight: 900;
+  font-size: 18px;
+  color: #0D162A;
+  letter-spacing: 0;
+  line-height: 15px;
+}
+</style>