|
|
@@ -3,7 +3,7 @@
|
|
|
<view class="content1-top">
|
|
|
<view class="search-form round">
|
|
|
<u-search placeholder-color='#AFB3BF' search-icon-color='#AFB3BF' bg-color='#F5F6F9'
|
|
|
- placeholder="请输入合同编号、车牌号或派车编号" v-model="keyword" @search="searchKeyWord()"
|
|
|
+ placeholder="请输入任务日期或任务标题" v-model="keyword" @search="searchKeyWord()"
|
|
|
@custom="searchKeyWord()"></u-search>
|
|
|
</view>
|
|
|
<view class="top2">
|
|
|
@@ -313,32 +313,33 @@
|
|
|
if (!this.keyword) {
|
|
|
this.$api.msg('关键字不能为空')
|
|
|
}
|
|
|
- uni.showLoading({
|
|
|
- title: "正在加载"
|
|
|
- })
|
|
|
- this.$api.doRequest('get', '/warehouseInOutInfo/selectInfoByKeyWord', this.warehouseInOutInfo).then(
|
|
|
- res => {
|
|
|
- if (res.data.code == 200) {
|
|
|
- this.taskInfo = res.data.data
|
|
|
- uni.hideLoading()
|
|
|
- } else {
|
|
|
- uni.showToast({
|
|
|
- title: res.data.message,
|
|
|
- icon: 'none',
|
|
|
- duration: 2000
|
|
|
- })
|
|
|
- uni.hideLoading(this.taskInfo, "信息")
|
|
|
- }
|
|
|
- }).catch(res => {
|
|
|
- uni.showToast({
|
|
|
- title: res.data.message,
|
|
|
- icon: 'none',
|
|
|
- duration: 2000
|
|
|
- })
|
|
|
- uni.hideLoading()
|
|
|
- })
|
|
|
+ this.getIndexBuyData('',this.keyword)
|
|
|
+ // uni.showLoading({
|
|
|
+ // title: "正在加载"
|
|
|
+ // })
|
|
|
+ // this.$api.doRequest('get', '/warehouseInOutInfo/selectInfoByKeyWord', this.warehouseInOutInfo).then(
|
|
|
+ // res => {
|
|
|
+ // if (res.data.code == 200) {
|
|
|
+ // this.taskInfo = res.data.data
|
|
|
+ // uni.hideLoading()
|
|
|
+ // } else {
|
|
|
+ // uni.showToast({
|
|
|
+ // title: res.data.message,
|
|
|
+ // icon: 'none',
|
|
|
+ // duration: 2000
|
|
|
+ // })
|
|
|
+ // uni.hideLoading(this.taskInfo, "信息")
|
|
|
+ // }
|
|
|
+ // }).catch(res => {
|
|
|
+ // uni.showToast({
|
|
|
+ // title: res.data.message,
|
|
|
+ // icon: 'none',
|
|
|
+ // duration: 2000
|
|
|
+ // })
|
|
|
+ // uni.hideLoading()
|
|
|
+ // })
|
|
|
},
|
|
|
- getIndexBuyData(status) {
|
|
|
+ getIndexBuyData(status,searchKeyword) {
|
|
|
const that = this
|
|
|
var pages = that.pages
|
|
|
var limit = that.limit
|
|
|
@@ -348,13 +349,13 @@
|
|
|
})
|
|
|
var data = {}
|
|
|
if (this.statusFlag == 1) {
|
|
|
- // data = this.warehouseInOutInfo
|
|
|
url = '/newNoticeTask/query/noticeTasks'
|
|
|
} else if (this.statusFlag == 3) {
|
|
|
data.currentPage = pages
|
|
|
data.pageSize = limit
|
|
|
data.roleId = this.userInfo.roleIds
|
|
|
data.userId = this.userInfo.id
|
|
|
+ data.searchKeyword = searchKeyword
|
|
|
url = '/commonUser/query/findHisPageNoticeTasks'
|
|
|
}
|
|
|
else if (this.statusFlag == 5) {
|
|
|
@@ -362,6 +363,7 @@
|
|
|
data.pageSize = limit
|
|
|
data.roleId = this.userInfo.roleIds
|
|
|
data.userId = this.userInfo.id
|
|
|
+ data.searchKeyword = searchKeyword
|
|
|
url = '/commonUser/query/findHisPageNoticeTasksMy'
|
|
|
}
|
|
|
|
zhangyuewww