|
@@ -12,34 +12,34 @@
|
|
|
<text>{{searchForm.creatTime[0]}} ~ {{searchForm.creatTime[1]}}</text>
|
|
|
</view>
|
|
|
</u-sticky>
|
|
|
- <view class="record-item" v-for="(item,index) in list" :key="index">
|
|
|
+ <view class="record-item" v-for="(item,index) in list" :key="index" @click="getDetails(item)">
|
|
|
<view class="item-head">
|
|
|
<text class="item-c-tit">{{item.storeName}}</text>
|
|
|
- <u-tag class="item-c-type" :text="item.orderStatus" type="primary" />
|
|
|
+ <u-tag class="item-c-type" :text="item.status | taskStatus" type="primary" />
|
|
|
</view>
|
|
|
<view class="item-main">
|
|
|
<text class="item-tit">巡店人:</text>
|
|
|
- <text class="item-val">{{item.shopInspector}}</text>
|
|
|
+ <text class="item-val">{{item.userName}}</text>
|
|
|
</view>
|
|
|
<view class="item-main">
|
|
|
<text class="item-tit">创建时间:</text>
|
|
|
- <text class="item-val">{{item.createDate}}</text>
|
|
|
+ <text class="item-val">{{item.startTime}}</text>
|
|
|
</view>
|
|
|
<u-grid class="item-grid" :col="4" hover-class="none">
|
|
|
<u-grid-item>
|
|
|
- <text class="grid-num text-blue">18</text>
|
|
|
+ <text class="grid-num text-blue">{{item.totalTargetCount}}</text>
|
|
|
<text class="grid-text">检查项</text>
|
|
|
</u-grid-item>
|
|
|
<u-grid-item>
|
|
|
- <text class="grid-num text-green">13</text>
|
|
|
+ <text class="grid-num text-green">{{item.passTargetCount}}</text>
|
|
|
<text class="grid-text">合格</text>
|
|
|
</u-grid-item>
|
|
|
<u-grid-item>
|
|
|
- <text class="grid-num text-red">3</text>
|
|
|
+ <text class="grid-num text-red">{{item.notPassTargetCount}}</text>
|
|
|
<text class="grid-text">不合格</text>
|
|
|
</u-grid-item>
|
|
|
<u-grid-item>
|
|
|
- <text class="grid-num text-yellow">2</text>
|
|
|
+ <text class="grid-num text-yellow">{{item.notWorkTargetCount}}</text>
|
|
|
<text class="grid-text">不适用</text>
|
|
|
</u-grid-item>
|
|
|
</u-grid>
|
|
@@ -81,6 +81,22 @@
|
|
|
this.searchForm.creatTime = [ this.get7day(-6), this.get7day(0) ]
|
|
|
this.pageInit(1)
|
|
|
},
|
|
|
+ filters: {
|
|
|
+ // 任务类型
|
|
|
+ taskStatus(val){
|
|
|
+ let str = ''
|
|
|
+ if(val == 'PENDING'){
|
|
|
+ str = '待处理'
|
|
|
+ }else if(val == 'RUNNING'){
|
|
|
+ str = '进行中'
|
|
|
+ }else if(val == 'FINISHED'){
|
|
|
+ str = '已完成'
|
|
|
+ }else if(val == 'EXPIRED'){
|
|
|
+ str = '已过期'
|
|
|
+ }
|
|
|
+ return str
|
|
|
+ }
|
|
|
+ },
|
|
|
methods: {
|
|
|
// 查询列表
|
|
|
pageInit(pageNo){
|
|
@@ -115,9 +131,15 @@
|
|
|
this.status = 'loadmore'
|
|
|
});
|
|
|
},
|
|
|
+ // 查看详情
|
|
|
+ getDetails(item){
|
|
|
+ uni.navigateTo({
|
|
|
+ url: '/pages/shopTourDetails/shopTourDetails?taskId=' + item.id
|
|
|
+ })
|
|
|
+ },
|
|
|
// 筛选
|
|
|
refresh(params){
|
|
|
- console.log(params,'1111111111')
|
|
|
+ // console.log(params,'1111111111')
|
|
|
this.searchForm = params
|
|
|
this.pageInit(1)
|
|
|
},
|
|
@@ -150,58 +172,6 @@
|
|
|
this.status = 'nomore'
|
|
|
}
|
|
|
},
|
|
|
- // // 关闭筛选
|
|
|
- // closeDropdown() {
|
|
|
- // this.$refs.uDropdown.close()
|
|
|
- // },
|
|
|
- // // 显示日期选择
|
|
|
- // onShowDatePicker(type){
|
|
|
- // this.showPicker = true
|
|
|
- // this.searchForm.creatTime = this.range
|
|
|
- // },
|
|
|
- // // 日期选择
|
|
|
- // onSelected(e) {
|
|
|
- // this.showPicker = false
|
|
|
- // if(e) {
|
|
|
- // this.range = e.value
|
|
|
- // }
|
|
|
- // // },
|
|
|
-
|
|
|
-
|
|
|
- // // 过滤已选数据
|
|
|
- // filterData(data) {
|
|
|
- // let arr = []
|
|
|
- // data.map(item => {
|
|
|
- // if (item.checked) {
|
|
|
- // arr.push(item.code)
|
|
|
- // }
|
|
|
- // });
|
|
|
- // return arr
|
|
|
- // },
|
|
|
-
|
|
|
-
|
|
|
- // // 选择检查方式
|
|
|
- // chooseSourceType(item) {
|
|
|
- // item.checked = !item.checked
|
|
|
- // },
|
|
|
- // 获取数据字典数据
|
|
|
- // getLookUpData(code) {
|
|
|
- // getLookUpDatas({ type: code }).then(res => {
|
|
|
- // if (res.status == 200) {
|
|
|
- // res.data.map(item => {
|
|
|
- // item.label = item.dispName
|
|
|
- // item.value = item.code
|
|
|
- // item.checked = false
|
|
|
- // })
|
|
|
- // if (code == 'TASK_TYPE') { // 检查方式
|
|
|
- // this.sourceTypeList = res.data
|
|
|
- // }else if(code == 'TASK_STATUS'){ // 状态
|
|
|
- // res.data.unshift({label: '全部', value: ''})
|
|
|
- // this.screenState = res.data
|
|
|
- // }
|
|
|
- // }
|
|
|
- // });
|
|
|
- // },
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
@@ -212,69 +182,6 @@
|
|
|
height: calc(100vh - 44px);
|
|
|
}
|
|
|
.shopTourRecord-wrap{
|
|
|
- // 筛选条件
|
|
|
- .uDropdown{
|
|
|
- background-color: #fff;
|
|
|
- .screen-dropdown{
|
|
|
- .slot-content{
|
|
|
- background-color: #fff;
|
|
|
- .scroll-view{
|
|
|
- height: 300upx;
|
|
|
- // margin: 20upx 30upx 20upx;
|
|
|
- .screen-module{
|
|
|
- margin: 20upx 30upx 20upx;
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- .screen-tit{
|
|
|
- color: #464646;
|
|
|
- font-size: 26upx;
|
|
|
- width: 140upx;
|
|
|
- flex-shrink: 0;
|
|
|
- }
|
|
|
- .screen-time-val{
|
|
|
- flex-grow: 1;
|
|
|
- font-size: 26upx;
|
|
|
- background-color: #f4f4f4;
|
|
|
- border-radius: 12upx;
|
|
|
- padding: 10upx 14upx;
|
|
|
- margin: 10upx 0;
|
|
|
- text-align: center;
|
|
|
- text{
|
|
|
- display: inline-block;
|
|
|
- width: 85%;
|
|
|
- }
|
|
|
- .close-circle{
|
|
|
- display: inline-block;
|
|
|
- padding-left: 3%;
|
|
|
- vertical-align: bottom;
|
|
|
- }
|
|
|
- }
|
|
|
- .screen-inp-val{
|
|
|
- flex-grow: 1;
|
|
|
- .screen-inp{
|
|
|
- color: #464646;
|
|
|
- font-size: 26upx;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- .status-item {
|
|
|
- display: inline-block;
|
|
|
- width: 30%;
|
|
|
- text-align: center;
|
|
|
- line-height: 60upx;
|
|
|
- background-color: #e2e2e2;
|
|
|
- color: #333;
|
|
|
- font-size: 24upx;
|
|
|
- margin: 0 10upx;
|
|
|
- }
|
|
|
- .active {
|
|
|
- background-color: #ffaa00;
|
|
|
- color: #fff;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
// 列表数据
|
|
|
.list-con{
|
|
|
.scroll-con{
|