From 08c2033475fa42690c3246aa1510f6c6c932c2ea Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 02 八月 2025 10:53:31 +0800
Subject: [PATCH] 数量可以支持小数

---
 src/views/order/index.vue |   58 +++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index ca46952..9fdb65a 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -16,7 +16,7 @@
                 </el-input>
             </div>
         </div>
-        <div style="height: calc(100vh - 208px)">
+        <div style="height: calc(100vh - 158px)">
             <el-table
                 v-loading="listLoading"
                 :data="list"
@@ -29,7 +29,7 @@
                 <el-table-column label="瀛﹀憳" prop="playerBaseInfo.name">
                 </el-table-column>
                 <el-table-column label="鐢佃瘽" prop="mobile"> </el-table-column>
-                <el-table-column label="璐拱鏂瑰紡" width="200" prop="payType">
+                <el-table-column label="璐拱鏂瑰紡" prop="payType">
                     <template slot-scope="scope">
                         {{
                             scope.row.payType == 'DIRECT'
@@ -44,9 +44,9 @@
                 </el-table-column>
                 <el-table-column label="瀹為檯缂磋垂" width="80" prop="amt">
                 </el-table-column>
-                <el-table-column label="璁㈠崟鏃堕棿" width="200" prop="createTime">
+                <el-table-column label="璁㈠崟鏃堕棿" width="180" prop="createTime">
                 </el-table-column>
-                <el-table-column label="鎿嶄綔" width="200">
+                <el-table-column label="鎿嶄綔" width="120">
                     <template slot-scope="scope">
                         <el-link
                             @click="handlePrint(scope.row)"
@@ -122,8 +122,8 @@
         fetchData() {
             this.listLoading = true;
             getData(this.data).then((response) => {
-                this.list = response.data.findOrderByOrgId.ls;
-                this.total = response.data.findOrderByOrgId.pageOut.total;
+                this.list = response.data.findOrderVoByOrgId.ls;
+                this.total = response.data.findOrderVoByOrgId.pageOut.total;
                 this.listLoading = false;
             });
         },
@@ -163,7 +163,7 @@
                 <td>${o.qty} </td>
                 <td> ${o.giftQty || 0}</td>
                 <td>${o.amt}</td>
-                <td>${row.saleStaff.name} </td>
+                <td>${row.saleStaff ? row.saleStaff.name : ''} </td>
             </tr>`;
             });
 
@@ -172,7 +172,7 @@
         <h2 style="text-align: center;">${orgName}缂磋垂鏀舵嵁 </h2>
         <div> 璁㈠崟鍙凤細${row.number}</div>
         <div class="div-2-column">
-            <div> 瀛﹀憳濮撳悕锛�<u>${row.playerBaseInfo ? row.playerBaseInfo.name : ""
+            <div> 瀛﹀憳濮撳悕锛�<u>${row.playerBaseInfo ? (row.playerBaseInfo.name||'') : ""
                 }</u> </div>
             <div>鑱旂郴鐢佃瘽锛�<u>${row.mobile || "鏈綍鍏�"} </u></div>
         </div>
@@ -185,7 +185,7 @@
                 <th width="140px" nowradiv>绉戠洰</th>
                 <th width="80px" nowradiv>鏁伴噺</th>
                 <th width="80px" nowradiv>璧犻��</th>
-                <th width="100px" nowradiv>浣欓</th>
+                <th width="100px" nowradiv>閲戦</th>
                 <th>璇剧▼椤鹃棶</th>
             </tr>
             ${detail}
@@ -204,6 +204,7 @@
                 }锛�</td>
             </tr>
         </table>
+        <div>&nbsp;鏍″尯鍦板潃锛�${row.org.address||row.org.addressDetail}</div>
         <div>&nbsp;澶囨敞锛�${row.message || ""} </div>
         <br>
         <br>
@@ -221,3 +222,42 @@
     },
 };
 </script>
+
+<style>
+#print-container {
+    display: none;
+}
+@media print {
+    body > :not(.print-container) {
+        display: none;
+    }
+    html,
+    body {
+        display: block !important;
+    }
+    #print-container {
+        display: block;
+    }
+}
+@page {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+.div-2-column {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+}
+.m-h2 {
+    text-align: center;
+    font-size: 1.17em;
+    margin-top: 50px;
+    font-weight: bold;
+}
+#tr {
+    height: 30px;
+}
+.txt-center {
+    text-align: center;
+}
+</style>
\ No newline at end of file

--
Gitblit v1.8.0