sungongwei vor 8 Monaten
Ursprung
Commit
b9d1adbbdb
1 geänderte Dateien mit 11 neuen und 4 gelöschten Zeilen
  1. 11 4
      server/routes/master/order.js

+ 11 - 4
server/routes/master/order.js

@@ -60,8 +60,8 @@ async function fillSingle(data) {
  * @number
  */
 router.get('/', async (req, res) => {
-  const { page = 0, title, uname, stime, etime, channel } = req.query;
-  const where = _.omit(req.query, ['page', 'uname', 'stime', 'etime']);
+  const { page = 0, title, uname, stime, etime, channel, phone } = req.query;
+  const where = _.omit(req.query, ['page', 'uname', 'stime', 'etime', 'phone']);
   if (title) {
     where.title = { [Op.like]: `%${title}` };
   }
@@ -70,9 +70,16 @@ router.get('/', async (req, res) => {
     stime && (where.payAt[Op.gte] = moment(stime).startOf('d'));
     etime && (where.payAt[Op.lte] = moment(etime).endOf('d'));
   }
-  if (uname) {
+  if (uname || phone) {
+    const where2 = {};
+    if (uname) {
+      where2.login = { [Op.like]: `%${uname}` };
+    }
+    if (phone) {
+      where2.phoneNumber = phone;
+    }
     const uList = await SysUser.findAll({
-      where: { login: { [Op.like]: `%${uname}` } },
+      where: where2,
       attributes: ['id'],
     });
     where.uid = { [Op.in]: uList.map(item => item.id) };