Commit e2bdca3a by 何为

修改电子券BUG

parent 71c1a104
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
</div> </div>
</div> </div>
</div> --> </div> -->
<!-- <div class="form"> <div class="form">
<div class="table"> <div class="table">
<div class="tr"> <div class="tr">
<div class="td label">社区卫生机构</div> <div class="td label">社区卫生机构</div>
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> --> </div>
<div class="p-title"> <div class="p-title">
<span class="label">服务成员信息</span> <span class="label">服务成员信息</span>
</div> </div>
...@@ -469,7 +469,7 @@ export default { ...@@ -469,7 +469,7 @@ export default {
return { return {
userId: store.getters.user_id, userId: store.getters.user_id,
pageType: this.$route.query.pageType ? parseInt(this.$route.query.pageType) : null, // 0=孕产妇 1=儿童 pageType: this.$route.query.pageType ? parseInt(this.$route.query.pageType) : null, // 0=孕产妇 1=儿童
orgId: this.$route.query.orgId ? parseInt(this.$route.query.orgId) : null, orgId: null,
groupId: this.$route.query.groupId ? parseInt(this.$route.query.groupId) : null, groupId: this.$route.query.groupId ? parseInt(this.$route.query.groupId) : null,
accountId: this.$route.query.accountId ? this.$route.query.accountId : store.getters.accountId, accountId: this.$route.query.accountId ? this.$route.query.accountId : store.getters.accountId,
slaveId: this.$route.query.slaveId ? this.$route.query.slaveId : null, slaveId: this.$route.query.slaveId ? this.$route.query.slaveId : null,
...@@ -597,6 +597,10 @@ export default { ...@@ -597,6 +597,10 @@ export default {
} }
}, },
created () { created () {
console.log('----------------' , store.getters)
if(this.$route.query.orgId) {
this.orgId = parseInt(this.$route.query.orgId)
}
console.log('created') console.log('created')
wxpermission(0, () => {}) wxpermission(0, () => {})
// this.getOrgInfoFn() // this.getOrgInfoFn()
...@@ -893,6 +897,17 @@ export default { ...@@ -893,6 +897,17 @@ export default {
}) })
return false return false
} }
// 社区卫生机构字段校验
const _orgNameFlag = this.BaseForm.orgName
if (!_orgNameFlag) {
this.BaseValidate.orgState = false
this.$toast({
message: '请选择所在社区卫生机构!',
position: 'center',
duration: 3000
})
return false
}
return true return true
}, },
...@@ -1064,7 +1079,8 @@ export default { ...@@ -1064,7 +1079,8 @@ export default {
} }
let birth = selectedDate.getFullYear() + '-' + month + '-' + day let birth = selectedDate.getFullYear() + '-' + month + '-' + day
this.childrenArr[this.pickerOpenIndex].birth = birth this.childrenArr[this.pickerOpenIndex].birth = birth
this.childrenArr[this.pickerOpenIndex].age = getAgeByBirth(birth) // this.childrenArr[this.pickerOpenIndex].age = getAgeByBirth(birth)
this.childrenArr[this.pickerOpenIndex].age = birth
}, },
openPopupAddress () { // 现住址picker openPopupAddress () { // 现住址picker
this.addressPopupVisible = true this.addressPopupVisible = true
...@@ -1253,7 +1269,7 @@ export default { ...@@ -1253,7 +1269,7 @@ export default {
bs: childrenArr, bs: childrenArr,
'accountId': this.accountId, 'accountId': this.accountId,
'group_id': this.groupId, 'group_id': this.groupId,
'orgId': this.orgId, 'orgId': this.BaseForm.orgId,
'idCard': this.BaseForm.idCard, 'idCard': this.BaseForm.idCard,
'pregnantDate': this.BaseForm.lastMensesTime, 'pregnantDate': this.BaseForm.lastMensesTime,
'imagedate': this.signatureImage, 'imagedate': this.signatureImage,
...@@ -1270,6 +1286,7 @@ export default { ...@@ -1270,6 +1286,7 @@ export default {
'voucherUserId': this.userId, 'voucherUserId': this.userId,
'dq': 'wd' 'dq': 'wd'
} }
console.log(params)
params.accountId = this.accountId params.accountId = this.accountId
if (this.signStatus === 'update') { // 如signId不为0或者为空则是修改签约信息 if (this.signStatus === 'update') { // 如signId不为0或者为空则是修改签约信息
params.fileUuid = this.fileUuid params.fileUuid = this.fileUuid
...@@ -1480,7 +1497,10 @@ export default { ...@@ -1480,7 +1497,10 @@ export default {
this.cancelPopupAddress() this.cancelPopupAddress()
}, },
setOrgId (item) { setOrgId (item) {
console.log(item)
this.BaseValidate.orgState = true
this.BaseForm.orgId = item.orgId this.BaseForm.orgId = item.orgId
console.log(this.BaseForm.orgId)
this.BaseForm.orgName = item.orgName this.BaseForm.orgName = item.orgName
this.cancelPopupOrg() this.cancelPopupOrg()
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment