From fc222664efcba835f623c03382a8fbe5ab426ec0 Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Fri, 17 Mar 2023 17:27:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=8A=A0=E6=8A=A5=E5=90=8D?=
 =?UTF-8?q?=E9=A2=84=E7=BA=A63?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/components/activity-draw.vue     | 11 +++++-
 .../components/gro-exchange-detail.vue        |  2 +-
 src/views/sylive/groups-exchange/index.vue    | 38 ++++++++++++++++++-
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/src/views/sylive/activity/components/activity-draw.vue b/src/views/sylive/activity/components/activity-draw.vue
index c606610..f21e89e 100644
--- a/src/views/sylive/activity/components/activity-draw.vue
+++ b/src/views/sylive/activity/components/activity-draw.vue
@@ -1,7 +1,7 @@
 <!-- 编辑弹窗 -->
 <template>
   <ele-modal
-    width="930px"
+    width="960px"
     :visible="visible"
     :append-to-body="true"
     :close-on-click-modal="true"
@@ -88,6 +88,14 @@
               </el-select>
             </template>
           </el-table-column>
+          <el-table-column label="收货地址" width="100px" align="center">
+            <template v-slot="{ row }">
+              <el-select v-model="row.ifAddress" class="ele-fluid">
+                <el-option label="不需要" value="0" />
+                <el-option label="需要" value="1" />
+              </el-select>
+            </template>
+          </el-table-column>
           <el-table-column
             label="操作"
             width="70px"
@@ -288,6 +296,7 @@
           tag: '',
           itemIds: '',
           ifCode: '0',
+          ifAddress: '0',
           img: []
         });
       },
diff --git a/src/views/sylive/groups-exchange/components/gro-exchange-detail.vue b/src/views/sylive/groups-exchange/components/gro-exchange-detail.vue
index 3051724..e8e596f 100644
--- a/src/views/sylive/groups-exchange/components/gro-exchange-detail.vue
+++ b/src/views/sylive/groups-exchange/components/gro-exchange-detail.vue
@@ -49,7 +49,7 @@
           </el-form-item>
           <el-form-item label="描述:" v-if="item.descrip">
             <el-input
-              disabled="true"
+              :disabled="true"
               v-model="item.descrip"
               :rows="2"
               type="textarea"
diff --git a/src/views/sylive/groups-exchange/index.vue b/src/views/sylive/groups-exchange/index.vue
index 3fd0d0c..490e4f1 100644
--- a/src/views/sylive/groups-exchange/index.vue
+++ b/src/views/sylive/groups-exchange/index.vue
@@ -47,8 +47,24 @@
           >
             详情
           </el-link>
+          <el-popconfirm
+            v-if="row.useStatus == 1 && !row.ifAddress"
+            class="ele-action"
+            title="确定要通过吗？"
+            @confirm="remove(row, 2)"
+          >
+            <template v-slot:reference>
+              <el-link
+                type="primary"
+                :underline="false"
+                icon="el-icon-finished"
+              >
+                通过
+              </el-link>
+            </template>
+          </el-popconfirm>
           <el-link
-            v-if="row.useStatus == 1"
+            v-if="row.useStatus == 1 && row.ifAddress"
             type="primary"
             :underline="false"
             icon="el-icon-finished"
@@ -88,6 +104,7 @@
   import {
     getGroupsExchangeDetail,
     listGroupsExchange,
+    updateGroupsExchangeUseStatus,
     exportGroupsExchange
   } from '@/api/sylive/groups-exchange';
   import { utils, writeFile } from 'xlsx';
@@ -202,6 +219,25 @@
       };
     },
     methods: {
+      /* 删除 */
+      remove(row, status) {
+        const loading = this.$loading({ lock: true });
+        updateGroupsExchangeUseStatus({
+          cfId: row.id,
+          type: this.useType,
+          useStatus: status,
+          descrip: ''
+        })
+          .then((msg) => {
+            loading.close();
+            this.$message.success(msg);
+            this.reload();
+          })
+          .catch((e) => {
+            loading.close();
+            this.$message.error(e.message);
+          });
+      },
       /* 打开导入弹窗 */
       openImport() {
         this.showImport = true;