|
|
@@ -4,12 +4,12 @@
|
|
|
|
|
|
<view class="search-box">
|
|
|
<uni-section>
|
|
|
- <uni-easyinput @clear="clearSearch" prefixIcon="search" style="width: 460rpx" v-model="searchForm.code"
|
|
|
+ <uni-easyinput @clear="clearSearch" prefixIcon="search" style="width: 460rpx" v-model="code"
|
|
|
placeholder="工单编号">
|
|
|
</uni-easyinput>
|
|
|
</uni-section>
|
|
|
<button class="search_btn" @click="doSearch">搜索</button>
|
|
|
- <!-- <image class="menu_icon" @click="showSearch" src="~@/static/pda/menu.svg"></image> -->
|
|
|
+ <image class="menu_icon" @click="showSearch" src="~@/static/pda/menu.svg"></image>
|
|
|
</view>
|
|
|
|
|
|
|
|
|
@@ -85,9 +85,8 @@
|
|
|
qrContent: null,
|
|
|
barType: 0,
|
|
|
searchShow: false,
|
|
|
- searchForm: {
|
|
|
- code: ''
|
|
|
- },
|
|
|
+ code: '',
|
|
|
+ searchForm: {},
|
|
|
formItems: [{
|
|
|
label: '规则名称:',
|
|
|
prop: 'ruleId',
|
|
|
@@ -240,12 +239,13 @@
|
|
|
this.formItems.find(item => item.prop === 'ruleId').props.localdata = res
|
|
|
},
|
|
|
clearSearch() {
|
|
|
- this.searchForm.code = ''
|
|
|
+ this.code = ''
|
|
|
this.doSearch()
|
|
|
},
|
|
|
doSearch() {
|
|
|
this.isEnd = false;
|
|
|
this.page = 1;
|
|
|
+ this.searchForm.code = this.code
|
|
|
this.showTab = isObjectEmpty(this.searchForm)
|
|
|
this.getList();
|
|
|
},
|
|
|
@@ -253,28 +253,21 @@
|
|
|
this.searchShow = true
|
|
|
},
|
|
|
confirmSearch(e) {
|
|
|
-
|
|
|
+ console.log(e);
|
|
|
let data = JSON.parse(JSON.stringify(e))
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
if (data.startEndTime) {
|
|
|
var [startTime, endTime] = data.startEndTime
|
|
|
delete data.startEndTime
|
|
|
this.searchForm = {
|
|
|
- ...this.searchForm,
|
|
|
...data,
|
|
|
startTime,
|
|
|
endTime
|
|
|
}
|
|
|
} else {
|
|
|
this.searchForm = {
|
|
|
- ...this.searchForm,
|
|
|
...data
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
console.log(this.searchForm);
|
|
|
this.doSearch()
|
|
|
},
|