From 3bffb1909ca9e0485ed5f4b8aabaf5c1a2675485 Mon Sep 17 00:00:00 2001
From: dy-hu <dy-hu@haihangyun.com>
Date: Wed, 3 Jul 2024 15:37:57 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=95=86=E5=AE=B6=E7=AB=AF=E5=AE=9A=E4=BB=B7?=
 =?UTF-8?q?=E6=8D=86=E7=BB=91=E6=A8=A1=E5=9D=97=E5=95=86=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=8E=B7=E5=8F=96=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=81=E5=94=AE=E4=BB=B7=E5=8C=BA=E9=97=B4=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D=E3=80=81=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D=202.?=
 =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AB=AF=E5=AE=9A=E4=BB=B7=E6=8D=86=E7=BB=91?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=95=86=E5=93=81=E6=96=B0=E5=A2=9E=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E5=BA=97=E9=93=BA=E6=98=BE=E7=A4=BA=E4=B8=9A=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/marketing/compose/add.vue  | 11 ++++++++---
 src/views/marketing/discount/add.vue | 22 ++++++++++++++++++----
 src/views/marketing/price/add.vue    | 12 +++++++++---
 src/views/marketing/spike/add.vue    |  7 ++++---
 4 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/src/views/marketing/compose/add.vue b/src/views/marketing/compose/add.vue
index e3742d4..50f000a 100644
--- a/src/views/marketing/compose/add.vue
+++ b/src/views/marketing/compose/add.vue
@@ -158,7 +158,7 @@
     <el-dialog
       title="选择商品"
       :visible.sync="isVisible"
-      width="55%"
+      width="70%"
       top="50px"
       class="group-dialog"
       :close-on-click-modal="false"
@@ -198,11 +198,11 @@
             :reserve-selection="true"
             width="55"
           />
-          <el-table-column
+<!--          <el-table-column
             prop="productId"
             label="商品id"
             show-overflow-tooltip
-          />
+          />-->
           <el-table-column label="商品主图" width="150" align="center">
             <template slot-scope="scope">
               <img
@@ -226,6 +226,11 @@
             width="120"
             show-overflow-tooltip
           />
+          <el-table-column
+            prop="shopName"
+            label="所属店铺"
+            show-overflow-tooltip
+          />
         </el-table>
         <div class="fenye">
           <el-pagination
diff --git a/src/views/marketing/discount/add.vue b/src/views/marketing/discount/add.vue
index 1706b34..7810c17 100644
--- a/src/views/marketing/discount/add.vue
+++ b/src/views/marketing/discount/add.vue
@@ -60,7 +60,7 @@
     <el-dialog
       :title="visitDetail ? '查看商品' : '选择商品'"
       :visible.sync="isVisible"
-      width="55%"
+      width="75%"
       top="50px"
       class="group-dialog"
       :close-on-click-modal="false"
@@ -69,6 +69,12 @@
     >
       <!-- 表格 -->
       <div class="tableBox">
+
+        <div style="margin-bottom: 15px">
+          <el-input v-model="prodSearch" :placeholder="$t('product.productname_hint')" style="width: 360px"/>
+          <el-button type="primary" style="margin-left: 8px" @click="searchProd">{{$t('common.query')}}</el-button>
+        </div>
+
         <el-table
           ref="multipleTable"
           :data="tableData"
@@ -86,12 +92,12 @@
             :reserve-selection="true"
             width="55"
           />
-          <el-table-column label="商品信息" width="150" align="center">
+          <el-table-column label="商品图片" width="150" align="center">
             <template slot-scope="scope">
               <img height="80" width="80" :src="scope.row.image " alt srcset>
             </template>
           </el-table-column>
-          <el-table-column prop="productName" label="" />
+          <el-table-column prop="productName" label="商品名称" show-overflow-tooltip/>
           <el-table-column prop="originalPrice" label="原价（元）" width="120" />
           <el-table-column prop="value" label="规格" width="120" />
           <el-table-column label="折扣" width="155">
@@ -105,6 +111,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="stockNumber" label="库存" width="120" show-overflow-tooltip />
+          <el-table-column prop="shopName" label="所属店铺" show-overflow-tooltip />
           <!--          <el-table-column width="80" :label="$t('common.operate')" show-overflow-tooltip>-->
           <!--            <template slot-scope="scope">-->
           <!--              <div class="btnList">-->
@@ -193,6 +200,7 @@ export default {
       isVisible: false, // 选择商品弹窗
       inputDiscountTableData: [],
       selectionKeys: [],
+      prodSearch: undefined
     }
   },
   watch: {
@@ -401,6 +409,12 @@ export default {
     numFilter(value) {
       const realVal = parseFloat(value).toFixed(2)
       return realVal
+    },
+    searchProd() {
+      this.proOption.page = 1
+      this.proOption.pageSize = 10
+      this.proOption.searchContent = this.prodSearch
+      this.getProList()
     }
   }
 }
@@ -410,7 +424,7 @@ export default {
 @import url("../../../styles/elDialog.scss");
 .addGroupBuy {
   background: #FFFFFF;
-  
+
   .formBox {
     margin-top: 20px;
     .flexBox {
diff --git a/src/views/marketing/price/add.vue b/src/views/marketing/price/add.vue
index 4125853..af24e7e 100644
--- a/src/views/marketing/price/add.vue
+++ b/src/views/marketing/price/add.vue
@@ -147,7 +147,7 @@
     <el-dialog
       title="选择商品"
       :visible.sync="isVisible"
-      width="55%"
+      width="70%"
       top="50px"
       class="group-dialog"
       :close-on-click-modal="false"
@@ -183,11 +183,11 @@
             :reserve-selection="true"
             width="55"
           />
-          <el-table-column
+<!--          <el-table-column
             prop="productId"
             label="商品id"
             show-overflow-tooltip
-          />
+          />-->
           <el-table-column label="商品主图" width="150" align="center">
             <template slot-scope="scope">
               <img
@@ -211,6 +211,12 @@
             width="120"
             show-overflow-tooltip
           />
+          />
+          <el-table-column
+            prop="shopName"
+            label="所属店铺"
+            show-overflow-tooltip
+          />
         </el-table>
         <div class="fenye">
           <el-pagination
diff --git a/src/views/marketing/spike/add.vue b/src/views/marketing/spike/add.vue
index 405b457..aee61c5 100644
--- a/src/views/marketing/spike/add.vue
+++ b/src/views/marketing/spike/add.vue
@@ -60,7 +60,7 @@
     <el-dialog
       :title="visitDetail ? '查看商品' : '选择商品'"
       :visible.sync="isVisible"
-      width="58%"
+      width="75%"
       top="50px"
       class="group-dialog"
       :close-on-click-modal="false"
@@ -93,12 +93,12 @@
             :reserve-selection="true"
             width="55"
           />
-          <el-table-column label="商品信息" width="150" align="center">
+          <el-table-column label="商品图片" width="150" align="center">
             <template slot-scope="scope">
               <img height="80" width="80" :src="scope.row.image " alt srcset>
             </template>
           </el-table-column>
-          <el-table-column prop="productName" label="" />
+          <el-table-column prop="productName" label="商品名称" show-overflow-tooltip/>
           <el-table-column prop="originalPrice" label="原价（元）" width="120" />
           <el-table-column prop="value" label="规格" width="120" />
           <el-table-column label="直降（元）" width="153">
@@ -112,6 +112,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="stockNumber" label="库存" width="120" show-overflow-tooltip />
+          <el-table-column prop="shopName" label="所属店铺" show-overflow-tooltip />
           <!--          <el-table-column width="80" :label="$t('common.operate')" show-overflow-tooltip>-->
           <!--            <template slot-scope="scope">-->
           <!--              <div class="btnList">-->