change

pages/home/home.vue

@@ -41,7 +41,7 @@
 			return {
 				userName: '',
 				menuList: [
-					{title: '解包管理', path: 'RF03', sonTree: [{title: '解包上料', path: '/pages/zw/jb-up-mater'}, {title: '解包下料', path: '/pages/zw/jb-lower-mater'}, {title: '料桶组盘', path: '/pages/zw/materbox-instore'}, {title: '解包退料', path: '/pages/zw/jb-return-mater'}, {title: '人车安全', path: '/pages/zw/mancar-safe'}]},
+					{title: '解包管理', path: 'RF03', sonTree: [{title: '解包上料', path: '/pages/zw/jb-up-mater'}, {title: '解包下料', path: '/pages/zw/jb-lower-mater'}, {title: '料桶盘点', path: '/pages/zw/materbox-instore'}, {title: '解包退料', path: '/pages/zw/jb-return-mater'}, {title: '人车安全', path: '/pages/zw/mancar-safe'}]},
 					{title: '原料管理', path: 'RF04', sonTree: [{title: '来料入库', path: '/pages/zw/ll-instore'}, {title: '空载具入库', path: '/pages/zw/kzj-instore'}, {title: '空载具出库', path: '/pages/zw/kzj-outstore'}, {title: '点位属性设置', path: '/pages/zw/point-attrset'}, {title: '物料组盘', path: '/pages/zw/wl-groupplate'}]},
 					{title: '产线管理', path: 'RF07', sonTree: [{title: '手工叫料', path: '/pages/zw/manual-callmater'}, {title: '手工退料', path: '/pages/zw/manual-returnmater'}, {title: '确认取货', path: '/pages/zw/confirm-quhuo'}]},
 					// {title: '预装管理', path: 'RF04', sonTree: [{title: '物料组盘', path: '/pages/entry/mater-group'}, {title: '货架绑定', path: '/pages/outbound/shelf-bind'}]},

pages/zw/ll-instore.vue

@@ -6,7 +6,7 @@
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
-						<span class="filter_label">托盘码/点位码</span>
+						<span class="filter_label">托盘/点位码</span>
 					</view>
 					<view class="zd-col-17">
 						<search-box

pages/zw/manual-callmater.vue

@@ -22,7 +22,7 @@
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
-						<span class="filter_label">料桶号</span>
+						<span class="filter_label filter_input_disabled">料桶号</span>
 					</view>
 					<view class="zd-col-24 filter_select">
 						<input type="text" class="filter_input filter_input_disabled" v-model="currentData.storagevehicle_code" @tap="toJump">
@@ -131,6 +131,7 @@
 		onShow() {
 			if (this.$store.getters.publicObj !== '') {
 				this.currentData = this.$store.getters.publicObj
+				this.$store.dispatch('setPublicObj', '')
 			}
 		},
 		created () {

pages/zw/materbox-instore.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<!-- 料桶组盘 -->
+		<!-- 料桶盘点 -->
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
@@ -100,7 +100,7 @@
 					</view>
 				</view>
 				<view v-if="typeof currentData === 'string'">
-					<view class="msg_item">提示：当前是空载具</view>
+					<view class="msg_item">{{currentData}}</view>
 				</view>
 			</view>
 		</view>
@@ -191,6 +191,7 @@
 					this.disabled = false
 					return
 				}
+				this.currentData = {}
 				try {
 					let res = await jbGetLtInfo(this.val1, this.val2)
 					if (res.code === '200') {
@@ -199,7 +200,6 @@
 							title: res.message,
 							icon: 'none'
 						})
-						this.clearUp()
 					} else {
 						uni.showToast({
 							title: res.message,

pages/zw/point-attrset.vue

@@ -34,7 +34,7 @@
 						<tbody>
 							<tr v-for="(item, i) in dataList" :key="i">
 								<td>{{item.point_code}}</td>
-								<td><span class="span1" :class="{'hightlight': item.point_type === '1'}" @tap="setpoint_type(item, '1')">入库点</span><span class="span1"  :class="{'hightlight': item.point_type === '2'}" @tap="setpoint_type(item, '2')">出库点</span></td>
+								<td><span class="span1" :class="{'hightlight': item.point_type === '1'}" @tap="setpoint_type(item, '1')">入库点</span><span class="span1" :class="{'hightlight': item.point_type === '2'}" @tap="setpoint_type(item, '2')">出库点</span></td>
 								<!-- <uni-data-select 
 									v-model="item.point_type" 
 									:localdata="options"
@@ -70,12 +70,13 @@
 				val1: '',
 				options: [{text:'入库点', value:'1'},{text:'出库点',value: '2'}],
 				index: '',
-				dataList: [
+				dataList: [],
-					{ point_code: 'P-1001', point_type: '2' },
+				// dataList: [
-					{ point_code: 'P-1002', point_type: '1' },
+				// 	{ point_code: 'P-1001', point_type: '2' },
-					{ point_code: 'P-1003', point_type: '2' },
+				// 	{ point_code: 'P-1002', point_type: '1' },
-					{ point_code: 'P-1004', point_type: '2' }
+				// 	{ point_code: 'P-1003', point_type: '2' },
-				],
+				// 	{ point_code: 'P-1004', point_type: '2' }
+				// ],
 				disabled: false
 			};
 		},