From aa5973abc2272df6892703cde8c78ee184ad714b Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 08 八月 2025 17:04:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 manager/src/views/goods/goods-info/goods.vue |   64 +++++++++++++++++++++++++++++++-
 1 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/manager/src/views/goods/goods-info/goods.vue b/manager/src/views/goods/goods-info/goods.vue
index 55309ba..ed1eece 100644
--- a/manager/src/views/goods/goods-info/goods.vue
+++ b/manager/src/views/goods/goods-info/goods.vue
@@ -180,11 +180,30 @@
         >
       </div>
     </Modal>
+    <Modal
+      title="璁剧疆鍟嗗搧鎺掑簭"
+      v-model="showSort"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="underForm" :model="sortForm" :label-width="100">
+        <FormItem label="鍟嗗搧鎺掑簭" prop="reason">
+          <InputNumber v-model="sortForm.sort" :min="0" :max="999" clearable style="width: 100%" />
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="showSort= false">鍙栨秷</Button>
+        <Button type="primary" :loading="submitLoading" @click="submitSort"
+        >鎻愪氦</Button
+        >
+      </div>
+    </Modal>
   </div>
 </template>
 
 <script>
-import { getGoodsListData, upGoods, lowGoods ,getGoodsFirstSkuId,queryExportGoods } 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";
@@ -197,6 +216,12 @@
   name: "goods",
   data() {
     return {
+      sortForm:{
+        goodsId:'',
+        sort:0
+      },
+      showSort:false,
+
       tagForm:{
         selectTagIds:[],
         goodsId:'',
@@ -317,7 +342,7 @@
           key: "action",
           align: "center",
           fixed: "right",
-          width: 220,
+          width: 400,
           render: (h, params) => {
             if (params.row.marketEnable == "DOWN") {
               return h("div", [
@@ -359,6 +384,9 @@
                 h(
                   "Button",
                   {
+                    style: {
+                      marginRight: "5px",
+                    },
                     props: {
                       type: "info",
                       size: "small",
@@ -444,6 +472,20 @@
                     },
                   },
                   "鐢熸垚浜岀淮鐮�"
+                ),                h(
+                  "Button",
+                  {
+                    props: {
+                      type: "error",
+                      size: "small",
+                    },
+                    on: {
+                      click: () => {
+                        this.goodsSort(params.row);
+                      },
+                    },
+                  },
+                  "璁剧疆鍟嗗搧鎺掑簭"
                 ),h(
                   "Button",
                   {
@@ -472,6 +514,24 @@
     };
   },
   methods: {
+    cancelSort(){
+      console.log('鐐瑰嚮浜嗗彇娑�')
+      this.showSort = false;
+    },
+   async submitSort(){
+    const response =  await goodsSort(this.sortForm)
+    console.log(response)
+     this.showSort = false;
+     this.getDataList();
+    },
+    goodsSort(row){
+      // this.sortForm = {
+      //
+      // }
+      this.sortForm.goodsId = row.id;
+      this.sortForm.sort = row.goodsSort
+      this.showSort = true;
+    },
     saveTag(){
       this.showUpdateTag = false;
       const form = {

--
Gitblit v1.8.0