1.安全承诺书冲突修改
guoyuepeng
parent
93666ae7e7
commit
3eb3b8f28c
|
|
@ -6,105 +6,54 @@
|
||||||
itemStyle="height:80upx;padding-bottom:10upx;background-color: #fff;"
|
itemStyle="height:80upx;padding-bottom:10upx;background-color: #fff;"
|
||||||
@click="tabsClick"
|
@click="tabsClick"
|
||||||
></u-tabs>
|
></u-tabs>
|
||||||
<<<<<<< HEAD
|
<view class="container">
|
||||||
<view class="container">
|
<u-sticky offset-top="200">
|
||||||
<u-sticky offset-top="200">
|
<u-button type="primary" text="高级搜索" @click="popupOpen" style="height: 30px;"></u-button>
|
||||||
<u-button type="primary" text="高级搜索" @click="popupOpen" style="height: 30px;"></u-button>
|
</u-sticky>
|
||||||
</u-sticky>
|
</view>
|
||||||
</view>
|
<u-popup :show="popupShow" mode="right" :overlay="true" customStyle='width: 300px;' :safeAreaInsetTop="true" @close="popupClose" @open="popupOpen">
|
||||||
<u-popup :show="popupShow" mode="right" :overlay="true" customStyle='width: 300px;' :safeAreaInsetTop="true" @close="popupClose" @open="popupOpen">
|
<view>
|
||||||
<view>
|
<u-datetime-picker
|
||||||
<u-datetime-picker
|
:show="addStartPickBarShow"
|
||||||
:show="addStartPickBarShow"
|
v-model="addTimeStart"
|
||||||
v-model="addTimeStart"
|
mode="date"
|
||||||
mode="date"
|
@close="addPickBarOnClose('start')"
|
||||||
@close="addPickBarOnClose('start')"
|
@cancel="addPickBarOnCancel('start')"
|
||||||
@cancel="addPickBarOnCancel('start')"
|
@confirm="addPickBarOnConfirm"
|
||||||
@confirm="addPickBarOnConfirm"
|
></u-datetime-picker>
|
||||||
></u-datetime-picker>
|
<u-button @click="addStartPickBarShow = true">起始时间：{{ addTimeStartStr == '' ? '请选择起始时间...' : addTimeStartStr }}</u-button>
|
||||||
<u-button @click="addStartPickBarShow = true">起始时间：{{ addTimeStartStr == '' ? '请选择起始时间...' : addTimeStartStr }}</u-button>
|
<u-datetime-picker
|
||||||
<u-datetime-picker
|
:show="addEndPickBarShow"
|
||||||
:show="addEndPickBarShow"
|
v-model="addTimeEnd"
|
||||||
v-model="addTimeEnd"
|
mode="date"
|
||||||
mode="date"
|
@close="addPickBarOnClose('end')"
|
||||||
@close="addPickBarOnClose('end')"
|
@cancel="addPickBarOnCancel('end')"
|
||||||
@cancel="addPickBarOnCancel('end')"
|
@confirm="addPickBarOnConfirm"
|
||||||
@confirm="addPickBarOnConfirm"
|
></u-datetime-picker>
|
||||||
></u-datetime-picker>
|
<u-button @click="addEndPickBarShow = true">结束时间：{{ addTimeEndStr == '' ? '请选择结束时间...' : addTimeEndStr }}</u-button>
|
||||||
<u-button @click="addEndPickBarShow = true">结束时间：{{ addTimeEndStr == '' ? '请选择结束时间...' : addTimeEndStr }}</u-button>
|
<u-toast ref="uToast"></u-toast>
|
||||||
<u-toast ref="uToast"></u-toast>
|
<view class="u-page">
|
||||||
<view class="u-page">
|
<view class="u-demo-block">
|
||||||
<view class="u-demo-block">
|
<view class="u-demo-block__content">
|
||||||
<view class="u-demo-block__content">
|
<u-row customStyle="margin-bottom: 10px">
|
||||||
<u-row customStyle="margin-bottom: 10px">
|
<u-col span="6">
|
||||||
<u-col span="6">
|
<view class="demo-layout bg-purple-light">
|
||||||
<view class="demo-layout bg-purple-light">
|
<u-button @click="resetAdvancedParam">重置</u-button>
|
||||||
<u-button @click="resetAdvancedParam">重置</u-button>
|
</view>
|
||||||
</view>
|
</u-col>
|
||||||
</u-col>
|
<u-col span="6">
|
||||||
<u-col span="6">
|
<view class="demo-layout bg-purple">
|
||||||
<view class="demo-layout bg-purple">
|
<u-button @click="advancedSearch">搜索</u-button>
|
||||||
<u-button @click="advancedSearch">搜索</u-button>
|
</view>
|
||||||
</view>
|
</u-col>
|
||||||
</u-col>
|
</u-row>
|
||||||
</u-row>
|
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
</u-popup>
|
</u-popup>
|
||||||
=======
|
|
||||||
<view class="container">
|
|
||||||
<u-sticky offset-top="200">
|
|
||||||
<u-button type="primary" text="高级搜索" @click="popupOpen" style="height: 30px;"></u-button>
|
|
||||||
</u-sticky>
|
|
||||||
</view>
|
|
||||||
<u-popup :show="popupShow" mode="right" :overlay="true" customStyle='width: 300px;' :safeAreaInsetTop="true" @close="popupClose" @open="popupOpen">
|
|
||||||
<view>
|
|
||||||
<u-datetime-picker
|
|
||||||
:show="addStartPickBarShow"
|
|
||||||
v-model="addTimeStart"
|
|
||||||
mode="date"
|
|
||||||
@close="addPickBarOnClose('start')"
|
|
||||||
@cancel="addPickBarOnCancel('start')"
|
|
||||||
@confirm="addPickBarOnConfirm"
|
|
||||||
></u-datetime-picker>
|
|
||||||
<u-button @click="addStartPickBarShow = true">起始时间：{{ addTimeStartStr == '' ? '请选择起始时间...' : addTimeStartStr }}</u-button>
|
|
||||||
<u-datetime-picker
|
|
||||||
:show="addEndPickBarShow"
|
|
||||||
v-model="addTimeEnd"
|
|
||||||
mode="date"
|
|
||||||
@close="addPickBarOnClose('end')"
|
|
||||||
@cancel="addPickBarOnCancel('end')"
|
|
||||||
@confirm="addPickBarOnConfirm"
|
|
||||||
></u-datetime-picker>
|
|
||||||
<u-button @click="addEndPickBarShow = true">结束时间：{{ addTimeEndStr == '' ? '请选择结束时间...' : addTimeEndStr }}</u-button>
|
|
||||||
<u-toast ref="uToast"></u-toast>
|
|
||||||
<view class="u-page">
|
|
||||||
<view class="u-demo-block">
|
|
||||||
<view class="u-demo-block__content">
|
|
||||||
<u-row customStyle="margin-bottom: 10px">
|
|
||||||
<u-col span="6">
|
|
||||||
<view class="demo-layout bg-purple-light">
|
|
||||||
<u-button @click="resetAdvancedParam">重置</u-button>
|
|
||||||
</view>
|
|
||||||
</u-col>
|
|
||||||
<u-col span="6">
|
|
||||||
<view class="demo-layout bg-purple">
|
|
||||||
<u-button @click="advancedSearch">搜索</u-button>
|
|
||||||
</view>
|
|
||||||
</u-col>
|
|
||||||
</u-row>
|
|
||||||
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
</view>
|
|
||||||
</u-popup>
|
|
||||||
>>>>>>> remotes/origin/pet
|
|
||||||
<view class="message_list">
|
<view class="message_list">
|
||||||
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
|
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
|
||||||
<u-list-item v-for="(item, index) in list" :key="index">
|
<u-list-item v-for="(item, index) in list" :key="index">
|
||||||
|
|
@ -150,13 +99,13 @@ export default {
|
||||||
currentPage: 1,
|
currentPage: 1,
|
||||||
totalPage: 0,
|
totalPage: 0,
|
||||||
list: [],
|
list: [],
|
||||||
popupShow: false, // 高级搜索弹窗
|
popupShow: false, // 高级搜索弹窗
|
||||||
addStartPickBarShow: false, // 起始日期选择器
|
addStartPickBarShow: false, // 起始日期选择器
|
||||||
addEndPickBarShow: false, // 结束日期选择器
|
addEndPickBarShow: false, // 结束日期选择器
|
||||||
addTimeStart: Number(new Date()), // 承诺书添加时间-起始
|
addTimeStart: Number(new Date()), // 承诺书添加时间-起始
|
||||||
addTimeEnd: Number(new Date()), // 承诺书添加时间-结束
|
addTimeEnd: Number(new Date()), // 承诺书添加时间-结束
|
||||||
addTimeStartStr: '', // 承诺书添加时间-起始-字符串
|
addTimeStartStr: '', // 承诺书添加时间-起始-字符串
|
||||||
addTimeEndStr: '', // 承诺书添加时间-结束-字符串
|
addTimeEndStr: '', // 承诺书添加时间-结束-字符串
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
|
@ -173,8 +122,8 @@ export default {
|
||||||
USER_ID: this.userInfo.USER_ID,
|
USER_ID: this.userInfo.USER_ID,
|
||||||
showCount: this.pageSize,
|
showCount: this.pageSize,
|
||||||
currentPage: this.currentPage,
|
currentPage: this.currentPage,
|
||||||
ADDSTART: this.addTimeStartStr,
|
ADDSTART: this.addTimeStartStr,
|
||||||
ADDEND: this.addTimeEndStr
|
ADDEND: this.addTimeEndStr
|
||||||
})
|
})
|
||||||
this.list = [...this.list, ...resData.varList]
|
this.list = [...this.list, ...resData.varList]
|
||||||
this.totalPage = resData.page.totalPage
|
this.totalPage = resData.page.totalPage
|
||||||
|
|
@ -184,8 +133,8 @@ export default {
|
||||||
USER_ID: this.userInfo.USER_ID,
|
USER_ID: this.userInfo.USER_ID,
|
||||||
showCount: this.pageSize,
|
showCount: this.pageSize,
|
||||||
currentPage: this.currentPage,
|
currentPage: this.currentPage,
|
||||||
ADDSTART: this.addTimeStartStr,
|
ADDSTART: this.addTimeStartStr,
|
||||||
ADDEND: this.addTimeEndStr
|
ADDEND: this.addTimeEndStr
|
||||||
})
|
})
|
||||||
this.list = [...this.list, ...resData.varList]
|
this.list = [...this.list, ...resData.varList]
|
||||||
},
|
},
|
||||||
|
|
@ -205,7 +154,7 @@ export default {
|
||||||
},
|
},
|
||||||
tabsClick(e) {
|
tabsClick(e) {
|
||||||
this.TYPE = e.id
|
this.TYPE = e.id
|
||||||
this.resetAllAddTime()
|
this.resetAllAddTime()
|
||||||
this.resetList()
|
this.resetList()
|
||||||
},
|
},
|
||||||
fnNavigator(item) {
|
fnNavigator(item) {
|
||||||
|
|
@ -218,95 +167,80 @@ export default {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
// 高级搜索弹窗弹出函数
|
// 高级搜索弹窗弹出函数
|
||||||
popupOpen() {
|
popupOpen() {
|
||||||
this.popupShow = true
|
this.popupShow = true
|
||||||
|
|
||||||
},
|
|
||||||
// 高级搜索弹窗关闭函数
|
|
||||||
<<<<<<< HEAD
|
|
||||||
popupClose() {
|
|
||||||
this.popupShow = false
|
|
||||||
|
|
||||||
},
|
},
|
||||||
=======
|
// 高级搜索弹窗关闭函数
|
||||||
popupClose() {
|
popupClose() {
|
||||||
this.popupShow = false
|
this.popupShow = false
|
||||||
|
|
||||||
},
|
},
|
||||||
>>>>>>> remotes/origin/pet
|
// 高级搜索日期选择器关闭回调
|
||||||
// 高级搜索日期选择器关闭回调
|
addPickBarOnClose(type) {
|
||||||
addPickBarOnClose(type) {
|
switch (type) {
|
||||||
switch (type) {
|
case 'start':
|
||||||
case 'start':
|
this.addStartPickBarShow = false;
|
||||||
this.addStartPickBarShow = false;
|
break;
|
||||||
break;
|
case 'end':
|
||||||
case 'end':
|
this.addEndPickBarShow = false;
|
||||||
this.addEndPickBarShow = false;
|
break;
|
||||||
break;
|
default:
|
||||||
default:
|
this.$refs.uToast.show({message:'日期选择参数错误',duration:1000})
|
||||||
this.$refs.uToast.show({message:'日期选择参数错误',duration:1000})
|
}
|
||||||
}
|
},
|
||||||
},
|
// 高级搜索日期选择器取消回调
|
||||||
// 高级搜索日期选择器取消回调
|
addPickBarOnCancel(type) {
|
||||||
addPickBarOnCancel(type) {
|
this.addPickBarOnClose(type)
|
||||||
this.addPickBarOnClose(type)
|
},
|
||||||
},
|
// 高级搜索日期选择器确认回调
|
||||||
// 高级搜索日期选择器确认回调
|
addPickBarOnConfirm(value) {
|
||||||
addPickBarOnConfirm(value) {
|
// alert(value.value)
|
||||||
// alert(value.value)
|
switch (this.addStartPickBarShow) {
|
||||||
switch (this.addStartPickBarShow) {
|
case true:
|
||||||
case true:
|
// start type
|
||||||
// start type
|
this.addTimeStartStr = uni.$u.timeFormat(value.value, 'yyyy-mm-dd')
|
||||||
this.addTimeStartStr = uni.$u.timeFormat(value.value, 'yyyy-mm-dd')
|
this.addPickBarOnClose('start')
|
||||||
this.addPickBarOnClose('start')
|
break;
|
||||||
break;
|
case false:
|
||||||
case false:
|
// end type
|
||||||
// end type
|
this.addTimeEndStr = uni.$u.timeFormat(value.value, 'yyyy-mm-dd')
|
||||||
this.addTimeEndStr = uni.$u.timeFormat(value.value, 'yyyy-mm-dd')
|
this.addPickBarOnClose('end')
|
||||||
this.addPickBarOnClose('end')
|
break;
|
||||||
break;
|
default:
|
||||||
default:
|
this.$refs.uToast.show({message:'日期选择参数错误',duration:1000})
|
||||||
this.$refs.uToast.show({message:'日期选择参数错误',duration:1000})
|
}
|
||||||
}
|
},
|
||||||
},
|
// 清除高级搜索内的起始日期、结束日期组件绑定的时间属性（时间戳类型）；清除根据时间戳格式化的文本日期
|
||||||
<<<<<<< HEAD
|
resetAllAddTime() {
|
||||||
// 清除高级搜索内的起始日期、结束日期组件绑定的时间属性（时间戳类型）；清除根据时间戳格式化的文本日期
|
this.addTimeStart = Number(new Date())
|
||||||
=======
|
this.addTimeEnd = Number(new Date())
|
||||||
// 清除高级搜索内的起始日期、结束日期组件绑定的时间属性（时间戳类型）；清除根据时间戳格式化的文本日期
|
this.addTimeStartStr = ''
|
||||||
>>>>>>> remotes/origin/pet
|
this.addTimeEndStr = ''
|
||||||
resetAllAddTime() {
|
},
|
||||||
this.addTimeStart = Number(new Date())
|
// 重置高级搜索条件
|
||||||
this.addTimeEnd = Number(new Date())
|
resetAdvancedParam() {
|
||||||
this.addTimeStartStr = ''
|
this.resetAllAddTime()
|
||||||
this.addTimeEndStr = ''
|
this.resetList()
|
||||||
},
|
},
|
||||||
// 重置高级搜索条件
|
// 高级搜索
|
||||||
resetAdvancedParam() {
|
advancedSearch(){
|
||||||
this.resetAllAddTime()
|
const toast = uni.$u.toast
|
||||||
this.resetList()
|
// 日期合法判定
|
||||||
},
|
if (this.addTimeStartStr > this.addTimeEndStr){
|
||||||
// 高级搜索
|
// 包含两种case：case1 开始时间 > 结束时间；case2 开始时间有值，结束时间为空
|
||||||
advancedSearch(){
|
this.$refs.uToast.show({message:'日期不合法',duration:1000})
|
||||||
const toast = uni.$u.toast
|
return
|
||||||
// 日期合法判定
|
}
|
||||||
if (this.addTimeStartStr > this.addTimeEndStr){
|
if (this.addTimeEndStr != '' && this.addTimeStartStr == ''){
|
||||||
<<<<<<< HEAD
|
// 结束时间有值，开始时间为空
|
||||||
// 包含两种case：case1 开始时间 > 结束时间；case2 开始时间有值，结束时间为空
|
this.$refs.uToast.show({message:'日期不合法',duration:1000})
|
||||||
=======
|
return
|
||||||
// 包含两种case：case1 开始时间 > 结束时间；case2 开始时间有值，结束时间为空
|
}
|
||||||
>>>>>>> remotes/origin/pet
|
this.resetList()
|
||||||
this.$refs.uToast.show({message:'日期不合法',duration:1000})
|
this.popupClose()
|
||||||
return
|
}
|
||||||
}
|
|
||||||
if (this.addTimeEndStr != '' && this.addTimeStartStr == ''){
|
|
||||||
// 结束时间有值，开始时间为空
|
|
||||||
this.$refs.uToast.show({message:'日期不合法',duration:1000})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
this.resetList()
|
|
||||||
this.popupClose()
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -318,23 +252,23 @@ export default {
|
||||||
height: 100vh;
|
height: 100vh;
|
||||||
}
|
}
|
||||||
.wrap {
|
.wrap {
|
||||||
padding: 12px;
|
padding: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.demo-layout {
|
.demo-layout {
|
||||||
height: 25px;
|
height: 25px;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bg-purple {
|
.bg-purple {
|
||||||
background: #CED7E1;
|
background: #CED7E1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bg-purple-light {
|
.bg-purple-light {
|
||||||
background: #e5e9f2;
|
background: #e5e9f2;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bg-purple-dark {
|
.bg-purple-dark {
|
||||||
background: #99a9bf;
|
background: #99a9bf;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue