From 9797e46619f64bddb78d4b4eaa03d53069ac2ba4 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 01 九月 2025 17:37:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
seller/src/views/goods/goods-seller/goodsOperationSec.vue | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index eb74f13..ffa87b6 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -327,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="璇疯緭鍏ラ噸閲�"
@@ -401,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"
@@ -415,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"
@@ -700,6 +700,7 @@
preSaleTime:[],
preSaleBeginDate:'',
preSaleEndDate:'',
+ commission:5
},
/** 琛ㄦ牸澶� */
skuTableColumn: [],
@@ -1702,6 +1703,7 @@
this.baseInfoForm.regeneratorSkuFlag = true;
this.newSkuValues[$index] = "";
}
+ this.renderTableData(this.skuTableData);
},
handleClearSku() {
this.skuInfo = [];
@@ -1755,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({
@@ -1818,6 +1820,7 @@
* array spec鏁版嵁
*/
specIterator(result, spec, skus) {
+
let table = result;
if (spec.length > 0) {
//娓呴櫎褰撳墠寰幆鐨勫垎缁�
@@ -1859,6 +1862,11 @@
} else {
this.skuIndex++;
}
+
+ table.forEach((item,index) =>{
+ console.log("鍏冪礌:" + item +"index:" + (index +1))
+ item.sn = index + 1;
+ })
return table;
},
/** 鏍规嵁鍒嗙被id鑾峰彇绯荤粺璁剧疆瑙勬牸淇℃伅*/
@@ -1916,6 +1924,7 @@
return;
}
}
+
// else if (item === "alertQuantity") {
// if (
// !/^[0-9]\d*$/.test(row[item]) ||
@@ -1999,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 = "";
--
Gitblit v1.8.0