⚡ 我的申请页面移除状态查询条件

saber3/src/api/workflow/index.js

@@ -16,13 +16,18 @@ export const getProcessTypes = () => {
  * 对应接口: GET /blade-zhaocai/zcProcess/getPageList
  */
 export const getTodoList = (current, size, params) => {
+  const { keyWord, processName, processId, userCode, ...rest } = params;
   return request({
     url: '/blade-zhaocai/zcProcess/getPageList',
     method: 'get',
     params: {
-      ...params,
+      ...rest,
       pageNo: current,
       pageSize: size,
+      keyWord: keyWord || '',
+      processName: processName || '',
+      processId: processId || '',
+      userCode: userCode || '',
     },
   });
 };
@@ -32,13 +37,18 @@ export const getTodoList = (current, size, params) => {
  * 对应接口: GET /blade-zhaocai/zcProcess/getDonePageList
  */
 export const getDoneList = (current, size, params) => {
+  const { keyWord, processName, processId, userCode, ...rest } = params;
   return request({
     url: '/blade-zhaocai/zcProcess/getDonePageList',
     method: 'get',
     params: {
-      ...params,
+      ...rest,
       pageNo: current,
       pageSize: size,
+      keyWord: keyWord || '',
+      processName: processName || '',
+      processId: processId || '',
+      userCode: userCode || '',
     },
   });
 };
@@ -48,13 +58,18 @@ export const getDoneList = (current, size, params) => {
  * 对应接口: GET /blade-zhaocai/zcProcess/getAppliedPageList
  */
 export const getMyList = (current, size, params) => {
+  const { keyWord, processName, processId, userCode, ...rest } = params;
   return request({
     url: '/blade-zhaocai/zcProcess/getAppliedPageList',
     method: 'get',
     params: {
-      ...params,
+      ...rest,
       pageNo: current,
       pageSize: size,
+      keyWord: keyWord || '',
+      processName: processName || '',
+      processId: processId || '',
+      userCode: userCode || '',
     },
   });
 };

saber3/src/views/workflow/done.vue

@@ -90,7 +90,8 @@
 </template>
 
 <script>
-import { getDoneList, getDetail } from '@/api/workflow';
+import { getDoneList, getDetail, getProcessTypes } from '@/api/workflow';
+import { mapGetters } from 'vuex';
 
 export default {
   data() {
@@ -105,6 +106,7 @@ export default {
       },
       query: {},
       data: [],
+      processTypes: [],
       // 流转弹窗
       transferDialogVisible: false,
       currentProcessName: '',
@@ -126,11 +128,25 @@ export default {
         menuWidth: 150,
         dialogClickModal: false,
         column: [
+          {
+            label: '关键字',
+            prop: 'keyWord',
+            search: true,
+            hide: true,
+          },
           {
             label: '流程名称',
             prop: 'processName',
             overHidden: true,
           },
+          {
+            label: '流程Key',
+            prop: 'processId',
+            type: 'select',
+            search: true,
+            hide: true,
+            dicData: [],
+          },
           {
             label: '申请人',
             prop: 'tCreateUser',
@@ -150,7 +166,26 @@ export default {
       },
     };
   },
+  computed: {
+    ...mapGetters(['userInfo']),
+  },
+  mounted() {
+    this.loadProcessTypes();
+  },
   methods: {
+    loadProcessTypes() {
+      getProcessTypes().then(res => {
+        const data = res.data.data;
+        this.processTypes = data.map(item => ({
+          label: item.processName,
+          value: item.processId,
+        }));
+        const processIdColumn = this.option.column.find(item => item.prop === 'processId');
+        if (processIdColumn) {
+          processIdColumn.dicData = this.processTypes;
+        }
+      });
+    },
     searchReset() {
       this.query = {};
       this.onLoad(this.page);
@@ -175,6 +210,8 @@ export default {
       const query = {
         ...this.query,
         ...params,
+        userCode: this.userInfo.account,
+        processName: '',
       };
       getDoneList(page.currentPage, page.pageSize, query).then(res => {
         const data = res.data.data;

saber3/src/views/workflow/my.vue

@@ -97,6 +97,7 @@
 
 <script>
 import { getMyList, getProcessTypes } from '@/api/workflow';
+import { mapGetters } from 'vuex';
 import { Document } from '@element-plus/icons-vue';
 
 export default {
@@ -122,7 +123,7 @@ export default {
         height: 'auto',
         calcHeight: 32,
         tip: false,
-        searchShow: false,
+        searchShow: true,
         searchMenuSpan: 6,
         border: true,
         index: true,
@@ -134,25 +135,30 @@ export default {
         menuWidth: 200,
         dialogClickModal: false,
         column: [
+          {
+            label: '关键字',
+            prop: 'keyWord',
+            search: true,
+            hide: true,
+          },
           {
             label: '流程名称',
             prop: 'processName',
-            search: true,
             overHidden: true,
           },
+          {
+            label: '流程Key',
+            prop: 'processId',
+            type: 'select',
+            search: true,
+            hide: true,
+            dicData: [],
+          },
           {
             label: '状态',
             prop: 'status',
             slot: true,
             width: 100,
-            search: true,
-            type: 'select',
-            dicData: [
-              { label: '待提交', value: '待提交' },
-              { label: '审批中', value: '审批中' },
-              { label: '已完成', value: '已完成' },
-              { label: '已驳回', value: '已驳回' },
-            ],
           },
           {
             label: '申请人',
@@ -173,6 +179,9 @@ export default {
       },
     };
   },
+  computed: {
+    ...mapGetters(['userInfo']),
+  },
   mounted() {
     this.loadProcessTypes();
   },
@@ -184,6 +193,10 @@ export default {
           label: item.processName,
           value: item.processId,
         }));
+        const processIdColumn = this.option.column.find(item => item.prop === 'processId');
+        if (processIdColumn) {
+          processIdColumn.dicData = this.processTypes;
+        }
       });
     },
     searchReset() {
@@ -210,6 +223,8 @@ export default {
       const query = {
         ...this.query,
         ...params,
+        userCode: this.userInfo.account,
+        processName: '',
       };
       getMyList(page.currentPage, page.pageSize, query).then(res => {
         const data = res.data.data;

saber3/src/views/workflow/todo.vue

@@ -224,6 +224,7 @@ export default {
         userCode: this.userInfo.account,
         processName: '',
       };
+      console.log('[todo onLoad] userInfo:', this.userInfo, 'query:', query);
       getTodoList(page.currentPage, page.pageSize, query).then(res => {
         const data = res.data.data;
         this.page.total = data.total;