diff --git a/src/views/taskmanage/index.vue b/src/views/taskmanage/index.vue index 02b64f20..a3a349fd 100644 --- a/src/views/taskmanage/index.vue +++ b/src/views/taskmanage/index.vue @@ -405,33 +405,15 @@ function getCurrentTotalStat() { bussObj = queryData[i].FieldValue queryData.splice(i, 1); } else - if (queryData[i].FieldName === 'portloaD_CODE') { - str1 = queryData[i].FieldValue - queryData.splice(i, 1); - } else - if (queryData[i].FieldName === 'portdischargE_CODE') { - str2 = queryData[i].FieldValue - queryData.splice(i, 1); - } + if (queryData[i].FieldName === 'portloaD_CODE') { + str1 = queryData[i].FieldValue + queryData.splice(i, 1); + } else + if (queryData[i].FieldName === 'portdischargE_CODE') { + str2 = queryData[i].FieldValue + queryData.splice(i, 1); + } } - // for (let i = 0; i < queryData.length; i++) { - // if (queryData[i].FieldName === 'businessNo') { - // bussObj = queryData[i].FieldValue - // queryData.splice(i, 1) - // i-- - // } - // if (queryData[i].FieldName === 'portloaD_CODE') { - // str1 = queryData[i].FieldValue - // queryData.splice(i, 1) - // i-- - // } - // if (queryData[i].FieldName === 'portdischargE_CODE') { - // str2 = queryData[i].FieldValue - // queryData.splice(i, 1) - // i-- - // } - // } - console.log(queryData, 123123); } const data = { isReCalc: false, @@ -488,9 +470,36 @@ function openFile() { function refshTotalStat() { levelreLoading.value = true levelLoading.value = true + let bussObj = '' + let str1 = '' + let str2 = '' + let queryData = formatParams(getForm().getFieldsValue()).queryCondition + if (queryData) { + queryData = JSON.parse(queryData) + let i = queryData.length; + while (i--) { + if (queryData[i].FieldName === 'businessNo') { + bussObj = queryData[i].FieldValue + queryData.splice(i, 1); + } else + if (queryData[i].FieldName === 'portloaD_CODE') { + str1 = queryData[i].FieldValue + queryData.splice(i, 1); + } else + if (queryData[i].FieldName === 'portdischargE_CODE') { + str2 = queryData[i].FieldValue + queryData.splice(i, 1); + } + } + } GetCurrentTotalStat({ isReCalc: false, - ...getForm().getFieldsValue() + queryCondition: JSON.stringify(queryData), + otherQueryCondition: { + businessNo: bussObj, + portloaD_CODE: str1, + portdischargE_CODE: str2 + } }) .then(res => { levelLoading.value = false @@ -710,23 +719,23 @@ const [registerTable, { reload, setProps, getForm, getSelectRows, setColumns }] bussObj = queryData[i].FieldValue queryData.splice(i, 1); } else - if (queryData[i].FieldName === 'portloaD_CODE') { - str1 = queryData[i].FieldValue - queryData.splice(i, 1); - } else - if (queryData[i].FieldName === 'portdischargE_CODE') { - str2 = queryData[i].FieldValue - queryData.splice(i, 1); - } else - if (queryData[i].FieldName === 'task_TYPE') { - queryData[i].ConditionalType = 0 - } else - if (queryData[i].FieldName === 'taskRecvName') { - queryData[i].ConditionalType = 0 - } else - if (queryData[i].FieldName === 'taskSource') { - queryData[i].ConditionalType = 0 - } + if (queryData[i].FieldName === 'portloaD_CODE') { + str1 = queryData[i].FieldValue + queryData.splice(i, 1); + } else + if (queryData[i].FieldName === 'portdischargE_CODE') { + str2 = queryData[i].FieldValue + queryData.splice(i, 1); + } else + if (queryData[i].FieldName === 'task_TYPE') { + queryData[i].ConditionalType = 0 + } else + if (queryData[i].FieldName === 'taskRecvName') { + queryData[i].ConditionalType = 0 + } else + if (queryData[i].FieldName === 'taskSource') { + queryData[i].ConditionalType = 0 + } } data.queryCondition = JSON.stringify(queryData) data.otherQueryCondition = {}