宅基地系统-手机端宅基地申请、退出、有偿使用复测问题修改

src/components/home/HomeApplyUploadComp.vue

@@ -57,6 +57,7 @@
           uploadImgUrl: "/open/home/mobile/common/attach",
         },
         newAttachments: [],
+        fileTypeList:[],
         active: -1,
         has: false,
       }
@@ -86,11 +87,10 @@
           params: item.postData,
           data: formData,
         }).then((resp) => {
-          console.info(11111);
+
           if (resp.code === 200) {
             file.response = resp;
-            file.fileList = item.fileList[0];
-            file.fileList.push(resp);
+            file.fileList = item.fileList;
             this.onFileListChanged("ADD", resp);
             this.setFileStatus(file, 'done', '文件上传成功');
 
@@ -115,9 +115,10 @@
         return "http://"+ip + ":" + port + "/api"
       },
       handleRemove(file, detail) {
-        console.log(file, detail);
+        console.log(file);
         this.setFileStatus(file, 'uploading', '文件删除中...');
         let id = file.id || file.response.id;
+        this.onFileListChanged("REMOVE", id);
         removeFile(id).then(resp => {
           if (this.proposerId != -1 && false) // 不刷新
             this.showAttachmentComp(this.businessType, this.proposerId, this.houseApplyStatus, this.processKey, this.tableName, this.full)
@@ -128,7 +129,6 @@
                     fileList.splice(fileList.indexOf(file), 1);
                   }*/
           this.setFileStatus(file, 'done', '文件删除成功');
-          this.onFileListChanged("REMOVE", id);
         }).catch((e) => {
           this.setFileStatus(file, 'fail', '文件删除失败!');
         }).finally(() => {
@@ -153,6 +153,7 @@
           if (baseImgUrl === "") {
             baseImgUrl = this.getPath();
           }
+
           let UfileList = []; //上传图片列表
           list.forEach((value, index) => {
             UfileList.push({
@@ -162,20 +163,33 @@
               id: value.id,
               fileList: UfileList,
             });
+            if(list.length > 0){
+              this.newAttachments.push(value);
+              this.fileTypeList.push(value.fileType)
+            }
           });
           return UfileList;
         }
       },
       onFileListChanged(type, data) {
-        if (type === "ADD") {
+        console.info(data);
+        if(type === "ADD")
+        {
           this.newAttachments.push(data);
-        } else if (type === "REMOVE") {
-          let index = this.newAttachments.indexOf(data.id);
-          if (index !== -1)
-            this.newAttachments.splice(index, 1);
+          this.fileTypeList.push(data.fileType);
+        }
+        else if(type === "REMOVE")
+        {
+          this.fileTypeList = [];
+          this.newAttachments = this.newAttachments.filter((item)=>{
+            return item.id !== data;
+          });
+          this.newAttachments.forEach((item)=>{
+            this.fileTypeList.push(item.fileType);
+          });
         }
         console.log(this.newAttachments);
-        this.$emit('uploadFinished', this.newAttachments);
+        this.$emit('uploadFinished', this.newAttachments,this.fileTypeList);
       },
       getCurrentFiles(businessType, proposerId, houseApplyStatus, processKey, tableName) {
         this.loading = true;
@@ -202,6 +216,7 @@
           processKey: processKey,
           dictTypeSort: 'home_stage_status',
           nodeStatusSort: '',
+          tableId: proposerId,
         }).then(resp => {
           //console.log(resp);
           try {
@@ -222,6 +237,7 @@
       },
       handleResponse(rows, proposerId, houseApplyStatus, tableName) {
         rows.forEach((value, index) => {
+
           let obj = {
             fileTypeName: value.fileTypeName,
             tableId: proposerId,
@@ -244,22 +260,18 @@
               this.active++;
             this.has = true;
           }
-          this.attachmentList.push(obj);
 
+          if(value.attachmentList != null){
+            if(value.attachmentList.length > 0){
+              let list = this.formatFile( value.attachmentList);
+              this.$set(obj, "fileList", list);
+            }
+          }
+          this.attachmentList.push(obj);
+          console.info(this.attachmentList);
         });
         if (proposerId !== -1) {
-          this.attachmentList.forEach((value, index) => {
-            attachmentFind(value).then(resp => {
-              let list = this.formatFile(resp.data);
-
-              this.$set(this.attachmentList[index], "fileList", list);
-            });
-          });
-        }
-        console.info(this.attachmentList);
-        if (this.attachmentList.length > 0) {
-          this.newAttachments = this.attachmentList;
-          this.$emit('uploadFinished', this.newAttachments);
+            this.$emit('uploadFinished',this.newAttachments,this.fileTypeList);
         }
       },
       setFileStatus(file, status, message) {

src/components/house/CommonMap.vue

@@ -207,6 +207,7 @@ export default {
       return this.setLayerVisible(name, true);
     },
     setDraw(on) {
+
       if(!this.mapObject)
         return;
 /*      if(this.allowDraw === on)
@@ -214,7 +215,6 @@ export default {
       if(on) {
         let self = this;
         let draw;
-
         // 不要使用 $('DOM-selector').click(function), 动态加载按钮时手机端会失效
         $(document).on('click', "#drawPolygon" + this.elementId, function () {
           self.drawResult = null;
@@ -274,7 +274,6 @@ export default {
     addLayer(name, theGeom) {
       if(!this.mapObject)
         return false;
-
       //地图只加载一次
       //加载地图编辑
       //图层查询定位开始 ---------start

src/components/house/MultiImageUploadComp.vue

@@ -44,9 +44,9 @@ export default {
     return {
       uploadImg: {
         //上传图片配置
-        attachImgUrl: "/common/attach",
-        uploadImgUrl: "/common/upload",
-        removeImgUrl: "/system/attachment/remove",
+        attachImgUrl: "/open/home/mobile/common/attach",
+        uploadImgUrl: "/open/home/mobile/common/upload",
+        removeImgUrl: "/open/home/mobile/attach/remove",
         uploadImgHeaders: {
           Authorization: "Bearer " + getToken(),
         },
@@ -79,7 +79,7 @@ export default {
           file.path = resp.fileName;
         }
         file.fileList = this.uploadImg.fileList;
-        this.$emit('fileChanged', this.uploadImg.fileList);
+        this.$emit('fileChanged', resp.fileUrl);
         this.updateValue();
         console.log('新增', this.uploadImg.fileList);
       }).catch((e) => {
@@ -96,7 +96,7 @@ export default {
       Notify({ type: type || 'primary', message: message });
     },
     handleRemove(file, detail) {
-      console.log(file, detail);
+      console.log(file.id);
       if(file.id) // new upload
       {
         this.setFileStatus(file, 'uploading', '文件删除中...');
@@ -107,7 +107,7 @@ export default {
           if(index !== -1)
             this.uploadImg.fileList.splice(index, 1);
           console.log(this.uploadImg.fileList);
-          this.$emit('fileChanged', this.uploadImg.fileList);
+          this.$emit('fileChanged', null);
           this.updateValue();
           console.log('删除', this.uploadImg.fileList);
         })

src/views/sunVillage_info/homeApplication/proposerLite.vue

@@ -4208,18 +4208,20 @@ export default {
       }
       else {
         console.info(this.deptId);
-        getQueryLand(this.deptId).then((response) => {
-          if (response.code == 200) {
-            let InsertCode = response.data;
-            this.form.orgCode = InsertCode.orgCode;
-            this.tGeoOrganizationLat = InsertCode.lat;
-            this.tGeoOrganizationLng = InsertCode.lng;
-            if(func)
-            {
-              func(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
+        if(this.deptId != null){
+          getQueryLand(this.deptId).then((response) => {
+            if (response.code == 200) {
+              let InsertCode = response.data;
+              this.form.orgCode = InsertCode.orgCode;
+              this.tGeoOrganizationLat = InsertCode.lat;
+              this.tGeoOrganizationLng = InsertCode.lng;
+              if(func)
+              {
+                func(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
+              }
             }
-          }
-        });
+          });
+        }
       }
     },
     validateBaseApplyFormBase() {

src/views/sunVillage_info/homeApplication/proposerLiteNew.vue

@@ -444,7 +444,12 @@
                 <van-row type="flex" justify="space-between" align="center">
                   <van-col span="5">宅基地<br/>坐落平<br/>面位置图</van-col>
                   <van-col span="19">
-                    <MultiImageUploadComp :value="applicationDetail.ydjfsp.zjdzlpmwzt" :uploadDisabled="!wztUpdate"
+                    <MultiImageUploadComp :value="applicationDetail.ydjfsp.zjdzlpmwzt"
+                                          :uploadDisabled="!wztUpdate"
+                                          :tableId="applicationDetail.ydjfsp.id"
+                                          :tableName="spTableName"
+                                          :fileType="0"
+                                          :attach="true"
                                           @fileChanged="fileUpdate"/>
                     <van-row>
                       <van-col span="12">
@@ -1573,7 +1578,11 @@
                     <van-col span="19">
 
                       <MultiImageUploadComp :value="applicationDetail.ydjfys.jgpmjt"
-                                            :uploadDisabled="this.formEnabled.acceptingForm.baseFormEnabled"
+                                            :uploadDisabled="!this.formEnabled.acceptingForm.baseFormEnabled"
+                                            :tableId="applicationDetail.ydjfys.id"
+                                            :tableName="houseApplyUploadComp.tableName"
+                                            :fileType="0"
+                                            :attach="true"
                                             @fileChanged="fileUpdatePmt"/>
                       <van-field required :readonly="!this.formEnabled.acceptingForm.baseFormEnabled"
                                  v-model="applicationDetail.ydjfys.jgpmjtjbr" placeholder="经办人" label="经办人"
@@ -2170,6 +2179,7 @@
         // 当前显示流程
         selectedTabName: 0,
         processKeyField: null,
+        spTableName:"t_homeapply_ydjfsp",
         // 表单意图
         proposerStatus: PROPOSER_VIEW,
         // 显示控制
@@ -2366,8 +2376,8 @@
         flowVisible: false,
         // 是/否字典
         yesNoOptions: [
-          {dictLabel: '是', dictValue: 'Y'},
-          {dictLabel: '否', dictValue: 'N'},
+          {dictLabel: '是', dictValue: '1'},
+          {dictLabel: '否', dictValue: '0'},
         ],
         yhzgxOptions: [],
         // 当前附件tab
@@ -2394,6 +2404,7 @@
       this.type = this.$route.query.type;
       this.taskId = this.$route.query.taskId;
       this.auditbatchNo = this.$route.query.auditbatchNo;
+      this.$set(this.applicationDetail, "fileList", this.fileIdList);
       this.getDicts("family_status").then(response => {
         let arr = [];
         response.data.forEach(function (item) {
@@ -2955,20 +2966,17 @@
                   endDate: null,
                 });
               }
+            } else if (this.isProposeStatus(homeApplyStatus, ["71"])) {
+              this.$set(this.formEnabled.acceptingForm, 'baseFormEnabled', false);
+              if (this.applicationDetail.ydjfys.sfxszfjsbzzc == null)
+                this.$set(this.applicationDetail.ydjfys, 'sfxszfjsbzzc', "N");
+              if (this.applicationDetail.ydjfys.qtysnr.clrsj == null)
+                this.$set(this.applicationDetail.ydjfys.qtysnr, 'clrsj', handlerTime);
+              if (this.applicationDetail.ydjfys.qtysnr.dsfwfsj == null)
+                this.$set(this.applicationDetail.ydjfys.qtysnr, 'dsfwfsj', handlerTime);
+              if (this.applicationDetail.ydjfys.qtysnr.zyjsrysj == null)
+                this.$set(this.applicationDetail.ydjfys.qtysnr, 'zyjsrysj', handlerTime);
             }
-
-              // 验收
-              // else if(this.isProposeStatus(homeApplyStatus, ["71"]))
-              // {
-              //   if(!this.applicationDetail.tHouseApplyEnd)
-              //   {
-              //     this.$set(this.applicationDetail, 'tHouseApplyEnd', {
-              //       //TODO: 开工结束时后台必定生成
-              //     });
-              //   }
-              //   if(this.applicationDetail.tHouseApplyEnd.oldHouseStatus == '0')
-              //     this.applicationDetail.tHouseApplyEnd.oldHouseStatus = null;
-              // }
             // 开工二道场审批
 
             else if (this.isProposeStatus(homeApplyStatus, ["39"])) {
@@ -2981,22 +2989,23 @@
             else if (this.isProposeStatus(homeApplyStatus, ["79", "7C", "7F"])) {
               if (this.isInRoles(role, ['town_leader'])) {
                 if (!this.applicationDetail.ydjfys.jgpmjtjbr) this.applicationDetail.ydjfys.jgpmjtjbr = handlerName;
-                if (!this.applicationDetail.ydjfys.xzzfysjbrxm) //this.applicationDetail.tHouseApplyEnd.zhenName = handlerName;
+                if (!this.applicationDetail.ydjfys.xzzfysyj) //this.applicationDetail.tHouseApplyEnd.zhenName = handlerName;
                   if (!this.applicationDetail.ydjfys.xzzfyssj) this.applicationDetail.ydjfys.xzzfyssj = handlerTime;
               }
 
               if (this.isInRoles(role, ['agriculture'])) {
-                if (!this.applicationDetail.ydjfys.nyncbmysjbrxm) //this.applicationDetail.tHouseApplyEnd.nongyeName = handlerName;
+                if (!this.applicationDetail.ydjfys.nyncbmysyj) //this.applicationDetail.tHouseApplyEnd.nongyeName = handlerName;
                   if (!this.applicationDetail.ydjfys.nyncbmyssj) this.applicationDetail.ydjfys.nyncbmyssj = handlerTime;
               }
 
               if (this.isInRoles(role, ['nature_resource'])) {
-                if (!this.applicationDetail.ydjfys.zrzybmysjbrxm) //this.applicationDetail.tHouseApplyEnd.natureName = handlerName;
+                if (!this.applicationDetail.ydjfys.zrzybmysyj) //this.applicationDetail.tHouseApplyEnd.natureName = handlerName;
                   if (!this.applicationDetail.ydjfys.zrzybmyssj) this.applicationDetail.ydjfys.zrzybmyssj = handlerTime;
               }
 
               if (this.isInRoles(role, ['building'])) {
-                if (!this.applicationDetail.ydjfys.zfcxjsbmysjbrxm) //this.applicationDetail.tHouseApplyEnd.natureName = handlerName;
+
+                if (!this.applicationDetail.ydjfys.zfcxjsbmysyj) //this.applicationDetail.tHouseApplyEnd.natureName = handlerName;
                   if (!this.applicationDetail.ydjfys.zfcxjsbmyssj) this.applicationDetail.ydjfys.zfcxjsbmyssj = handlerTime;
               }
               if (0) {
@@ -3489,15 +3498,17 @@
         }
       },
       // 初次申请草稿的附件上传
-      onUploadFinished(fileIdList) {
-        this.fileTypeList = [];
-        this.fileIdList = [];
+      onUploadFinished(fileIdList,fileTypeList) {
         let _this = this;
-        fileIdList.forEach(function (item) {
-          _this.fileTypeList.push(item.fileType);
-          _this.fileIdList.push(item.id);
-        })
-        this.$set(this.applicationDetail, "fileList",  this.fileIdList);
+        this.fileIdList = [];
+        this.fileTypeList = [];
+        // setTimeout(() => {
+          fileIdList.forEach(function (item) {
+            _this.fileIdList.push(item.id);
+            _this.fileTypeList.push(item.fileType);
+          })
+        // }, 3000);
+        this.$set(this.applicationDetail, "fileList", this.fileIdList);
       },
       // 获取申请人信息
       getApplyerDetail(val) {
@@ -3539,12 +3550,41 @@
       // 保存申请(是否提交)
       saveProposerApply(submit) {
         this.$refs.form.validate().then(() => {
-          let msg = this.validateBaseApplyFormBase();
-          console.info(msg)
-          if (msg) {
-            this.notify(msg, 'danger');
-            return;
-          }
+          this.$toast.loading({
+            message: "数据处理中...",
+            forbidClick: true,
+          });
+          // setTimeout(() => {
+            let msg = this.validateBaseApplyFormBase();;
+            if (msg) {
+              this.$toast.clear();
+              this.notify(msg, 'danger');
+              return;
+            }
+            console.log("进行保存", this.applicationDetail);
+            this.$set(this.applicationDetail, 'applyUserId', this.sysFarmer.id);
+            this.$set(this.applicationDetail, 'auditStatus', "0");
+            saveHomeBaseInfo(this.applicationDetail).then((response) => {
+              if (submit) {
+                this.id = response.data;
+                this.submitApplyProposer();
+              } else {
+                if (response.code === 200) {
+                  this.$toast.clear();
+                  this.notify("保存成功", 'success');
+                  this.goBack();
+                } else {
+                  this.$toast.clear();
+                  this.notify("保存失败,申请人没有资格权！", 'danger');
+                }
+
+              }
+            }).catch((e) => {
+              this.$toast.clear();
+              this.notify("保存失败!", 'danger');
+            }).finally(() => {
+            });
+          // }, 3000);
           // //地图判断
           // if (this.drawInsert != null) {
           //   this.applicationDetail.theGeom = JSON.stringify(this.drawInsert);
@@ -3557,33 +3597,7 @@
           //   }
           // }
 
-          console.log("进行保存", this.applicationDetail);
-          this.$set(this.applicationDetail, 'applyUserId', this.sysFarmer.id);
-          this.$set(this.applicationDetail, 'auditStatus', "0");
-          this.$toast.loading({
-            message: "数据处理中...",
-            forbidClick: true,
-          });
-          saveHomeBaseInfo(this.applicationDetail).then((response) => {
-            if (submit) {
-              this.id = response.data;
-              this.submitApplyProposer();
-            } else {
-              if (response.code === 200) {
-                this.$toast.clear();
-                this.notify("保存成功", 'success');
-                this.goBack();
-              } else {
-                this.$toast.clear();
-                this.notify("保存失败,申请人没有资格权！", 'danger');
-              }
 
-            }
-          }).catch((e) => {
-            this.$toast.clear();
-            this.notify("保存失败!", 'danger');
-          }).finally(() => {
-          });
         }).catch(e => {
           let msg = this.validateBaseApplyFormBase();
           if (msg) {
@@ -3682,6 +3696,7 @@
       },
       // 提交申请
       submitApplyProposer() {
+
         if (this.applicationDetail.auditStatus == '2' && this.selectedTabName == 0) {
           updateOpretion(this.id).then();
         }
@@ -3807,46 +3822,49 @@
                 //   break;
                 // }
                 msg = this.validateTownForm();
+
                 if (msg) {
                   break;
-                }
-                comment = this.applicationDetail.ydjfsp.zfcxjsbmscyj;
-                // this.submitHouseApproveAgricultureOptions().then(item=>{
-                //     _this.submitHouseApproveNatureplanOptions().then(item2=>{
-                //         _this.submitHouseApproveOtherOptions().then(item3=>{
-                //           if(_this.$refs.pictureUploadApplyingTHouseApproveTown && _this.$refs.pictureUploadApplyingTHouseApproveTown.isValid()) {
-                //             _this.submitHouseApproveTownOptions().then(item4=>{
-                //               //地图判断
-                //               if (_this.drawInsert != null) {
-                //                 _this.applicationDetail.tHouseApproveNatureOptions.theGeom = JSON.stringify(_this.drawInsert);
-                //               }
-                //               else {
-                //                 if(_this.applicationDetail.tHouseApproveNatureOptions && _this.applicationDetail.tHouseApproveNatureOptions.theGeom == null){
-                //                   _this.applicationDetail.tHouseApproveNatureOptions.theGeom = _this.convertGeom(_this.applicationDetail.tHouseApplyProposedSituation.theGeom);
-                //                 }
-                //               }
-                if (!pass) {
-                  comment = "驳回";
-                }
-                if (this.applicationDetail.ydjfsp.zjdzlpmwzt != null && this.applicationDetail.ydjfsp.zjdzlpmwzt !== "") {
-                  // _this.submitHouseApproveLocationplanOptions(pass, comment).then(item5=>{
-                  // _this.submitHouseApproveNatureplanOptions().then(item6=>{
-                  //   setTimeout(() => {
-                  saveHomeBaseInfo(this.applicationDetail).then((response) => {
-                    this.complete(pass, comment);
-                  }).catch(resp => {
-                    this.notify(msg, 'danger');
-                    this.notify("保存失败!", 'danger');
-                  });
-                  // }, 500);
-                  // });
-                  // });
                 } else {
-                  this.notify("宅基地坐落平面位置图不能为空", 'danger');
-                  this.$refs.form.validate().then(() => {
-                  }).catch((e) => {
-                  })
+                  comment = this.applicationDetail.ydjfsp.zfcxjsbmscyj;
+                  // this.submitHouseApproveAgricultureOptions().then(item=>{
+                  //     _this.submitHouseApproveNatureplanOptions().then(item2=>{
+                  //         _this.submitHouseApproveOtherOptions().then(item3=>{
+                  //           if(_this.$refs.pictureUploadApplyingTHouseApproveTown && _this.$refs.pictureUploadApplyingTHouseApproveTown.isValid()) {
+                  //             _this.submitHouseApproveTownOptions().then(item4=>{
+                  //               //地图判断
+                  //               if (_this.drawInsert != null) {
+                  //                 _this.applicationDetail.tHouseApproveNatureOptions.theGeom = JSON.stringify(_this.drawInsert);
+                  //               }
+                  //               else {
+                  //                 if(_this.applicationDetail.tHouseApproveNatureOptions && _this.applicationDetail.tHouseApproveNatureOptions.theGeom == null){
+                  //                   _this.applicationDetail.tHouseApproveNatureOptions.theGeom = _this.convertGeom(_this.applicationDetail.tHouseApplyProposedSituation.theGeom);
+                  //                 }
+                  //               }
+                  if (!pass) {
+                    comment = "驳回";
+                  }
+                  if (this.applicationDetail.ydjfsp.zjdzlpmwzt != null && this.applicationDetail.ydjfsp.zjdzlpmwzt !== "") {
+                    // _this.submitHouseApproveLocationplanOptions(pass, comment).then(item5=>{
+                    // _this.submitHouseApproveNatureplanOptions().then(item6=>{
+                      setTimeout(() => {
+                    saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                      this.complete(pass, comment);
+                    }).catch(resp => {
+                      this.notify(msg, 'danger');
+                      this.notify("保存失败!", 'danger');
+                    });
+                    }, 500);
+                    // });register/face/verified/allow
+                    // });
+                  } else {
+                    this.notify("宅基地坐落平面位置图不能为空", 'danger');
+                    this.$refs.form.validate().then(() => {
+                    }).catch((e) => {
+                    })
+                  }
                 }
+
                 // });
                 // } else {
 
@@ -3954,7 +3972,17 @@
                 this.notify("保存失败!", 'danger');
               });
             } else {
-              this.complete(pass);
+              if (this.applicationDetail.homeApplyStatus === "3C") {
+                if (this.fileTypeList.indexOf("14") === -1) {
+                  this.notify("请上传开工乡镇受理会议纪要", 'danger');
+
+                }else{
+                  this.complete(pass);
+                }
+              }else{
+                this.complete(pass);
+              }
+
             }
             break;
           case PROPOSER_STAGE_END_ACTIVITY : {
@@ -3976,6 +4004,18 @@
 
                 break;
               case "nature_resource":
+                msg = this.validateAcceptingFormTown(undefined, role);
+                if (msg) {
+                  break;
+                }
+                comment = this.applicationDetail.ydjfys.zfcxjsbmysyj;
+                saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                  this.complete(pass, comment);
+                }).catch(err => {
+                  this.notify('保存失败', 'danger');
+                });
+                break;
+              case "building":
                 msg = this.validateAcceptingFormTown(undefined, role);
                 if (msg) {
                   break;
@@ -3992,6 +4032,7 @@
                 if (msg) {
                   break;
                 }
+
                 comment = this.applicationDetail.ydjfys.xzzfysyj;
                 if (this.applicationDetail.ydjfys.jgpmjt != null) {
                   saveHomeBaseInfo(this.applicationDetail).then((response) => {
@@ -4294,26 +4335,10 @@
         });
       },
       fileUpdate(val) {
-        const params = new FormData();
-        params.append("tableId", this.applicationDetail.ydjfsp.id);
-        params.append("tableName", "t_homeapply_ydjfsp");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append('file', val[0].file);
-        attach(params).then((resp) => {
-          this.$set(this.applicationDetail.ydjfsp, 'zjdzlpmwzt', resp.fileUrl);
-        });
+         this.$set(this.applicationDetail.ydjfsp, 'zjdzlpmwzt', val);
       },
       fileUpdatePmt(val) {
-        const params = new FormData();
-        params.append("tableId", this.applicationDetail.ydjfys.id);
-        params.append("tableName", "t_homeapply_ydjfsq");
-        params.append("bizPath", "upload");
-        params.append("fileType", "0");
-        params.append('file', val[0].file);
-        attach(params).then((resp) => {
-          this.$set(this.applicationDetail.ydjfys, 'jgpmjt', resp.fileUrl);
-        });
+        this.$set(this.applicationDetail.ydjfys, 'jgpmjt',val);
       },
       // 带平面图附件上传的镇级验收审批
       submitHouseApplyEndLocationplanOptions(pass, commentText) {
@@ -4397,6 +4422,7 @@
       selectTab(index) {
         if (index <= this.active) {
           this.selectedTabName = index;
+          this.pointDarw(null);
         }
         //console.log(index, this.active,this.selectedTabName);
       },
@@ -4450,30 +4476,37 @@
         //     this.applicationDetail.tHouseApplyEnd.theGeom = this.convertGeom(this.applicationDetail.tHouseApproveNatureOptions.theGeom);
         //   }
         // }
-        console.info(this.applicationDetail);
-        this.$toast.loading({
-          message: "数据处理中...",
-          forbidClick: true,
-        });
-        saveHomeBaseInfo(this.applicationDetail).then(resp => {
-          if (submit) {
-            submitCheck(this.applicationDetail.id).then(resp => {
+        if (this.applicationDetail.ydjfys.jgpmjt != null) {
+        this.$refs.form.validate().then(() => {
+          this.$toast.loading({
+            message: "数据处理中...",
+            forbidClick: true,
+          });
+
+          saveHomeBaseInfo(this.applicationDetail).then(resp => {
+            if (submit) {
+              submitCheck(this.applicationDetail.id).then(resp => {
+                this.$toast.clear();
+                this.notify("操作成功", 'success');
+                this.goBack();
+              }).catch(err => {
+                this.$toast.clear();
+                this.notify("操作失败!", 'danger');
+              });
+            } else {
               this.$toast.clear();
-              this.notify("操作成功", 'success');
+              this.notify("保存成功", 'success');
               this.goBack();
-            }).catch(err => {
-              this.$toast.clear();
-              this.notify("操作失败!", 'danger');
-            });
-          } else {
+            }
+          }).catch(err => {
             this.$toast.clear();
-            this.notify("保存成功", 'success');
-            this.goBack();
-          }
-        }).catch(err => {
-          this.$toast.clear();
-          this.notify('保存失败', 'danger');
-        });
+            this.notify('保存失败', 'danger');
+          });
+
+        })
+        } else {
+          this.notify("竣工平面简图不能为空", 'danger');
+        }
         // }).catch(e => {
         //   let msg = this.validateAcceptingFormBase();
         //   if (msg) {
@@ -4491,18 +4524,19 @@
             func(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
           })
         } else {
-          console.info(this.deptId);
-          getQueryLand(this.deptId).then((response) => {
-            if (response.code == 200) {
-              let InsertCode = response.data;
-              this.form.orgCode = InsertCode.orgCode;
-              this.tGeoOrganizationLat = InsertCode.lat;
-              this.tGeoOrganizationLng = InsertCode.lng;
-              if (func) {
-                func(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
+          if(this.deptId !== null && this.deptId !== undefined){
+            getQueryLand(this.deptId).then((response) => {
+              if (response.code == 200) {
+                let InsertCode = response.data;
+                this.form.orgCode = InsertCode.orgCode;
+                this.tGeoOrganizationLat = InsertCode.lat;
+                this.tGeoOrganizationLng = InsertCode.lng;
+                if (func) {
+                  func(this.tGeoOrganizationLng, this.tGeoOrganizationLat);
+                }
               }
-            }
-          });
+            });
+          }
         }
       },
       validateBaseApplyFormBase() {
@@ -4659,9 +4693,11 @@
         }
         if (this.fileTypeList.indexOf("1") === -1) {
           return "请上传申请会议纪要";
-        } else if (this.fileTypeList.indexOf("2") === -1) {
+        }
+        if (this.fileTypeList.indexOf("2") === -1) {
           return "请上传申请承诺书";
-        } else if (this.fileTypeList.indexOf("3") === -1) {
+        }
+        if (this.fileTypeList.indexOf("3") === -1) {
           return "请上传身份材料";
         }
         return false;
@@ -4789,15 +4825,29 @@
         return false;
       },
       validateTownForm() {
-        if (this.checkString(this.applicationDetail.ydjfsp.zfcxjsbmscyj)) {
+
+        if (this.checkString(this.applicationDetail.ydjfsp.zjdzlpmwzt)) {
+          return "宅基地坐落平面位置图不能为空";
+        }
+        if (this.checkString(this.applicationDetail.ydjfsp.zckcryxm)) {
+          return "踏勘人不能为空";
+        }
+        if (this.checkString(this.applicationDetail.ydjfsp.zjdzlpmwztztr)) {
+          return "制图人不能为空";
+        }
+        if (this.checkString(this.applicationDetail.ydjfsp.xzzfshpzyj)) {
           return "镇政府审批意见不能为空";
         }
         if (this.checkString(this.applicationDetail.ydjfsp.xzzfshpzrxm)) {
           return "镇政府审批签字不能为空";
         }
-        if (this.fileTypeList.indexOf("4") === -1) {
-          return "请上传归档文件";
+        if (this.applicationDetail.homeApplyStatus === "1C" || this.applicationDetail.homeApplyStatus === "7C") {
+
+          if (this.fileTypeList.indexOf("4") === -1) {
+            return "请上传归档文件";
+          }
         }
+
         // if (this.checkString(this.applicationDetail.tHouseApproveTownOptions.theGeomPoint)) {
         //   return "镇政府审批现场定位不能为空";
         // }
@@ -4856,11 +4906,12 @@
         // if (this.applicationDetail.tHouseApplyEnd.isEnjoySubsidy === 'Y' && this.checkString(this.applicationDetail.tHouseApplyEnd.enjoySubsidyContent)) {
         //   return "享受住房建设补助政策不能为空";
         // }
-        if (this.fileTypeList.indexOf("9") === -1) {
-          return "验收会议纪要";
-        } else if (this.fileTypeList.indexOf("10") === -1) {
-          return "验收保证书";
-        }
+          if (this.fileTypeList.indexOf("9") === -1) {
+            return "请上传验收会议纪要";
+          } else if (this.fileTypeList.indexOf("10") === -1) {
+            return "请上传验收保证书";
+          }
+
         return false;
       },
       validateAcceptingFormTown(pass, role) {
@@ -4913,7 +4964,7 @@
             return "乡镇自然资源部门经办时间不能为空";
           }
         }
-        if (0) {
+        if (!role || role === 'building') {
           if (this.checkString(this.applicationDetail.ydjfys.zfcxjsbmysyj)) {
             return "乡镇住建部门意见不能为空";
           }
@@ -4954,7 +5005,8 @@
         }
 
         // 通过时检查打勾, 农业部门
-        if (pass) {
+        if (!role || role === 'town_leader') {
+          console.info(this.fileTypeList)
           if (this.fileTypeList.indexOf("11") === -1) {
             return "请上传归档文件";
           }

src/views/yinnong/doneCompleted/completedNew.vue

@@ -8,6 +8,12 @@
         <img :src="image" style="width:100%;height: 128px"/>
       </van-swipe-item>
     </van-swipe>
+    <van-list
+      v-model="loading"
+      :finished="finished"
+      finished-text="没有更多了"
+      @load="getList"
+    >
     <van-cell-group @click="goDetail(item)" v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;padding-bottom: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
       <van-cell>
         <template #title>
@@ -40,6 +46,7 @@
         </template>
       </van-cell>
     </van-cell-group>
+    </van-list>
     <van-empty v-if="taskList.length<1" description="暂无事项" />
     <yinnongIndex></yinnongIndex>
   </div>
@@ -60,13 +67,15 @@
       data(){
         return{
           taskList:[],
+          loading:false,
+          finished:false,
           activeName:this.$route.query.activeName?this.$route.query.activeName:'1',
           total:0,
           nickName:"",
           electronicSignature:"",
           queryParams: {
             pageNum: 1,
-            pageSize: 100,
+            pageSize:5,
           },
           activityBusinessTypeOptions:[],
           images:['../../../../static/images/onlineHome/banner_03.png'],
@@ -98,31 +107,42 @@
           }
         },
         getList() {
-          this.taskList = []
           // this.$set(this.queryParams, "systemType", '4');
-          A_myTodoList(this.queryParams).then((response) => {
-            response.rows.map(res => {
-              if(res.tableName?res.tableName.indexOf('t_homeapply')>0:""){
-                res.tableName = '来自农村宅基地管理系统'
-              }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
-                res.tableName = '来自银农直联审批管理系统'
-              }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
-                res.tableName = '来自银农直联审批管理系统'
-              }
-
-              if(this.activityBusinessTypeOptions){
-                this.activityBusinessTypeOptions.map(t => {
-                  if(t.dictValue === res.businessType){
-                    res.businessType = t.dictLabel
-                    this.taskList.push(res)
+          let _this = this;
+          if(this.loading){
+            setTimeout(() => {
+            A_myTodoList(this.queryParams).then((response) => {
+              console.info(_this.taskList.length)
+              if(response.rows.length>0&& _this.taskList.length<response.total){
+                response.rows.map(res => {
+                  if(res.tableName?res.tableName.indexOf('t_homeapply')>0:""){
+                    res.tableName = '来自农村宅基地管理系统'
+                  }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
+                    res.tableName = '来自银农直联审批管理系统'
+                  }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
+                    res.tableName = '来自银农直联审批管理系统'
+                  }
+                  _this.loading = false;
+                  if(this.activityBusinessTypeOptions){
+                    _this.activityBusinessTypeOptions.map(t => {
+                      if(t.dictValue === res.businessType){
+                        res.businessType = t.dictLabel
+                        _this.taskList.push(res)
+                      }
+                    });
                   }
-                });
+                })
+                _this.queryParams.pageNum += 1 ;
+              }else{
+                _this.finished = true;
               }
+
             })
-          })
+            }, 3000);
+          }
+
         },
         goDetail(item){
-          console.log(item)
           let type = item.tableName;
           switch (type) {
             case 't_homeuse_zyyctc':

src/views/yinnong/doneCompleted/doneNew.vue

@@ -63,7 +63,7 @@ done.vue<template>
           total:0,
           queryParams: {
             pageNum: 1,
-            pageSize: 100,
+            pageSize: 5,
           },
           activityBusinessTypeOptions:[],
           images:['../../../../static/images/onlineHome/banner_02.png'],
@@ -121,9 +121,9 @@ done.vue<template>
             case 't_homeuse_zyyctc':
               this.$router.push({name:'sunVillageInfoPaidExitDetailNew',query: {id:item.data.id,taskId:item.id,auditbatchNo:item.auditbatchNo,type:"done",electronicSignature:this.electronicSignature,nickName:this.nickName}})
               break;
-            case 'home_check':
-            case 'home_start':
-              this.$router.push({name:'approvalForm',query: {id:item.formData.ydjfsqId,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
+            case 't_homeapply_ydjfys':
+            case 't_homeapply_ydjfkg':
+              this.$router.push({name:'sunVillageInfoProposerLiteNew',query: {id:item.data.ydjfsqId,taskId:item.id,auditbatchNo:item.auditbatchN,type:"done"}})
               break;
             case 't_homeapply_ydjfsq':
               this.$router.push({name:'sunVillageInfoProposerLiteNew',query: {id:item.data.id,taskId:item.id,auditbatchNo:item.auditbatchN,type:"done"}})

src/views/yinnong/homestead/homeApplication/applicationList.vue

@@ -41,7 +41,7 @@
               <van-icon name="../../../static/images/onlineHome/icon_zjd1.png" size="30" color="#539FFD" style="margin-right: 10px;" />
             </template>
             <span v-if="item.auditStatus === '0'">{{ formatDict(houseApplyStatus, item.homeApplyStatus) }} </span>
-            <span v-else-if="item.auditStatus === '2' " style="color: #F56C6C">{{ formatDict(houseApplyStatus, item.homeApplyStatus) + ' ● 已驳回' }} </span>
+            <span v-else-if="item.auditStatus === '2' " style="color: #F56C6C">{{ formatDict(houseApplyStatus, item.homeApplyStatus) }} </span>
             <span  v-else style="color: #67c23a;">{{ formatDict(houseApplyStatus, item.homeApplyStatus) }} </span>
             <template #label>
               <p>{{item.projectName}}</p>

src/views/yinnong/homestead/paidUtilize/paidUtilizeList.vue

@@ -108,6 +108,10 @@
           message: '是否重新生成收费计划？',
         })
           .then(() => {
+            _this.$refs.sfjh.loading = true;
+            _this.$refs.sfjh.finished = false;
+            _this.$refs.sfjh.applicationList = [];
+            _this.$refs.sfjh.queryParams.pageNum = 1;
             // on confirm
             getYcsy(_this.ycsyId).then(response => {
               generateFeePlan(response.data).then((response) => {

src/views/yinnong/homestead/paidUtilize/paidUtilizeModify.vue

@@ -179,8 +179,8 @@
         showDropList: false,//是否显示下拉框
         mapShow: false,
         circulation:{},
-        minDate: new Date(),
-        maxDate: new Date(2025, 10, 1),
+        minDate: new Date(1950, 1, 1),
+        maxDate: new Date(2070, 1, 1),
         currentDate: new Date(),
       };
     },

src/views/yinnong/homestead/paidUtilizeFeeplan/paidUtilizeFeeplanList.vue

@@ -31,6 +31,9 @@
             <van-col>
               <van-button square text="缴费" v-if="item.isJf == '0'" @click="handlePay(item)" type="info" class="delete-button" />
             </van-col>
+            <van-col>
+              <van-button square text="删除" v-if="item.isJf == '0'" @click="deletePlan(item.id)" type="danger" class="delete-button" />
+            </van-col>
           </van-row>
         </template>
       </van-swipe-cell>
@@ -40,7 +43,7 @@
 
 <script>
   import {generateFeePlan  } from "@/api/onlineHome/homestead/paidUtilize";
-  import {listYcsysfmx,updateYcsysfmx } from "@/api/onlineHome/homestead/ycsysfmx";
+  import {listYcsysfmx,updateYcsysfmx,delYcsysfmx } from "@/api/onlineHome/homestead/ycsysfmx";
   import wcnhList from "@/views/homesteadSurvey/wcnhList";
   import {getGeoServerConfigKey} from "@/api/system/config";
   export default {
@@ -101,6 +104,7 @@
         window.location = 'paidUtilizeAdd';
       },
       getList(){
+        console.info(this.loading)
         if(this.loading){
           setTimeout(() => {
             listYcsysfmx(this.queryParams).then(response => {
@@ -133,10 +137,36 @@
         this.$set(row, "jfrq",  this.getNowFormatDate());
         updateYcsysfmx(row).then(response => {
           if(response.code != 200) throw response.msg;
+          this.loading = true;
+          this.finished = false;
+          this.queryParams.pageNum = 1;
           this.$toast.success("缴费成功");
           this.getList();
         });
       },
+      /** 删除计划 */
+      deletePlan(id){
+        let _this = this;
+        this.$dialog.confirm({
+          message: '您确认删除当前收费计划？',
+        })
+          .then(() => {
+            // on confirm
+            delYcsysfmx(id).then(res => {
+              if(res.code = 200){
+                this.loading = true;
+                this.finished = false;
+                this.queryParams.pageNum = 1;
+                _this.$toast.success('删除成功');
+                _this.applicationList = [];
+                _this.getList();
+              }
+            });
+          })
+          .catch(() => {
+            // on cancel
+          });
+      },
       /** 时间转换 */
       //获取当前日期
       getNowFormatDate() {