From 593b3453dbf8bb34546ad1b8c6f4b568d1d4ab39 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 16 十月 2025 13:47:41 +0800
Subject: [PATCH] 修改模板

---
 seller/src/views/order/order/orderList.vue |   82 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue
index 146ef7a..fbf74b7 100644
--- a/seller/src/views/order/order/orderList.vue
+++ b/seller/src/views/order/order/orderList.vue
@@ -17,10 +17,10 @@
             style="width: 160px"
           />
         </Form-item>
-        <Form-item label="浼氬憳鍚嶇О" prop="buyerName">
+        <Form-item label="浼氬憳鍚嶇О" prop="nickName">
           <Input
             type="text"
-            v-model="searchForm.buyerName"
+            v-model="searchForm.nickName"
             clearable
             placeholder="璇疯緭鍏ヤ細鍛樺悕绉�"
             style="width: 160px"
@@ -42,6 +42,16 @@
             <Option value="STAY_PICKED_UP">寰呰嚜鎻�</Option>
           </Select>
         </Form-item>
+        <Form-item label="瀹氬埗鍟嗗搧" prop="customizeFlag">
+          <Select
+            v-model="searchForm.customizeFlag"
+            placeholder="璇烽�夋嫨"
+            clearable
+            style="width: 160px"
+          >
+            <Option value="CUSTOMIZE">瀹氬埗鍟嗗搧</Option>
+          </Select>
+        </Form-item>
         <Form-item label="璁㈠崟绫诲瀷" prop="orderType">
           <Select
             v-model="searchForm.orderPromotionType"
@@ -60,7 +70,7 @@
           <DatePicker
             v-model="selectDate"
             type="datetimerange"
-            format="yyyy-MM-dd"
+            format="yyyy-MM-dd HH:mm:ss"
             clearable
             @on-change="selectDateRange"
             placeholder="閫夋嫨璧峰鏃堕棿"
@@ -94,7 +104,22 @@
         :columns="columns"
         :data="data"
         ref="table"
-      ></Table>
+      >
+        <template slot="sn" slot-scope="{ row }">
+          <div
+            style="width: 100%; cursor: pointer;"
+            @click="detail(row)"
+          >
+            <!-- 淇濈暀鍘熸潵鐨� sellerRemark 鍒ゆ柇閫昏緫 -->
+            <span v-if="row.sellerRemark">
+        {{ row.sellerRemark }} ({{ row.sn }})
+      </span>
+            <span v-else>
+        {{ row.sn }}
+      </span>
+          </div>
+        </template>
+      </Table>
       <Row type="flex" justify="end" class="mt_10">
         <Page
           :current="searchForm.pageNumber"
@@ -135,7 +160,7 @@
         startDate: "", // 璧峰鏃堕棿
         endDate: "", // 缁堟鏃堕棿
         orderSn: "",
-        buyerName: "",
+        nickNam: "",
         orderStatus: "",
         orderType: "NORMAL",
       },
@@ -146,13 +171,14 @@
           key: "sn",
           minWidth: 200,
           tooltip: true,
-          render: (h, params) => {
-            if (params.row.sellerRemark) {
-              return h("div", {}, params.row.sellerRemark + " ("+params.row.sn+")");
-            } else {
-              return h("div", {}, params.row.sn);
-            }
-          },
+          slot: 'sn',
+          // render: (h, params) => {
+          //   if (params.row.sellerRemark) {
+          //     return h("div", {}, params.row.sellerRemark + " ("+params.row.sn+")");
+          //   } else {
+          //     return h("div", {}, params.row.sn);
+          //   }
+          // },
         },
         {
           title: "璁㈠崟鏉ユ簮",
@@ -202,7 +228,7 @@
         },
         {
           title: "涔板鍚嶇О",
-          key: "memberName",
+          key: "nickName",
           minWidth: 130,
           tooltip: true,
         },
@@ -213,6 +239,23 @@
           tooltip: true,
           render: (h, params) => {
             return h("priceColorScheme", {props:{value:params.row.flowPrice,color:this.$mainColor}} );
+          },
+        },
+        {
+          title: "瀹氬埗鍟嗗搧",
+          key: "customizeFlag",
+          minWidth: 120,
+          tooltip: true,
+          render: (h, params) => {
+            if (params.row.customizeFlag == "CUSTOMIZE") {
+              return h("div", [
+                h("tag", { props: { color: "blue" } }, "瀹氬埗鍟嗗搧"),
+              ]);
+            } else  {
+              return h("div", [
+                h("tag", { props: { color: "volcano" } }, "鏅�氬晢鍝�"),
+              ]);
+            }
           },
         },
 
@@ -262,10 +305,21 @@
           width: 170,
         },
         {
+          title:"鏀惰揣浜�",
+          key:"consigneeName",
+          width: 170,
+        },
+        {
+          title:"鎵嬫満鍙�",
+          key:"consigneeMobile",
+          width: 170,
+        },
+        {
           title: "鎿嶄綔",
           key: "action",
           align: "center",
           width: 100,
+          fixed: "right",
           render: (h, params) => {
             return h("div", [
               h(
@@ -427,7 +481,7 @@
   },
   // 椤甸潰缂撳瓨澶勭悊锛屼粠璇ラ〉闈㈢寮�鏃讹紝淇敼KeepAlive涓篺alse锛屼繚璇佽繘鍏ヨ椤甸潰鏄埛鏂�
   beforeRouteLeave(to, from, next) {
-    from.meta.keepAlive = false;
+    from.meta.keepAlive = true;
     next();
   },
 };

--
Gitblit v1.8.0