|
@@ -242,7 +242,7 @@ export default {
|
|
|
let start = ''
|
|
let start = ''
|
|
|
// console.log('this.$store.getters',this.$store.getters)
|
|
// console.log('this.$store.getters',this.$store.getters)
|
|
|
const positionsDatas = this.$store.getters.userInfo.positions
|
|
const positionsDatas = this.$store.getters.userInfo.positions
|
|
|
- console.log('getters', this.$store.getters)
|
|
|
|
|
|
|
+ console.log('getters1111', this.$store.getters)
|
|
|
const needSelType = []
|
|
const needSelType = []
|
|
|
if (this.$store.getters.userInfo.positions == 0) {
|
|
if (this.$store.getters.userInfo.positions == 0) {
|
|
|
this.$message({
|
|
this.$message({
|
|
@@ -251,6 +251,8 @@ export default {
|
|
|
})
|
|
})
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
|
|
+ console.log('33333333333', this.searchWhere)
|
|
|
|
|
+
|
|
|
for (var i in this.searchWhere) {
|
|
for (var i in this.searchWhere) {
|
|
|
if (i == 'b') {
|
|
if (i == 'b') {
|
|
|
start = this.searchWhere[i]
|
|
start = this.searchWhere[i]
|
|
@@ -260,10 +262,13 @@ export default {
|
|
|
wheres2 = wheres2 + ` and bian_zhi_shi_jian between '${start} 00:00:00' and '${this.searchWhere[i]} 23:59:59'`
|
|
wheres2 = wheres2 + ` and bian_zhi_shi_jian between '${start} 00:00:00' and '${this.searchWhere[i]} 23:59:59'`
|
|
|
wheres3 = wheres3 + ` and bian_zhi_shi_jian between '${start} 00:00:00' and '${this.searchWhere[i]} 23:59:59'`
|
|
wheres3 = wheres3 + ` and bian_zhi_shi_jian between '${start} 00:00:00' and '${this.searchWhere[i]} 23:59:59'`
|
|
|
}
|
|
}
|
|
|
|
|
+ console.log('iiiii22222222', i)
|
|
|
|
|
+
|
|
|
if (i !== 'i' && i !== 'b') {
|
|
if (i !== 'i' && i !== 'b') {
|
|
|
- wheres1 = wheres1 + ` and wj.${i} like '%${this.searchWhere[i]}%'`
|
|
|
|
|
- wheres2 = wheres2 + ` and wj.${i} like '%${this.searchWhere[i]}%'`
|
|
|
|
|
- wheres3 = wheres3 + ` and wj.${i} like '%${this.searchWhere[i]}%'`
|
|
|
|
|
|
|
+ const likeWhere = i === 'nian_du_' ? this.searchWhere[i].getFullYear() : this.searchWhere[i]
|
|
|
|
|
+ wheres1 = wheres1 + ` and wj.${i} like '%${likeWhere}%'`
|
|
|
|
|
+ wheres2 = wheres2 + ` and wj.${i} like '%${likeWhere}%'`
|
|
|
|
|
+ wheres3 = wheres3 + ` and wj.${i} like '%${likeWhere}%'`
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|