diff --git a/src/assets/images/sunVillage_info/add_icon_3.png b/src/assets/images/sunVillage_info/add_icon_3.png new file mode 100644 index 00000000..34891533 Binary files /dev/null and b/src/assets/images/sunVillage_info/add_icon_3.png differ diff --git a/src/assets/images/sunVillage_info/index_block_21.png b/src/assets/images/sunVillage_info/index_block_21.png new file mode 100644 index 00000000..4d0b6a6b Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_21.png differ diff --git a/src/router/index.js b/src/router/index.js index c2cf9495..85553089 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3489,6 +3489,24 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/list_tourists_ranking'], resolve) }, + { ////阳光村务(新)-- 零工登记 + path: '/sunVillage_info/list_tourists_registration', + name: 'sunVillageInfoListTouristsRegistration', + meta: { + title: '零工登记', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_tourists_registration'], resolve) + }, + { ////阳光村务(新)-- 零工登记 + path: '/sunVillage_info/list_tourists_registration_add', + name: 'sunVillageInfoListTouristsRegistrationAdd', + meta: { + title: '零工登记', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_tourists_registration_add'], resolve) + }, { ////阳光村务(新)-- 合同信息 path: '/sunVillage_info/list_register', name: 'sunVillageInfoListRegister', diff --git a/src/views/homesteadSurvey/list4.vue b/src/views/homesteadSurvey/list4.vue index 027c03b7..883e12e3 100644 --- a/src/views/homesteadSurvey/list4.vue +++ b/src/views/homesteadSurvey/list4.vue @@ -5962,31 +5962,32 @@ this.mapZjdTeAll.active =1; this.mapZjdTeAll.mapZjdAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId; this.mapZjdTeAll.mapZjdAData.theGeomJson =this.htZjdZrzFsss; - console.info(this.mapZjdTeAll.mapZjdAData.theGeomJson); listSuyqr({deptId: this.item.deptId}).then((response) => { - this.$set(this.mapZjdTeAll.mapZjdAData, "suyqrdm",response.rows[0]); + this.$set(this.mapZjdTeAll.mapZjdAData, "suyqrdm",response.rows[0].suyqrdm); + this.$set(this.mapZjdTeAll.mapZjdAData, "zjdlyzk","1"); + this.$set(this.mapZjdTeAll.mapZjdAData, "landStatus","1"); + this.$set(this.mapZjdTeAll.mapZjdAData, "houseOwnership","2"); + this.$set(this.mapZjdTeAll.mapZjdAData, "landPhms","10"); + this.$set(this.mapZjdTeAll.mapZjdAData, "isMore","0"); + this.$set(this.mapZjdTeAll.mapZjdAData, "sffz","0"); + this.$set(this.mapZjdTeAll.mapZjdAData, "sfcz","0"); + this.$set(this.mapZjdTeAll.mapZjdAData, "zjdqdfs","01"); + this.$set(this.mapZjdTeAll.mapZjdAData, "sjly","01"); + this.$set(this.mapZjdTeAll.mapZjdAData, "qlsdfs","1"); + this.$set(this.mapZjdTeAll.mapZjdAData, "qllx","1"); + this.$set(this.mapZjdTeAll.mapZjdAData, "qlxz","203"); + this.$set(this.mapZjdTeAll.mapZjdAData, "yt","01"); + this.$set(this.mapZjdTeAll.mapZjdAData, "dj","1"); + + //this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId; + //this.$cookies.set("search",this.mapZjdTeAll); + this.$cookies.set("search","") + console.info(this.mapZjdTeAll.mapZjdAData); + localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapZjdAData)); + localStorage.setItem("executePermission",true); + this.$router.push({path:'/homesteadSurvey/add'}); }); - this.$set(this.mapZjdTeAll.mapZjdAData, "zjdlyzk","1"); - this.$set(this.mapZjdTeAll.mapZjdAData, "landStatus","1"); - this.$set(this.mapZjdTeAll.mapZjdAData, "houseOwnership","2"); - this.$set(this.mapZjdTeAll.mapZjdAData, "landPhms","10"); - this.$set(this.mapZjdTeAll.mapZjdAData, "isMore","0"); - this.$set(this.mapZjdTeAll.mapZjdAData, "sffz","0"); - this.$set(this.mapZjdTeAll.mapZjdAData, "sfcz","0"); - this.$set(this.mapZjdTeAll.mapZjdAData, "zjdqdfs","01"); - this.$set(this.mapZjdTeAll.mapZjdAData, "sjly","01"); - this.$set(this.mapZjdTeAll.mapZjdAData, "qlsdfs","1"); - this.$set(this.mapZjdTeAll.mapZjdAData, "qllx","1"); - this.$set(this.mapZjdTeAll.mapZjdAData, "qlxz","203"); - this.$set(this.mapZjdTeAll.mapZjdAData, "yt","01"); - this.$set(this.mapZjdTeAll.mapZjdAData, "dj","1"); - //this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId; - //this.$cookies.set("search",this.mapZjdTeAll); - this.$cookies.set("search","") - localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapZjdAData)); - localStorage.setItem("executePermission",true); - this.$router.push({path:'/homesteadSurvey/add'}); }else { this.$toast("已选择宅基地,请选择自然幢或附属设施按钮"); diff --git a/src/views/homesteadSurvey/nhcyAdd.vue b/src/views/homesteadSurvey/nhcyAdd.vue index 6c3c5ea5..f778bcb4 100644 --- a/src/views/homesteadSurvey/nhcyAdd.vue +++ b/src/views/homesteadSurvey/nhcyAdd.vue @@ -332,6 +332,7 @@ export default { let data = this.$route.query; this.form = data; this.permission = localStorage.getItem("executePermission"); + this.zjdzdxx = JSON.parse(localStorage.getItem("zjdzdxxItem")); if(this.form.id == null){ if(data.yhzgxOperate === "true"){ this.yhzgxOperate = true; @@ -339,7 +340,7 @@ export default { }else{ this.$set(this.form, 'yhzgx', "11"); } - + this.$set(this.form, 'suyqrdm', this.zjdzdxx.suyqrdm); this.$set(this.form, 'zjlx', "01"); this.$set(this.form, 'xb', "1"); this.$set(this.form, 'hklx', "01"); diff --git a/src/views/sunVillage_info/list_tourists_registration.vue b/src/views/sunVillage_info/list_tourists_registration.vue new file mode 100644 index 00000000..e19014e8 --- /dev/null +++ b/src/views/sunVillage_info/list_tourists_registration.vue @@ -0,0 +1,495 @@ + + + + 零工登记 + + + + + + + {{year == '' ? '全部': year}}{{year == '' ? '': '年'}}{{month}}{{month == '' ? '': '月'}} + 共{{listLength}}次出工 + + + + + 全部 + {{item}} + + + + {{item}} + + + + + + + + 姓名 + + + 张三 + + + + + + + + + 出工日期 + 出工事由 + 出工数 + + + 2023-03-05 + 上班打卡 + 8 + + + + + + + + + + + + + + diff --git a/src/views/sunVillage_info/list_tourists_registration_add.vue b/src/views/sunVillage_info/list_tourists_registration_add.vue new file mode 100644 index 00000000..0c0f4d36 --- /dev/null +++ b/src/views/sunVillage_info/list_tourists_registration_add.vue @@ -0,0 +1,164 @@ + + + + 零工登记 + + + + + + + 添加零工 + + + + + + + + + + + + + + + + + + + + 保存 + + + + + + +
添加零工