优化

components/ba-tree-picker/ba-tree-picker.vue

@@ -448,7 +448,7 @@ export default {
         this.treeList[i].checkStatus = v.orCheckStatus
       })
     },
-    _initTree () {v,
+    _initTree () {
       this.treeList = []
       this._formatTreeData(this.localdata)
     }

pages.json

@@ -1434,30 +1434,27 @@
 			}
 		},
 		{
-			"path" : "pages/pda/components/searchPopup",
-			"style" : 
-			{
-				"navigationBarTitleText" : "",
-				"enablePullDownRefresh" : false
+			"path": "pages/pda/components/searchPopup",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/pda/feeding/components/deviceBom",
-			"style" : 
-			{
-				"navigationBarTitleText" : "",
-				"enablePullDownRefresh" : false
+			"path": "pages/pda/feeding/components/deviceBom",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path" : "pages/pda/feeding/bill/index",
-			"style" : 
-			{
-				"navigationBarTitleText" : "",
-				"enablePullDownRefresh" : false
+			"path": "pages/pda/feeding/bill/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
 			}
 		}
-		
+
 
 
 

pages/pda/feeding/bill/index.vue

@@ -1,6 +1,7 @@
 <template>
-	<view>
-		
+	<view class="content-box">
+		<uni-nav-bar fixed="true" statusBar="true" left-icon="back" title="投料单" background-color="#F7F9FA" color="#000"
+			@clickLeft="back"></uni-nav-bar>
 	</view>
 </template>
 
@@ -17,6 +18,14 @@
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	.content-box {
+		height: 100vh;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
+
+	}
+
 
 </style>

pages/pda/feeding/details.vue

@@ -194,8 +194,8 @@
 				// CX-EQ-YLSJL-008	  设备
 				// M001 M002 模具 
 				//  S310000552731 物料
-				this.scanItData('M002', id)
-				return false
+				// this.scanItData('M002', id)
+				// return false
 
 				let _this = this
 				uni.scanCode({
@@ -256,8 +256,8 @@
 				// CX-EQ-YLSJL-008	  设备
 				// M001 M002 模具 
 				//  S310000552731 物料
-				this.scanItAllData('M001')
-				return false
+				// this.scanItAllData('M001')
+				// return false
 				
 				let _this = this
 				uni.scanCode({

pages/pda/feeding/index/index.vue

@@ -15,7 +15,7 @@
 					未投料({{navObj.unclaimedQuantity}})</view>
 				<view class="nav_item" :class="{active: feedStatus == 1}" @click="handNav(1)">
 					已投料({{navObj.claimedQuantity}})</view>
-				
+
 
 				<view class="menu_box" @click="handleSearch">
 					<image class="menu_icon" src="~@/static/pda/menu.svg"></image>
@@ -59,32 +59,21 @@
 
 		<SearchPopup mode="top" v-if='searchShow'>
 			<template v-slot:list>
-			   <view class="search_list">
-				   
-				   
-				   <u-form
-				     labelPosition="left"
-				     :model="formData"
-				     labelWidth="180"
-				     labelAlign="left"
-				     class="baseForm"
-				   >
-				   
-				   <u-form-item
-				     label="工艺路线:"
-				     class="required-form"
-				     borderBottom
-				     prop="assetType"
-				   >
-				   
-				   <zxz-uni-data-select :localdata="produceList" v-model="formData.produceRoutingId"
-				   	dataValue='id' format='{name}' ></zxz-uni-data-select>
-				   
-				   </u-form-item>
-				   
-				   </u-form>
-				   
-			   </view>
+				<view class="search_list">
+
+
+					<u-form labelPosition="left" :model="formData" labelWidth="180" labelAlign="left" class="baseForm">
+
+						<u-form-item label="工艺路线:" class="required-form" borderBottom prop="assetType">
+
+							<zxz-uni-data-select :localdata="produceList" v-model="formData.produceRoutingId"
+								dataValue='id' format='{name}'></zxz-uni-data-select>
+
+						</u-form-item>
+
+					</u-form>
+
+				</view>
 			</template>
 
 			<template v-slot:operate>
@@ -129,7 +118,7 @@
 			return {
 				tabType: 1,
 				feedStatus: 0,
-				
+
 				formData: {
 					produceRoutingId: ''
 				},
@@ -163,25 +152,25 @@
 
 		onLoad(option) {
 			this.feedStatus = option.feedStatus || 0
-			
-			
-			if(option.feedStatus == 0 | option.feedStatus == 1) {
+
+
+			if (option.feedStatus == 0 | option.feedStatus == 1) {
 				this.page = 1
 				this.dataList = []
-				
+
 			}
 			this.getList()
 			this.produceFn()
 		},
 
 		onShow() {
-	
+
 			this.getpickTics()
 		},
 
 
 		methods: {
-			
+
 			search() {
 				this.page = 1
 				this.getList()
@@ -219,7 +208,9 @@
 			},
 
 			getpickTics() {
-				pickStatistics({ type: 'feedStatus'}).then(res => {
+				pickStatistics({
+					type: 'feedStatus'
+				}).then(res => {
 					this.navObj = res
 				})
 			},
@@ -297,14 +288,14 @@
 			handleSearch() {
 				this.searchShow = true
 			},
-			
+
 			searchCancel() {
 				this.formData.produceRoutingId = ''
 				this.page = 1
 				this.getList()
 				this.searchShow = false
 			},
-			
+
 			// 工艺路线
 			produceFn() {
 				let param = {
@@ -313,10 +304,10 @@
 				}
 				producerouting(param).then(res => {
 					this.produceList = res.list
-					
+
 				})
 			},
-			
+
 		}
 	}
 </script>
@@ -412,19 +403,20 @@
 			border-color: $theme-color !important;
 		}
 	}
-	
-	
-	.search_list{
+
+
+	.search_list {
 		min-height: 100rpx;
-		
-		/deep/ .baseForm{
+
+		/deep/ .baseForm {
 			padding: 0 20rpx;
 		}
 	}
 
-	.operate_box{
+	.operate_box {
 		padding: 10rpx 32rpx;
-		/deep/ .u-button{
+
+		/deep/ .u-button {
 			width: 40%;
 		}
 	}