From 30dbe5b15902d90a5ca41e77ccd7d399d6c9578d Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 11 九月 2025 18:33:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into send_coupon

---
 manager/src/views/goods/goods-info/goods.vue |  142 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 141 insertions(+), 1 deletions(-)

diff --git a/manager/src/views/goods/goods-info/goods.vue b/manager/src/views/goods/goods-info/goods.vue
index 4dd6d2d..bf50b4b 100644
--- a/manager/src/views/goods/goods-info/goods.vue
+++ b/manager/src/views/goods/goods-info/goods.vue
@@ -76,6 +76,12 @@
           icon="ios-search"
           >鎼滅储</Button
         >
+        <Button
+          @click="queryExportGoods"
+          class="search-btn"
+          type="primary"
+        >瀵煎嚭鍟嗗搧娓呭崟</Button
+        >
       </Form>
       <Table
         :loading="loading"
@@ -106,6 +112,22 @@
           </div>
         </template>
       </Table>
+      <Modal
+        v-model="showUpdateTag"
+        title="鏍囩"
+        width="800"
+        :mask-closable="false"
+      >
+        <Select v-model="tagForm.selectTagIds" multiple filterable :loading="selectLoading" style="width:200px;">
+          <Option v-for="item in options" :key="item.id" :label="item.tagName" :value="item.id"></Option>
+        </Select>
+
+        <div slot="footer">
+          <Button type="error" @click="saveTag">淇濆瓨</Button>
+          <!--          <Button type="primary" @click="generalQrCode">纭</Button>-->
+        </div>
+      </Modal>
+
       <Modal
         v-model="showGeneralQrCode"
         title="浜岀淮鐮�"
@@ -180,9 +202,13 @@
 </template>
 
 <script>
-import { getGoodsListData, upGoods, lowGoods ,getGoodsFirstSkuId ,goodsSort} from "@/api/goods";
+import { getGoodsListData, upGoods, lowGoods ,getGoodsFirstSkuId,queryExportGoods,goodsSort } from "@/api/goods";
+
 import {getSts} from '@/api/file'
 import vueQr from "vue-qr";
+import {getTags} from "@/api/tag";
+import {addOrUpDateTag,getGoodSTagById} from "@/api/goods-tag"
+
 export default {
   components: {
     "vue-qr": vueQr,
@@ -195,6 +221,19 @@
         sort:0
       },
       showSort:false,
+
+      tagForm:{
+        selectTagIds:[],
+        goodsId:'',
+        createType:'MANAGER',
+      },
+
+      selectLoading: false,
+      options: [],
+
+      showUpdateTag:false,
+
+
       showGeneralQrCode:false,
       QRCodeUrl:'',
       codeUrl: this.QRcodeBaseUrl+ '/scanpage/goods',
@@ -349,6 +388,7 @@
                       marginRight: "5px",
                     },
                     props: {
+                      type: "info",
                       size: "small",
                     },
                     on: {
@@ -358,6 +398,24 @@
                     },
                   },
                   "鐢熸垚浜岀淮鐮�"
+                ),
+                h(
+                  "Button",
+                  {
+                    style: {
+                      marginLeft: "5px",
+                      marginTop: "5px",
+                    },
+                    props: {
+                      size: "small",
+                    },
+                    on: {
+                      click: () => {
+                        this.openTagsModal(params.row);
+                      },
+                    },
+                  },
+                  "缂栬緫鏍囩"
                 )
               ]);
             } else {
@@ -428,6 +486,23 @@
                     },
                   },
                   "璁剧疆鍟嗗搧鎺掑簭"
+                ),h(
+                  "Button",
+                  {
+                    style: {
+                      marginLeft: "5px",
+                      marginTop: "5px",
+                    },
+                    props: {
+                      size: "small",
+                    },
+                    on: {
+                      click: () => {
+                        this.openTagsModal(params.row);
+                      },
+                    },
+                  },
+                  "缂栬緫鏍囩"
                 )
               ]);
             }
@@ -456,6 +531,56 @@
       this.sortForm.goodsId = row.id;
       this.sortForm.sort = row.goodsSort
       this.showSort = true;
+    },
+    saveTag(){
+      this.showUpdateTag = false;
+      const form = {
+        tagIds:this.tagForm.selectTagIds,
+        createType:this.tagForm.createType,
+        goodsId:this.tagForm.goodsId
+      }
+      addOrUpDateTag(form).then(res =>{
+        console.log(res)
+      })
+    },
+    openTagsModal(row){
+
+      this.showUpdateTag = true;
+      this.tagForm.selectTagIds = [];
+      this.tagForm.goodsId = "";
+      getGoodSTagById(row.id).then(res =>{
+        if(res.code === 200){
+          this.tagForm.goodsId = row.id;
+          res.data.forEach(item =>{
+            this.tagForm.selectTagIds.push(item.tagId);
+          })
+        }
+        console.log(this.tagForm)
+      })
+    },
+    queryExportGoods(){
+        queryExportGoods(this.searchForm).then(res =>{
+          const blob = new Blob([res], {
+            type: "application/vnd.ms-excel;charset=utf-8",
+          });
+          //瀵逛簬<a>鏍囩锛屽彧鏈� Firefox 鍜� Chrome锛堝唴鏍革級 鏀寔 download 灞炴��
+          //IE10浠ヤ笂鏀寔blob浣嗘槸渚濈劧涓嶆敮鎸乨ownload
+          if ("download" in document.createElement("a")) {
+            //鏀寔a鏍囩download鐨勬祻瑙堝櫒
+            const link = document.createElement("a"); //鍒涘缓a鏍囩
+            link.download = "鍟嗗搧娓呭崟.xlsx"; //a鏍囩娣诲姞灞炴��
+            link.style.display = "none";
+            link.href = URL.createObjectURL(blob);
+            document.body.appendChild(link);
+            link.click(); //鎵ц涓嬭浇
+            URL.revokeObjectURL(link.href); //閲婃斁url
+            document.body.removeChild(link); //閲婃斁鏍囩
+          } else {
+            navigator.msSaveBlob(blob, fileName);
+          }
+        })
+
+
     },
     closeGeneralQrCode(){
       this.showGeneralQrCode = false;
@@ -566,9 +691,24 @@
         query: { id: id },
       })
     },
+    remoteMethod(query) {
+      this.selectLoading = true;
+      var params = {
+        "tagTypeKey": "GOODS",
+        "pageNumber": 1,
+        "pageSize": 500
+      }
+      getTags(params).then(res => {
+        this.options = res.data;
+        this.selectLoading = false;
+      });
+    },
+
   },
+
   mounted() {
     this.init();
+    this.remoteMethod("")
   },
 };
 </script>

--
Gitblit v1.8.0