Browse Source

修复报表搜索错误

dev-xx
马远东 8 months ago
parent
commit
87040c03fd
  1. 4
      src/views/reportforms/DeliveryCustomers.vue
  2. 4
      src/views/reportforms/DeliveryDetails.vue
  3. 9
      src/views/reportforms/DeliveryTrainNumber.vue
  4. 2
      src/views/reportforms/Inventory.vue
  5. 4
      src/views/reportforms/InventoryOutbound.vue
  6. 4
      src/views/reportforms/InventoryReceipt.vue
  7. 4
      src/views/reportforms/Selfpickupreport.vue
  8. 4
      src/views/reportforms/Selfpickuptask.vue
  9. 6
      src/views/reportforms/Stockordertable.vue

4
src/views/reportforms/DeliveryCustomers.vue

@ -334,7 +334,7 @@ const selectionChange = list => {
//
const searchChange = () => {
//
if (TopQuery.value.time.length) {
if (TopQuery.value.time?.length) {
queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //
queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //
} else {
@ -342,7 +342,7 @@ const searchChange = () => {
delete queryCarn.value.endTaskTime;
}
//
if (TopQuery.value.warehouseNameRange.length) {
if (TopQuery.value.warehouseNameRange?.length) {
queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');
} else {
delete queryCarn.value.warehouseNameRange;

4
src/views/reportforms/DeliveryDetails.vue

@ -361,7 +361,7 @@ const searchReset = () => {
//
const searchChange = () => {
//
if (TopQuery.value.time.length) {
if (TopQuery.value.time?.length) {
queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //
queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //
} else {
@ -369,7 +369,7 @@ const searchChange = () => {
delete queryCarn.value.endTaskTime;
}
//
if (TopQuery.value.warehouseNameRange.length) {
if (TopQuery.value.warehouseNameRange?.length) {
queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');
} else {
delete queryCarn.value.warehouseNameRange;

9
src/views/reportforms/DeliveryTrainNumber.vue

@ -335,7 +335,7 @@ const selectionChange = list => {
//
const searchChange = () => {
//
if (TopQuery.value.time.length) {
if (TopQuery.value.time?.length) {
queryCarn.value.startTaskTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //
queryCarn.value.endTaskTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //
} else {
@ -429,26 +429,25 @@ function updateDictionary(targetArray, dictionaryType) {
//
const onLoad = () => {
warehouseList.value = [];
columnList.find(res => res.label == '配送类型').checkarr = [];
columnList.find(res => res.label == '配送类型').checkarr = DeliveryTypeList.value;
columnList.find(res => res.label == '配送种类').checkarr = [];
columnList.find(res => res.label == '配送种类').checkarr = DeliverygenericList.value;
columnList.find(res => res.label == '仓库').checkarr = [];
columnList.find(res => res.label == '仓库').checkarr = warehouseList.value;
console.log(columnList, 'columnList');
//
$_getMyWarehouseList().then(res => {
console.log(res, '仓库列表');
if (res.data.data.length)
if (res.data.data.length){
res.data.data.forEach(item => {
warehouseList.value.push({
value: item.name,
label: item.name,
});
});
}
});
};
onLoad();

2
src/views/reportforms/Inventory.vue

@ -329,7 +329,7 @@ const selectionChange = list => {
const searchChange = () => {
console.log(TopQuery.value, 'TopQuery.value');
//
if (TopQuery.value.warehouseNameRange.length) {
if (TopQuery.value.warehouseNameRange?.length) {
queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');
} else {
delete queryCarn.value.warehouseNameRange;

4
src/views/reportforms/InventoryOutbound.vue

@ -352,7 +352,7 @@ const searchReset = () => {
const searchChange = () => {
console.log(TopQuery.value, 'TopQuery.value');
//
if (TopQuery.value.time.length) {
if (TopQuery.value.time?.length) {
queryCarn.value.startCreateTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //
queryCarn.value.endCreateTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //
} else {
@ -360,7 +360,7 @@ const searchChange = () => {
delete queryCarn.value.endTaskTime;
}
//
if (TopQuery.value.warehouseNameRange.length) {
if (TopQuery.value.warehouseNameRange?.length) {
queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');
} else {
delete queryCarn.value.warehouseNameRange;

4
src/views/reportforms/InventoryReceipt.vue

@ -354,7 +354,7 @@ const searchReset = () => {
const searchChange = () => {
console.log(TopQuery.value, 'TopQuery.value');
//
if (TopQuery.value.time.length) {
if (TopQuery.value.time?.length) {
queryCarn.value.startWarehousingTime = dayjs(TopQuery.value.time[0]).format(
'YYYY-MM-DD HH:mm:ss'
); //
@ -367,7 +367,7 @@ const searchChange = () => {
}
//
console.log(TopQuery.value, 'TopQuery.value');
if (TopQuery.value.warehouseNameRange.length) {
if (TopQuery.value.warehouseNameRange?.length) {
queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');
} else {
delete queryCarn.value.warehouseNameRange;

4
src/views/reportforms/Selfpickupreport.vue

@ -316,7 +316,7 @@ const searchReset = () => {
const searchChange = () => {
console.log(TopQuery.value, 'TopQuery.value');
//
if (TopQuery.value.time.length) {
if (TopQuery.value.time?.length) {
queryCarn.value.startScanTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //
queryCarn.value.endScanTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //
} else {
@ -324,7 +324,7 @@ const searchChange = () => {
delete queryCarn.value.endScanTime;
}
//
if (TopQuery.value.warehouseNameRange.length) {
if (TopQuery.value.warehouseNameRange?.length) {
queryCarn.value.warehouseNameRange = TopQuery.value.warehouseNameRange.join(',');
} else {
delete queryCarn.value.warehouseNameRange;

4
src/views/reportforms/Selfpickuptask.vue

@ -351,7 +351,7 @@ const searchReset = () => {
//
const searchChange = () => {
//
if (TopQuery.value.time.length) {
if (TopQuery.value.time?.length) {
queryCarn.value.startCreatedTime = dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss'); //
queryCarn.value.endCreatedTime = dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss'); //
} else {
@ -359,7 +359,7 @@ const searchChange = () => {
delete queryCarn.value.endCreatedTime;
}
//
if (TopQuery.value.warehouseRange.length) {
if (TopQuery.value.warehouseRange?.length) {
queryCarn.value.warehouseRange = TopQuery.value.warehouseRange.join(',');
} else {
delete queryCarn.value.warehouseRange;

6
src/views/reportforms/Stockordertable.vue

@ -336,15 +336,15 @@ const searchReset = () => {
const searchChange = () => {
//
//
queryCarn.value.startWarehouseEntryTime = TopQuery.value.time.length
queryCarn.value.startWarehouseEntryTime = TopQuery.value.time?.length
? dayjs(TopQuery.value.time[0]).format('YYYY-MM-DD HH:mm:ss')
: undefined;
queryCarn.value.endWarehouseEntryTime = TopQuery.value.time.length
queryCarn.value.endWarehouseEntryTime = TopQuery.value.time?.length
? dayjs(TopQuery.value.time[1]).format('YYYY-MM-DD HH:mm:ss')
: undefined;
//
queryCarn.value.warehouseRange = TopQuery.value.warehouseRange.length
queryCarn.value.warehouseRange = TopQuery.value.warehouseRange?.length
? TopQuery.value.warehouseRange.join(',')
: undefined;

Loading…
Cancel
Save