From 5591c18dc3500bd3e0719bb6b28b26f7f9e7cb58 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 15 五月 2024 09:46:19 +0800
Subject: [PATCH] 计划订单

---
 CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/details.html |  121 +++++++++++++++++++++++++++++----------
 1 files changed, 89 insertions(+), 32 deletions(-)

diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/details.html
index 76a3cc6..8aaa265 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/details.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/corecmsplanorder/details.html
@@ -7,16 +7,16 @@
         <tbody>
 
             <tr>
-                <td width="25%">
+                <td width="17%">
                     <label for="orderId">璁㈠崟鍙�</label>
                 </td>
-                <td width="25%">
+                <td width="34%" colspan="2">
                     {{ d.params.data.model.orderId || '' }}
                 </td>
-                <td width="25%">
+                <td width="17%">
                     <label for="shipAddress">瀛︽牎</label>
                 </td>
-                <td width="25%">
+                <td width="34%" colspan="2">
                     {{ d.params.data.model.shipAddress || '' }}
                 </td>
             </tr>
@@ -27,13 +27,13 @@
                 <td>
                     <label for="shi">甯�</label>
                 </td>
-                <td>
+                <td colspan="2">
                     {{ d.params.data.model.shi || '' }}
                 </td>
                 <td>
                     <label for="quxian">鍖哄幙</label>
                 </td>
-                <td>
+                <td colspan="2">
                     {{ d.params.data.model.quxian || '' }}
                 </td>
             </tr>
@@ -43,13 +43,13 @@
                 <td>
                     <label for="pianqu">鐗囧尯</label>
                 </td>
-                <td>
+                <td colspan="2">
                     {{ d.params.data.model.pianqu || '' }}
                 </td>
                 <td>
                     <label for="quxian">鏀惰揣鍦板潃</label>
                 </td>
-                <td>
+                <td colspan="2">
                     {{ d.params.data.model.shouhuoAddress || '' }}
                 </td>
             </tr>
@@ -58,13 +58,13 @@
                 <td>
                     <label for="shipName">鑱旂郴浜�</label>
                 </td>
-                <td>
+                <td colspan="2">
                     {{ d.params.data.model.shipName || '' }}
                 </td>
                 <td>
                     <label for="shipMobile">鑱旂郴鐢佃瘽</label>
                 </td>
-                <td>
+                <td colspan="2">
                     {{ d.params.data.model.shipMobile || '' }}
                 </td>
             </tr>
@@ -73,13 +73,13 @@
                 <td>
                     <label for="oldOrderAmount">璁″垝閲戦</label>
                 </td>
-                <td>
+                <td colspan="2">
                     {{ d.params.data.model.oldOrderAmount || '' }}
                 </td>
                 <td>
                     <label for="orderAmount">璋冩暣閲戦</label>
                 </td>
-                <td>
+                <td style="color:red;" colspan="2">
                     {{ d.params.data.model.orderAmount || '' }}
                 </td>
             </tr>
@@ -89,13 +89,13 @@
                 <td>
                     <label for="keYongAmount">鍙敤浣欓</label>
                 </td>
-                <td>
-                    {{ d.params.data.model.keYongAmount || '' }}
+                <td style="color:red;" colspan="2">
+                    {{ d.params.data.model.keYongAmount}}
                 </td>
                 <td>
                     <label for="status">璁㈠崟鐘舵��</label>
                 </td>
-                <td>
+                <td colspan="2">
                     {{ d.params.data.model.statusText || '' }}
                 </td>
             </tr>
@@ -104,23 +104,23 @@
                 <td>
                     <label for="createTime">寤虹珛鏃堕棿</label>
                 </td>
-                <td>
+                <td colspan="2">
                     {{ d.params.data.model.createTime || '' }}
                 </td>
                 <td>
                     <label for="upDataTime">淇敼鏃堕棿</label>
                 </td>
-                <td>
+                <td colspan="2">
                     {{ d.params.data.model.upDataTime || '' }}
                 </td>
             </tr>
 
-            <tr>
-                <td style="background-color:lightsteelblue;" colspan="4">
-                    鍘熻鍗�
-                </td>
+            <!--<tr>
+        <td style="background-color:lightsteelblue;" colspan="4">
+            鍘熻鍗�
+        </td>
 
-            </tr>
+    </tr>-->
             <tr>
                 <td style="background-color:lightsteelblue;">
                     鍟嗗搧鍚嶇О
@@ -129,10 +129,16 @@
                     鍗曚环锛堝厓锛�
                 </td>
                 <td style="background-color:lightsteelblue;">
-                    鏁伴噺
+                    璁″垝鏁伴噺
                 </td>
                 <td style="background-color:lightsteelblue;">
-                    鎬讳环锛堝厓锛�
+                    璁″垝閲戦锛堝厓锛�
+                </td>
+                <td style="background-color:lightsteelblue;">
+                    璋冩暣鏁伴噺
+                </td>
+                <td style="background-color:lightsteelblue;">
+                    璋冩暣閲戦锛堝厓锛�
                 </td>
             </tr>
 
@@ -150,14 +156,17 @@
                 <td>
                     {{ item.amount }}
                 </td>
+                <td>
+                    {{ item.numsnew }}
+                </td>
+                <td>
+                    {{ item.amountnew }}
+                </td>
             </tr>
             {{# }); }}
-
-
-
             <tr>
-                <td style="background-color:lightsteelblue;" colspan="4">
-                    淇敼璁㈠崟
+                <td style="background-color:lightsteelblue;" colspan="6">
+                    鏅�氬晢鍝�
                 </td>
 
             </tr>
@@ -172,14 +181,18 @@
                     鏁伴噺
                 </td>
                 <td style="background-color:lightsteelblue;">
-                    鎬讳环锛堝厓锛�
+                    閲戦锛堝厓锛�
+                </td>
+                <td style="background-color:lightsteelblue;">
+                </td>
+                <td style="background-color:lightsteelblue;">
                 </td>
             </tr>
 
-            {{# layui.each(d.params.data.modelItem2, function(index, item){ }}
+            {{# layui.each(d.params.data.coreCmsOrderItems, function(index, item){ }}
             <tr>
                 <td>
-                    {{ item.name }}   {{ item.specification }}
+                    {{ item.name }}  {{ item.addon }}
                 </td>
                 <td>
                     {{ item.price }}
@@ -190,9 +203,53 @@
                 <td>
                     {{ item.amount }}
                 </td>
+                <td>
+                   
+                </td>
+                <td>
+                    
+                </td>
             </tr>
             {{# }); }}
 
+            <!--<tr>
+         <td style="background-color:lightsteelblue;" colspan="4">
+             淇敼璁㈠崟
+         </td>
+
+     </tr>
+    <tr>
+         <td style="background-color:lightsteelblue;">
+             鍟嗗搧鍚嶇О
+         </td>
+         <td style="background-color:lightsteelblue;">
+             鍗曚环锛堝厓锛�
+         </td>
+         <td style="background-color:lightsteelblue;">
+             鏁伴噺
+         </td>
+         <td style="background-color:lightsteelblue;">
+             鎬讳环锛堝厓锛�
+         </td>
+     </tr>
+
+     {{# layui.each(d.params.data.modelItem2, function(index, item){ }}
+     <tr>
+         <td>
+             {{ item.name }}   {{ item.specification }}
+         </td>
+         <td>
+             {{ item.price }}
+         </td>
+         <td>
+             {{ item.nums }}
+         </td>
+         <td>
+             {{ item.amount }}
+         </td>
+     </tr>
+     {{# }); }}-->
+
         </tbody>
     </table>
 </script>

--
Gitblit v1.9.1