diff --git a/src/api/goods/goods.js b/src/api/goods/goods.js
index 31257e6..acb7196 100644
--- a/src/api/goods/goods.js
+++ b/src/api/goods/goods.js
@@ -5,8 +5,8 @@ export default {
// 查询分页列表
listPage: function(params) {
return request({
- // url: '/wms/apiadmin/base/basegoodsspu/listPage',
- url: '/wms/apiadmin/base/basegoodsspu/goodsListPage',
+ url: '/wms/apiadmin/base/basegoodsspu/listPage',
+ // url: '/wms/apiadmin/base/basegoodsspu/goodsListPage',
method: 'post',
data: params,
headers: {
@@ -25,8 +25,8 @@ export default {
// 新增、保存
saveGoods: function(data) {
return request({
- // url: '/wms/apiadmin/base/basegoodsspu/saveOrUpdate',
- url: '/wms/apiadmin/base/basegoodsspu/saveOrUpdateGoods',
+ url: '/wms/apiadmin/base/basegoodsspu/saveOrUpdate',
+ // url: '/wms/apiadmin/base/basegoodsspu/saveOrUpdateGoods',
method: 'post',
data: data,
headers: {
@@ -38,8 +38,8 @@ export default {
// 初始化
initGoods: function(data) {
return request({
- // url: '/wms/apiadmin/base/basegoodsspu/initialization/' + data,
- url: '/wms/apiadmin/base/basegoodsspu//goodsDetails/' + data,
+ url: '/wms/apiadmin/base/basegoodsspu/initialization/' + data,
+ // url: '/wms/apiadmin/base/basegoodsspu/goodsDetails/' + data,
method: 'get'
});
},
@@ -48,8 +48,8 @@ export default {
// 商品-- 删除
deleteBySids: function(data) {
return request({
- // url: '/wms/apiadmin/base/basegoodsspu/delBySids',
- url: '/wms/apiadmin/base/basegoodsspu/delGoodsBySids',
+ url: '/wms/apiadmin/base/basegoodsspu/delBySids',
+ // url: '/wms/apiadmin/base/basegoodsspu/delGoodsBySids',
method: 'DELETE',
data: data,
headers: {
diff --git a/src/views/goods/goods/goodsAdd.vue b/src/views/goods/goods/goodsAdd.vue
index e38a342..40ca87e 100644
--- a/src/views/goods/goods/goodsAdd.vue
+++ b/src/views/goods/goods/goodsAdd.vue
@@ -21,32 +21,33 @@
-
+
商品名称
-
+
商品简称
-
-
-
-
+
商品副标题
-
+
+
+
+
+
商品拼音缩写
-
-
-
-
-
+
商品编码
-
+
商品条形码
+
+
-
+
商品品牌
-
+
商品类别
@@ -96,11 +99,22 @@
+
+
+ 商品单位
+
+
+
+
+
+
+
-
+
商品厂家
-
+
厂家货号
-
-
-
-
-
- 商品单位
-
-
-
-
-
-
-
-
+
是否上架
@@ -144,16 +144,22 @@
+
+
-
+
外部编码
-
+
国标码
-
-
-
-
-
+
税率
-
+
+
+
+
+
+
保质期天
-
-
-
-
-
+
商品排序
-
+
商品备注
@@ -202,6 +205,12 @@
+
+
diff --git a/src/views/goods/goods/goodsInfo.vue b/src/views/goods/goods/goodsInfo.vue
index 15ec78e..77b5095 100644
--- a/src/views/goods/goods/goodsInfo.vue
+++ b/src/views/goods/goods/goodsInfo.vue
@@ -20,50 +20,54 @@
-
+
商品名称
{{formobj.goodsName}}
-
+
商品简称
{{formobj.goodsShortName}}
-
-
-
-
+
商品副标题
{{formobj.subTitle}}
-
+
+
+
+
+
+
+
+
商品拼音缩写
{{formobj.goodsPY}}
-
-
-
-
-
+
商品编码
{{formobj.goodsCode}}
-
+
商品条形码
{{formobj.barCode}}
@@ -74,50 +78,46 @@
-
+
商品品牌
{{formobj.brandName}}
-
+
商品类别
{{formobj.typeName}}
+
+ 商品单位
+
+ {{formobj.goodsUnitName}}
+
+
+
-
+
商品厂家
{{formobj.manufacturerName}}
-
+
厂家货号
{{formobj.factoryCode}}
-
-
-
-
-
- 商品单位
-
- {{formobj.goodsUnitName}}
-
-
-
-
+
是否上架
@@ -127,54 +127,66 @@
+
+
+
-
+
外部编码
{{formobj.externalCode}}
-
+
国标码
{{formobj.nationalStandardCode}}
-
-
-
-
-
+
税率
{{formobj.taxRate}}
-
+
+
+
+
+
+
+
保质期天
{{formobj.shelfLife}}
-
-
-
-
-
+
商品排序
{{formobj.sortNo}}
-
+
商品备注
{{formobj.remarks}}
diff --git a/src/views/goods/goods/index.vue b/src/views/goods/goods/index.vue
index d7a1efa..f952e38 100644
--- a/src/views/goods/goods/index.vue
+++ b/src/views/goods/goods/index.vue
@@ -27,7 +27,8 @@
-
+
@@ -39,7 +40,8 @@
-
+
@@ -74,7 +76,7 @@
inactive-value="2" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
-->
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -143,8 +162,8 @@
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
- import divAdd from './goodsAdd2.vue'
- import divInfo from './goodsInfo2.vue'
+ import divAdd from './goodsAdd.vue'
+ import divInfo from './goodsInfo.vue'
export default {
components: {
ButtonBar,
diff --git a/src/views/goods/unit/unitAdd.vue b/src/views/goods/unit/unitAdd.vue
index 02c3055..974a123 100644
--- a/src/views/goods/unit/unitAdd.vue
+++ b/src/views/goods/unit/unitAdd.vue
@@ -30,7 +30,7 @@
备注
-
+