diff --git a/common/request.js b/common/request.js index 356bd2e..f8499ae 100644 --- a/common/request.js +++ b/common/request.js @@ -3,8 +3,8 @@ import store from "@/store" export function host(host='default',suffix='/plant_manage'){ var url=process.env.NODE_ENV === 'development'?{ // default:`http://e5ruv4.natappfree.cc` //陈 - default:`http://nys8cm.natappfree.cc` //马 - // default:`http://7r39sr.natappfree.cc` //何 + // default:`http://nys8cm.natappfree.cc` //马 + default:`http://4gg9xn.natappfree.cc` //何 // default:`http://192.168.0.116:8080` //孙 }:{ default:`` diff --git a/pages/stock/already.vue b/pages/stock/already.vue index 258fcaf..116c2da 100644 --- a/pages/stock/already.vue +++ b/pages/stock/already.vue @@ -76,7 +76,7 @@ - + {{v.agriculturalGoods}} {{v.substanceName}} ({{v.specDescribe}}) @@ -104,11 +104,9 @@ export default { }, list:[], total:0, - intoPage:"",//formRecord 从农事记录进入 } }, onLoad(options){ - this.intoPage=options.intoPage this.search() }, methods:{ @@ -137,13 +135,6 @@ export default { } } }, - toAddSpecs(id){ - if(this.intoPage=='formRecord'){ - uni.navigateTo({ - url:`/pages/massif/agrSpecs?id=${id}` - }) - } - }, } } \ No newline at end of file diff --git a/pages/stock/goods_detail.vue b/pages/stock/goods_detail.vue index 7083af6..3781513 100644 --- a/pages/stock/goods_detail.vue +++ b/pages/stock/goods_detail.vue @@ -24,22 +24,22 @@ 基本信息 - 批次号 A23366683 + 批次号 {{detail.batchNo}} - 出库类型 销售出库 + 出库类型 {{detail.inOutType}} - 农资名称 中量元素水溶肥 + 农资名称 {{detail.substanceName}} - 规格 100kg/袋 + 规格 {{detail.specDescribe}} - 物品数量 2袋(200kg) + 物品数量 {{detail.number}}袋(共{{detail.equivalentAmount}}{{detail.unit}}) - 供销商 云南云天化股份有限公司 + 供销商 {{detail.supplierName}} @@ -48,8 +48,14 @@ export default { data(){ return{ - + detail:{} } - } + }, + onLoad(){ + var eventChannel = this.getOpenerEventChannel(); + eventChannel.on('detail', data=>{ + this.detail=data + }) + }, } \ No newline at end of file diff --git a/pages/stock/record.vue b/pages/stock/record.vue index 656b66a..35f0067 100644 --- a/pages/stock/record.vue +++ b/pages/stock/record.vue @@ -66,7 +66,7 @@