+
{{data.type}}
+
2
+
{
-
+
diff --git a/src/views/formTable/myTask.vue b/src/views/formTable/myTask.vue
index fe33d01..8570253 100644
--- a/src/views/formTable/myTask.vue
+++ b/src/views/formTable/myTask.vue
@@ -61,10 +61,12 @@ const gainAppTaskList = () => {
if(data.data.list){
appTaskList.value.push(...data.data.list)
}
-
- if(data.total > 0){
- if(logCount.value < data.total){
- let pagenum = searchInfo.pagesize - data.count
+ let allPageCount = data.data.total
+ console.log("获取任务列表内容=====111======>",allPageCount,logCount.value)
+ if(allPageCount > 0){
+ if(logCount.value < allPageCount){
+ let pagenum = searchInfo.pagesize - data.data.count
+ console.log("获取任务列表内容====pagenum=======>",pagenum)
if (pagenum > 0) {
loadText.value = ""
loadingList.value = true
@@ -73,8 +75,15 @@ const gainAppTaskList = () => {
loadingList.value = false
}
}else{
- loadText.value = ""
- loadingList.value = true
+ let pagenum = searchInfo.pagesize - data.data.count
+ if (pagenum < 0) {
+ loadText.value = ""
+ loadingList.value = true
+ }else{
+ loadText.value = "此选项没有数据!"
+ loadingList.value = true
+ }
+
}
}else{
loadText.value = "此选项没有数据!"
@@ -92,9 +101,9 @@ const gainAppTaskList = () => {
appTaskList.value.push(...data.data.list)
}
- if(data.total > 0){
- if(logCount.value < data.total){
- let pagenum = searchInfo.pagesize - data.count
+ if(data.data.total > 0){
+ if(logCount.value < data.data.total){
+ let pagenum = searchInfo.pagesize - data.data.count
if (pagenum > 0) {
loadText.value = ""
loadingList.value = true
@@ -103,8 +112,14 @@ const gainAppTaskList = () => {
loadingList.value = false
}
}else{
- loadText.value = ""
- loadingList.value = true
+ let pagenum = searchInfo.pagesize - data.data.count
+ if (pagenum < 0) {
+ loadText.value = ""
+ loadingList.value = true
+ }else{
+ loadText.value = "此选项没有数据!"
+ loadingList.value = true
+ }
}
}else{
loadText.value = "此选项没有数据!"
@@ -122,9 +137,9 @@ const gainAppTaskList = () => {
appTaskList.value.push(...data.data.list)
}
- if(data.total > 0){
- if(logCount.value < data.total){
- let pagenum = searchInfo.pagesize - data.count
+ if(data.data.total > 0){
+ if(logCount.value < data.data.total){
+ let pagenum = searchInfo.pagesize - data.data.count
if (pagenum > 0) {
loadText.value = ""
loadingList.value = true
@@ -133,8 +148,14 @@ const gainAppTaskList = () => {
loadingList.value = false
}
}else{
- loadText.value = ""
- loadingList.value = true
+ let pagenum = searchInfo.pagesize - data.data.count
+ if (pagenum < 0) {
+ loadText.value = ""
+ loadingList.value = true
+ }else{
+ loadText.value = "此选项没有数据!"
+ loadingList.value = true
+ }
}
}else{
loadText.value = "此选项没有数据!"
@@ -153,9 +174,9 @@ const gainAppTaskList = () => {
appTaskList.value.push(...data.data.list)
}
- if(data.total > 0){
- if(logCount.value < data.total){
- let pagenum = searchInfo.pagesize - data.count
+ if(data.data.total > 0){
+ if(logCount.value < data.data.total){
+ let pagenum = searchInfo.pagesize - data.data.count
if (pagenum > 0) {
loadText.value = ""
loadingList.value = true
@@ -164,8 +185,14 @@ const gainAppTaskList = () => {
loadingList.value = false
}
}else{
- loadText.value = ""
- loadingList.value = true
+ let pagenum = searchInfo.pagesize - data.data.count
+ if (pagenum < 0) {
+ loadText.value = ""
+ loadingList.value = true
+ }else{
+ loadText.value = "此选项没有数据!"
+ loadingList.value = true
+ }
}
}else{
loadText.value = "此选项没有数据!"
@@ -178,11 +205,11 @@ const gainAppTaskList = () => {
gainAppAllTaskList(searchInfo)
.then(({data}) => {
console.log("获取列表内容",data)
- logCount.value = logCount.value + data.count
+ logCount.value = logCount.value + data.data.count
appTaskList.value.push(...data.list)
- if(data.total > 0){
- if(logCount.value < data.total){
- let pagenum = searchInfo.pagesize - data.count
+ if(data.data.total > 0){
+ if(logCount.value < data.data.total){
+ let pagenum = searchInfo.pagesize - data.data.count
if (pagenum > 0) {
loadText.value = ""
loadingList.value = true
@@ -191,8 +218,14 @@ const gainAppTaskList = () => {
loadingList.value = false
}
}else{
- loadText.value = ""
- loadingList.value = true
+ let pagenum = searchInfo.pagesize - data.data.count
+ if (pagenum < 0) {
+ loadText.value = ""
+ loadingList.value = true
+ }else{
+ loadText.value = "此选项没有数据!"
+ loadingList.value = true
+ }
}
}else{
loadText.value = "此选项没有数据!"
diff --git a/src/views/formTable/page/flowAndLog.vue b/src/views/formTable/page/flowAndLog.vue
index 58708ed..d3705d6 100644
--- a/src/views/formTable/page/flowAndLog.vue
+++ b/src/views/formTable/page/flowAndLog.vue
@@ -116,7 +116,7 @@ const newAddPageData = () => {
}else{
console.log("获取流程==2=1=>",props.appPageInfo)
if(props.appPageInfo && props.appPageInfo.runFlowId && props.appPageInfo.runFlowId != "0" && props.appPageInfo.runFlowId != ""){
- gainRunTaskFlow({id:props.appPageInfo.runFlowIdStr})
+ gainRunTaskFlow({id:props.appPageInfo.runFlowId})
.then(({data})=>{
console.log("获取流程==2==>",data)
flowMap.value = data.flowList
diff --git a/src/views/formTable/taskListPage.vue b/src/views/formTable/taskListPage.vue
index 720b9a0..6153403 100644
--- a/src/views/formTable/taskListPage.vue
+++ b/src/views/formTable/taskListPage.vue
@@ -451,10 +451,10 @@ const setUpClick = (val:string,id:string) => {
message: data.mag,
type: "success",
});
- cardPageRef.value.getPageData();
+ cardPageRef.value.requeryList();
});
}).catch(() => {
- cardPageRef.value.getPageData();
+ cardPageRef.value.requeryList();
});
}else{
ElMessage.error("你还未选中要删除的项目!");