From f8fd1bd1df45a1aa7b6717562722e61c7ee8b4c3 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 15 十月 2025 10:20:31 +0800
Subject: [PATCH] 显示调整

---
 manager/src/views/order/order/orderList.vue          |   29 +++++++++++++-
 seller/src/views/order/order/orderList.vue           |   28 ++++++++++++++
 seller/src/views/template/goodsCustomizeTemplate.vue |   19 ++++++---
 3 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index 083b224..112e451 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -36,7 +36,16 @@
             style="width: 160px"
           />
         </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"
@@ -385,7 +394,23 @@
           },
 
         },
-
+        {
+          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" } }, "鏅�氬晢鍝�"),
+              ]);
+            }
+          },
+        },
         {
           title: "璁㈠崟鐘舵��",
           key: "orderStatus",
diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue
index 2cade25..fbf74b7 100644
--- a/seller/src/views/order/order/orderList.vue
+++ b/seller/src/views/order/order/orderList.vue
@@ -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"
@@ -231,6 +241,23 @@
             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" } }, "鏅�氬晢鍝�"),
+              ]);
+            }
+          },
+        },
 
         {
           title: "璁㈠崟鐘舵��",
@@ -292,6 +319,7 @@
           key: "action",
           align: "center",
           width: 100,
+          fixed: "right",
           render: (h, params) => {
             return h("div", [
               h(
diff --git a/seller/src/views/template/goodsCustomizeTemplate.vue b/seller/src/views/template/goodsCustomizeTemplate.vue
index 0425a17..391465c 100644
--- a/seller/src/views/template/goodsCustomizeTemplate.vue
+++ b/seller/src/views/template/goodsCustomizeTemplate.vue
@@ -353,12 +353,19 @@
 
     },
     delTemplate(row){
-      del(row.id).then(res =>{
-        if (res.code === 200){
-          this.$Message.success(res.msg)
+      this.$Modal.confirm({
+        title: "鎿嶄綔纭",
+        content: "鎮ㄧ‘璁よ鍒犻櫎銆� " + row.templateName + "銆戝悧?",
+        onOk: () => {
+          del(row.id).then(res =>{
+            if (res.code === 200){
+              this.$Message.success(res.msg)
+            }
+            this.getList()
+          })
         }
-        this.getList()
-      })
+      });
+
     },
     async upLoadImg(file) {
       console.log("鎵撳嵃涓婁紶1")
@@ -509,6 +516,7 @@
             if (res.code === 200) {
               this.$Message.success(res.msg);
               this.modelShow = false;
+              this.showModal = false;
               this.getList();
             } else {
               this.$Message.error(res.msg);
@@ -518,7 +526,6 @@
             console.error(error);
           } finally {
             this.submitLoading = false;
-            this.showModal = false;
           }
         }
       });

--
Gitblit v1.8.0