diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 97467334..1321ccb8 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -301,6 +301,8 @@
@@ -790,7 +792,7 @@ export default {
showXzyy:false,
showXzqssj:false,
showUpload:false,
- minDate: new Date(1950,0,1),
+ minDate: new Date(1950,1,1),
maxDate: new Date(2030, 10, 1),
form:{}
};
diff --git a/src/views/homesteadSurvey/add4.vue b/src/views/homesteadSurvey/add4.vue
index 80284269..94d852d7 100644
--- a/src/views/homesteadSurvey/add4.vue
+++ b/src/views/homesteadSurvey/add4.vue
@@ -106,15 +106,6 @@
调查审核
-
-
-
@@ -156,6 +147,26 @@
+
+
+
+
+
+
+
+
+
+ 审核
+
+
+
+ 通过
+ 驳回
+
+
+
+
+
@@ -206,7 +217,6 @@ export default {
ycbz:"",
jzwqkList:[],
fssslxList:[],
- examineData:[{dictLabel:"审批通过",dictValue:"5"},{dictLabel:"审批驳回",dictValue:"4"}],
zjdzdxx:{surveyStatus:"5"},
fssslist:[],
//电子签名
@@ -270,24 +280,31 @@ export default {
canvasTTdown() {
$('#canvasTT').css('display', 'none');
},
- onSurveyStatusChanged(val){
- this.$set(this.zjdzdxx, 'surveyStatus', val.dictValue);
- if(val.dictValue === "5"){
- let surveyItem = JSON.parse(localStorage.getItem("surveyItem"));
- this.$set(this.zjdzdxx, 'surveyId', surveyItem.id);
+ onBeforeCloseSh(action, done){
+ if (action === 'confirm') {
+ this.$refs.dcshForm.validate().then(() => {
+ updateZjdzd(this.zjdzdxx).then(response => {
+ if(response.code === 200){
+ let _this =this
+ _this.$toast({
+ icon: 'success', // 找到自己需要的图标
+ message: '保存成功',
+ duration:"1000",
+ onClose:function(){
+ _this.dcshShow = false;
+ _this.goRightBack();
+ }
+ })
+ }
+
+ });
+ }).catch(() => {
+ return done(false);
+ });
+ } else {
+ return done();
}
- updateZjdzd(this.zjdzdxx).then(response => {
- let _this =this
- _this.$toast({
- icon: 'success', // 找到自己需要的图标
- message: '保存成功',
- duration:"1000",
- onClose:function(){
- _this.dcshShow = false;
- _this.goRightBack();
- }
- })
- });
+
},
onRefreshFsss(){
if(this.loading){
@@ -435,12 +452,9 @@ export default {
} else {
return done();
}
- },
- confirmn(){
- console.info(111)
-
},
dcsh(){
+ this.$set(this.zjdzdxx, 'surveyStatus', "5");
this.dcshShow = true;
},
showUploadList(id){
diff --git a/src/views/homesteadSurvey/index.vue b/src/views/homesteadSurvey/index.vue
index 16c6e649..189a79c0 100644
--- a/src/views/homesteadSurvey/index.vue
+++ b/src/views/homesteadSurvey/index.vue
@@ -286,13 +286,9 @@
this.$router.push({name:'homesteadList'})
});
},
- chooseValue(item){
- let a = ((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed()
- return a
- },
chooseColor(item){
- let a = ((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed()
- if(a < 50){
+ let a = ((item.zjdwcsl/item.zjdsl)*100).toFixed()
+ if(a === "NaN" || a < 50){
return '#FA5353'
}else if(a < 100){
return '#22B7F2'
@@ -302,8 +298,8 @@
return '#FA5353'
},
chooseColor2(item){
- let a = ((item.confirmZjdzdNumber/item.reportZjdzdNumber)*100).toFixed()
- if(a < 50){
+ 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)'
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index aaecf8e0..e27d855a 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -920,10 +920,19 @@
// 入户核查搜索框新增。
onClickzjd(){
this.$cookies.remove("search");
- localStorage.setItem("zjdzdxxItem",JSON.stringify({suyqrdm:this.qlrform.suyqrdm,zjddm:null,zjdlyzk:"1",landStatus:"1"
- ,houseOwnership:"2",landPhms:"10",isMore:"0",sffz:"0",sfcz:"0"
- ,zjdqdfs:"01",sjly:"01",qlsdfs:"1",qllx:"1",qlxz:"203",dj:"1",yt:"01"}));
- this.$router.push({name:'homesteadAdd'});
+ let params = {
+ "deptId" : this.$store.state.user.loginDeptId
+ }
+ listSuyqr(params).then((response) => {
+ if(response.rows.length>0){
+ localStorage.setItem("zjdzdxxItem",JSON.stringify({suyqrdm:response.rows[0].suyqrdm,zjddm:null,zjdlyzk:"1",landStatus:"1"
+ ,houseOwnership:"2",landPhms:"10",isMore:"0",sffz:"0",sfcz:"0"
+ ,zjdqdfs:"01",sjly:"01",qlsdfs:"1",qllx:"1",qlxz:"203",dj:"1",yt:"01"}));
+ this.$router.push({name:'homesteadAdd'});
+ }
+ });
+
+
},
// 农户信息搜索框新增。
onClicknh(){
diff --git a/src/views/homesteadSurvey/nhcyList.vue b/src/views/homesteadSurvey/nhcyList.vue
index 3d57b578..99471c8c 100644
--- a/src/views/homesteadSurvey/nhcyList.vue
+++ b/src/views/homesteadSurvey/nhcyList.vue
@@ -55,7 +55,7 @@
{{item.xm}}
- {{formatDict(yhzgxList,item.yhzgx)}}
+ {{formatDict(yhzgxList,item.yhzgx)}}
证件号码:
diff --git a/src/views/homesteadSurvey/zrzAdd.vue b/src/views/homesteadSurvey/zrzAdd.vue
index 9213441b..694bbb17 100644
--- a/src/views/homesteadSurvey/zrzAdd.vue
+++ b/src/views/homesteadSurvey/zrzAdd.vue
@@ -97,6 +97,8 @@
@@ -233,7 +235,7 @@ export default {
// 当前位置信息
tGeoOrganizationLat: null,
tGeoOrganizationLng: null,
- minDate: new Date(),
+ minDate: new Date(1950,1,1),
maxDate: new Date(2025, 10, 1),
showZgqrzrq:false,
form:{}