diff --git a/warehousing-system/project_web_ui-xxs/src/api/supervise/commodityFile.js b/warehousing-system/project_web_ui-xxs/src/api/supervise/commodityFile.js
index 63024b47..bff1198f 100644
--- a/warehousing-system/project_web_ui-xxs/src/api/supervise/commodityFile.js
+++ b/warehousing-system/project_web_ui-xxs/src/api/supervise/commodityFile.js
@@ -17,7 +17,7 @@ export default {
brandDelBySids: function(sid) {
return request({
url: '/v1/restrictedbrand/delBySid/' + sid,
- method: 'delete'
+ method: 'get'
})
},
// 品牌品类 保存品牌品类
diff --git a/warehousing-system/project_web_ui-xxs/src/views/brand/brandManagementInfoAdd.vue b/warehousing-system/project_web_ui-xxs/src/views/brand/brandManagementInfoAdd.vue
index 2eebd606..0c74667a 100644
--- a/warehousing-system/project_web_ui-xxs/src/views/brand/brandManagementInfoAdd.vue
+++ b/warehousing-system/project_web_ui-xxs/src/views/brand/brandManagementInfoAdd.vue
@@ -18,11 +18,11 @@
品牌名称:
-
+
品牌编码:
-
+
diff --git a/warehousing-system/project_web_ui-xxs/src/views/component/initial_value/add/productAdd.vue b/warehousing-system/project_web_ui-xxs/src/views/component/initial_value/add/productAdd.vue
index a3b84441..32646d67 100644
--- a/warehousing-system/project_web_ui-xxs/src/views/component/initial_value/add/productAdd.vue
+++ b/warehousing-system/project_web_ui-xxs/src/views/component/initial_value/add/productAdd.vue
@@ -16,12 +16,17 @@
+
条码:
@@ -33,28 +38,44 @@
-
三级类别:
+
@@ -105,7 +126,7 @@
roughWeight: "",
effectiveDays: "",
remarks: "",
- brand:"",
+ brand: "",
brandSid: "",
categoryY: "",
categorySidY: "",
@@ -179,7 +200,7 @@
this.categoryPSid = value
- this.locationForm.categoryAsid = value
+ this.locationForm.categorySidY = value
this.getCategoryList("2")
@@ -193,7 +214,7 @@
this.locationForm.categorySid = ''
this.categoryPSid = value
- this.locationForm.categoryBsid = value
+ this.locationForm.categorySidR = value
this.getCategoryList("3")
@@ -202,8 +223,17 @@
console.log("selectCategoryB", value)
},
selectCategoryC(value) {
+ this.$forceUpdate();
console.log("selectCategoryC", value)
+
+ var item = this.categoryCList.find(item => item.sid == value)
+
+ console.log("selectCategoryC", item)
+
this.locationForm.categorySid = value
+ this.locationForm.category = item.categorys
+
+
},
saveOrUpdate() {
@@ -230,18 +260,19 @@
name: "",
anotherName: "",
value: "",
- code:"系统自动排序生成",
+ code: "系统自动排序生成",
netWeight: "",
roughWeight: "",
effectiveDays: "",
remarks: "",
- brandSid: "",
- categoryA: "",
- categoryAsid: "",
- categoryB: "",
- categoryBsid: "",
- categoryC: "",
- categorySid: "",
+ brand: "",
+ brandSid: "",
+ categoryY: "",
+ categorySidY: "",
+ categoryR: "",
+ categorySidR: "",
+ category: "",
+ categorySid: "",
}
},
showEdit(row) {
@@ -252,7 +283,34 @@
},
async updataProduct() {
- console.log("updataProduct", this.locationForm)
+ console.log("updataProduct", this.locationForm)
+
+
+ if(!this.locationForm.name){
+ this.$message.error('商品名称不能为空')
+ return
+ }
+
+ if(!this.locationForm.brandSid){
+ this.$message.error('商品品牌不能为空')
+ return
+ }
+
+ if(!this.locationForm.categorySidY){
+ this.$message.error('一级类别不能为空')
+ return
+ }
+
+ if(!this.locationForm.categorySidR){
+ this.$message.error('二级类别不能为空')
+ return
+ }
+
+ if(!this.locationForm.categorySid){
+ this.$message.error('三级类别不能为空')
+ return
+ }
+
const {
data: result
@@ -262,7 +320,35 @@
this.handleReturn('true')
},
async addProduct() {
- console.log("addProduct", this.locationForm)
+
+
+ if(!this.locationForm.name){
+ this.$message.error('商品名称不能为空')
+ return
+ }
+
+ if(!this.locationForm.brandSid){
+ this.$message.error('商品品牌不能为空')
+ return
+ }
+
+ if(!this.locationForm.categorySidY){
+ this.$message.error('一级类别不能为空')
+ return
+ }
+
+ if(!this.locationForm.categorySidR){
+ this.$message.error('二级类别不能为空')
+ return
+ }
+
+ if(!this.locationForm.categorySid){
+ this.$message.error('三级类别不能为空')
+ return
+ }
+
+
+ console.log("addProduct", this.locationForm)
const {
data: result
} = await this.$http.post('/product/addProduct', this.locationForm)
@@ -326,9 +412,8 @@
line-height: 40px;
.item_text {
- flex: 0.8;
+
font-size: 18px;
- text-align: right;
}
.item_input {