Ver Fonte

列表搜索bug修复

ye-zhaojia há 2 semanas atrás
pai
commit
6b3818f992
3 ficheiros alterados com 10 adições e 10 exclusões
  1. 1 1
      README.md
  2. 6 6
      src/views/flow/definition/index.vue
  3. 3 3
      src/views/flow/instance/mine.vue

+ 1 - 1
README.md

@@ -32,7 +32,7 @@ Docker 构建时如遇缓存问题,修改 `Dockerfile` 中的 `ARG BUILD_BUSTE
 
 
 ## 默认账号
 ## 默认账号
 
 
-密码均为 `123456a`:
+密码均为 `admin123`:
 
 
 | 账号 | 可见菜单 |
 | 账号 | 可见菜单 |
 |------|---------|
 |------|---------|

+ 6 - 6
src/views/flow/definition/index.vue

@@ -13,10 +13,10 @@
 
 
       <el-form :inline="true" :model="queryParams" class="search-form">
       <el-form :inline="true" :model="queryParams" class="search-form">
         <el-form-item label="流程编码">
         <el-form-item label="流程编码">
-          <el-input v-model="queryParams.code" placeholder="请输入流程编码" clearable />
+          <el-input v-model="queryParams.processCode" placeholder="请输入流程编码" clearable />
         </el-form-item>
         </el-form-item>
         <el-form-item label="流程名称">
         <el-form-item label="流程名称">
-          <el-input v-model="queryParams.name" placeholder="请输入流程名称" clearable />
+          <el-input v-model="queryParams.processName" placeholder="请输入流程名称" clearable />
         </el-form-item>
         </el-form-item>
         <el-form-item label="状态">
         <el-form-item label="状态">
           <el-select v-model="queryParams.status" placeholder="全部" clearable style="width: auto; min-width: 120px;">
           <el-select v-model="queryParams.status" placeholder="全部" clearable style="width: auto; min-width: 120px;">
@@ -269,8 +269,8 @@ const total = ref(0)
 const queryParams = reactive({
 const queryParams = reactive({
   pageNum: 1,
   pageNum: 1,
   pageSize: 10,
   pageSize: 10,
-  code: undefined as string | undefined,
-  name: undefined as string | undefined,
+  processCode: undefined as string | undefined,
+  processName: undefined as string | undefined,
   status: undefined as number | undefined
   status: undefined as number | undefined
 })
 })
 
 
@@ -410,8 +410,8 @@ function handleSizeChange() {
 }
 }
 
 
 function resetQuery() {
 function resetQuery() {
-  queryParams.code = undefined
-  queryParams.name = undefined
+  queryParams.processCode = undefined
+  queryParams.processName = undefined
   queryParams.status = undefined
   queryParams.status = undefined
   handleQuery()
   handleQuery()
 }
 }

+ 3 - 3
src/views/flow/instance/mine.vue

@@ -71,7 +71,7 @@
         <el-table-column label="操作" width="200">
         <el-table-column label="操作" width="200">
           <template #default="{ row }">
           <template #default="{ row }">
             <el-button link type="primary" @click="handleDetail(row)">查看详情</el-button>
             <el-button link type="primary" @click="handleDetail(row)">查看详情</el-button>
-            <el-button v-if="row.status === 0 || row.status === 1 || row.status === 4" link type="warning" @click="handleRevoke(row)">撤回</el-button>
+            <el-button v-if="row.status === 0 || row.status === 1" link type="warning" @click="handleRevoke(row)">撤回</el-button>
             <el-button v-if="row.status === 6" link type="danger" @click="handleDelete(row)">删除</el-button>
             <el-button v-if="row.status === 6" link type="danger" @click="handleDelete(row)">删除</el-button>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
@@ -205,7 +205,7 @@ async function handleDelete(row: FlowInstance) {
 function getRevocableIds(): number[] {
 function getRevocableIds(): number[] {
   return selectedIds.value.filter(id => {
   return selectedIds.value.filter(id => {
     const row = tableData.value.find(r => r.id === id)
     const row = tableData.value.find(r => r.id === id)
-    return row && (row.status === 0 || row.status === 1 || row.status === 4)
+    return row && (row.status === 0 || row.status === 1)
   })
   })
 }
 }
 
 
@@ -219,7 +219,7 @@ function getDeletableIds(): number[] {
 async function handleBatchRevoke() {
 async function handleBatchRevoke() {
   const ids = getRevocableIds()
   const ids = getRevocableIds()
   if (ids.length === 0) {
   if (ids.length === 0) {
-    ElMessage.warning('请选择可撤回的流程(运行中或已回退)')
+    ElMessage.warning('请选择可撤回的流程(待接收或运行中)')
     return
     return
   }
   }
   try {
   try {