From a9a71b6419429fbdba7409560626c374ab95568e Mon Sep 17 00:00:00 2001 From: xuyuanqing <392009588@qq.com> Date: Mon, 11 Dec 2023 17:17:57 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83?= =?UTF-8?q?=E6=9F=A5=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/homesteadSurvey/index.vue | 843 ++++++++++++++-------------- 1 file changed, 430 insertions(+), 413 deletions(-) diff --git a/src/views/homesteadSurvey/index.vue b/src/views/homesteadSurvey/index.vue index 2a4aa765..96158e83 100644 --- a/src/views/homesteadSurvey/index.vue +++ b/src/views/homesteadSurvey/index.vue @@ -69,36 +69,41 @@ 仅我 -
- - + + + +
+
+ + - - - - - + + + + +
@@ -109,28 +114,28 @@ :immediate-check="false" @load="onRefreshtask" > - - - + +
@@ -141,27 +146,27 @@ :immediate-check="false" @load="onRefreshtask" > - - - - - + + + +
@@ -177,379 +182,391 @@ import {Dialog} from "vant"; import {sysConfig} from "../../api/homesteadSurvey"; import axios from "axios"; - export default { - name: "homesteadIndex", - components: { - CircleProccess - }, - data() { - return { - currentRate1:0, - currentRate2:0, - currentRate3:0, - active: 1, - show: false, - loading: false, - finished: false, - checked:true, - zjdsl:100, - height:200, - phone:null, - activeKey:0, - currentRate: 0, - deptName:"全部乡镇", - showDropList:false, - total:0, - totalList:[], - xzList:[], - done:0, - doneList:[], - todo:0, - todoList:[], - gradientColor:{ - - }, - // 查询参数 - queryParams: { - rwwczt: null, - rwfbzt:"PUBLISHED", - rwzxr:null - }, - nickName:"", - text:0, - isLoadingtask:false, - countqb:1, - countyhc:1, - countwhc:1, + export default { + name: "homesteadIndex", + components: { + CircleProccess + }, + data() { + return { + currentRate1:0, + currentRate2:0, + currentRate3:0, + active: 1, + show: false, + loading: false, + finished: false, + checked:true, + rwmcValue:"", + zjdsl:100, + height:200, + phone:null, + activeKey:0, + currentRate: 0, + deptName:"全部乡镇", + showDropList:false, + total:0, + totalList:[], + xzList:[], + done:0, + doneList:[], + todo:0, + todoList:[], + gradientColor:{ - //当前用户级别 - businessLevel:1, - // 字典列表json - dictTypeList:null, - }; - }, - created(){ - if(this.checked){ - setTimeout(() => { - let userId = this.$store.state.user.userId; - console.info(userId); - this.nickName = this.$store.state.user.nickName; - this.$set(this.queryParams, "rwzxr", userId); - this.$set(this.queryParams, "params", {deptId:100}); - this.getList(); - },1000) - }else{ + }, + // 查询参数 + queryParams: { + rwwczt: null, + rwfbzt:"PUBLISHED", + rwzxr:null + }, + nickName:"", + text:0, + isLoadingtask:false, + countqb:1, + countyhc:1, + countwhc:1, - this.$set(this.queryParams, "rwzxr", null); + //当前用户级别 + businessLevel:1, + // 字典列表json + dictTypeList:null, + }; + }, + created(){ + if(this.checked){ + setTimeout(() => { + let userId = this.$store.state.user.userId; + console.info(userId); + this.nickName = this.$store.state.user.nickName; + this.$set(this.queryParams, "rwzxr", userId); + this.$set(this.queryParams, "params", {deptId:100}); this.getList(); - } - getTownInfo(100).then(response => { - this.xzList = response.data - let qbxz = {deptId:100,deptName:"全部乡镇"} - this.xzList.unshift(qbxz); - }) + },1000) + }else{ - axios.get('../static/dictyType.json').then(res => { - this.dictTypeList = res.data - }) + this.$set(this.queryParams, "rwzxr", null); + this.getList(); + } + getTownInfo(100).then(response => { + this.xzList = response.data + let qbxz = {deptId:100,deptName:"全部乡镇"} + this.xzList.unshift(qbxz); + }) - }, - mounted(){ + axios.get('../static/dictyType.json').then(res => { + this.dictTypeList = res.data + }) - // 监听屏幕方向 - let self = this; - window.addEventListener( - "onorientationchange" in window ? "orientationchange" : "resize", - function() { - if (window.orientation === 90 || window.orientation === -90) { - // 横屏 - } - }, - false - ); - if(this.$cookies.get("url")==null||this.$cookies.get("url")==""){ - this.getBaseUrl() - } - }, - methods: { - getBaseUrl(){ - let params={ - configKey: "system.attachment.url"} - sysConfig(params).then(response => { - this.$cookies.set("url",response.rows[0].configValue) - }) - }, - qiehuan(deptId){ - changeDept(deptId).then(response => { - this.$router.push({name:'homesteadList'}) - }); - }, - chooseNum(item){ - let a = ((item.zjdwcsl/item.zjdsl)*100); - if(a === "NaN"){ - return a = 0 - }else{ - return a = Math.round(a); + }, + mounted(){ + + // 监听屏幕方向 + let self = this; + window.addEventListener( + "onorientationchange" in window ? "orientationchange" : "resize", + function() { + if (window.orientation === 90 || window.orientation === -90) { + // 横屏 } }, - chooseColor(item){ - let a = ((item.zjdwcsl/item.zjdsl)*100).toFixed() - if(a === "NaN" || a < 50){ - return '#FA5353' - }else if(a < 100){ - return '#22B7F2' - }else{ - return '#85d824' - } - return '#FA5353' - }, - chooseColor2(item){ - let a = ((item.zjdwcsl/item.zjdsl)*100).toFixed() - if(a === "NaN" || a < 50){ - return 'rgba(250,83,83,0.22)' - }else if(a < 100){ - return 'rgba(34,183,242,0.22)' - }else{ - return 'rgba(122,201,67,0.22)' - } + false + ); + if(this.$cookies.get("url")==null||this.$cookies.get("url")==""){ + this.getBaseUrl() + } + }, + methods: { + onSearch(){ + // this.finished = false; + // this.loading = false; + // this.totalList = [] + // this.doneList = []; + // this.todoList = []; + this.$set(this.queryParams, "rwmc", this.rwmcValue); + this.checkBadge(); + }, + getBaseUrl(){ + let params={ + configKey: "system.attachment.url"} + sysConfig(params).then(response => { + this.$cookies.set("url",response.rows[0].configValue) + }) + }, + qiehuan(deptId){ + changeDept(deptId).then(response => { + this.$router.push({name:'homesteadList'}) + }); + }, + chooseNum(item){ + let a = ((item.zjdwcsl/item.zjdsl)*100); + if(a === "NaN"){ + return a = 0 + }else{ + return a = Math.round(a); + } + }, + chooseColor(item){ + let a = ((item.zjdwcsl/item.zjdsl)*100).toFixed() + if(a === "NaN" || a < 50){ return '#FA5353' - }, - onRefreshtask(){ - this.isLoadingtask = false; - let _this = this - if(this.active==1 && this.loading ){ - let params = { - "rwfbzt":"PUBLISHED", - "params":this.queryParams.params, - "parentId":this.queryParams.parentId, - "pageNum": this.countyhc+1, - "pageSize":4, - } - if(this.queryParams.rwzxr != null){ - params.rwzxr = this.queryParams.rwzxr; - } - listTask(params).then((response) => { - if(response.rows.length>0&&this.totalList.length { - if(response.rows.lenght>0&&this.doneList.length { - if(response.rows.length>0&&this.todoList.length { - // on confirm - this.$router.push({name:'homesteadList'}) - this.$cookies.set("item",JSON.stringify(item)); + listTask(params).then((response) => { + if(response.rows.length>0&&this.totalList.length { - // on cancel - }); - }else{ - this.$router.push({name:'homesteadList'}) - this.$cookies.set("item",JSON.stringify(item)); - }*/ - let userId = this.$store.state.user.userId; - // let businessLevel = this.$store.getters.businessLevel; - let status = false; - if(item.rwzxrIds != null && item.rwzxrIds !== ""){ - let ids = item.rwzxrIds.split(","); - ids.forEach(function(id){ - if(userId === parseInt(id)){ - status = true; - } - }); - } - if(status){ - localStorage.setItem("surveyItem",JSON.stringify(item)); - this.qiehuan(item.deptId); - }else{ - this.$dialog.alert({ - message: "没有该任务的调查权限！", - }); - } - - }, - queryAllxz(){ - if (this.showDropList) { - this.showDropList = false; // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示 - } else { - this.showDropList = true; + this.countyhc++ + this.loading = false; + }else{ + this.finished = true; + } + }); + }else if(this.active==2 && this.loading){ + let params = { + "rwwczt": "PUBLISHED", + "rwfbzt":"PUBLISHED", + "rwmc":this.rwmcValue, + "params":this.queryParams.params, + "parentId":this.queryParams.parentId, + "pageNum": this.countwhc+1, + "pageSize":4, } - }, - xzChange(val){ - this.deptName = val.deptName; - this.showDropList = false; - this.$set(this.queryParams, "deptId", null); - if(val.deptId != 100){ - this.$set(this.queryParams, "parentId", val.deptId); - this.$set(this.queryParams, "params", {deptId:null}); - }else{ - this.$set(this.queryParams, "parentId", null); - this.$set(this.queryParams, "params", {deptId:val.deptId}); + if(this.queryParams.rwzxr != null){ + params.rwzxr = this.queryParams.rwzxr; } - this.getList(); - }, - checkBadge(){ - this.finished = false; - this.loading = false; - this.totalList = [] - this.doneList = []; - this.todoList = []; - this.getList(); - }, - getList() { - this.totalList = [] - this.doneList = []; - this.todoList = []; - this.countqb = 1; - this.countyhc = 1; - this.countwhc = 1; - this.finished = false; - this.loading = false; - if(this.active==1) { - this.$set(this.queryParams, "rwfbzt", "PUBLISHED"); - this.$set(this.queryParams, "rwwczt", null); - this.$set(this.queryParams, "pageNum", this.countyhc); - this.$set(this.queryParams, "pageSize", 4); - mobileList(this.queryParams).then(response => { - this.done = response.wcs; - this.todo = response.dcs; - this.total = response.tableDataInfo.total; - this.totalList = response.tableDataInfo.rows.map(function(item){ - if(item.zjdwcsl === 0){ - item.zjdslz = 0; - }else{ - item.zjdslz = 100; - } - return item; - }); - - }); - }else if(this.active==2) { - this.$set(this.queryParams, "rwwczt", "FINISHED"); - this.$set(this.queryParams, "rwfbzt", "PUBLISHED"); - this.$set(this.queryParams, "pageNum", this.countwhc); - mobileList(this.queryParams).then(response => { - this.total = response.wcs; - this.todo = response.dcs; - this.done = response.tableDataInfo.total; - this.doneList = response.tableDataInfo.rows.map(function(item){ + listTask(params).then((response) => { + if(response.rows.lenght>0&&this.doneList.length { - this.total = response.wcs; - this.done = response.dcs; - this.todo = response.tableDataInfo.total; - this.todoList = response.tableDataInfo.rows.map(function(item){ + this.countwhc++ + this.loading = false; + }else{ + this.finished = true; + } + }); + }else if(this.active==3 && this.loading){ + let params = { + "rwwczt": "UNFINISHED", + "rwfbzt":"PUBLISHED", + "rwmc":this.rwmcValue, + "params":this.queryParams.params, + "parentId":this.queryParams.parentId, + "pageNum": this.countqb+1, + "pageSize":4, + } + if(this.queryParams.rwzxr != null){ + params.rwzxr = this.queryParams.rwzxr; + } + listTask(params).then((response) => { + if(response.rows.length>0&&this.todoList.length { + // on confirm + this.$router.push({name:'homesteadList'}) + this.$cookies.set("item",JSON.stringify(item)); + }) + .catch(() => { + // on cancel + }); + }else{ + this.$router.push({name:'homesteadList'}) + this.$cookies.set("item",JSON.stringify(item)); + }*/ + let userId = this.$store.state.user.userId; + // let businessLevel = this.$store.getters.businessLevel; + let status = false; + if(item.rwzxrIds != null && item.rwzxrIds !== ""){ + let ids = item.rwzxrIds.split(","); + ids.forEach(function(id){ + if(userId === parseInt(id)){ + status = true; + } + }); + } + if(status){ + localStorage.setItem("surveyItem",JSON.stringify(item)); + this.qiehuan(item.deptId); + }else{ + this.$dialog.alert({ + message: "没有该任务的调查权限！", + }); + } + + }, + queryAllxz(){ + if (this.showDropList) { + this.showDropList = false; // div显示会阻挡下边的选择框和输入框，showDropList控制下拉框是否显示 + } else { + this.showDropList = true; + } + }, + xzChange(val){ + this.deptName = val.deptName; + this.showDropList = false; + this.$set(this.queryParams, "deptId", null); + if(val.deptId != 100){ + this.$set(this.queryParams, "parentId", val.deptId); + this.$set(this.queryParams, "params", {deptId:null}); + }else{ + this.$set(this.queryParams, "parentId", null); + this.$set(this.queryParams, "params", {deptId:val.deptId}); + } + this.getList(); + }, + checkBadge(){ + // this.finished = false; + // this.loading = false; + // this.totalList = [] + // this.doneList = []; + // this.todoList = []; + this.getList(); + }, + getList() { + this.totalList = [] + this.doneList = []; + this.todoList = []; + this.countqb = 1; + this.countyhc = 1; + this.countwhc = 1; + this.finished = false; + this.loading = false; + if(this.active==1) { + this.$set(this.queryParams, "rwfbzt", "PUBLISHED"); + this.$set(this.queryParams, "rwwczt", null); + this.$set(this.queryParams, "pageNum", this.countyhc); + this.$set(this.queryParams, "pageSize", 4); + mobileList(this.queryParams).then(response => { + this.done = response.wcs; + this.todo = response.dcs; + this.total = response.tableDataInfo.total; + this.totalList = response.tableDataInfo.rows.map(function(item){ + if(item.zjdwcsl === 0){ + item.zjdslz = 0; + }else{ + item.zjdslz = 100; + } + return item; }); - } + }); + }else if(this.active==2) { + this.$set(this.queryParams, "rwwczt", "FINISHED"); + this.$set(this.queryParams, "rwfbzt", "PUBLISHED"); + this.$set(this.queryParams, "pageNum", this.countwhc); + mobileList(this.queryParams).then(response => { + this.total = response.wcs; + this.todo = response.dcs; + this.done = response.tableDataInfo.total; + this.doneList = response.tableDataInfo.rows.map(function(item){ + if(item.zjdwcsl === 0){ + item.zjdslz = 0; + }else{ + item.zjdslz = 100; + } + return item; + }) + }); + }else{ + this.$set(this.queryParams, "rwwczt", "UNFINISHED"); + this.$set(this.queryParams, "rwfbzt", "PUBLISHED"); + this.$set(this.queryParams, "pageNum", this.countqb); + mobileList(this.queryParams).then(response => { + this.total = response.wcs; + this.done = response.dcs; + this.todo = response.tableDataInfo.total; + this.todoList = response.tableDataInfo.rows.map(function(item){ + if(item.zjdwcsl === 0){ + item.zjdslz = 0; + }else{ + item.zjdslz = 100; + } + return item; + }) + }); + } - }, - gotoLink(){ - this.$router.push('/homesteadSurvey/settle') - }, }, - } + gotoLink(){ + this.$router.push('/homesteadSurvey/settle') + }, + }, + } diff --git a/src/views/sunVillage_info/informationFunPlanAdd.vue b/src/views/sunVillage_info/informationFunPlanAdd.vue new file mode 100644 index 00000000..262ad266 --- /dev/null +++ b/src/views/sunVillage_info/informationFunPlanAdd.vue @@ -0,0 +1,251 @@ + + + diff --git a/src/views/sunVillage_info/informationFunPlanEdit.vue b/src/views/sunVillage_info/informationFunPlanEdit.vue new file mode 100644 index 00000000..f0d905b2 --- /dev/null +++ b/src/views/sunVillage_info/informationFunPlanEdit.vue @@ -0,0 +1,244 @@ + + + From 872e3e99eabed147769bf1e3e2b506d3b110fe3a Mon Sep 17 00:00:00 2001 From: makaba <985019473@qq.com> Date: Tue, 26 Dec 2023 08:43:03 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=A0=87=E6=AE=B5=E5=90=88=E5=90=8C=20?= =?UTF-8?q?=E7=BB=93=E6=AC=BE=E8=AE=A1=E5=88=92=20=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sunVillage_info/informationFunPlanAdd.vue | 21 +++++++++++-------- .../informationFunPlanEdit.vue | 17 ++++++++------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/views/sunVillage_info/informationFunPlanAdd.vue b/src/views/sunVillage_info/informationFunPlanAdd.vue index 262ad266..272abb18 100644 --- a/src/views/sunVillage_info/informationFunPlanAdd.vue +++ b/src/views/sunVillage_info/informationFunPlanAdd.vue @@ -24,14 +24,14 @@ @cancel="showCollectionPay = false"/> - - + + - + - + - + - + @@ -97,11 +97,11 @@ showCollectionPay:false, collectionPayOptions:[], - rules: { - settlementAmount: [ - { required: true, message: '请输入结款金额' }, - ] - }, + // rules: { + // settlementAmount: [ + // { required: true, message: '请输入结款金额' }, + // ] + // }, }; }, created() { @@ -232,6 +232,9 @@ /deep/ .van-cell--required::before{ left: 0; } + /deep/ .van-field--disabled .van-field__label { + color: #646566; + } }