change
This commit is contained in:
@@ -74,7 +74,18 @@
|
||||
</view>
|
||||
<view class="zd-row border-bottom">
|
||||
<view class="zd-col-7" style="width: 45%;">
|
||||
<span class="filter_label">回空载具点位</span>
|
||||
<span class="filter_label">回空载具起点</span>
|
||||
</view>
|
||||
<view class="zd-col-24">
|
||||
<search-box
|
||||
v-model="val2"
|
||||
@handleChange="handleChange"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row border-bottom">
|
||||
<view class="zd-col-7" style="width: 45%;">
|
||||
<span class="filter_label">回空载具终点</span>
|
||||
</view>
|
||||
<view class="zd-col-24 filter_select">
|
||||
<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
|
||||
@@ -84,7 +95,7 @@
|
||||
</view>
|
||||
<view class="zd-row submit-bar">
|
||||
<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
|
||||
<button class="zd-col-16 button-primary" :class="{'button-info': !(this.val1 && this.currentData.group_id && (this.isChecked || (!this.isChecked && this.index)))}" :disabled="disabled" @tap="_confirm('1')">确认</button>
|
||||
<button class="zd-col-16 button-primary" :class="{'button-info': !(this.val1 && this.currentData.group_id && (this.isChecked || (!this.isChecked && this.val2 && this.index)))}" :disabled="disabled" @tap="_confirm('1')">确认</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -101,6 +112,7 @@
|
||||
data() {
|
||||
return {
|
||||
val1: '',
|
||||
val2: '',
|
||||
options: [],
|
||||
index: '',
|
||||
currentData: {},
|
||||
@@ -171,7 +183,7 @@
|
||||
// this.disabled = false
|
||||
// return
|
||||
// }
|
||||
if (this.val1 && this.currentData.group_id && (this.isChecked || (!this.isChecked && this.index))) {
|
||||
if (this.val1 && this.currentData.group_id && (this.isChecked || (!this.isChecked && this.val2 && this.index))) {
|
||||
// console.log(1)
|
||||
} else {
|
||||
this.disabled = false
|
||||
@@ -179,7 +191,7 @@
|
||||
}
|
||||
let checkflag = this.isChecked === false ? '0' : '1'
|
||||
try {
|
||||
let res = await confirm(this.currentData.group_id, this.val1, type, checkflag, this.index)
|
||||
let res = await confirm(this.currentData.group_id, this.val1, this.val2, type, checkflag, this.index)
|
||||
if (res.code === '200') {
|
||||
uni.showToast({
|
||||
title: res.message,
|
||||
|
||||
Reference in New Issue
Block a user