Merge branch 'master' of http://121.40.234.130:8899/xiangxy/hht-tongbo

pages/ProductManage/PointManage.vue

@@ -8,7 +8,10 @@
 						<span class="filter_label">点位</span>
 					</view>
 					<view class="filter_input_wraper">
-						<search-box v-model="val1" />
+						<search-box 
+						v-model="val1"
+						@input="handleChange1"
+						/>
 					</view>
 				</view>
 				<view class="filter_item">
@@ -16,7 +19,10 @@
 						<span class="filter_label">空轴/母卷</span>
 					</view>
 					<view class="filter_input_wraper">
-						<search-box v-model="val2" />
+						<search-box 
+						v-model="val2"
+						@input="handleChange2"
+						/>
 					</view>
 				</view>
 				<view class="filter_item">
@@ -52,8 +58,13 @@
 			};
 		},
 		methods: {
-			handleChange (e) {
+			handleChange1 (e) {
 				console.log(e)
+				// this._pointStatusQuery()
+			},
+			handleChange2 (e) {
+				console.log(e)
+				// this._pointStatusQuery()
 			},
 			/** 查询 */
 			async _pointStatusQuery () {

pages/ProductManage/SboProdProgress.vue

@@ -56,7 +56,7 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2 || !index}" @tap="_queryRawFoil">查询</button>
+			<button class="submit-button" @tap="_queryRawFoil">查询</button>
 		</view>
 	</view>
 </template>