change

pages/modules/rawmater-outstore.vue

@@ -6,13 +6,13 @@
 				<view class="filter_item">
 					<view class="filter_label">起始点位</view>
 					<view class="filter_input_wraper">
-						<input type="text" class="filter_input" v-model="val1" disabled>
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
 					</view>
 				</view>
 				<view class="filter_item">
 					<view class="filter_label">回温模式</view>
 					<view class="filter_input_wraper">
-						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
 					</view>
 				</view>
 				<view class="filter_item">
@@ -25,7 +25,7 @@
 		</view>
 		<view class="zd-row submit-bar_new">
 			<button class="zd-col-7 submit-button_c" @tap="toClear">清空</button>
-			<button class="zd-col-15 submit-button_new" :class="{'btn-disabled': !val1 || index1 || !val2}" :disabled="disabled" @tap="_yclck">确认</button>
+			<button class="zd-col-15 submit-button_new" :class="{'btn-disabled': !index1 || index2 || !val2}" :disabled="disabled" @tap="_yclck">确认</button>
 		</view>
 	</view>
 </template>
@@ -41,9 +41,10 @@
 			return {
 				dataList: [],
 				disabled: false,
-				options1: [{value: '0',text: '普通'}, {value: '1',text: '快速'}],
+				options1: [],
 				index1: '',
-				val1: '',
+				options2: [{value: '0',text: '普通'}, {value: '1',text: '快速'}],
+				index2: '',
 				val2: ''
 			};
 		},
@@ -54,23 +55,30 @@
 			selectChange1 (e) {
 				this.index1 = e
 			},
-			/** 点位查询 */
+			selectChange2 (e) {
+				this.index2 = e
+			},
+			/** 点位查询 下拉框显示 */
 			async _pointSearch (a) {
 				let res = await pointSearch(a)
-				this.val1 = res[0].point_code
+				this.options1 = [...res]
+				this.options1.map(el => {
+				this.$set(el, 'value', el.point_code)
+				this.$set(el, 'text', el.point_name)
+				})
 			},
 			toClear () {
-				this.val1 = ''
+				this.index1 = ''
 				this.val2 = ''
 			},
 			async _yclck () {
 				this.disabled = true
-				if (!this.val1 || this.index1 || !this.val2) {
+				if (!this.index1 || this.index2 || !this.val2) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await yclck(this.val1, this.index1, this.val2)
+					let res = await yclck(this.index1, this.index2, this.val2)
 					this.disabled = false
 					uni.showToast({
 						title: res.message,