商品信息
+ 品牌信息
品牌Logo：
-
-
@@ -98,8 +98,8 @@
// this.initData()
},
methods: {
- backData(value) {
- console.log('backData》》》》', value)
+
+ backData(value){
console.log('imgList', this.imgList)
if (this.imgList.length > 0) {
@@ -107,25 +107,13 @@
} else {
this.formobj.image = ''
}
-
this.hideUploadBtn = this.imgList.length != 0
console.log('this.hideUploadBtn', this.hideUploadBtn)
},
- backData2(value) {
- console.log('backData2》》》》', value)
- console.log('imgList2', this.imgList2)
-
- if (this.imgList2.length > 0) {
- this.formobj.bigPic = this.imgList2[0].url
- } else {
- this.formobj.bigPic = ''
- }
- this.hideUploadBtn2 = this.imgList2.length != 0
- console.log('this.hideUploadBtn2', this.hideUploadBtn2)
- },
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+
req.saveBrands(this.formobj)
.then(resp => {
if (resp.success) {
@@ -144,9 +132,7 @@
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.imgList = []
- this.imgList2 = []
this.hideUploadBtn = true
- this.hideUploadBtn2 = true
this.formobj = {
sid: '',
brandName: '',
@@ -159,9 +145,7 @@
},
showAdd() {
console.log("this.imgList", this.imgList)
- console.log("this.imgList2", this.imgList2)
this.hideUploadBtn = this.imgList.length != 0
- this.hideUploadBtn2 = this.imgList2.length != 0
},
showEdit(row) {
req.initBrands(row.sid)
@@ -169,26 +153,18 @@
if (resp.success) {
this.formobj = resp.data
this.imgList = []
- this.imgList2 = []
if (resp.data.image != '') {
this.imgList.push({
url: resp.data.image
})
}
- if (resp.data.bigPic != '') {
- this.imgList2.push({
- url: resp.data.bigPic
- })
- }
this.hideUploadBtn = this.imgList.length != 0
- this.hideUploadBtn2 = this.imgList2.length != 0
}
})
.catch(e => {
this.formobj = row
this.imgList = []
- this.imgList2 = []
})
},
diff --git a/yxt-as-ui/src/views/goods/goods/goodsAdd.vue b/yxt-as-ui/src/views/goods/goods/goodsAdd.vue
index d2bb507b42..70f7dceb86 100644
--- a/yxt-as-ui/src/views/goods/goods/goodsAdd.vue
+++ b/yxt-as-ui/src/views/goods/goods/goodsAdd.vue
@@ -15,241 +15,329 @@
-
-
@@ -737,6 +751,7 @@
import req2 from '@/api/goods/brand.js'
import req3 from '@/api/goods/category.js'
import req4 from '@/api/goods/factory.js'
+ import req5 from '@/api/goods/unit.js'
import uploadImg from '@/components/uploadFile/uploadImg'
export default {
components: {
@@ -771,6 +786,7 @@
brandList: [],
cateList: [],
facturerList: [],
+ unitNameList: [],
hideUploadBtn: false,
dialogVisible: false,
dialogVisible2: false,
@@ -793,16 +809,15 @@
req4.getAllFacturer().then(resp => {
this.facturerList = resp.data
})
+ req5.getAllUnit().then(resp => {
+ this.unitNameList = resp.data
+ })
},
backData(value) {
console.log('backData》》》》', value)
console.log('imgList', this.imgList)
- if (this.imgList.length > 0) {
- this.formobj.picUrl = this.imgList[0].url
- } else {
- this.formobj.picUrl = ''
- }
+ this.itemInfo.urls = this.imgList
this.hideUploadBtn = this.imgList.length != 0
console.log('this.hideUploadBtn', this.hideUploadBtn)
@@ -890,6 +905,12 @@
this.formobj.manufacturerSid = choose[0].sid
this.formobj.manufacturerName = choose[0].manufacturerName
},
+ selectunitNameChange(val) {
+ const choose = this.unitNameList.filter((item) => item.sid == val)
+ console.log('>>>>>>>>>selectunitNameChange', choose)
+ this.formobj.goodsUnitSid = choose[0].sid
+ this.formobj.goodsUnitName = choose[0].unitName
+ },
editGoodsSku(goodsSku) {
console.log('>>>>>>>>>editGoodsSku', goodsSku)
this.orderInfo = goodsSku
@@ -922,7 +943,7 @@
},
saveGoodsSku() {
- console.log('>>>>>>>>>saveGoodsSkuDttail', this.orderInfo)
+ console.log('>>>>>>>>>saveGoodsSkuDttail', this.orderInfo)
if (this.orderInfo.sid == '') {
this.orderInfo.sid = require('uuid').v1()
@@ -991,7 +1012,7 @@
addGoodsSku() {
this.dialogVisible3 = true
this.orderInfo = {
- sid:''
+ sid: ''
}
}
@@ -999,103 +1020,29 @@
}
}
-
diff --git a/yxt-as-ui/src/views/goods/goods/goodsInfo.vue b/yxt-as-ui/src/views/goods/goods/goodsInfo.vue
index cb54f3debc..15ec78ebf9 100644
--- a/yxt-as-ui/src/views/goods/goods/goodsInfo.vue
+++ b/yxt-as-ui/src/views/goods/goods/goodsInfo.vue
@@ -6,7 +6,6 @@
+
+
-
-
- 商品名称
+
+
+
+
-
-
-
+
+
-
-
- 商品编码
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
- 商品品牌
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
-
-
- 商品类别
-
-
-
-
-
+
+
+
+
+
-
-
- 商品厂家
-
-
-
-
-
+
+
-
-
- 厂家货号
-
-
-
-
-
+
+
+
-
-
- 外部编码
+
+
+
+
+
-
-
-
+
+
+ 上架
+ 下架
+
-
-
- 国标码
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
- 税率
+
+
+
+
-
-
-
+
+
-
-
- 保质期天
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
- 商品详细说明
+
+
+
+
-
-
-
+
+
+
+
+
+
+
-
-
- 商品描述
+
+
+
+
-
-
-
+
+
+
+
+
+
+
-
-
-
- 规格列表添加
+
+
+
+
+ 编辑
-
-
-
-
- 编辑
-
-
-
-
-
-
-
- 查看
- 编辑
-
-
-
-
-
-
+
+
+
+
+
+
+ 查看
+ 编辑
+
+
+
-
+
+
+
-
-
- 规格代码
-
-
-
-
-
-
+
+
-
-
- 规格标题
+
+
+
+
-
-
-
-
+
+
-
-
- 外部编码
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
@@ -262,184 +350,179 @@
-
-
+
+
-
-
- 最后采购价
-
-
-
-
- {{itemInfo.finalPurchasePrice}}
-
-
-
-
- 安全库存天数
-
-
-
-
- {{itemInfo.safetyStockDays}}
+
+
+
+ {{itemInfo.finalPurchasePrice}}
-
-
- 是否原厂
+
+
+
+ {{itemInfo.safetyStockDays}}
-
-
- {{itemInfo.isOriginalFactory}}
+
+
+
+
+ 是
+ 否
+
+
-
-
- 是否库存警戒
-
-
-
-
- {{itemInfo.isInventoryAlert}}
-
-
-
-
- 库存警戒上线
-
-
-
-
- {{itemInfo.inventoryAlertUpperLimit}}
+
+
+
+
+ 是
+ 否
+
-
-
- 库存警戒下线
+
+
+
+ {{itemInfo.inventoryAlertUpperLimit}}
-
-
- {{itemInfo.inventoryAlertLowerLimit}}
+
+
+
+ {{itemInfo.inventoryAlertLowerLimit}}
+
-
-
- 成本价
-
-
-
-
- {{itemInfo.costPrice}}
-
-
-
-
- 吊牌价
-
-
-
-
- {{itemInfo.tagPrice}}
+
+
+
+ {{itemInfo.costPrice}}
-
-
- 销售单价
+
+
+
+ {{itemInfo.tagPrice}}
-
-
- {{itemInfo.salesPrice}}
+
+
+
+ {{itemInfo.salesPrice}}
+
+
-
-
- 标准进价
-
-
-
-
- {{itemInfo.standardPurchasePrice}}
-
-
-
-
- 代理价
-
-
-
-
- {{itemInfo.agencyPrice}}
+
+
+
+ {{itemInfo.standardPurchasePrice}}
-
-
- 折扣
+
+
+
+ {{itemInfo.agencyPrice}}
-
-
- {{itemInfo.discount}}
+
+
+
+ {{itemInfo.discount}}
+
+
-
-
- 最低零售价
+
+
+
+ {{itemInfo.minimumSalesPrice}}
-
-
- {{itemInfo.minimumSalesPrice}}
+
+
+
+
+ 是
+ 否
+
-
-
- 是否积分兑换
+
+
+
+ {{itemInfo.integralAmount}}
-
-
- {{itemInfo.isIntegralExchange}}
+
+
+
+
+
+
+
+
+ 是
+ 否
+
-
-
- 积分数量
+
+
+
+ {{itemInfo.sortNo}}
-
-
- {{itemInfo.integralAmount}}
+
+
+
+ {{itemInfo.remarks}}
+
-
-
- 规格图片
-
-
-
-
+
+
-
+
![]()
![]()
-
-
+
+
-
-
- 最后采购价
-
-
-
-
-
-
-
-
-
- 安全库存天数
-
-
-
-
-
-
+
+
-
-
- 是否原厂
+
+
+
+
-
-
-
-
+
+
+ 是
+ 否
+
+
-
-
- 是否库存警戒
-
-
-
-
-
-
-
-
-
- 库存警戒上线
-
-
-
-
-
-
+
+
+ 是
+ 否
+
-
-
- 库存警戒下线
+
+
+
+
-
-
-
-
+
+
+
-
-
- 成本价
-
-
-
-
-
-
-
-
-
- 吊牌价
-
-
-
-
-
-
+
+
-
-
- 销售单价
+
+
+
+
-
-
-
-
+
+
+
-
-
- 标准进价
-
-
-
-
-
-
-
-
-
- 代理价
-
-
-
-
-
-
+
+
-
-
- 折扣
+
+
+
+
-
-
-
-
+
+
+
-
-
- 最低零售价
-
-
-
-
-
-
+
+
-
-
- 是否积分兑换
+
+
+
+
+ 是
+ 否
+
-
-
-
-
+
+
-
-
- 积分数量
+
+
+
+
+
+
+
+
+ 是
+ 否
+
-
-
-
-
+
+
-
-
-
-
- 规格图片
+
+
+
-
-
-
-
+
+
+
+
-
确 定
-
-
基础信息
商品名称
+ 商品简称
+ 商品副标题
+ 商品拼音缩写
+ 商品编码
+ 商品条形码
+ 商品品牌
+ 商品类别
+ 商品厂家
+ 厂家货号
+ 商品单位
+ 是否上架
+ 外部编码
+ 国标码
+ 税率
+ 保质期天
+ 商品排序
+ 商品备注
+ 商品详细说明
+ 商品描述
+ 商品通用规格参数
+ 商品特有规格参数
+
+ 添加
+
+ 规格列表
+ 规格代码
+ 商品标题
+ 外部编码
+ 特有规格属性
+ 特有规格参数
+ 最后采购价
+ 安全库存天数
+ 是否原厂
+ 是否库存警戒
+ 库存警戒上线
+ 库存警戒下线
+ 成本价
+ 吊牌价
+ 销售单价
+ 标准进价
+ 代理价
+ 折扣
+ 最低零售价
+ 是否积分兑换
+ 积分数量
+ 锁定销售价格
+ 排序
+ 备注
+ 规格图片
+ 最后采购价
+ 安全库存天数
+ 是否原厂
+ 是否库存警戒
+ 库存警戒上线
+ 库存警戒下线
+ 成本价
+ 吊牌价
+ 销售单价
+ 标准进价
+ 代理价
+ 折扣
+ 最低零售价
+ 是否积分兑换
+ 积分数量
+ 锁定销售价格
+ 排序
+ 备注
+ 规格图片
+ 商品信息
- 保存
关闭
@@ -15,648 +14,432 @@
-
-
@@ -664,14 +447,7 @@
-
diff --git a/yxt-as-ui/src/views/goods/goods/index.vue b/yxt-as-ui/src/views/goods/goods/index.vue
index ffd2d1adcb..a1d9415088 100644
--- a/yxt-as-ui/src/views/goods/goods/index.vue
+++ b/yxt-as-ui/src/views/goods/goods/index.vue
@@ -67,7 +67,7 @@
+
+
-
-
- 商品名称
-
-
-
-
-
-
-
-
- 商品编码
+
+
+
+ {{formobj.goodsName}}
-
-
-
+
+ {{formobj.goodsShortName}}
+
-
-
- 商品品牌
+
+
+
+ {{formobj.subTitle}}
-
-
-
-
+
+
+
+ {{formobj.goodsPY}}
-
-
- 商品类别
+
+
+
+
+
+
+
+ {{formobj.goodsCode}}
-
-
-
-
+
+
+
+ {{formobj.barCode}}
+
-
-
- 商品厂家
+
+
+
+ {{formobj.brandName}}
-
-
-
-
+
+
+
+ {{formobj.typeName}}
-
-
- 厂家货号
+
+
+
+
+
+
+
+ {{formobj.manufacturerName}}
-
-
-
+
+ {{formobj.factoryCode}}
+
-
-
- 外部编码
+
+
+
+ {{formobj.goodsUnitName}}
-
-
-
+
+
+ 上架
+ 下架
+
-
-
- 国标码
+
+
+
+
+
+
+
+ {{formobj.externalCode}}
-
-
-
+
+ {{formobj.nationalStandardCode}}
+
-
-
- 税率
+
+
+
+ {{formobj.taxRate}}
-
-
-
+
+ {{formobj.shelfLife}}
-
-
- 保质期天
+
+
+
+
+
+
+
+ {{formobj.sortNo}}
-
-
-
+
+ {{formobj.remarks}}
+
-
-
- 商品详细说明
+
+
+
+ {{formobj.baseGoodsSpuDetail.goodsExplain}}
-
-
-
+
+
+
+
+
+ {{formobj.baseGoodsSpuDetail.goodsDescription}}
+
-
-
- 商品描述
+
+
+
+ {{formobj.baseGoodsSpuDetail.genericSpec}}
-
-
-
+
+
+
+
+
+ {{formobj.baseGoodsSpuDetail.specialSpec}}
+
-
-
-
- 规格列表添加
-
-
-
-
-
-
-
-
- 查看
- 编辑
-
-
-
-
-
+
+
+
+
+ 查看
+
+
+
-
-
+
+
-
-
- 最后采购价
-
-
-
-
- {{itemInfo.finalPurchasePrice}}
-
-
-
-
- 安全库存天数
-
-
-
-
- {{itemInfo.safetyStockDays}}
-
-
-
-
- 是否原厂
-
-
-
-
- {{itemInfo.isOriginalFactory}}
-
-
-
-
-
-
- 是否库存警戒
-
-
-
-
- {{itemInfo.isInventoryAlert}}
-
-
-
-
- 库存警戒上线
+
+
+ {{itemInfo.finalPurchasePrice}}
-
-
- {{itemInfo.inventoryAlertUpperLimit}}
-
-
-
-
- 库存警戒下线
-
-
-
-
- {{itemInfo.inventoryAlertLowerLimit}}
-
-
-
-
-
-
- 成本价
+
+
+ {{itemInfo.safetyStockDays}}
-
-
- {{itemInfo.costPrice}}
-
-
-
-
- 吊牌价
-
-
-
-
- {{itemInfo.tagPrice}}
-
-
-
-
- 销售单价
-
-
-
-
- {{itemInfo.salesPrice}}
+
+
+
+
+ 是
+ 否
+
+
-
-
- 标准进价
-
-
-
-
- {{itemInfo.standardPurchasePrice}}
-
-
-
-
- 代理价
-
-
-
-
- {{itemInfo.agencyPrice}}
+
+
+
+
+ 是
+ 否
+
-
-
- 折扣
+
+
+
+ {{itemInfo.inventoryAlertUpperLimit}}
-
-
- {{itemInfo.discount}}
+
+
+
+ {{itemInfo.inventoryAlertLowerLimit}}
+
+
-
-
- 最低零售价
-
-
-
-
- {{itemInfo.minimumSalesPrice}}
-
-
-
-
- 是否积分兑换
-
-
-
-
- {{itemInfo.isIntegralExchange}}
-
-
-
-
- 积分数量
-
-
-
-
- {{itemInfo.integralAmount}}
+
+
+
+ {{itemInfo.costPrice}}
-
-
-
-
- 规格图片
+
+
+ {{itemInfo.tagPrice}}
-
-
-
-
-
- ![]()
- ![]()
-
-
-
+
+
+
+ {{itemInfo.salesPrice}}
-
-
-
-
-
-
-
-
-
-
-
- 最后采购价
-
-
-
-
- {{itemInfo.finalPurchasePrice}}
-
-
-
-
- 安全库存天数
-
-
-
-
- {{itemInfo.safetyStockDays}}
-
-
-
-
- 是否原厂
-
-
-
-
- {{itemInfo.isOriginalFactory}}
-
-
-
-
- 是否库存警戒
-
-
-
-
- {{itemInfo.isInventoryAlert}}
-
-
-
-
- 库存警戒上线
-
-
-
-
- {{itemInfo.inventoryAlertUpperLimit}}
-
-
-
-
- 库存警戒下线
-
-
-
-
- {{itemInfo.inventoryAlertLowerLimit}}
-
-
-
-
-
-
- 成本价
-
-
-
-
- {{itemInfo.costPrice}}
-
-
-
-
- 吊牌价
+
+
+ {{itemInfo.standardPurchasePrice}}
-
-
- {{itemInfo.tagPrice}}
-
-
-
-
- 销售单价
+
+
+
+ {{itemInfo.agencyPrice}}
-
-
- {{itemInfo.salesPrice}}
+
+
+
+ {{itemInfo.discount}}
+
-
-
- 标准进价
-
-
-
-
- {{itemInfo.standardPurchasePrice}}
-
-
-
-
- 代理价
-
-
-
-
- {{itemInfo.agencyPrice}}
+
+
+
+ {{itemInfo.minimumSalesPrice}}
-
-
- 折扣
+
+
+
+
+ 是
+ 否
+
-
-
- {{itemInfo.discount}}
+
+
+
+ {{itemInfo.integralAmount}}
+
+
-
-
- 最低零售价
-
-
-
-
- {{itemInfo.minimumSalesPrice}}
-
-
-
-
- 是否积分兑换
-
-
-
-
- {{itemInfo.isIntegralExchange}}
+
+
+
+
+ 是
+ 否
+
-
-
- 积分数量
+
+
+
+ {{itemInfo.sortNo}}
-
-
- {{itemInfo.integralAmount}}
+
+
+
+ {{itemInfo.remarks}}
+
-
-
- 规格图片
-
-
-
-
-
-
+
+
+
+
+ ![]()
+ ![]()
+
+
+
-
-
-
-
基础信息
商品名称
+ 商品简称
+ 商品副标题
+ 商品拼音缩写
+ 商品编码
+ 商品条形码
+ 商品品牌
+ 商品类别
+ 商品厂家
+ 厂家货号
+ 商品单位
+ 是否上架
+ 外部编码
+ 国标码
+ 税率
+ 保质期天
+ 商品排序
+ 商品备注
+ 商品详细说明
+ 商品描述
+ 商品通用规格参数
+ 商品特有规格参数
+
+
+ 规格列表
+ 最后采购价
+ 安全库存天数
+ 是否原厂
+ 是否库存警戒
+ 库存警戒上线
+ 库存警戒下线
+ 成本价
+ 吊牌价
+ 销售单价
+
- 关 闭
-
- 标准进价
+ 代理价
+ 折扣
+ 最低零售价
+ 是否积分兑换
+ 积分数量
+ 锁定销售价格
+ 排序
+ 备注
+ 规格图片
+
- 确 定
+ 关 闭