diff --git a/manager/src/views/goods/goods-info/goodsDetail.vue b/manager/src/views/goods/goods-info/goodsDetail.vue
index d738a0cd..5d723674 100644
--- a/manager/src/views/goods/goods-info/goodsDetail.vue
+++ b/manager/src/views/goods/goods-info/goodsDetail.vue
@@ -214,14 +214,14 @@ export default {
});
} else {
this.skuColumn.push(
- {
- title: "成本",
- key: "cost",
- render: (h, params) => {
- console.log(params)
- return h("priceColorScheme", {props:{value:params.row.cost,color:this.$mainColor}} );
- },
- },
+ // {
+ // title: "成本",
+ // key: "cost",
+ // render: (h, params) => {
+ // console.log(params)
+ // return h("priceColorScheme", {props:{value:params.row.cost,color:this.$mainColor}} );
+ // },
+ // },
{
title: "价格",
key: "price",
diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index 4a9ff626..12ed8d09 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -29,6 +29,7 @@
+
商品交易信息
@@ -38,6 +39,7 @@
+
{{
- baseInfoForm.goodsUnit || ""
+ baseInfoForm.goodsUnit || ""
}}
@@ -226,12 +228,12 @@
}}
-
+
@@ -341,6 +343,7 @@
+
@@ -611,7 +614,7 @@ export default {
"_index",
"_rowKey",
"sn",
- "cost",
+ // "cost",
"price",
"weight",
"quantity",
@@ -629,6 +632,17 @@ export default {
}
},
methods: {
+ // 局部刷新
+ refresh(v){
+ if( v == 'template'){
+ this.GET_ShipTemplate()
+ }else if( v == 'goodsUnit'){
+ this.goodsUnitList = []
+ this.GET_GoodsUnit()
+ }else{
+ this.getGoodsBrandList()
+ }
+ },
getImages(v) {
this.previewImage = v;
this.visible = true;
@@ -990,7 +1004,7 @@ export default {
id: e.id,
sn: e.sn,
price: e.price,
- cost: e.cost,
+ // cost: e.cost,
quantity: e.quantity,
weight: e.weight,
};
@@ -1273,7 +1287,7 @@ export default {
find.id = "";
find.price && (find.price = "");
find.sn && (find.sn = "");
- find.cost && (find.cost = "");
+ // find.cost && (find.cost = "");
find.quantity && (find.quantity = "");
find.weight && (find.weight = "");
@@ -1287,7 +1301,7 @@ export default {
find.id = "";
find.price && (find.price = "");
find.sn && (find.sn = "");
- find.cost && (find.cost = "");
+ // find.cost && (find.cost = "");
find.quantity && (find.quantity = "");
find.weight && (find.weight = "");
@@ -1340,10 +1354,10 @@ export default {
// 有成本价和价格的情况
if (this.baseInfoForm.salesModel !== "WHOLESALE") {
pushData.push(
- {
- title: "成本价",
- slot: "cost",
- },
+ // {
+ // title: "成本价",
+ // slot: "cost",
+ // },
{
title: "价格",
slot: "price",
@@ -1422,7 +1436,7 @@ export default {
id: skus[index].id,
sn: skus[index].sn,
quantity: skus[index].quantity,
- cost: skus[index].cost,
+ cost: 1,
price: skus[index].price,
[spec[0].name]: specItem.value,
images:
@@ -1503,18 +1517,19 @@ export default {
this.validatatxt = "请输入0~99999999之间的整数";
return;
}
- } else if (item === "cost" || item === "price") {
- if (
- !regular.money.test(row[item]) ||
- parseInt(row[item]) < 0 ||
- parseInt(row[item]) > 99999999
- ) {
- // 成本价 价格
- this.validateError.push([index, item]);
- this.validatatxt = "请输入0~99999999之间的价格";
- return;
- }
- }
+ }
+ // else if (item === "cost" || item === "price") {
+ // if (
+ // !regular.money.test(row[item]) ||
+ // parseInt(row[item]) < 0 ||
+ // parseInt(row[item]) > 99999999
+ // ) {
+ // // 成本价 价格
+ // this.validateError.push([index, item]);
+ // this.validatatxt = "请输入0~99999999之间的价格";
+ // return;
+ // }
+ // }
this.$nextTick(() => {
this.skuTableData[index][item] = row[item];
});
@@ -1592,7 +1607,7 @@ export default {
submit.skuList = [];
this.skuTableData.map((sku) => {
let skuCopy = {
- cost: sku.cost,
+ cost: 1,
price: sku.price,
quantity: sku.quantity,
sn: sku.sn,
@@ -1702,17 +1717,20 @@ export default {
}
});
},
+ GET_ShipTemplate(){
+ // 获取物流模板
+ API_Shop.getShipTemplate().then((res) => {
+ if (res.success) {
+ this.logisticsTemplate = res.result;
+ }
+ });
+ }
},
mounted() {
this.accessToken = {
accessToken: this.getStore("accessToken"),
};
- // 获取物流模板
- API_Shop.getShipTemplate().then((res) => {
- if (res.success) {
- this.logisticsTemplate = res.result;
- }
- });
+ this.GET_ShipTemplate()
if (this.$route.query.id || this.$route.query.draftId) {
// 编辑商品、模板
this.GET_GoodData(this.$route.query.id, this.$route.query.draftId);
@@ -1783,4 +1801,7 @@ export default {
.view-video{
margin: 0 10px;
}
+.refresh-icon{
+ margin-left: 10px;
+}