Browse Source

feat: update bug

master
TengXF 6 months ago
parent
commit
149d11d312
  1. 2
      src/pages/mes/workScheduling/callMaterial.vue
  2. 42
      src/pages/mes/workScheduling/workScheduling.vue

2
src/pages/mes/workScheduling/callMaterial.vue

@ -59,7 +59,7 @@ const status = ref('loadmore') //是否显示没有更多了
const workingNodeStr = ref('') const workingNodeStr = ref('')
const planMasterCodeStr = ref('') const planMasterCodeStr = ref('')
const schedulingCodeStr = ref('') const schedulingCodeStr = ref('')
const planCountStr = ref() const planCountStr = ref(1)
const workroomCodeStr = ref('') const workroomCodeStr = ref('')
const list = ref([]) const list = ref([])

42
src/pages/mes/workScheduling/workScheduling.vue

@ -209,25 +209,6 @@
status: '', status: '',
flag: null flag: null
}) })
async function getViewList() {
if (status.value == 'nomore') return
status.value = 'loading'
proxy.$modal.loading('加载中')
await workSchedulingListApi.getWorkSchedulingPDAPage(params.value).then((res) => {
proxy.$modal.closeLoading()
if (res.data.list.length > 0) {
list.value = list.value.concat(res.data.list)
params.value.pageNo++
status.value = 'loadmore'
} else {
status.value = 'nomore'
}
}).catch(() => {
proxy.$modal.closeLoading()
})
falg.value = 'view'
}
function getFormattedDate(date) { function getFormattedDate(date) {
@ -253,6 +234,25 @@
}) })
async function getViewList() {
if (status.value == 'nomore') return
status.value = 'loading'
proxy.$modal.loading('加载中')
await workSchedulingListApi.getWorkSchedulingPDAPage(params.value).then((res) => {
proxy.$modal.closeLoading()
if (res.data.list.length > 0) {
list.value = list.value.concat(res.data.list)
params.value.pageNo++
status.value = 'loadmore'
} else {
status.value = 'nomore'
}
}).catch(() => {
proxy.$modal.closeLoading()
})
falg.value = 'view'
}
function getTabsList() { function getTabsList() {
console.log(tabParams.value) console.log(tabParams.value)
@ -329,7 +329,7 @@
getViewList() getViewList()
} }
if (falg.value == 'call') { if (falg.value == 'request') {
status.value = 'loading' status.value = 'loading'
getRequestList() getRequestList()
} }
@ -411,7 +411,7 @@
tabParams.value.status = '1'; tabParams.value.status = '1';
break; break;
case 4: case 4:
falg.value == 'call' falg.value == 'request'
list.value = []; list.value = [];
status.value = 'loading'; status.value = 'loading';
tabParams.value.status = '0'; tabParams.value.status = '0';

Loading…
Cancel
Save