|
|
@@ -53,10 +53,16 @@ export class OrderDetailService extends BaseService<modelType> {
|
|
|
if (arr) info.good = arr._id;
|
|
|
}
|
|
|
if (status) {
|
|
|
- if (status === '0') info.$or = [{ status: '0' }, { status: '20' }];
|
|
|
- else if (status === '2') info.$or = [{ status: '2' }, { status: '30' }];
|
|
|
- else if (status === '6') info.$or = [{ status: '6' }, { status: '40' }];
|
|
|
- else if (status === '7') info.$or = [{ status: '7' }, { status: '50' }];
|
|
|
+ if (status === '0' && s_accounting)
|
|
|
+ info.$or = [{ status: '0' }, { status: '20' }];
|
|
|
+ else if (status === '2' && s_leader)
|
|
|
+ info.$or = [{ status: '2' }, { status: '30' }];
|
|
|
+ else if (status === '4' && info.supplier)
|
|
|
+ info.$or = [{ status: '4' }, { status: '5' }, { status: '6' }];
|
|
|
+ else if (status === '6' && c_accounting)
|
|
|
+ info.$or = [{ status: '6' }, { status: '40' }];
|
|
|
+ else if (status === '7' && c_leader)
|
|
|
+ info.$or = [{ status: '7' }, { status: '50' }];
|
|
|
else info.status = status;
|
|
|
}
|
|
|
list = await this.model.find(info).skip(skip).limit(limit).lean();
|
