1

src/views/zr/zrOrder/index.vue

@@ -34,7 +34,6 @@ export default {
     ...dictData({ dictQuery: 'query' }),
     // 查询其他信息
     async searchOther() {
-      console.log(this.user);
       let res;
       // 类型
       res = await this.dictQuery({ code: 'order_process' });

src/views/zr/zrOrder/parts/detail-1.vue

@@ -76,7 +76,12 @@ export default {
         condition[`buy_time@end`] = _.last(condition.buy_time);
         delete condition.buy_time;
       }
-      let res = await this.query({ skip, limit, ...condition, ...info, shop: this.user.shop.id });
+      if (this.user.role.code == 'sadmin') {
+        info.shop = '';
+      } else {
+        info.shop = this.user.shop.id;
+      }
+      let res = await this.query({ skip, limit, ...condition, ...info });
       if (this.$checkRes(res)) {
         this.$set(this, 'list', res.data);
         this.$set(this, 'total', res.total);
@@ -84,7 +89,7 @@ export default {
     },
     // 详情
     toDetail({ data }) {
-      this.$router.push({ path: '/selfShop/zrOrder/detail_orderDetail', query: { id: data._id } });
+      this.$router.push({ path: '/zr/zrOrder/detail_orderDetail', query: { id: data._id } });
     },
     toClose() {
       this.searchForm = {};