Merge remote-tracking branch 'origin/dev' into dev

zxl

2025-08-08 aa5973abc2272df6892703cde8c78ee184ad714b

 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",
@@ -447,6 +475,20 @@
                ),h(
                  "Button",
                  {
                    props: {
                      type: "error",
                      size: "small",
                    },
                    on: {
                      click: () => {
                        this.goodsSort(params.row);
                      },
                    },
                  },
                  "设置商品排序"
                ),h(
                  "Button",
                  {
                    style: {
                      marginRight: "5px",
                      marginTop: "5px",
@@ -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 = {