From d3cd5a28554e7eb6943c25fde627112ca208ba32 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Thu, 16 Oct 2025 17:04:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(activity):=20=E8=90=A5=E9=94=80=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=B7=BB=E5=8A=A0=E6=8A=A5=E5=8D=95=E8=B5=A0=E9=80=81?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/activity.js                           |  2 +-
 src/views/goodsManage/productList/index.vue   |  6 ++
 src/views/goodsManage/productRelease/jcsz.vue | 11 ++-
 .../productRelease/productDetail.vue          | 11 ++-
 .../marketing/declarationActivity/record.vue  | 70 ++++++++++++-------
 .../marketing/declarationActivity/update.vue  |  8 ++-
 .../declarationActivity/updateInfo.vue        | 15 ++--
 7 files changed, 87 insertions(+), 36 deletions(-)

diff --git a/src/api/activity.js b/src/api/activity.js
index fe56917..cfee73e 100644
--- a/src/api/activity.js
+++ b/src/api/activity.js
@@ -75,7 +75,7 @@ export function delDeclarationActivityList(data) {
 // 报单赠送记录列表
 export function declarationActivityRecordList(params) {
   return request({
-    url: '/activity/manage/declarationActivityRecord/list',
+    url: '/activity/manage/acDeclarationRecord/list',
     method: 'get',
     params
   })
diff --git a/src/views/goodsManage/productList/index.vue b/src/views/goodsManage/productList/index.vue
index 5c7c800..140191c 100644
--- a/src/views/goodsManage/productList/index.vue
+++ b/src/views/goodsManage/productList/index.vue
@@ -426,6 +426,12 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column
+            align="center"
+            prop="deliveryQuantity"
+            width="120"
+            :label="'提货基数'"
+          />
           <el-table-column
             align="center"
             prop="typeShippingMerge"
diff --git a/src/views/goodsManage/productRelease/jcsz.vue b/src/views/goodsManage/productRelease/jcsz.vue
index f015a07..61b90b7 100644
--- a/src/views/goodsManage/productRelease/jcsz.vue
+++ b/src/views/goodsManage/productRelease/jcsz.vue
@@ -337,6 +337,11 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col class="el-col-20">
+                <el-form-item :label="'提货基数'" prop="deliveryQuantity">
+                  <el-input-number v-model="form.deliveryQuantity" clearable :min="0" :max="999999999" :controls="false" />
+                </el-form-item>
+              </el-col>
               <el-col class="el-col-20">
                 <el-form-item :label="'运输方式'" prop="ysList">
                   <el-checkbox-group v-model="form.ysList" @change="changeYsfs">
@@ -506,6 +511,9 @@ export default {
         ],
         wmsCode: [
           { required: true, message: '请输入仓储编号', trigger: 'blur' }
+        ],
+        deliveryQuantity: [
+          { required: true, message: '请输入提货基数', trigger: 'blur' }
         ]
       },
       ggList: [],
@@ -530,7 +538,8 @@ export default {
         weight: '',
         shelfLife: '',
         retailPrice: '',
-        wmsCode: ''
+        wmsCode: '',
+        deliveryQuantity: 1
       },
       tabActive: 0,
       agreeList: [
diff --git a/src/views/goodsManage/productRelease/productDetail.vue b/src/views/goodsManage/productRelease/productDetail.vue
index 7b0e2e3..e922d53 100644
--- a/src/views/goodsManage/productRelease/productDetail.vue
+++ b/src/views/goodsManage/productRelease/productDetail.vue
@@ -483,6 +483,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col class="el-col-20">
+              <el-form-item :label="'提货基数'" prop="deliveryQuantity">
+                <el-input-number v-model="form.deliveryQuantity" clearable :min="0" :max="999999999" :controls="false" />
+              </el-form-item>
+            </el-col>
             <el-col class="el-col-20">
               <el-form-item
                 :label="'运输方式'"
@@ -669,6 +674,9 @@ export default {
         ],
         wmsCode: [
           { required: true, message: '请输入仓储编号', trigger: 'blur' }
+        ],
+        deliveryQuantity: [
+          { required: true, message: '请输入提货基数', trigger: 'blur' }
         ]
       },
       ggList: [],
@@ -731,7 +739,8 @@ export default {
       repurchaseTypeList: [],
       productList: [],
       isType: 0,
-      supplierList: []
+      supplierList: [],
+      deliveryQuantity: ''
     }
   },
   mounted() {
diff --git a/src/views/marketing/declarationActivity/record.vue b/src/views/marketing/declarationActivity/record.vue
index 026ce41..5e6424b 100644
--- a/src/views/marketing/declarationActivity/record.vue
+++ b/src/views/marketing/declarationActivity/record.vue
@@ -118,13 +118,23 @@
             />
             <el-table-column
               align="center"
-              prop="memberCode"
-              label="会员编号"
+              prop="referenceCode"
+              label="报单会员编号"
             />
             <el-table-column
               align="center"
-              prop="memberName"
-              label="会员姓名"
+              prop="referenceName"
+              label="报单会员姓名"
+            />
+            <el-table-column
+              align="center"
+              prop="registerAuthorityVal"
+              label="注册权限"
+            />
+            <el-table-column
+              align="center"
+              prop="specifyLevelVal"
+              label="指定等级"
             />
             <el-table-column
               align="center"
@@ -133,33 +143,40 @@
             />
             <el-table-column
               align="center"
-              prop="originalLevelVal"
-              label="原等级"
+              prop="orderCode"
+              label="订单编号"
             />
             <el-table-column
               align="center"
-              prop="upgradeLevelVal"
-              label="新等级"
-            />
-            <!-- <el-table-column
+              prop="acDeclarationProductParamList"
+              label="产品信息"
+              min-width="400"
+            >
+              <template slot-scope="scope">
+                <div v-if="scope.row.acDeclarationProductParamList && scope.row.acDeclarationProductParamList.length > 0">
+                  <div v-for="item in scope.row.acDeclarationProductParamList" :key="item.pkId">
+                    {{ item.productName }}({{ item.specsName }}) x{{ item.quantity }}
+                  </div>
+                </div>
+                <div v-else>
+                  -
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column
               align="center"
-              prop="actStartDate"
-              :label="'开始日期'"
+              prop="memberCode"
+              label="会员编号"
             />
             <el-table-column
               align="center"
-              prop="actEndDate"
-              :label="'结束日期'"
-            /> -->
-            <!-- <el-table-column
-              align="center"
-              prop="status"
-              :label="'活动状态'"
-            /> -->
+              prop="memberName"
+              label="会员名称"
+            />
             <el-table-column
               align="center"
-              prop="creationTime"
-              :label="'创建日期'"
+              prop="payTime"
+              label="支付时间"
             />
 
           </el-table>
@@ -213,7 +230,7 @@ export default {
       moren: 'declarationActivityRecordList',
       topList: [
         {
-          name: '加购升级记录',
+          name: '报单赠送记录',
           path: 'declarationActivityRecordList'
         }
       ],
@@ -246,6 +263,7 @@ export default {
         this.actStatus = res.data
       })
     },
+
     changeTime(val) {
       this.select.startActStartDate = val ? val[0] : ''
       this.select.endActStartDate = val ? val[1] : ''
@@ -273,7 +291,7 @@ export default {
     getDataList() {
       this.loading = true
       api
-        .upgradeRecordList(
+        .declarationActivityRecordList(
           Object.assign({}, this.queryParams, this.select, { actType: 31 })
         )
         .then((res) => {
@@ -291,9 +309,9 @@ export default {
         type: 'warning'
       }).then((_) => {
         this.download(
-          'activity/manage/addUpgradeRecord/listExport',
+          'activity/manage/acDeclarationRecord/listExport',
           Object.assign({}, { actType: 31 }, this.queryParams, this.select),
-          `${'加购升级记录'}${new Date().getTime()}.xlsx`
+          `${'报单赠送记录'}${new Date().getTime()}.xlsx`
         )
       })
     },
diff --git a/src/views/marketing/declarationActivity/update.vue b/src/views/marketing/declarationActivity/update.vue
index efbce92..04483bc 100644
--- a/src/views/marketing/declarationActivity/update.vue
+++ b/src/views/marketing/declarationActivity/update.vue
@@ -110,6 +110,7 @@
                   v-model="stem.specsName"
                   disabled
                 />
+               
               </div>
               <div class="tableFlex_i">
                 <el-input v-model="stem.quantity" />
@@ -350,15 +351,18 @@ export default {
   mounted() {
     this.getgradeRanglist()
     this.getMemberAuthEnum()
-    this.init()
+    this.initData()
   },
   methods: {
     isLocals,
-    init() {
+    initData(allData) {
       this.allData.push({
         acDeclarationConfigParam: []
       })
     },
+    setAllData(allData) {
+      this.$set(this.allData[0], 'acDeclarationConfigParam', JSON.parse(JSON.stringify(allData || [])))
+    },
     getgradeRanglist() {
       getgradeRanglist().then((res) => {
         if (res.code === 200) {
diff --git a/src/views/marketing/declarationActivity/updateInfo.vue b/src/views/marketing/declarationActivity/updateInfo.vue
index 6501c51..360cef0 100644
--- a/src/views/marketing/declarationActivity/updateInfo.vue
+++ b/src/views/marketing/declarationActivity/updateInfo.vue
@@ -96,7 +96,7 @@
     <div v-show="controlType != 4" class="footer">
       <el-button size="small" class="cancelBtn" @click="$router.back()">
         {{ '取消' }}</el-button>
-      <el-button size="small" class="sureBtn" @click="submit('ruleForm')">
+      <el-button size="small" class="sureBtn" :loading="loading" @click="submit('ruleForm')">
         {{ '确认' }}</el-button>
     </div>
     <!-- </div> -->
@@ -163,7 +163,8 @@ export default {
       pkId: '',
       repurchaseCouponsShowList: [],
       controlType: '',
-      addData: {}
+      addData: {},
+      loading: false
     }
   },
   mounted() {
@@ -218,14 +219,15 @@ export default {
             disEndDate
           ])
 
-          this.$refs.updateInfo.initData(
-            this.addData.acDeclarationConfigParams || []
+          this.$refs.updateInfo.setAllData(
+            this.addData.acDeclarationConfigParams || null
           )
         })
     },
     // 切换tab
     handleLink(id) {
       this.tabActive = id
+      console.log(this.$refs.updateInfo.allData, '....this.$refs.updateInfo')
     },
     // 单选
 
@@ -251,6 +253,7 @@ export default {
     submit() {
       this.$refs['ruleForm'].validate((valid) => {
         if (valid) {
+          this.loading = true
           const obj = Object.assign(
             {},
             {
@@ -268,7 +271,7 @@ export default {
             }
           )
 
-          const api = this.controlType === 1 ? addDeclarationActivityList : updateDeclarationActivityList
+          const api = Number(this.controlType) === 1 ? addDeclarationActivityList : updateDeclarationActivityList
           api(obj).then((res) => {
             if (res.code === 200) {
               this.$message({
@@ -277,6 +280,8 @@ export default {
               })
               this.$router.back()
             }
+          }).finally(() => {
+            this.loading = false
           })
         }
       })