|
|
@@ -337,28 +337,18 @@ var vm = new Vue({
|
|
|
uploadList: [],
|
|
|
imgName: '',
|
|
|
visible: false,
|
|
|
+ stores: [],
|
|
|
goods: {primaryPicUrl: '', listPicUrl: '',videoUrl:'', categoryId: '', isOnSale: 1, isAppExclusive: 0, isLimited: 0, isHot: 0, categoryName: '', retailPrice: '', marketPrice: '', goodsRate: '', sortOrder: '',goodsNumber: '' },
|
|
|
ruleValidate: {
|
|
|
- /*name: [
|
|
|
- {required: true, message: '名称不能为空', trigger: 'blur'}
|
|
|
- ]*/
|
|
|
},
|
|
|
q: {name: '', goodsSn: '', prodBarcode: '',goodsBizType:'', merchSn: '',thirdPartyMerchCode:''},
|
|
|
attributes: [],
|
|
|
attributeEntityList: [{'id': '', 'goodsId': '', 'attributeId': '', 'value': '', 'isDelete': 0}],
|
|
|
productEntityList: [{'id': '', 'goodsId': '', 'goodsSpecificationIds': '', 'goodsSpecificationNameValue': '', 'goodsSn': '', 'goodsNumber': '', 'isDelete': 0, 'goodsDefault': 0}],
|
|
|
- /*queryCategories: [],//一级分类
|
|
|
- queryCategoriesTwo: [],*/
|
|
|
queryMerch: [],
|
|
|
- /*categories: [],//一级分类
|
|
|
- categoriesTwo: [],*/
|
|
|
macros: [],//商品单位
|
|
|
- // attributeCategories: [],//属性类别
|
|
|
specifications: [],
|
|
|
- // brands: [],
|
|
|
- // freights: [],
|
|
|
showInput: true,
|
|
|
- // categoryId: '',
|
|
|
cusUnitCodeList: [],
|
|
|
cusNationCodeList: [],
|
|
|
merchList: [],
|
|
|
@@ -385,20 +375,6 @@ var vm = new Vue({
|
|
|
}
|
|
|
vm.productEntityList.push({'id': '', 'goodsId': '', 'goodsSpecificationIds': '', 'goodsSpecificationNameValue': '', 'goodsSn': '', 'goodsNumber': '', 'isDelete': 0, 'goodsDefault': 0});
|
|
|
},
|
|
|
- /*delAttrRow: function (index) {
|
|
|
- //最后一行时禁止删除
|
|
|
- if (vm.attributeEntityList.length == 1) {
|
|
|
- return;
|
|
|
- }
|
|
|
- vm.attributeEntityList[index].isDelete = 1;
|
|
|
- },
|
|
|
- addAttrRow: function () {
|
|
|
- let goodsId = '';
|
|
|
- if (vm.goods) {
|
|
|
- goodsId = vm.goods.id;
|
|
|
- }
|
|
|
- vm.attributeEntityList.push({'id': '', 'goodsId': goodsId, 'attributeId': '', 'value': '', 'isDelete': 0});
|
|
|
- },*/
|
|
|
reloadSearch: function () {
|
|
|
vm.q = {
|
|
|
name: '',
|
|
|
@@ -463,19 +439,27 @@ var vm = new Vue({
|
|
|
vm.detail();
|
|
|
|
|
|
},
|
|
|
- getInfo: function (id) {
|
|
|
- $.get("../goods/info/" + id, function (r) {
|
|
|
- vm.goods = r.goods;
|
|
|
- vm.goodsBizType = r.goods.goodsBizType;
|
|
|
+ getInfo: function () {
|
|
|
+ var postData = {"goodsSn":vm.q.goodsSn,'prodBarcode':vm.q.prodBarcode,'storeId':vm.q.storeId};
|
|
|
+ vm.getCusUnitCodeList();
|
|
|
+ vm.getCusNationCode();
|
|
|
+ $.post("../goods/infoByQuery",postData,function(r){
|
|
|
|
|
|
- vm.branch(r.goods.goodsSn);
|
|
|
- vm.barcode(r.goods.goodsSn);
|
|
|
- vm.sales(r.goods.goodsSn);
|
|
|
+ vm.goods = r.goods;
|
|
|
+ // vm.goodsBizType = r.goods.goodsBizType;
|
|
|
});
|
|
|
+ // $.get("../goods/info/" + id, function (r) {
|
|
|
+ // vm.goods = r.goods;
|
|
|
+ // vm.goodsBizType = r.goods.goodsBizType;
|
|
|
+ //
|
|
|
+ // // vm.branch(r.goods.goodsSn);
|
|
|
+ // // vm.barcode(r.goods.goodsSn);
|
|
|
+ // // vm.sales(r.goods.goodsSn);
|
|
|
+ // });
|
|
|
},
|
|
|
- branch:function(sku){
|
|
|
+ branch:function(){
|
|
|
|
|
|
- var postData = {"goodsSn":sku}
|
|
|
+ var postData = {"goodsSn":vm.q.goodsSn,'prodBarcode':vm.q.prodBarcode,'storeId':vm.q.storeId};
|
|
|
|
|
|
$("#branchJqGrid").jqGrid('setGridParam',{
|
|
|
datatype:'json',
|
|
|
@@ -488,8 +472,8 @@ var vm = new Vue({
|
|
|
discount:function(){
|
|
|
|
|
|
},
|
|
|
- barcode:function(sku){
|
|
|
- var postData = {"goodsSn":sku}
|
|
|
+ barcode:function(){
|
|
|
+ var postData = {"goodsSn":vm.q.goodsSn,'prodBarcode':vm.q.prodBarcode,'storeId':vm.q.storeId};
|
|
|
|
|
|
$("#barcodeJqGrid").jqGrid('setGridParam',{
|
|
|
datatype:'json',
|
|
|
@@ -499,8 +483,8 @@ var vm = new Vue({
|
|
|
detail:function(){
|
|
|
|
|
|
},
|
|
|
- sales:function(sku){
|
|
|
- var postData = {"sku":sku}
|
|
|
+ sales:function(){
|
|
|
+ var postData = {"goodsSn":vm.q.goodsSn,'prodBarcode':vm.q.prodBarcode,'storeId':vm.q.storeId};
|
|
|
|
|
|
$("#salesJqGrid").jqGrid('setGridParam',{
|
|
|
datatype:'json',
|
|
|
@@ -669,25 +653,28 @@ var vm = new Vue({
|
|
|
});
|
|
|
},
|
|
|
reload: function (event) {
|
|
|
+ vm.sales();
|
|
|
+ vm.branch();
|
|
|
+ vm.barcode();
|
|
|
+ vm.getInfo();
|
|
|
vm.showList = true;
|
|
|
- let page = event;
|
|
|
- if (event != 1) {
|
|
|
- page = $("#jqGrid").jqGrid('getGridParam', 'page');
|
|
|
- }
|
|
|
- $("#jqGrid").jqGrid('setGridParam', {
|
|
|
- postData: {
|
|
|
- 'name': vm.q.name,
|
|
|
- 'englishName': vm.q.englishName,
|
|
|
- // 'plu': vm.q.plu,
|
|
|
- 'goodsSn': vm.q.goodsSn,
|
|
|
- 'prodBarcode': vm.q.prodBarcode,
|
|
|
- 'goodsBizType': vm.q.goodsBizType,
|
|
|
- 'merchSn': vm.q.merchSn,
|
|
|
- 'thirdPartyMerchCode': vm.q.thirdPartyMerchCode
|
|
|
- },
|
|
|
- page: page
|
|
|
- }).trigger("reloadGrid");
|
|
|
- vm.handleReset('formValidate');
|
|
|
+ // let page = event;
|
|
|
+ // if (event != 1) {
|
|
|
+ // page = $("#jqGrid").jqGrid('getGridParam', 'page');
|
|
|
+ // }
|
|
|
+ // $("#jqGrid").jqGrid('setGridParam', {
|
|
|
+ // postData: {
|
|
|
+ // 'name': vm.q.name,
|
|
|
+ // 'englishName': vm.q.englishName,
|
|
|
+ // 'goodsSn': vm.q.goodsSn,
|
|
|
+ // 'prodBarcode': vm.q.prodBarcode,
|
|
|
+ // 'goodsBizType': vm.q.goodsBizType,
|
|
|
+ // 'merchSn': vm.q.merchSn,
|
|
|
+ // 'thirdPartyMerchCode': vm.q.thirdPartyMerchCode
|
|
|
+ // },
|
|
|
+ // page: page
|
|
|
+ // }).trigger("reloadGrid");
|
|
|
+ // vm.handleReset('formValidate');
|
|
|
},
|
|
|
getCategory: function () {
|
|
|
//加载分类树
|
|
|
@@ -921,7 +908,9 @@ var vm = new Vue({
|
|
|
$.get("../merch/queryAll", function (r) {
|
|
|
vm.queryMerch = r.list;
|
|
|
});
|
|
|
-
|
|
|
+ $.get("../store/queryAll", function (r) {
|
|
|
+ vm.stores = r.list;
|
|
|
+ });
|
|
|
$.get("../sys/macro/queryMacrosByValue?value=goodsBizType", function (r) {
|
|
|
vm.macros = r.list;
|
|
|
});
|
zcb