From 7974dd05f68a21e6b50fb90981952d9e9b2b2bf1 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Tue, 9 Jul 2024 19:20:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E7=BA=BF?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/job/jobFilter.vue | 10 ++++++++--
 src/pages.json                     | 28 ++++++++++++++--------------
 src/pages/issue/job/issueJob.vue   |  4 ++--
 3 files changed, 24 insertions(+), 18 deletions(-)

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 @@
 	<uni-popup ref="popup" >
 		<view class="maskbox" @tap="maskClick"></view>
 		<view class="uni-flex uni-column center"
-			style="background-color: white;width: 100%; height:auto;padding: 20rpx;z-index: 99;position: relative;">
+			style="background-color: white;width: 100%; height:auto;padding: 20rpx;z-index: 99;position: relative; border-radius: 10rpx;">
 			<view class="uni-flex space-between u-col-center" style="width: 100%;">
 					<view class="" style="font-size: 32rpx;">
 						只看当天
@@ -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 = []