@@ -43,11 +43,11 @@ | |||||
<van-col span="6" :offset="1"> | <van-col span="6" :offset="1"> | ||||
<p style="color: #878787">{{item.createTime?item.createTime.substring(0,10):item.startTime.substring(0,10)}}</p> | <p style="color: #878787">{{item.createTime?item.createTime.substring(0,10):item.startTime.substring(0,10)}}</p> | ||||
</van-col> | </van-col> | ||||
<van-col span="8" :offset="2"> | |||||
<van-col span="11" :offset="2"> | |||||
<!-- <p style="color: #878787">{{item.formData.activityBusinessType}}</p>--> | <!-- <p style="color: #878787">{{item.formData.activityBusinessType}}</p>--> | ||||
<p style="color: #878787">{{item.taskName}}</p> | <p style="color: #878787">{{item.taskName}}</p> | ||||
</van-col> | </van-col> | ||||
<van-col span="5" :offset="1"> | |||||
<van-col span="3" :offset="1"> | |||||
<p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">{{activeName=='1'?'待审批':'已审批'}}</p> | <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">{{activeName=='1'?'待审批':'已审批'}}</p> | ||||
</van-col> | </van-col> | ||||
</van-row> | </van-row> | ||||
@@ -35,7 +35,7 @@ | |||||
<van-icon name="../../../static/images/onlineHome/icon_zjd1.png" size="30" color="#539FFD" style="margin-right: 10px;" /> | <van-icon name="../../../static/images/onlineHome/icon_zjd1.png" size="30" color="#539FFD" style="margin-right: 10px;" /> | ||||
</template> | </template> | ||||
<span v-if="item.auditStatus === '0'">{{ formatDict(houseApplyStatus, item.houseApplyStatus) }} </span> | <span v-if="item.auditStatus === '0'">{{ formatDict(houseApplyStatus, item.houseApplyStatus) }} </span> | ||||
<span v-else-if="item.auditStatus !== '0' && item.auditStatus === '2' " style="color: #F56C6C">{{ formatDict(houseApplyStatus, item.houseApplyStatus) + ' ● 已驳回' }} </span> | |||||
<span v-else-if="item.auditStatus === '2' " style="color: #F56C6C">{{ formatDict(houseApplyStatus, item.houseApplyStatus) + ' ● 已驳回' }} </span> | |||||
<span v-else style="color: #67c23a;">{{ formatDict(houseApplyStatus, item.houseApplyStatus) }} </span> | <span v-else style="color: #67c23a;">{{ formatDict(houseApplyStatus, item.houseApplyStatus) }} </span> | ||||
<template #label> | <template #label> | ||||
<p>{{item.projectName}}</p> | <p>{{item.projectName}}</p> | ||||
@@ -2571,8 +2571,13 @@ export default { | |||||
this.selectedTabName = PROPOSER_STAGE_START; | this.selectedTabName = PROPOSER_STAGE_START; | ||||
this.processKeyField = PROPOSER_STAGE_START_ACTIVITY; | this.processKeyField = PROPOSER_STAGE_START_ACTIVITY; | ||||
this.attachmentActive = PROPOSER_STAGE_START; | this.attachmentActive = PROPOSER_STAGE_START; | ||||
} | |||||
else { // this.isBaseApply() | |||||
}else if(this.isLandscope()){ | |||||
this.active = PROPOSER_STAGE_START; | |||||
this.selectedTabName = PROPOSER_STAGE_START; | |||||
this.processKeyField = PROPOSER_STAGE_START_ACTIVITY; | |||||
this.attachmentActive = PROPOSER_STAGE_START; | |||||
}else | |||||
{ // this.isBaseApply() | |||||
this.active = PROPOSER_STAGE_BASE_APPLY; | this.active = PROPOSER_STAGE_BASE_APPLY; | ||||
this.selectedTabName = PROPOSER_STAGE_BASE_APPLY; | this.selectedTabName = PROPOSER_STAGE_BASE_APPLY; | ||||
this.attachmentActive = PROPOSER_STAGE_BASE_APPLY; | this.attachmentActive = PROPOSER_STAGE_BASE_APPLY; | ||||
@@ -2595,7 +2600,8 @@ export default { | |||||
} else if (this.isAccepting()) { | } else if (this.isAccepting()) { | ||||
this.active = PROPOSER_STAGE_END; | this.active = PROPOSER_STAGE_END; | ||||
this.selectedTabName = PROPOSER_STAGE_END; | this.selectedTabName = PROPOSER_STAGE_END; | ||||
if(this.isProposeStatus(houseApplyStatus, ["20"])){ | |||||
// 编辑时且为申请通过状态 -> 查看验收草稿 | |||||
if(this.proposerStatus == PROPOSER_VIEW && this.isProposeStatus(houseApplyStatus, ["20"])){ | |||||
this.selectedTabName = PROPOSER_STAGE_START; | this.selectedTabName = PROPOSER_STAGE_START; | ||||
} | } | ||||
@@ -159,12 +159,11 @@ export default { | |||||
this.showdcsj = false; | this.showdcsj = false; | ||||
}, | }, | ||||
goSubmit(){ | goSubmit(){ | ||||
console.log(this.circulation); | |||||
this.$refs._Form.validate().then(() => { | this.$refs._Form.validate().then(() => { | ||||
zjdlyAdd(this.circulation).then(response => { | zjdlyAdd(this.circulation).then(response => { | ||||
if(response.code = 200){ | if(response.code = 200){ | ||||
this.$toast.success('保存成功'); | this.$toast.success('保存成功'); | ||||
this.$router.back(); | |||||
window.location.replace("homesteadUtilize") | |||||
} | } | ||||
}); | }); | ||||
}).catch((e) => { | }).catch((e) => { | ||||