From 45e82a10bc8623bc18c8a5e1c153bf3e7303e7bd Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Thu, 23 Oct 2025 09:49:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(marketing):=20=E8=90=A5=E9=94=80=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E5=8A=A0=E8=B4=AD=E5=8D=87=E7=BA=A7=20=E3=80=81?=
 =?UTF-8?q?=E6=8A=A5=E5=8D=95=E8=B5=A0=E9=80=81=E8=AE=B0=E5=BD=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../marketing/declarationActivity/record.vue  | 71 +++++--------------
 .../marketing/declarationActivity/summary.vue | 43 +----------
 .../marketing/shoppingUpgrade/record.vue      | 36 +++-------
 3 files changed, 28 insertions(+), 122 deletions(-)

diff --git a/src/views/marketing/declarationActivity/record.vue b/src/views/marketing/declarationActivity/record.vue
index b7c7d4f..be925ed 100644
--- a/src/views/marketing/declarationActivity/record.vue
+++ b/src/views/marketing/declarationActivity/record.vue
@@ -10,11 +10,27 @@
         <el-form
           ref="select"
           :model="select"
-          label-width="auto"
+          label-width="90px"
         >
           <el-row :gutter="40">
             <el-col :span="4">
-              <el-form-item label="报单中心会员编号">
+              <el-form-item :label="'活动名称'">
+                <el-input
+                  v-model="select.actName"
+                  clearable
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item :label="'订单编号'">
+                <el-input
+                  v-model="select.orderCode"
+                  clearable
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label-width="130px" label="报单中心会员编号">
                 <el-input
                   v-model="select.referenceCode"
                   style="width:100%"
@@ -30,56 +46,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item :label="'活动名称'">
-                <el-input
-                  v-model="select.actName"
-                  clearable
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item :label="'活动状态'">
-                <el-select
-                  v-model="select.activityStatus"
-                  clearable
-                  :placeholder="'请选择'"
-                >
-                  <el-option
-                    v-for="item in actStatus"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="'开始日期'">
-                <el-date-picker
-                  v-model="creationTime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  type="datetimerange"
-                  :range-separator="'至'"
-                  :start-placeholder="'开始日期'"
-                  :end-placeholder="'结束日期'"
-                  @change="changeTime"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="'结束日期'">
-                <el-date-picker
-                  v-model="creationTime1"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  type="datetimerange"
-                  :range-separator="'至'"
-                  :start-placeholder="'开始日期'"
-                  :end-placeholder="'结束日期'"
-                  @change="changeTime1"
-                />
-              </el-form-item>
-            </el-col>
+
             <!-- <el-col :span="8">
               <el-form-item :label="'创建日期'">
                 <el-date-picker
diff --git a/src/views/marketing/declarationActivity/summary.vue b/src/views/marketing/declarationActivity/summary.vue
index ce70c1b..d98259d 100644
--- a/src/views/marketing/declarationActivity/summary.vue
+++ b/src/views/marketing/declarationActivity/summary.vue
@@ -21,22 +21,6 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
-              <el-form-item :label="'活动状态'">
-                <el-select
-                  v-model="select.activityStatus"
-                  clearable
-                  :placeholder="'请选择'"
-                >
-                  <el-option
-                    v-for="item in actStatus"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
             <el-col :span="4">
               <el-form-item label="产品编号">
                 <el-input
@@ -45,32 +29,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item :label="'开始日期'">
-                <el-date-picker
-                  v-model="creationTime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  type="datetimerange"
-                  :range-separator="'至'"
-                  :start-placeholder="'开始日期'"
-                  :end-placeholder="'结束日期'"
-                  @change="changeTime"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="'结束日期'">
-                <el-date-picker
-                  v-model="creationTime1"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  type="datetimerange"
-                  :range-separator="'至'"
-                  :start-placeholder="'开始日期'"
-                  :end-placeholder="'结束日期'"
-                  @change="changeTime1"
-                />
-              </el-form-item>
-            </el-col>
+
             <!-- <el-col :span="8">
               <el-form-item :label="'创建日期'">
                 <el-date-picker
diff --git a/src/views/marketing/shoppingUpgrade/record.vue b/src/views/marketing/shoppingUpgrade/record.vue
index 24de2d6..14c472b 100644
--- a/src/views/marketing/shoppingUpgrade/record.vue
+++ b/src/views/marketing/shoppingUpgrade/record.vue
@@ -23,23 +23,15 @@
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <el-form-item :label="'活动状态'">
-                <el-select
-                  v-model="select.activityStatus"
+              <el-form-item :label="'会员编号'">
+                <el-input
+                  v-model="select.memberCode"
                   clearable
-                  :placeholder="'请选择'"
-                >
-                  <el-option
-                    v-for="item in actStatus"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item :label="'开始日期'">
+              <el-form-item :label="'创建日期'">
                 <el-date-picker
                   v-model="creationTime"
                   value-format="yyyy-MM-dd HH:mm:ss"
@@ -51,19 +43,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item :label="'结束日期'">
-                <el-date-picker
-                  v-model="creationTime1"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  type="datetimerange"
-                  :range-separator="'至'"
-                  :start-placeholder="'开始日期'"
-                  :end-placeholder="'结束日期'"
-                  @change="changeTime1"
-                />
-              </el-form-item>
-            </el-col>
+
             <!-- <el-col :span="8">
               <el-form-item :label="'创建日期'">
                 <el-date-picker
@@ -248,10 +228,10 @@ export default {
     },
     changeTime(val) {
       this.select.startActStartDate = val ? val[0] : ''
-      this.select.endActStartDate = val ? val[1] : ''
+      this.select.startActEndDate = val ? val[1] : ''
     },
     changeTime1(val) {
-      this.select.startActEndDate = val ? val[0] : ''
+      this.select.endActStartDate = val ? val[0] : ''
       this.select.endActEndDate = val ? val[1] : ''
     },
     changeTime2(val) {