kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	src/apps/AppWalkask/AppWalkask.vue
This commit is contained in:
aixianling
2021-12-31 14:13:38 +08:00
parent 6392826608 adeb6f3062
commit c3a865fa0a
4 changed files with 45 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/apps/AppResidentActivitie/Add.vue
View File

@@ -207,9 +207,9 @@ export default {
if (this.showStartTime == true) {
var nowTime = new Date().getTime() * 1
var historyTime = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1
var beginTimes = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1
if (nowTime > historyTime) {
if (nowTime > beginTimes) {
this.forms.beginTime = ''
return this.$u.toast('开始时间应大于当前时间')
} else {
@@ -217,15 +217,18 @@ export default {
}
}
if (this.showEndTime == true) {
var nowTime = new Date().getTime() * 1
if (!this.forms.beginTime) {
return this.$u.toast('请先选择开始时间')
}
var beginTimes = new Date(this.forms.beginTime).getTime() * 1
var historyTime = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1
var endTimes = new Date(e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00').getTime() * 1
if (nowTime > historyTime) {
this.forms.endTime = ''
return this.$u.toast('结束时间应大于当前时间')
} else {
if (endTimes > beginTimes && endTimes != beginTimes) {
this.forms.endTime = e.year + '-' + e.month + '-' + e.day + ' ' + e.hour + ':' + e.minute + ':' + '00'
} else {
this.forms.endTime = ''
return this.$u.toast('结束时间应大于开始时间')
}
}
},

1
src/apps/AppWalkask/AppWalkask.vue
View File

@@ -165,6 +165,7 @@ export default {
},
change(index) {
this.data = []
this.areaId = this.user.areaId
this.keyword = ''
this.currentTabs = index

26
src/apps/AppWalkask/add.vue
View File

@@ -24,17 +24,18 @@
<div class="line"></div>
<u-form-item label="入户走访事项" prop="title" required label-position="top">
<u-input v-model="forms.title" placeholder="请输入入户走访事项(30字以内)" type="textarea" auto-height height="60" maxlength="30" />
<div>{{ forms.title.length }}/30</div>
<u-form-item label="入户走访事项" prop="title" required label-position="top" :border-bottom="false">
<u-input v-model="forms.title" placeholder="请输入入户走访事项(30字以内)" type="textarea" auto-height height="60" :maxlength="30" />
</u-form-item>
<div class="hint">{{ forms.title.length }}/30</div>
<div class="line"></div>
<u-form-item label="入户走访内容" prop="description" label-position="top">
<u-input v-model="forms.description" placeholder="请输入入户走访事项(500字以内)" type="textarea" auto-height height="60" maxlength="500" />
<div>{{ forms.description.length }}/500</div>
<u-form-item label="入户走访内容" prop="description" label-position="top" :border-bottom="false">
<u-input v-model="forms.description" placeholder="请输入入户走访事项(500字以内)" type="textarea" auto-height height="60" :maxlength="500" />
<!-- <div>{{ forms.description.length }}/500</div> -->
</u-form-item>
<div class="hint">{{ forms.description.length }}/500</div>
<div class="line"></div>
@@ -105,7 +106,6 @@ export default {
})
uni.$on('goBack', (data) => {
console.log(data)
this.forms.menuLevel3Name = data.applicationName
this.forms.applicationId = data.applicationId
this.forms.name = data.selectUser.name
@@ -195,7 +195,6 @@ export default {
},
areaSelect(e) {
console.log(e)
this.forms.areaId = e
},
@@ -213,11 +212,6 @@ export default {
},
toWalkObject() {
console.log(1);
// if (this.id) return
// this.addList = false
// this.comp = 'selectType'
// this.paramss = 111
uni.navigateTo({ url: `./selectType` })
},
},
@@ -287,6 +281,12 @@ export default {
background: #f3f6f9;
}
.hint {
padding: 4px 32px 8px 0;
text-align: right;
color: #999;
}
.avatars {
.u-form-item__body {
.default {

32
src/apps/AppWalkask/selectType.vue
View File

@@ -40,8 +40,7 @@
<div class="right">
<div class="applicationNames">{{ e.name }}</div>
<!-- <img src="./img/2.png" alt="" class="imgs" /> -->
<div class="idNumbers">{{ e.idNumber && e.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1******$2') }}</div>
</div>
</div>
</div>
@@ -107,7 +106,12 @@ export default {
getUser(data) {
this.applicationId = data.id
this.$http.post(`/app/appapplicationinfo/list?appId=${data.id}&current=${this.current}&size=${999}`, { searchParam: this.keyword }).then((res) => {
this.appId = data.id
this.getUsers()
},
getUsers() {
this.$http.post(`/app/appapplicationinfo/list?appId=${this.appId}&current=${this.current}&size=${999}`, { searchParam: this.keyword }).then((res) => {
if (res.code == 0) {
res.data.records.map((item) => {
item.isChecked = false
@@ -118,9 +122,12 @@ export default {
},
submit() {
uni.$emit('goBack', { selectUser: this.selectUser, applicationName: this.applicationName, applicationId: this.applicationId })
uni.navigateBack()
// uni.navigateTo({ url: `./add` })
if (this.selectUser.length > 0) {
uni.$emit('goBack', { selectUser: this.selectUser, applicationName: this.applicationName, applicationId: this.applicationId })
uni.navigateBack()
} else {
return this.$u.toast('请选择人员')
}
},
toUserSelect(item) {
@@ -139,17 +146,18 @@ export default {
},
handerSearch(e) {
if (this.showType) {
if (!this.showType) {
this.keyword = e
this.current = 1
this.getUser()
// this.getUser()
this.getUsers()
}
},
handerClear() {
this.keyword = ''
this.current = 1
this.getUser()
this.getUsers()
},
},
}
@@ -247,14 +255,14 @@ export default {
align-items: center;
margin-left: 32px;
border-bottom: 1px solid #e4e5e6;
padding-right: 20px;
.applicationNames {
font-size: 36px;
font-weight: 500;
color: #333333;
}
.imgs {
width: 40px;
height: 40px;
.idNumbers {
color: #666;
}
}
}