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

zxl

2025-08-08 aa5973abc2272df6892703cde8c78ee184ad714b

 seller/src/views/goods/goods-seller/goodsOperationSec.vue

@@ -28,6 +28,7 @@
<!--              <Input v-model="baseInfoForm.commission" max="100" min="0" clearable placeholder="抽成比例" style="width: 260px" type="number"/>-->
              <InputNumber v-model="baseInfoForm.commission" :formatter="value => `${value}%`"
                           :parser="value => value.replace('%', '')" :max="100" :min="0" clearable
                           :active-change="false"
                           placeholder="抽成比例" style="width: 260px" type="number"/>
            </FormItem>

@@ -326,9 +327,9 @@
                            overflow-x: hidden;
                          }
                        ">
                        <template slot="sn" slot-scope="{ row }">
                          <Input v-model="row.sn" clearable placeholder="请输入货号"
                                 @on-change="updateSkuTable(row, 'sn')"/>
                        <template slot="sn" slot-scope="{ row, index }">
                          <Input v-model="row.sn" placeholder="请输入货号" disabled
                                 @on-change="updateSkuTable(row, 'sn')" />
                        </template>
                        <div v-if="baseInfoForm.goodsType !== 'VIRTUAL_GOODS'" slot="weight" slot-scope="{ row }">
                          <Input v-model="row.weight" clearable placeholder="请输入重量"
@@ -400,7 +401,7 @@
            </div>
            <FormItem class="form-item-view-el" label="PC商品描述" prop="intro" style="width: 100%">
              <editor
                :show-upload="false"
                :show-upload="true"
                ref="editor"
                v-model="baseInfoForm.intro"
                height="800px"
@@ -414,7 +415,7 @@

            <FormItem class="form-item-view-el" label="移动端描述" prop="skuList" style="width: 100%">
              <editor
                :show-upload="false"
                :show-upload="true"
                ref="introEditor"
                v-model="baseInfoForm.mobileIntro"
                height="800px"
@@ -699,6 +700,7 @@
        preSaleTime:[],
        preSaleBeginDate:'',
        preSaleEndDate:'',
        commission:5
      },
      /** 表格头 */
      skuTableColumn: [],
@@ -1701,6 +1703,7 @@
        this.baseInfoForm.regeneratorSkuFlag = true;
        this.newSkuValues[$index] = "";
      }
      this.renderTableData(this.skuTableData);
    },
    handleClearSku() {
      this.skuInfo = [];
@@ -1754,14 +1757,14 @@
        );
      }
      // 预售模式
      if (this.baseInfoForm.salesModel !== "PRESALE") {
        pushData.push(
          {
            title: "预售时间",
            slot: "price",
          }
        );
      }
      // if (this.baseInfoForm.salesModel !== "PRESALE") {
      //   pushData.push(
      //     {
      //       title: "预售时间",
      //       slot: "price",
      //     }
      //   );
      // }
      if (this.baseInfoForm.salesModel === "WHOLESALE" && this.wholesaleData) {
        this.wholesaleData.forEach((item, index) => {
          pushData.push({
@@ -1817,6 +1820,7 @@
     * array spec数据
     */
    specIterator(result, spec, skus) {

      let table = result;
      if (spec.length > 0) {
        //清除当前循环的分组
@@ -1858,6 +1862,11 @@
      } else {
        this.skuIndex++;
      }

      table.forEach((item,index) =>{
        console.log("元素:" + item +"index:" + (index +1))
          item.sn = index + 1;
      })
      return table;
    },
    /** 根据分类id获取系统设置规格信息*/
@@ -1915,6 +1924,7 @@
          return;
        }
      }

      // else if (item === "alertQuantity") {
      //   if (
      //     !/^[0-9]\d*$/.test(row[item]) ||
@@ -1998,11 +2008,11 @@
              this.$Message.error("请上传商品图片");
              return;
            }
            if (!submit.goodsVideo){
              this.submitLoading = false;
              this.$Message.error("请上传商品视频");
              return;
            }
            // if (!submit.goodsVideo){
            //   this.submitLoading = false;
            //   this.$Message.error("请上传商品视频");
            //   return;
            // }
            if (submit.templateId === "") submit.templateId = 0;
            let flag = false;
            let paramValue = "";