diff --git a/.env.development b/.env.development index 2ee1390..7539635 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ VITE_APP_ENV = 'development' # 开发环境 -VITE_APP_BASE_API = 'http://192.168.110.209:8899' +VITE_APP_BASE_API = 'http://192.168.110.149:8899' # 李陈杰 209 # VITE_APP_BASE_API = 'http://192.168.110.209:8899' # 曾涛 diff --git a/src/views/cory/template/index.vue b/src/views/cory/template/index.vue index 7d94a7a..4a7e431 100644 --- a/src/views/cory/template/index.vue +++ b/src/views/cory/template/index.vue @@ -1,54 +1,19 @@ - + diff --git a/src/views/workflows/task/allTaskWaiting.vue b/src/views/workflows/task/allTaskWaiting.vue index 9dc0c89..7e86835 100644 --- a/src/views/workflows/task/allTaskWaiting.vue +++ b/src/views/workflows/task/allTaskWaiting.vue @@ -13,7 +13,7 @@ - + 搜索 @@ -38,8 +38,7 @@ - - + diff --git a/src/views/workflows/task/myDocument.vue b/src/views/workflows/task/myDocument.vue index 2f7cfe9..c4be9ca 100644 --- a/src/views/workflows/task/myDocument.vue +++ b/src/views/workflows/task/myDocument.vue @@ -24,8 +24,13 @@
- - + + + + + + + 搜索 @@ -43,11 +48,10 @@ - - - + + @@ -68,20 +72,18 @@ @@ -113,7 +115,12 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { wf_business_status } = toRefs(proxy?.useDict('wf_business_status')); const queryFormRef = ref(); const categoryTreeRef = ref(); - +import { useUserStore } from '@/store/modules/user'; +const userStore = useUserStore(); +const projects = computed(() => [ + { id: '0', name: '全部项目' }, // 添加空选项 + ...userStore.projects +]); // 遮罩层 const loading = ref(true); // 选中数组 @@ -135,11 +142,13 @@ const categoryName = ref(''); const tab = ref('running'); // 查询参数 -const queryParams = ref({ +const queryParams = ref({ pageNum: 1, pageSize: 10, flowCode: undefined, - category: undefined + category: undefined, + projectId: '0', + flowName: undefined }); onMounted(() => { diff --git a/src/views/workflows/task/taskCopyList.vue b/src/views/workflows/task/taskCopyList.vue index 776a064..4b776c5 100644 --- a/src/views/workflows/task/taskCopyList.vue +++ b/src/views/workflows/task/taskCopyList.vue @@ -7,11 +7,13 @@ - - + + - - + + + + 搜索 @@ -31,8 +33,7 @@ - - + @@ -43,7 +44,7 @@ @@ -64,6 +65,12 @@ import { TaskQuery } from '@/api/workflow/task/types'; import workflowCommon from '@/api/workflow/workflowCommon'; import { RouterJumpVo } from '@/api/workflow/workflowCommon/types'; //审批记录组件 +import { useUserStore } from '@/store/modules/user'; +const userStore = useUserStore(); +const projects = computed(() => [ + { id: '0', name: '全部项目' }, // 添加空选项 + ...userStore.projects +]); const queryFormRef = ref(); const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { wf_business_status } = toRefs(proxy?.useDict('wf_business_status')); @@ -82,8 +89,9 @@ const total = ref(0); // 模型定义表格数据 const taskList = ref([]); // 查询参数 -const queryParams = ref({ +const queryParams = ref({ pageNum: 1, + projectId: '0', pageSize: 10, nodeName: undefined, flowName: undefined, diff --git a/src/views/workflows/task/taskFinish.vue b/src/views/workflows/task/taskFinish.vue index 130cce9..87a05dc 100644 --- a/src/views/workflows/task/taskFinish.vue +++ b/src/views/workflows/task/taskFinish.vue @@ -4,19 +4,21 @@
- + - - + + - - + + + + 搜索 @@ -34,10 +36,8 @@ - - - + @@ -64,7 +64,7 @@ @@ -94,7 +94,12 @@ const { wf_task_status } = toRefs(proxy?.useDict('wf_task_status')); import UserSelect from '@/components/UserSelect'; import { ref } from 'vue'; import { UserVO } from '@/api/system/user/types'; - +import { useUserStore } from '@/store/modules/user'; +const userStore = useUserStore(); +const projects = computed(() => [ + { id: '0', name: '全部项目' }, // 添加空选项 + ...userStore.projects +]); const userSelectRef = ref>(); // 遮罩层 const loading = ref(true); @@ -111,11 +116,12 @@ const total = ref(0); // 模型定义表格数据 const taskList = ref([]); // 查询参数 -const queryParams = ref({ +const queryParams = ref({ pageNum: 1, pageSize: 10, nodeName: undefined, flowName: undefined, + projectId: '0', flowCode: undefined, createByIds: [] }); diff --git a/src/views/workflows/task/taskWaiting.vue b/src/views/workflows/task/taskWaiting.vue index e678401..a53bf3c 100644 --- a/src/views/workflows/task/taskWaiting.vue +++ b/src/views/workflows/task/taskWaiting.vue @@ -12,11 +12,13 @@ - - + + - - + + + + 搜索 @@ -33,10 +35,8 @@ - - - + @@ -60,7 +60,7 @@ @@ -88,7 +88,12 @@ const { wf_business_status } = toRefs(proxy?.useDict('wf_business_status')) import UserSelect from '@/components/UserSelect'; import { ref } from 'vue'; import { UserVO } from '@/api/system/user/types'; - +import { useUserStore } from '@/store/modules/user'; +const userStore = useUserStore(); +const projects = computed(() => [ + { id: '0', name: '全部项目' }, // 添加空选项 + ...userStore.projects +]); const userSelectRef = ref>(); //提交组件 const queryFormRef = ref(); @@ -112,13 +117,14 @@ const selectUserIds = ref>([]); //申请人选择数量 const userSelectCount = ref(0); // 查询参数 -const queryParams = ref({ +const queryParams = ref({ pageNum: 1, pageSize: 10, nodeName: undefined, flowName: undefined, flowCode: undefined, - createByIds: [] + createByIds: [], + projectId: '0' }); onMounted(() => { getWaitingList();