diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue index 9804827..e204a69 100644 --- a/src/views/tested/MeasurementBusiness/review/index.vue +++ b/src/views/tested/MeasurementBusiness/review/index.vue @@ -76,21 +76,11 @@ // 是否显示当前页，否则跳转第一页 listQuery.offset = 1 } - // getListPage(listQuery).then((response) => { - // list.value = response.data.rows - // total.value = parseInt(response.data.total) - // listLoading.value = false - // }) - list.value = [{ - formNo: '12345', - formName: '评审表1', - labCode: '海口实验室', - groupCode: '组别1', - signStatusName: '同意', - createUserName: '张三', - createTime: '2023-09-05', - }] - listLoading.value = false + getListPage(listQuery).then((response) => { + list.value = response.data.rows + total.value = parseInt(response.data.total) + listLoading.value = false + }) } fetchData() // 查询数据 diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue index 9804827..e204a69 100644 --- a/src/views/tested/MeasurementBusiness/review/index.vue +++ b/src/views/tested/MeasurementBusiness/review/index.vue @@ -76,21 +76,11 @@ // 是否显示当前页，否则跳转第一页 listQuery.offset = 1 } - // getListPage(listQuery).then((response) => { - // list.value = response.data.rows - // total.value = parseInt(response.data.total) - // listLoading.value = false - // }) - list.value = [{ - formNo: '12345', - formName: '评审表1', - labCode: '海口实验室', - groupCode: '组别1', - signStatusName: '同意', - createUserName: '张三', - createTime: '2023-09-05', - }] - listLoading.value = false + getListPage(listQuery).then((response) => { + list.value = response.data.rows + total.value = parseInt(response.data.total) + listLoading.value = false + }) } fetchData() // 查询数据 diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue index a41ea11..e2d0ea2 100644 --- a/src/views/tested/MeasurementPlan/dept/components/list.vue +++ b/src/views/tested/MeasurementPlan/dept/components/list.vue @@ -12,6 +12,7 @@ required: true, }, }) +const $route = useRoute() const { proxy } = getCurrentInstance() as any const userStore = useUserStore() const listQuery = reactive({ @@ -20,8 +21,8 @@ createTimeEnd: '', createTimeStart: '', notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值) - notifyDept: userStore.deptId, - notifyUser: userStore.id, + notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId, + notifyUser: $route.path.includes('curatorpage') ? userStore.id : '', offset: 1, limit: 20, }) diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue index 9804827..e204a69 100644 --- a/src/views/tested/MeasurementBusiness/review/index.vue +++ b/src/views/tested/MeasurementBusiness/review/index.vue @@ -76,21 +76,11 @@ // 是否显示当前页，否则跳转第一页 listQuery.offset = 1 } - // getListPage(listQuery).then((response) => { - // list.value = response.data.rows - // total.value = parseInt(response.data.total) - // listLoading.value = false - // }) - list.value = [{ - formNo: '12345', - formName: '评审表1', - labCode: '海口实验室', - groupCode: '组别1', - signStatusName: '同意', - createUserName: '张三', - createTime: '2023-09-05', - }] - listLoading.value = false + getListPage(listQuery).then((response) => { + list.value = response.data.rows + total.value = parseInt(response.data.total) + listLoading.value = false + }) } fetchData() // 查询数据 diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue index a41ea11..e2d0ea2 100644 --- a/src/views/tested/MeasurementPlan/dept/components/list.vue +++ b/src/views/tested/MeasurementPlan/dept/components/list.vue @@ -12,6 +12,7 @@ required: true, }, }) +const $route = useRoute() const { proxy } = getCurrentInstance() as any const userStore = useUserStore() const listQuery = reactive({ @@ -20,8 +21,8 @@ createTimeEnd: '', createTimeStart: '', notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值) - notifyDept: userStore.deptId, - notifyUser: userStore.id, + notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId, + notifyUser: $route.path.includes('curatorpage') ? userStore.id : '', offset: 1, limit: 20, }) diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue index aafe5e1..a25835f 100644 --- a/src/views/tested/MeasurementPlan/dept/index.vue +++ b/src/views/tested/MeasurementPlan/dept/index.vue @@ -5,5 +5,5 @@ diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue index 9804827..e204a69 100644 --- a/src/views/tested/MeasurementBusiness/review/index.vue +++ b/src/views/tested/MeasurementBusiness/review/index.vue @@ -76,21 +76,11 @@ // 是否显示当前页，否则跳转第一页 listQuery.offset = 1 } - // getListPage(listQuery).then((response) => { - // list.value = response.data.rows - // total.value = parseInt(response.data.total) - // listLoading.value = false - // }) - list.value = [{ - formNo: '12345', - formName: '评审表1', - labCode: '海口实验室', - groupCode: '组别1', - signStatusName: '同意', - createUserName: '张三', - createTime: '2023-09-05', - }] - listLoading.value = false + getListPage(listQuery).then((response) => { + list.value = response.data.rows + total.value = parseInt(response.data.total) + listLoading.value = false + }) } fetchData() // 查询数据 diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue index a41ea11..e2d0ea2 100644 --- a/src/views/tested/MeasurementPlan/dept/components/list.vue +++ b/src/views/tested/MeasurementPlan/dept/components/list.vue @@ -12,6 +12,7 @@ required: true, }, }) +const $route = useRoute() const { proxy } = getCurrentInstance() as any const userStore = useUserStore() const listQuery = reactive({ @@ -20,8 +21,8 @@ createTimeEnd: '', createTimeStart: '', notifyType: $props.notifyType, // 通知类型(负责人/部门，字典值) - notifyDept: userStore.deptId, - notifyUser: userStore.id, + notifyDept: $route.path.includes('curatorpage') ? '' : userStore.deptId, + notifyUser: $route.path.includes('curatorpage') ? userStore.id : '', offset: 1, limit: 20, }) diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue index aafe5e1..a25835f 100644 --- a/src/views/tested/MeasurementPlan/dept/index.vue +++ b/src/views/tested/MeasurementPlan/dept/index.vue @@ -5,5 +5,5 @@ diff --git a/src/views/tested/device/group/components/tableList.vue b/src/views/tested/device/group/components/tableList.vue index d1f60ce..f1b817a 100644 --- a/src/views/tested/device/group/components/tableList.vue +++ b/src/views/tested/device/group/components/tableList.vue @@ -177,7 +177,16 @@