2

src/api/stuMan/index.js

@@ -87,4 +87,13 @@ export function setGuestStartChapter(data) {
     method: 'post',
     data
   })
+}
+
+// 获取咖啡劵订单分页列表
+export function getCoffeeOrderList(data) {
+  return request({
+    url: '/EudGoods/GetGoodsOrderPageList',
+    method: 'post',
+    data
+  })
 }
\ No newline at end of file

src/pages/financial/financalDocument/FinancialDocumentsDetail.vue

@@ -974,6 +974,7 @@
                 @click="goFinDetail(GetDetail)">
                 单据详情
               </div>
+              
               <el-popover popper-class="detailsIT_Journal" width="250" trigger="click">
                 <div class="InfoChangeLog">
                   <div class="changLog">
@@ -1011,6 +1012,7 @@
             </div>
 
           </div>
+          <div class="cursor-pointer full-width" style="text-decoration: underline;display:flex;justify-content:flex-end" @click="goCoffeeOrder"  v-if="GetDetail.OtherType==54">查看订单</div>
         </div>
 
         <my-HB-Bill v-if="GetDetail.Is_Merge===1 && ZhiDanRen!==bossID" :ID="FrID" :FrID='FrID' :GetDetail="GetDetail"
@@ -2361,7 +2363,12 @@
             CommissionType: 1
           }
         })
-      }
+      },
+      goCoffeeOrder() {
+        this.OpenNewUrl('/stuMan/coffeeManage/coffeeOrderList',{
+          id: this.GetDetail.ReFinanceId
+        })
+      },
     },
     mounted() {
       this.GetAuth();

src/pages/stuMan/coffeeManage/coffeeOrderList.vue

+<template>
+  <div class="page-body activeType">
+    <div class="page-search row items-center flex q-col-gutter-md">
+      <div class="col-3">
+        <q-input @change="resetSearch" dense clearable filled v-model="msg.OrderNo" label="订单号" @clear="resetSearch"
+          maxlength="20" />
+      </div>
+      <div class="col-3">
+        <q-input @change="resetSearch" dense clearable filled v-model="msg.OrderId" label="订单Id" @clear="resetSearch"
+          maxlength="20" />
+      </div>
+      <div class="col-3">
+        <q-select @input="resetSearch" dense filled v-model="msg.OrderStatus" class="col-6" option-label="label"
+          option-value="value" :options="statusOpts" emit-value map-options label="订单状态" />
+      </div>
+      <div class="col-3">
+        <q-select @input="resetSearch" dense filled v-model="msg.OrderType" class="col-6" option-label="label"
+          option-value="value" :options="typeOpts" emit-value map-options label="订单类型" />
+      </div>
+    </div>
+    <div class="page-content">
+      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
+        class="sticky-right-column-table" separator="none" :data="dataList" :columns="columns"
+        row-key="name">
+        <template v-slot:top>
+          <div class="col-2 q-table__title">订单列表</div>
+        </template>
+        <template v-slot:body-cell-orderInfo="props">
+          <q-td :props="props">
+            <div>订单号：{{props.row.OrderNo}}({{ props.row.OrderId }})</div>
+            <div>下单时间：{{props.row.CreateDate}}</div>
+            <div>付款时间：{{props.row.PaymentTime}}</div>
+            <div>订单状态：<span v-if="props.row.OrderStatus==1">待付款 </span>
+              <span v-if="props.row.OrderStatus==2">已完成</span>
+              <span v-if="props.row.OrderStatus==3">已取消</span>
+            </div>
+            <div v-if="props.row.OrderStatus==3">取消时间：{{props.row.CancelTime}}</div>
+            <div>用户：<span v-if="props.row.UserType==1">{{props.row.EmName}} <q-chip class="q-ml-xs" size="xs" color="primary" text-color="white" >内部人员</q-chip></span> 
+                      <span v-if="props.row.UserType==2">{{props.row.EmName}}  <q-chip class="q-ml-xs" size="xs" color="positive" text-color="white">学生</q-chip></span>
+                      <span v-if="props.row.UserType==3">{{props.row.UserName}} <q-chip class="q-ml-xs" size="xs" color="info" text-color="white">甲鹤用户</q-chip></span>
+            </div>
+          </q-td>
+        </template>
+        <template v-slot:body-cell-goodsInfo="props">
+          <q-td :props="props">
+            <div>
+              <q-img :src="props.row.CoverImage" spinner-color="white" style="height: 90px; max-width: 90px" :ratio="4/3"/>
+              <span class="q-ml-sm">{{props.row.GoodsName}}</span>
+            </div>
+          </q-td>
+        </template>
+        <template v-slot:body-cell-priceInfo="props">
+          <q-td :props="props">
+            <div>单价：{{ props.row.Unit_Price}}</div>
+            <div>应收：{{ props.row.PreferPrice}}</div>
+            <div>实收：{{ props.row.Income}}</div>
+            <div v-if="props.row.Fee">手续费：{{ props.row.Fee}}</div>
+            <div v-if="props.row.Refund">退款金额：{{ props.row.Refund}}</div>
+          </q-td>
+        </template>
+        <template v-slot:bottom>
+          <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
+            :input="true" @input="changePage" />
+        </template>
+      </q-table>
+    </div>
+  </div>
+</template>
+<script>
+  import {
+    getCoffeeOrderList
+  } from "../../../api/stuMan/index"
+  export default {
+    meta: {
+      title: "咖啡订单列表"
+    },
+
+    data() {
+      return {
+        dataList: [],
+        loading: false,
+        msg: {
+          pageIndex: 1,
+          pageSize: 10,
+          rowsPerPage: 10,
+          OrderNo: "",
+          OrderId: "",
+          OrderType: 0,
+          OrderStatus: 0,
+        },
+        pageCount: 0,
+        typeOpts: [{
+            label: "不限",
+            value: 0
+          },
+          {
+            label: "咖啡券",
+            value: 1
+          },
+          {
+            label: "耗材类",
+            value: 2
+          },
+          {
+            label: "教师类",
+            value: 3
+          },
+        ],
+        statusOpts: [{
+            label: "不限",
+            value: 0
+          },
+          {
+            label: "待付款",
+            value: 1
+          },
+          {
+            label: "已完成",
+            value: 2
+          },
+        ],
+
+        columns: [{
+            name: "orderInfo",
+            label: "订单信息",
+            field: "",
+            align: "left",
+            style: 'width: 30%',
+          },
+          {
+            name: "goodsInfo",
+            label: "商品信息",
+            align: "left",
+
+          },
+          {
+            name: "priceInfo",
+            label: "费用信息",
+            align: "left",
+          },
+           {
+            name: "Number",
+            label: "数量",
+            field:"Number",
+            align: "left",
+          },
+           {
+            name: "Remark",
+            label: "备注",
+            field:"Remark",
+            align: "left",
+          },
+          // {
+          //   name: 'optioned',
+          //   label: '操作',
+          //   align: "left"
+          // }
+        ],
+      }
+    },
+
+    mounted() {
+     if(this.$route.query.id){
+       this.msg.OrderId=this.$route.query.id
+     }
+      this.getList();
+    },
+    methods: {
+      getList() {
+        this.loading = true;
+        getCoffeeOrderList(this.msg).then(res => {
+          this.loading = false;
+          this.dataList = res.Data.PageData
+          this.pageCount=res.Data.PageCount
+        })
+      },
+      //重新查询
+      resetSearch() {
+        this.msg.pageIndex = 1;
+        this.getList();
+      },
+      //翻页
+      changePage(val) {
+        this.msg.pageIndex = val;
+        this.getList()
+      },
+    }
+  }
+</script>
\ No newline at end of file

src/router/routes.js

@@ -1508,10 +1508,15 @@ const routes = [{
   
   
     {
-      path: "/stuMan/coffeeManage",//学管   商品管理
+      path: "/stuMan/coffeeManage/index",//学管   商品管理
       component: () =>
         import("pages/stuMan/coffeeManage/index")
     },
+    {
+      path: "/stuMan/coffeeManage/coffeeOrderList",//学管   咖啡订单列表
+      component: () =>
+        import("pages/stuMan/coffeeManage/coffeeOrderList")
+    },
   {
     path: "/stuMan/activeList",//学管   活动列表
     component: () =>