2

src/components/sale/orderlistbycoffee.vue

@@ -62,7 +62,7 @@
         <tbody v-for="(item, index) in dataList" :key="index">
           <tr>
             <td :rowspan="3" style="text-align: left">
-              <div class="order_OfferId" >{{item.OrderId}}</div>
+              <div class="" >{{item.OrderId}}</div>
               <div>{{item.OrderNo}}</div>
               <div>
                 订单类型：
@@ -119,6 +119,9 @@
                     <span v-else>暂无</span>
                   </div>
                 </div>
+                <div class="col-4">
+                  <div>收款单据：<span v-for="(x,y) in item.IncomeList" :key="y" class="q-ml-xs" style="color:#02C499">{{x.FrID}}</span></div>
+                </div>
               </div>
             </td>
           </tr>
@@ -139,11 +142,15 @@
       viewType:{
         type: Number,
         default: 0
+      },
+      loading:{
+        type: Boolean,
+        default: false
       }
     },
     data() {
       return {
-        loading:false,
+        
       };
     },
     created() {
@@ -379,15 +386,6 @@
   .table-body {
     overflow-x: hidden;
     overflow-y: auto;
-  }
-
-  .classorder .redstyle {
-    color: var(--q-color-negative);
-  }
-
-  .order_OferTitle {
-    font-size: 14px;
-    color: #333333;
-    margin-bottom: 10px;
+    height: calc(100vh - 240px );
   }
 </style>
\ No newline at end of file

src/pages/stuMan/coffeeManage/coffeeOrderList.vue

@@ -19,7 +19,7 @@
       </div>
     </div>
     <div class="page-content">
-      <OrderList :dataList="dataList"></OrderList>
+      <OrderList :dataList="dataList" :loading="loading"></OrderList>
       <div>
           <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="pageCount"
             :input="true" @input="changePage" />