diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationDetail.vue b/src/views/onlineHome/homestead/arbitration/arbitrationDetail.vue index d4ef06fa..37696d2d 100644 --- a/src/views/onlineHome/homestead/arbitration/arbitrationDetail.vue +++ b/src/views/onlineHome/homestead/arbitration/arbitrationDetail.vue @@ -87,17 +87,17 @@ - - + + - + - + - + @@ -269,6 +269,7 @@ export default { case INTENT_ADD: this.formEnabled.baseFormEnabled = true; this.formVisible.editVisible = true; + this.formEnabled.submitEnabled = true; break; } }, @@ -374,8 +375,10 @@ export default { }*/ console.log("进行保存", this.arbitrationData); (this.arbitrationData.id ? editArbitration : addArbitration)(this.arbitrationData).then((response) => { - if(submit && this.arbitrationData.id) + if(submit) { + if(!this.arbitrationData.id) + this.arbitrationData.id = response.data; this.submitArbitration(); } else @@ -611,4 +614,13 @@ export default { .van-goods-action { justify-content: center; } + .van-goods-action-button--first { + border-radius: 0.053333rem; + } + .van-goods-action-button--last { + border-radius: 0.053333rem; + } + .van-goods-action-button { + margin-left: 0.1rem; + } diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationHandlerDetail.vue b/src/views/onlineHome/homestead/arbitration/arbitrationHandlerDetail.vue index 3b7c9c0f..138c7668 100644 --- a/src/views/onlineHome/homestead/arbitration/arbitrationHandlerDetail.vue +++ b/src/views/onlineHome/homestead/arbitration/arbitrationHandlerDetail.vue @@ -41,7 +41,8 @@ - + + @@ -428,4 +429,13 @@ export default { .van-goods-action { justify-content: center; } + .van-goods-action-button--first { + border-radius: 0.053333rem; + } + .van-goods-action-button--last { + border-radius: 0.053333rem; + } + .van-goods-action-button { + margin-left: 0.1rem; + } diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationProcessDetail.vue b/src/views/onlineHome/homestead/arbitration/arbitrationProcessDetail.vue index 59a2371d..3811ce5c 100644 --- a/src/views/onlineHome/homestead/arbitration/arbitrationProcessDetail.vue +++ b/src/views/onlineHome/homestead/arbitration/arbitrationProcessDetail.vue @@ -66,7 +66,8 @@ - + + @@ -453,4 +454,13 @@ export default { .van-goods-action { justify-content: center; } + .van-goods-action-button--first { + border-radius: 0.053333rem; + } + .van-goods-action-button--last { + border-radius: 0.053333rem; + } + .van-goods-action-button { + margin-left: 0.1rem; + } diff --git a/src/views/onlineHome/homestead/circulation/circulationList.vue b/src/views/onlineHome/homestead/circulation/circulationList.vue index 5c9e8abd..4966744a 100644 --- a/src/views/onlineHome/homestead/circulation/circulationList.vue +++ b/src/views/onlineHome/homestead/circulation/circulationList.vue @@ -21,10 +21,11 @@ @load="getList" > - + + {{ item.auditStatus == '2' ? '已驳回' : formatDict(auditStatus, item.auditStatus) }} {{item.lzfs}}{{item.zrfdbmc}}{{item.lzmj}}㎡ @@ -32,13 +33,13 @@ - + - + - + @@ -85,8 +86,6 @@ export default { for (var i = 0; i < response.rows.length; i++) { var houseApplyStatus = this.selectDictLabel(this.houseApplyStatus, response.rows[i].lzfs); response.rows[i].lzfs = houseApplyStatus; - var auditStatus = this.selectDictLabel(this.auditStatus, response.rows[i].auditStatus); - response.rows[i].auditStatus = auditStatus; this.applicationList.push(response.rows[i]); } console.log(this.applicationList.length >= response.total) @@ -141,6 +140,9 @@ export default { this.applicationList = []; this.getList(); }, + formatDict(dict, value) { + return this.selectDictLabel(dict, value); + }, }, } diff --git a/src/views/onlineHome/homestead/homeApplication/applicationList.vue b/src/views/onlineHome/homestead/homeApplication/applicationList.vue index 7ddf3899..e50c70e4 100644 --- a/src/views/onlineHome/homestead/homeApplication/applicationList.vue +++ b/src/views/onlineHome/homestead/homeApplication/applicationList.vue @@ -34,9 +34,9 @@ - {{ item.houseApplyStatusName}} - {{ item.houseApplyStatusName + ' ● 已驳回' }} - {{item.houseApplyStatusName }} + {{ formatDict(houseApplyStatus, item.houseApplyStatus) }} + {{ formatDict(houseApplyStatus, item.houseApplyStatus) + ' ● 已驳回' }} + {{ formatDict(houseApplyStatus, item.houseApplyStatus) }} {{item.projectName}} @@ -44,13 +44,13 @@ - + - + - + @@ -83,10 +83,9 @@ export default { }, created() { this.houseGetDicts("house_apply_status").then((response) => { - console.log(response) this.houseApplyStatus = response.data; - this.getList(); }); + this.getList(); }, methods: { goAdd(){ @@ -137,11 +136,11 @@ export default { return; } for (var i = 0; i < response.rows.length; i++) { - var houseApplyStatusName = this.selectDictLabel(this.houseApplyStatus, response.rows[i].houseApplyStatus); + /*var houseApplyStatusName = this.selectDictLabel(this.houseApplyStatus, response.rows[i].houseApplyStatus); // if(response.rows[i].auditStatus !== '0' && response.rows[i].auditStatus === '2'){ // houseApplyStatusName = houseApplyStatusName+ ' ● 已驳回'; // } - response.rows[i].houseApplyStatusName = houseApplyStatusName; + response.rows[i].houseApplyStatusName = houseApplyStatusName;*/ this.applicationList.push(response.rows[i]); } this.total += response.rows.length; @@ -151,6 +150,9 @@ export default { this.refreshing = false; }); }, + formatDict(dict, value) { + return this.selectDictLabel(dict, value); + }, deleteList(id,index){ this.$dialog.confirm({ message: '您确认删除申请草稿?', diff --git a/src/views/onlineHome/homestead/mortgage/mortgageList.vue b/src/views/onlineHome/homestead/mortgage/mortgageList.vue index 6cb75739..9f03d242 100644 --- a/src/views/onlineHome/homestead/mortgage/mortgageList.vue +++ b/src/views/onlineHome/homestead/mortgage/mortgageList.vue @@ -22,6 +22,7 @@ > + {{ item.auditStatus == '2' ? '已驳回' : formatDict(auditStatus, item.auditStatus) }} @@ -32,10 +33,10 @@ - + - + @@ -87,7 +88,6 @@ export default { for (var i = 0; i < response.rows.length; i++) { response.rows[i].dybdclx = this.selectDictLabel(this.dybdclxStatus, response.rows[i].dybdclx) response.rows[i].dyfs = this.selectDictLabel(this.dyfsStatus, response.rows[i].dyfs) - response.rows[i].auditStatus = this.selectDictLabel(this.auditStatus, response.rows[i].auditStatus) this.applicationList.push(response.rows[i]); } if(this.applicationList.length >= response.total){ @@ -116,7 +116,10 @@ export default { .catch(() => { // on cancel }); - } + }, + formatDict(dict, value) { + return this.selectDictLabel(dict, value); + }, }, } @@ -126,7 +129,7 @@ export default { padding: 0.2rem 3%; } /deep/.van-cell__title{ - flex: 0.9; + flex: 0.8; } /deep/.van-cell__title span{ font-family: Arial; @@ -134,7 +137,7 @@ export default { font-weight: normal; } /deep/.van-cell__value{ - flex: 0.1; + flex: 0.2; color: #1D6FE9; font-weight: bold; }
{{item.lzfs}}{{item.zrfdbmc}}{{item.lzmj}}㎡
{{item.projectName}}