diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue index 41ee9ce3..af91fa70 100644 --- a/src/mycomponents/job/jobFilter.vue +++ b/src/mycomponents/job/jobFilter.vue @@ -2,7 +2,7 @@ + style="background-color: white;width: 100%; height:auto;padding: 20rpx;z-index: 99;position: relative; border-radius: 10rpx;"> 只看当天 @@ -129,7 +129,13 @@ methods: { // 生产线 productionLineCodeConfirm(){ - this.$emit("productionLineCode", this.productionLineCode) + var lineCode="" + this.productionline.forEach(item=>{ + if(item.text==this.productionLineCode){ + lineCode=item.value + } + }) + this.$emit("productionLineCode", lineCode) }, // 来源库位 diff --git a/src/pages.json b/src/pages.json index 06152d5d..8b413cec 100644 --- a/src/pages.json +++ b/src/pages.json @@ -130,7 +130,7 @@ "path": "pages/supplierDeliver/record/supplierDeliverRecord", "style": { "navigationBarTitleText": "供应商发货记录", - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, "titleNView": { // "autoBackButton": "true", "buttons": [ @@ -158,7 +158,7 @@ "path": "pages/supplierDeliver/record/supplierDeliverRecordDetail", "style": { "navigationBarTitleText": "供应商发货记录详情", - "enablePullDownRefresh": true + "enablePullDownRefresh": false } }, { @@ -564,7 +564,7 @@ "path": "pages/issue/record/issueRecord", "style": { "navigationBarTitleText": "直接发料记录", - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, "titleNView": { "autoBackButton": "true" } @@ -574,7 +574,7 @@ "path": "pages/issue/record/directIssue", "style": { "navigationBarTitleText": "直接发料", - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, "titleNView": { "autoBackButton": "true" } @@ -657,7 +657,7 @@ "path": "pages/repleinsh/record/repleinshRecord", "style": { "navigationBarTitleText": "补料记录", - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, "titleNView": { "autoBackButton": "true" } @@ -667,7 +667,7 @@ "path": "pages/repleinsh/record/directRepleinshRecord", "style": { "navigationBarTitleText": "直接补料", - "enablePullDownRefresh": true, + "enablePullDownRefresh": false, "titleNView": { "autoBackButton": "true" } @@ -1660,42 +1660,42 @@ "path": "pages/inventoryMove/record/moveFreeRecord", "style": { "navigationBarTitleText": "库存转移记录", - "enablePullDownRefresh": true + "enablePullDownRefresh": false } }, { "path": "pages/inventoryMove/record/scrapToHoldRecord", "style": { "navigationBarTitleText": "报废转隔离记录", - "enablePullDownRefresh": true + "enablePullDownRefresh": false } }, { "path": "pages/inventoryMove/record/okToHoldRecord", "style": { "navigationBarTitleText": "合格转隔离记录", - "enablePullDownRefresh": true + "enablePullDownRefresh": false } }, { "path": "pages/inventoryMove/record/holdToOkRecord", "style": { "navigationBarTitleText": "隔离转合格记录", - "enablePullDownRefresh": true + "enablePullDownRefresh": false } }, { "path": "pages/inventoryMove/record/holdToScrapRecord", "style": { "navigationBarTitleText": "隔离转报废记录", - "enablePullDownRefresh": true + "enablePullDownRefresh": false } }, { "path": "pages/inventoryMove/record/okToScrapRecord", "style": { "navigationBarTitleText": "合格转报废记录", - "enablePullDownRefresh": true + "enablePullDownRefresh": false } }, { @@ -1736,7 +1736,7 @@ "path": "pages/transfer/record/receiptRecord", "style": { "navigationBarTitleText": "调拨入库记录", - "enablePullDownRefresh": true + "enablePullDownRefresh": false } }, { @@ -1767,7 +1767,7 @@ "path": "pages/transfer/record/deliverRecord", "style": { "navigationBarTitleText": "调拨出库记录", - "enablePullDownRefresh": true + "enablePullDownRefresh": false } }, { diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index ca3ec5c7..f022ab69 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -129,8 +129,8 @@ console.log('生产线',res) if(res.code==0){ this.productionline = res.data.map(item=>({ - value: item, - text: item + value: item.value, + text: item.name })) }else{ this.productionline = []