|
@@ -22,13 +22,13 @@ export default {
|
|
|
},
|
|
},
|
|
|
onLoad(options) {
|
|
onLoad(options) {
|
|
|
this.options = options;
|
|
this.options = options;
|
|
|
- const { pageType,id } = options;
|
|
|
|
|
|
|
+ const { pageType,shopId,id } = options;
|
|
|
if (pageType) {
|
|
if (pageType) {
|
|
|
this.pageType = pageType;
|
|
this.pageType = pageType;
|
|
|
}
|
|
}
|
|
|
if (this.autoLoad) {
|
|
if (this.autoLoad) {
|
|
|
if(this.isGhsProduct){
|
|
if(this.isGhsProduct){
|
|
|
- this.initGhsData(id);//采购-进店下单
|
|
|
|
|
|
|
+ this.initGhsData(id,shopId);//采购-进店下单
|
|
|
}else{
|
|
}else{
|
|
|
this.initGoodsData();//成品
|
|
this.initGoodsData();//成品
|
|
|
this.initData();//组合
|
|
this.initData();//组合
|
|
@@ -204,12 +204,13 @@ export default {
|
|
|
/**
|
|
/**
|
|
|
* 请求商品数据
|
|
* 请求商品数据
|
|
|
*/
|
|
*/
|
|
|
- async initGhsData(id) {
|
|
|
|
|
|
|
+ async initGhsData(id,shopId) {
|
|
|
//extendInfo调用时的扩展参数 如 shopId
|
|
//extendInfo调用时的扩展参数 如 shopId
|
|
|
try {
|
|
try {
|
|
|
let params = {
|
|
let params = {
|
|
|
py: this.py,
|
|
py: this.py,
|
|
|
- id:id
|
|
|
|
|
|
|
+ id:id,
|
|
|
|
|
+ shopId:shopId
|
|
|
};
|
|
};
|
|
|
const { data } = await getGhsProductList(params);
|
|
const { data } = await getGhsProductList(params);
|
|
|
data.forEach(element => {
|
|
data.forEach(element => {
|