2024-05-09 流程待办更新

src/views/bpm/processInstance/index.vue

@@ -106,7 +106,8 @@
 import { getMyProcessInstancePage, cancelProcessInstance } from "@/api/bpm/processInstance";
 
 export default {
-  name: "ProcessInstance",
+  //lanbm 2024-05-08 添加查询条件不清空优化
+  name: "BpmProcessinstanceIndex",
   components: {
   },
   data() {
@@ -137,6 +138,14 @@ export default {
   created() {
     this.getList();
   },
+  watch: {
+    //lanbm 2024-05-08 添加页面再次进入刷新列表优化
+    $route(to) {
+      if (this.$route.path == "/task/my") {
+        this.getList();
+      }
+    },
+  },
   methods: {
     /** 查询列表 */
     getList() {

src/views/bpm/task/copy.vue

@@ -73,7 +73,8 @@
 import {getCopyTaskPage} from '@/api/bpm/task'
 
 export default {
-  name: "Copy",
+  //lanbm 2024-05-08 添加查询条件不清空优化
+  name: "BpmTaskCopy",
   components: {},
   data() {
     return {
@@ -100,6 +101,14 @@ export default {
   created() {
     this.getList();
   },
+  watch: {
+    //lanbm 2024-05-08 添加页面再次进入刷新列表优化
+    $route(to) {
+      if (this.$route.path == "/task/copy") {
+        this.getList();
+      }
+    },
+  },
   methods: {
     /** 查询列表 */
     getList() {

src/views/bpm/task/done.vue

@@ -80,7 +80,8 @@ import {getDoneTaskPage} from '@/api/bpm/task'
 import {getDate} from "@/utils/dateUtils";
 
 export default {
-  name: "Done",
+  //lanbm 2024-05-08 添加查询条件不清空优化
+  name: "BpmTaskDone",
   components: {},
   data() {
     return {
@@ -104,6 +105,14 @@ export default {
   created() {
     this.getList();
   },
+  watch: {
+    //lanbm 2024-05-08 添加页面再次进入刷新列表优化
+    $route(to) {
+      if (this.$route.path == "/task/done") {
+        this.getList();
+      }
+    },
+  },
   methods: {
     /** 查询列表 */
     getList() {

src/views/bpm/task/todo.vue

 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item :label="$t('流程编号')" prop="processInstanceId">
-        <el-input v-model="queryParams.processInstanceId" :placeholder="$t('流程编号')" clearable
-                  @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.processInstanceId"
+          :placeholder="$t('流程编号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item :label="$t('流程名称')" prop="name">
-        <el-input v-model="queryParams.name" :placeholder="$t('任务名称')" clearable @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.name"
+          :placeholder="$t('任务名称')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item :label="$t('流程分类')" prop="category">
-        <el-select v-model="queryParams.category" :placeholder="$t('请选择流程分类')" clearable>
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY)"
-                     :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
+        <el-select
+          v-model="queryParams.category"
+          :placeholder="$t('请选择流程分类')"
+          clearable
+        >
+          <el-option
+            v-for="dict in this.getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY)"
+            :key="dict.value"
+            :label="$l(dict, 'label')"
+            :value="dict.value"
+          />
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('提交时间')">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" :start-placeholder="$t('开始日期')"
-                        :end-placeholder="$t('结束日期')"/>
+        <el-date-picker
+          v-model="dateRangeCreateTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          :start-placeholder="$t('开始日期')"
+          :end-placeholder="$t('结束日期')"
+        />
       </el-form-item>
       <el-form-item :label="$t('业务编号')" prop="businessNo">
-        <el-input v-model="queryParams.businessNo" :placeholder="$t('请输入业务编号')" clearable
-                  @keyup.enter.native="handleQuery"/>
+        <el-input
+          v-model="queryParams.businessNo"
+          :placeholder="$t('请输入业务编号')"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
 
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('重置') }}</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{
+          $t("搜索")
+        }}</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">{{
+          $t("重置")
+        }}</el-button>
       </el-form-item>
     </el-form>
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column :label="$t('流程编号')" align="center" prop="processInstance.id" width="220"/>
-      <el-table-column :label="$t('流程名称')" align="center" prop="processInstance.name" width="220"/>
-      
+      <el-table-column
+        :label="$t('流程编号')"
+        align="center"
+        prop="processInstance.id"
+        width="220"
+      />
+      <el-table-column
+        :label="$t('流程名称')"
+        align="center"
+        prop="processInstance.name"
+        width="220"
+      />
+
       <el-table-column :label="$t('流程分类')" align="center" prop="category">
         <template slot-scope="scope">
-          <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="scope.row.category"/>
+          <dict-tag
+            :type="DICT_TYPE.BPM_MODEL_CATEGORY"
+            :value="scope.row.category"
+          />
         </template>
       </el-table-column>
-      <el-table-column :label="$t('业务编号')" align="center" prop="businessNo"/>
+      <el-table-column
+        :label="$t('业务编号')"
+        align="center"
+        prop="businessNo"
+      />
 
-      <el-table-column :label="$t('当前审批节点')" align="center" prop="name"/>
+      <el-table-column :label="$t('当前审批节点')" align="center" prop="name" />
       <!-- <el-table-column :label="$t('状态')" align="center" prop="version" width="80">
         <template slot-scope="scope">
           <el-tag type="success" v-if="scope.row.suspensionState === 1">{{ $t('激活') }}</el-tag>
@@ -56,7 +111,12 @@
           <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/>
         </template>
       </el-table-column> -->
-      <el-table-column :label="$t('提交时间')" align="center" prop="createTime" width="180">
+      <el-table-column
+        :label="$t('提交时间')"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
@@ -66,32 +126,52 @@
           <span>{{ parseTime(scope.row.endTime) }}</span>
         </template>
       </el-table-column> -->
-      <el-table-column :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width" width="150">
+      <el-table-column
+        :label="$t('操作')"
+        align="center"
+        fixed="right"
+        class-name="small-padding fixed-width"
+        width="150"
+      >
         <template slot-scope="scope">
           <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCancel(scope.row)"
                      v-hasPermi="['bpm:task:update']">{{ $t('取消') }}
           </el-button> -->
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"
-                     v-hasPermi="['bpm:task:update']">{{ $t('详情') }}
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleAudit(scope.row)"
+            v-hasPermi="['bpm:task:update']"
+            >{{ $t("详情") }}
           </el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"
-                     v-hasPermi="['bpm:task:update']">{{ $t('审批') }}
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleAudit(scope.row)"
+            v-hasPermi="['bpm:task:update']"
+            >{{ $t("审批") }}
           </el-button>
-
         </template>
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
   </div>
 </template>
 
 <script>
-import {getTodoTaskPage} from '@/api/bpm/task'
+import { getTodoTaskPage } from "@/api/bpm/task";
 import { cancelProcessInstance } from "@/api/bpm/processInstance";
 export default {
+  //lanbm 2024-05-08 添加查询条件不清空优化
   name: "BpmTaskTodo",
   components: {},
   data() {
@@ -118,14 +198,22 @@ export default {
   created() {
     this.getList();
   },
+  watch: {
+    //lanbm 2024-05-08 添加页面再次进入刷新列表优化
+    $route(to) {
+      if (this.$route.path == "/task/todo") {
+        this.getList();
+      }
+    },
+  },
   methods: {
     /** 查询列表 */
     getList() {
       this.loading = true;
       // 处理查询参数
-      let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
-      getTodoTaskPage(params).then(response => {
+      let params = { ...this.queryParams };
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, "createTime");
+      getTodoTaskPage(params).then((response) => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -144,23 +232,28 @@ export default {
     },
     /** 处理审批按钮 */
     handleAudit(row) {
-      this.$router.push({path: "/bpm/process-instance/detail", query: {id: row.processInstance.id}});
+      this.$router.push({
+        path: "/bpm/process-instance/detail",
+        query: { id: row.processInstance.id },
+      });
     },
     handleCancel(row) {
       const id = row.id;
-      this.$prompt(this.$t('请输入取消原因？'), this.$t("取消流程"), {
-        type: 'warning',
+      this.$prompt(this.$t("请输入取消原因？"), this.$t("取消流程"), {
+        type: "warning",
         confirmButtonText: this.$t("确定"),
         cancelButtonText: this.$t("取消"),
         inputPattern: /^[\s\S]*.*[^\s][\s\S]*$/, // 判断非空，且非空格
         inputErrorMessage: this.$t("取消原因不能为空"),
-      }).then(({ value }) => {
-        return cancelProcessInstance(id, value);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess(this.$t("取消成功"));
       })
+        .then(({ value }) => {
+          return cancelProcessInstance(id, value);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess(this.$t("取消成功"));
+        });
     },
-  }
+  },
 };
 </script>