diff --git a/src/api/onlineHome/homestead/paidExit.js b/src/api/onlineHome/homestead/paidExit.js index 5d3624ae..6e7bb1e5 100644 --- a/src/api/onlineHome/homestead/paidExit.js +++ b/src/api/onlineHome/homestead/paidExit.js @@ -44,9 +44,15 @@ export function zyyctcEdit(data){ } //宅基地流转提交 -export function zyyctcApply(id){ +/*export function zyyctcApply(id){ return request({ url:'/house/zyyctc/submitApply/'+id, method:'post', }) +}*/ +export function zyyctcApply(id){ + return request({ + url:'/house/zyyctc/paidExitSubmitApply/'+id, + method:'post', + }) } diff --git a/src/views/onlineHome/done.vue b/src/views/onlineHome/done.vue index 01a39a16..8c122f61 100644 --- a/src/views/onlineHome/done.vue +++ b/src/views/onlineHome/done.vue @@ -43,8 +43,9 @@

{{item.createTime?item.createTime.substring(0,10):item.startTime.substring(0,10)}}

 - -

{{item.formData.activityBusinessType}}

+ + +

{{item.taskName}}

{{activeName=='1'?'待审批':'已审批'}}

@@ -206,6 +207,9 @@ case 'house_utilize_signout': this.$router.push({name:'paidExitDetail',query: {id: item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}}) break; + case 'houseStandardZyyctcsq': + this.$router.push({name:'paidExitDetail',query: {id: item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}}) + break; case 'house_circulation': this.$router.push({name:'circulationDetail',query: {id: item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}}) break; diff --git a/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue b/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue index 7d1ff218..898b88ea 100644 --- a/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue +++ b/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue @@ -75,7 +75,7 @@ /> - - + --> + + - + @@ -139,8 +148,8 @@ @cancel="showbcfs = false" /> - - + + @@ -177,7 +186,7 @@ export default { zjdDictionaries:[],//宅基地代码 tcqllx:'', - tclx:'', + tclx:'有偿退出', tcfs:'', zjlx:'', bcfs:'', @@ -190,7 +199,12 @@ export default { showbcfs: false, showzjddm: false, - circulation:{} + circulation:{ + // 申请类型 1-宅基地退出 + sqlx: '1', + // 退出类型 01-有偿退出 02-无偿退出 + tclx: '01', + } }; }, created() { @@ -205,11 +219,11 @@ export default { } }); //退出类型 - this.houseGetDicts("tclx").then((res) => { + /*this.houseGetDicts("tclx").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ this.tclxDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue}); } - }); + });*/ //退出方式 this.houseGetDicts("tcfs").then((res) => { for(var i = 0 ; i < res.data.length ; i++){ @@ -266,11 +280,11 @@ export default { this.circulation.tcqllx = data.value; this.showtcqllx = false; }, - onConfirmTclx(data){ + /*onConfirmTclx(data){ this.tclx = data.text; this.circulation.tclx = data.value; this.showtclx = false; - }, + },*/ onConfirmTcfs(data){ this.tcfs = data.text; this.circulation.tcfs = data.value; @@ -284,6 +298,8 @@ export default { goSubmit(submit){ console.log(this.circulation); this.$refs._Form.validate().then(() => { + // 设置初始状态为草稿，0 代表草稿 + this.$set(this.circulation, "auditStatus", '0'); dyAdd(this.circulation).then(response => { if(response.code = 200){ if(submit) diff --git a/src/views/onlineHome/homestead/paidExit/paidExitDetail.vue b/src/views/onlineHome/homestead/paidExit/paidExitDetail.vue index 1c85cdcc..f404a341 100644 --- a/src/views/onlineHome/homestead/paidExit/paidExitDetail.vue +++ b/src/views/onlineHome/homestead/paidExit/paidExitDetail.vue @@ -50,7 +50,7 @@ input-align="right" label-width="auto" /> - + @@ -63,8 +63,8 @@ label-width="auto" input-align="right" /> - - + + diff --git a/src/views/onlineHome/homestead/paidExit/paidExitList.vue b/src/views/onlineHome/homestead/paidExit/paidExitList.vue index 1a918bf8..d916d9a3 100644 --- a/src/views/onlineHome/homestead/paidExit/paidExitList.vue +++ b/src/views/onlineHome/homestead/paidExit/paidExitList.vue @@ -35,7 +35,7 @@ - + @@ -65,7 +65,11 @@ export default { pageNum:1, pageSize:10, orderByColumn:'createTime', - isAsc:'desc' + isAsc:'desc', + // 申请类型 1-宅基地退出 + sqlx: '1', + // 退出类型 01-有偿退出 02-无偿退出 + tclx: '01', } }; }, @@ -79,8 +83,17 @@ export default { this.houseGetDicts("tcfs").then((res) => { this.tcfsStatus = res.data; }); - this.houseGetDicts("audit_status").then((res) => { - this.auditStatus = res.data; + this.houseGetDicts("yctcsp_status").then((res) => { + // this.auditStatus = res.data; + let _this = this; + res.data.forEach((item) => { + if (item.dictValue < 5) { + _this.auditStatus.push(item); + } else if (item.dictValue == 5) { + item.dictLabel = "审核通过"; + _this.auditStatus.push(item); + } + }); }); }, methods: { @@ -110,7 +123,7 @@ export default { }, deleteList(id,index){ this.$dialog.confirm({ - message: '您确认删除申请草稿？', + message: '您确认删除此申请草稿？', }) .then(() => { // on confirm @@ -155,6 +168,9 @@ export default { flex: 0.3; color: #1D6FE9; font-weight: bold; + text-align: center; + position: relative; + left: 20px; } /deep/.van-swipe-cell{ margin-bottom: 0.2rem; diff --git a/src/views/onlineHome/homestead/paidExit/paidExitModify.vue b/src/views/onlineHome/homestead/paidExit/paidExitModify.vue index 37c5ba74..6f156cca 100644 --- a/src/views/onlineHome/homestead/paidExit/paidExitModify.vue +++ b/src/views/onlineHome/homestead/paidExit/paidExitModify.vue @@ -7,7 +7,7 @@ @click-left="$router.back(-1)" > @@ -75,7 +75,7 @@ /> - - + --> + + - + @@ -139,8 +148,8 @@ @cancel="showbcfs = false" /> - - + + @@ -208,9 +217,9 @@ }); //退出类型 this.houseGetDicts("tclx").then((res) => { - for (var i = 0; i < res.data.length; i++) { + /*for (var i = 0; i < res.data.length; i++) { this.tclxDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue}); - } + }*/ this.tclx = this.selectDictLabel(res.data, response.data.tclx); }); //退出方式 @@ -272,11 +281,11 @@ this.circulation.tcqllx = data.value; this.showtcqllx = false; }, - onConfirmTclx(data){ + /*onConfirmTclx(data){ this.tclx = data.text; this.circulation.tclx = data.value; this.showtclx = false; - }, + },*/ onConfirmTcfs(data){ this.tcfs = data.text; this.circulation.tcfs = data.value; @@ -302,14 +311,16 @@ }, goSubmit(){ this.$refs._Form.validate().then(() => { - zyyctcApply(this.$route.query.id).then(response => { - if(response.code = 200){ - this.$toast.success('提交成功'); - setTimeout(function(){ - window.location.replace("paidExit") - },1000) - } - }) + zyyctcEdit(this.circulation).then(response => { + zyyctcApply(this.$route.query.id).then(response => { + if(response.code = 200){ + this.$toast.success('提交成功'); + setTimeout(function(){ + window.location.replace("paidExit") + },1000) + } + }); + }); }).catch((e) => { Notify({ type: 'danger', message: '请填写完整的表单项' }); });