diff --git a/src/components/home/HomeApplyUploadCompTc.vue b/src/components/home/HomeApplyUploadCompTc.vue index fbe586dc..db08bd56 100644 --- a/src/components/home/HomeApplyUploadCompTc.vue +++ b/src/components/home/HomeApplyUploadCompTc.vue @@ -63,6 +63,7 @@ export default { }, }, created() { + console.info(this.businessType); if (this.businessType !== null) { this.showAttachmentComp(this.businessType, this.proposerId, this.houseApplyStatus, this.processKey, this.tableName, this.full) } diff --git a/src/views/sunVillage_info/arbitration/arbitrationDetail.vue b/src/views/sunVillage_info/arbitration/arbitrationDetail.vue index a80d13f0..406d486a 100644 --- a/src/views/sunVillage_info/arbitration/arbitrationDetail.vue +++ b/src/views/sunVillage_info/arbitration/arbitrationDetail.vue @@ -16,7 +16,6 @@
纠纷调解
-
@@ -30,7 +29,7 @@
- {{item.sqrxm}} + {{item.shyqrdbxm}}
{ - if (response.code == 200) { - this.shyqrdmxmChange(response.rows[0]); - this.closeMoule(response.rows[0].zjddm); - } - }); - this.getDetail(); - this.getUserHouseApplyProposer(); + if(Cookies.get('user')){ + this.sysFarmer = JSON.parse(Cookies.get('user')); + getShyqrs({shyqrdbzjhm:this.sysFarmer.idcard,status:1}).then((response) => { + if (response.code == 200) { + if(response.rows.length > 0){ + this.shyqrdmxmChange(response.rows[0]); + this.closeMoule(response.rows[0].zjddm); + } + } + }); + this.getDetail(); + this.getUserHouseApplyProposer(); + } + }, computed: { allowCUD: function () { @@ -409,21 +413,7 @@ export default { if (query !== "") { getShyqrs({shyqrdbxm:query,status:1}).then((response) => { if (response.code == 200) { - this.getObligeeOptions = response.rows.map(function (item) { - return { - sqrxm:item.shyqrdbxm, - sqrxb:item.xb, - sqrzjhm:item.shyqrdbzjhm, - shyqrdm:item.shyqrdm, - sqrzjlx:item.shyqrdbzjlx, - zjddm:item.zjddm, - sqrdh:item.dh, - gyfs:item.gyfs, - dz:item.dz, - deptId:item.deptId, - deptName:item.deptName, - } - }) + this.getObligeeOptions = response.rows.filter(function (e) { return !e.shyqrdbxm.includes("村集体"); }); //设置模糊查询的下拉框和滚动条 if (this.getObligeeOptions.length > 0) { this.showDropList = true; // div显示会阻挡下边的选择框和输入框,showDropList控制下拉框是否显示 @@ -451,7 +441,7 @@ export default { shyqrdmxmChange(val){ this.$set(this.arbitrationData, "shyqrdbxm", val.shyqrdbxm); this.$set(this.arbitrationData, "deptId", val.deptId); - this.$set(this.arbitrationData, "deptName", val.deptId); + this.$set(this.arbitrationData, "deptName", val.deptName); this.$set(this.arbitrationData, "shyqrzjhm", val.shyqrdbzjhm); this.$set(this.arbitrationData, "shyqrzjlx", val.shyqrdbzjlx); this.$set(this.arbitrationData, "shyqrdm", val.shyqrdm); @@ -483,7 +473,6 @@ export default { this.notify("请标注宅基地位置!", 'danger'); return; }*/ - console.log("进行保存", this.arbitrationData); (this.arbitrationData.id ? editArbitration : addArbitration)(this.arbitrationData).then((response) => { this.notify("保存成功", 'success'); this.goBack(); @@ -531,6 +520,7 @@ export default { }, onActionSelect(a, index) { a.route.query.arbitrationId = this.arbitrationData.id; + console.info(a); this.$router.push(a.route); }, }, diff --git a/src/views/sunVillage_info/homeApplication/proposerLite.vue b/src/views/sunVillage_info/homeApplication/proposerLite.vue index bc946711..dadb5230 100644 --- a/src/views/sunVillage_info/homeApplication/proposerLite.vue +++ b/src/views/sunVillage_info/homeApplication/proposerLite.vue @@ -2102,7 +2102,11 @@ export default { if(this.type === "todo" || this.type === "done"){ this.$set(this.sysFarmer, 'memberName', this.$store.getters.nickName); }else{ - this.sysFarmer = JSON.parse(Cookies.get('user')); + if(Cookies.get('user')){ + this.sysFarmer = JSON.parse(Cookies.get('user')); + }else{ + this.$router.push('/sunVillage_info/login_code') + } } this.getFormIntent(); this.getDetail(); diff --git a/src/views/sunVillage_info/paidExit/paidExitAdd.vue b/src/views/sunVillage_info/paidExit/paidExitAdd.vue index caad2727..e401b769 100644 --- a/src/views/sunVillage_info/paidExit/paidExitAdd.vue +++ b/src/views/sunVillage_info/paidExit/paidExitAdd.vue @@ -24,7 +24,7 @@
- {{item.sqrxm}} + {{item.shyqrdbxm}}
@@ -283,7 +283,7 @@