diff --git a/pages/massif/collectList.vue b/pages/massif/collectList.vue
index a4e4064..368c4a2 100644
--- a/pages/massif/collectList.vue
+++ b/pages/massif/collectList.vue
@@ -63,6 +63,7 @@
{{v.typeOne}} {{v.supplier}}
+
diff --git a/pages/purchase/agrProdList.vue b/pages/purchase/agrProdList.vue
index 70dcee5..a6839e7 100644
--- a/pages/purchase/agrProdList.vue
+++ b/pages/purchase/agrProdList.vue
@@ -84,11 +84,11 @@ export default {
list:[],
total:0,
eventChannel:null,
- mode:"",
+ intoPage:"",
}
},
onLoad(options){
- this.mode=options.mode||'purchase'
+ this.intoPage=options.intoPage||'purchase'
this.eventChannel=this.getOpenerEventChannel()
this.search()
},
@@ -125,7 +125,7 @@ export default {
},
toAddSepc(e){
uni.navigateTo({
- url:`/pages/purchase/specs?goodsId=${e.id}&mode=${this.mode}`,
+ url:`/pages/purchase/specs?goodsId=${e.id}&intoPage=${this.intoPage}`,
events:{submit: e=>{
uni.navigateBack()
this.eventChannel.emit("submit",e)
diff --git a/pages/purchase/specs.vue b/pages/purchase/specs.vue
index 639c849..ee7d2c4 100644
--- a/pages/purchase/specs.vue
+++ b/pages/purchase/specs.vue
@@ -182,7 +182,7 @@
库存:{{specStr}}
-
+
采购数量
@@ -226,11 +226,11 @@ export default{
goodsDetail:{},
eventChannel:null,
- mode:"",
+ intoPage:"",
}
},
async onLoad(options){
- this.mode=options.mode
+ this.intoPage=options.intoPage
this.eventChannel=this.getOpenerEventChannel()
this.eventChannel.on("detail", detail=>{
this.formData.goodsName=detail.goodsName
@@ -240,7 +240,7 @@ export default{
})
this.formData.goodsId=options.goodsId
//从新增入库页面进入不需要搜索规格
- if(this.mode=='purchase')this.setGoodsVal()
+ if(this.intoPage=='purchase')this.setGoodsVal()
},
methods:{
async setGoodsVal(val){
@@ -290,7 +290,7 @@ export default{
if(!this.formData.goodsSpecification){
uni.showToast({title:"规格必选!",icon:"none"})
return false
- }else if(!this.formData.num>0 && this.mode=="purchase"){
+ }else if(!this.formData.num>0 && this.intoPage=="purchase"){
uni.showToast({title:"采购数量必填!",icon:"none"})
return false
}
diff --git a/pages/stock/agrWarehouse.vue b/pages/stock/agrWarehouse.vue
index 36107b1..e13447c 100644
--- a/pages/stock/agrWarehouse.vue
+++ b/pages/stock/agrWarehouse.vue
@@ -180,7 +180,7 @@ import request from '@/common/request'
},
toAddAgr(){
uni.navigateTo({
- url:"/pages/purchase/agrProdList?mode=stock",
+ url:"/pages/purchase/agrProdList?intoPage=stock",
events:{submit: e=>{
this.agrDetail=e
this.formData.specId=e.specificationId