宅基地系统-手机端宅基地申请、退出测试记录问题修改

src/components/home/HomeApplyUploadComp.vue

@@ -30,185 +30,198 @@
 </template>
 
 <script>
-import { treeSingleProcessView  , attach , removeFile , getAttachmentConfigTree, attachmentFind } from "@/api/sunVillage_info/homestead/application";
-import {getToken} from "@/utils/auth";
-import request from '@/utils/request'
-import {Notify} from "vant";
-/** 导入JS方法 */
+  import {
+    treeSingleProcessView,
+    attach,
+    removeFile,
+    getAttachmentConfigTree,
+    attachmentFind
+  } from "@/api/sunVillage_info/homestead/application";
+  import {getToken} from "@/utils/auth";
+  import request from '@/utils/request'
+  import {Notify} from "vant";
 
-export default {
-  name: "houseApplyUploadComp",
-  components: {},
-  props: ["businessType", "proposerId", "houseApplyStatus", "processKey", "tableName", "readonly", 'full',"userName"],
-  data() {
-    return {
-      disabled: this.readonly,
-      loading: false,
-      attachmentList: [],
-      uploadImg: {
-        //上传图片配置
-        uploadImgUrl: "/open/home/mobile/common/attach",
-      },
-      newAttachments: [],
-      active: -1,
-      has: false,
-    }
-  },
-  watch: {
-    proposerId: function (newVal, oldVal) {
-      this.showAttachmentComp(this.businessType, newVal, this.houseApplyStatus, this.processKey, this.tableName, this.full);
-    },
-    readonly: function (newVal, oldVal) {
-      this.disabled = newVal;
-    },
-  },
-  created() {
-    if (this.businessType !== null && this.proposerId == -1) {
-      this.showAttachmentComp(this.businessType, this.proposerId, this.houseApplyStatus, this.processKey, this.tableName, this.full)
-    }
-  },
-  methods: {
-    handleUploadSuccess(file, detail, item) {
-      this.setFileStatus(file, 'uploading', '文件上传中...');
-      let formData = new FormData;
-      formData.set('file', file.file);
-      this.$set(item.postData, 'userName', this.userName);
-      request({
-        url: this.uploadImg.uploadImgUrl,
-        method: "post",
-        params: item.postData,
-        data: formData,
-      }).then((resp) => {
-        if(resp.code == 200)
-        {
-          file.response = resp;
-          console.log(resp);
-          file.fileList = item.fileList;
-          this.onFileListChanged("ADD", resp);
-          this.setFileStatus(file, 'done', '文件上传成功');
-          this.$emit('onUploadSuccess', file);
-        }
-        else
-          this.setFileStatus(file, 'fail', '文件上传失败!');
-      }).catch((e) => {
-        this.setFileStatus(file, 'fail', '文件上传失败!');
-      });
-      return true;
-    },
-    handleRemove(file, detail) {
-      console.log(file, detail);
-      this.setFileStatus(file, 'uploading', '文件删除中...');
-      let id = file.id || file.response.id;
-      removeFile(id).then(resp => {
-        if(this.proposerId != -1 && false) // 不刷新
-          this.showAttachmentComp(this.businessType, this.proposerId, this.houseApplyStatus, this.processKey, this.tableName, this.full)
-/*        else // 新增时
-        {
-          let fileList = file.fileList;
-          //console.log(fileList);
-          fileList.splice(fileList.indexOf(file), 1);
-        }*/
-        this.setFileStatus(file, 'done', '文件删除成功');
-        this.onFileListChanged("REMOVE", id);
-      }).catch((e) => {
-        this.setFileStatus(file, 'fail', '文件删除失败!');
-      }).finally(() => {
-        //loading.close();
-      });
-      return true;
-    },
-    showAttachmentComp(businessType, proposerId, houseApplyStatus, processKey, tableName, full) {
-      this.attachmentList = [];
-      this.active = -1;
-      this.has = false;
-      if(!full && 0)
-      {
-        this.getCurrentFiles(businessType, proposerId, houseApplyStatus, processKey, tableName);
-      }
-      else
-      {
-        this.getHistoryFiles(businessType, proposerId, houseApplyStatus, processKey, tableName);
+  /** 导入JS方法 */
+
+  export default {
+    name: "houseApplyUploadComp",
+    components: {},
+    props: ["businessType", "proposerId", "houseApplyStatus", "processKey", "tableName", "readonly", 'full', "userName"],
+    data() {
+      return {
+        disabled: this.readonly,
+        loading: false,
+        attachmentList: [],
+        uploadImg: {
+          //上传图片配置
+          uploadImgUrl: "/open/home/mobile/common/attach",
+        },
+        newAttachments: [],
+        active: -1,
+        has: false,
       }
     },
-    formatFile(list) {
-      if (list !== null && list !== undefined) {
-        const baseImgUrl = this.$store.getters.baseRoutingUrl;
-        let UfileList = []; //上传图片列表
-        list.forEach((value, index) => {
-          UfileList.push({
-            name: value.fileName,
-            fileUrl: value.fileUrl,
-            url: baseImgUrl + value.fileUrl,
-            id: value.id,
-            fileList: UfileList,
-          });
-        });
-        return UfileList;
-      }
+    watch: {
+      proposerId: function (newVal, oldVal) {
+        this.showAttachmentComp(this.businessType, newVal, this.houseApplyStatus, this.processKey, this.tableName, this.full);
+      },
+      readonly: function (newVal, oldVal) {
+        this.disabled = newVal;
+      },
     },
-    onFileListChanged(type, data) {
-      if(this.proposerId != -1) return;
-      if(type === "ADD")
-      {
-        this.newAttachments.push(data);
+    created() {
+      if (this.businessType !== null && this.proposerId == -1) {
+        this.showAttachmentComp(this.businessType, this.proposerId, this.houseApplyStatus, this.processKey, this.tableName, this.full)
       }
-      else if(type === "REMOVE")
-      {
-        let index = this.newAttachments.indexOf(data.id);
-        if(index !== -1)
-          this.newAttachments.splice(index, 1);
-      }
-      console.log(this.newAttachments);
-      this.$emit('uploadFinished', this.newAttachments);
     },
-    getCurrentFiles(businessType, proposerId, houseApplyStatus, processKey, tableName) {
-      this.loading = true;
-      treeSingleProcessView({
-        businessType: businessType,
-        houseApplyStatus: houseApplyStatus,
-        processKey: processKey,
-        tableName: tableName,
-      }).then(res => {
-        this.handleResponse(res.rows, proposerId, houseApplyStatus, tableName);
-        if(this.attachmentList.length === 0)
-        {
-          this.disabled = true;
+    methods: {
+      handleUploadSuccess(file, detail, item) {
+        this.setFileStatus(file, 'uploading', '文件上传中...');
+        let formData = new FormData;
+        formData.set('file', file.file);
+        this.$set(item.postData, 'userName', this.userName);
+        request({
+          url: this.uploadImg.uploadImgUrl,
+          method: "post",
+          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);
+            this.onFileListChanged("ADD", resp);
+            this.setFileStatus(file, 'done', '文件上传成功');
+
+            this.$emit('onUploadSuccess', file);
+          } else
+            this.setFileStatus(file, 'fail', '文件上传失败!');
+        }).catch((e) => {
+          this.setFileStatus(file, 'fail', '文件上传失败!');
+        });
+        return true;
+      },
+      //获取ip
+      getPath() {
+        // 获取当前页面的URL
+        const url = window.location.href;
+        // 使用正则表达式解析URL以获取IP和端口
+        const ipAndPortRegex = /^(?:https?:\/\/)?(?:([^\s:@\/]+)(?::([^\s:@\/]+))?@)?([\da-z\.-]+)(?::(\d+))?(?:\/([^\?#]+))?(?:\?([^#]+))?(?:#(.+))?$/;
+        const match = url.match(ipAndPortRegex);
+        // 提取IP和端口
+        const ip = match[3];
+        const port = match[4];
+        return "http://"+ip + ":" + port + "/api"
+      },
+      handleRemove(file, detail) {
+        console.log(file, detail);
+        this.setFileStatus(file, 'uploading', '文件删除中...');
+        let id = file.id || file.response.id;
+        removeFile(id).then(resp => {
+          if (this.proposerId != -1 && false) // 不刷新
+            this.showAttachmentComp(this.businessType, this.proposerId, this.houseApplyStatus, this.processKey, this.tableName, this.full)
+          /*        else // 新增时
+                  {
+                    let fileList = file.fileList;
+                    //console.log(fileList);
+                    fileList.splice(fileList.indexOf(file), 1);
+                  }*/
+          this.setFileStatus(file, 'done', '文件删除成功');
+          this.onFileListChanged("REMOVE", id);
+        }).catch((e) => {
+          this.setFileStatus(file, 'fail', '文件删除失败!');
+        }).finally(() => {
+          //loading.close();
+        });
+        return true;
+      },
+      showAttachmentComp(businessType, proposerId, houseApplyStatus, processKey, tableName, full) {
+        this.attachmentList = [];
+        this.active = -1;
+        this.has = false;
+        if (!full && 0) {
+          this.getCurrentFiles(businessType, proposerId, houseApplyStatus, processKey, tableName);
+        } else {
           this.getHistoryFiles(businessType, proposerId, houseApplyStatus, processKey, tableName);
         }
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    getHistoryFiles(businessType, proposerId, houseApplyStatus, processKey, tableName) {
-      this.loading = true;
-      getAttachmentConfigTree({
-        businessType: businessType,
-        nodeStatus: houseApplyStatus,
-        processKey: processKey,
-        dictTypeSort: 'home_stage_status',
-        nodeStatusSort: '',
-      }).then(resp => {
-        //console.log(resp);
-        try {
-          if(!resp.data || resp.data.length === 0)
-            return;
-          let rows = resp.data[0].children;
-          rows.forEach((value, index) => {
-            if (!value.children)
-              return;
-            this.handleResponse(value.children, proposerId, houseApplyStatus, tableName);
+      },
+      formatFile(list) {
+
+        if (list !== null && list !== undefined) {
+          let baseImgUrl = this.$store.getters.baseRoutingUrl;
+          if (baseImgUrl === "") {
+            baseImgUrl = this.getPath();
+          }
+          let UfileList = []; //上传图片列表
+          list.forEach((value, index) => {
+            UfileList.push({
+              name: value.fileName,
+              fileUrl: value.fileUrl,
+              url: baseImgUrl + value.fileUrl,
+              id: value.id,
+              fileList: UfileList,
+            });
           });
+          return UfileList;
         }
-        catch (e)
-        {
-          console.error(e);
+      },
+      onFileListChanged(type, 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);
         }
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    handleResponse(rows, proposerId, houseApplyStatus, tableName) {
-      rows.forEach((value, index) => {
+        console.log(this.newAttachments);
+        this.$emit('uploadFinished', this.newAttachments);
+      },
+      getCurrentFiles(businessType, proposerId, houseApplyStatus, processKey, tableName) {
+        this.loading = true;
+        treeSingleProcessView({
+          businessType: businessType,
+          houseApplyStatus: houseApplyStatus,
+          processKey: processKey,
+          tableName: tableName,
+        }).then(res => {
+          this.handleResponse(res.rows, proposerId, houseApplyStatus, tableName);
+          if (this.attachmentList.length === 0) {
+            this.disabled = true;
+            this.getHistoryFiles(businessType, proposerId, houseApplyStatus, processKey, tableName);
+          }
+        }).finally(() => {
+          this.loading = false;
+        });
+      },
+      getHistoryFiles(businessType, proposerId, houseApplyStatus, processKey, tableName) {
+        this.loading = true;
+        getAttachmentConfigTree({
+          businessType: businessType,
+          nodeStatus: houseApplyStatus,
+          processKey: processKey,
+          dictTypeSort: 'home_stage_status',
+          nodeStatusSort: '',
+        }).then(resp => {
+          //console.log(resp);
+          try {
+            if (!resp.data || resp.data.length === 0)
+              return;
+            let rows = resp.data[0].children;
+            rows.forEach((value, index) => {
+              if (!value.children)
+                return;
+              this.handleResponse(value.children, proposerId, houseApplyStatus, tableName);
+            });
+          } catch (e) {
+            console.error(e);
+          }
+        }).finally(() => {
+          this.loading = false;
+        });
+      },
+      handleResponse(rows, proposerId, houseApplyStatus, tableName) {
+        rows.forEach((value, index) => {
           let obj = {
             fileTypeName: value.fileTypeName,
             tableId: proposerId,
@@ -224,76 +237,79 @@ export default {
             current: value.nodeStatus == houseApplyStatus,
             collapse: this.disabled || value.nodeStatus == houseApplyStatus ? 0 : '',
           };
-          if(value.nodeStatus != houseApplyStatus && !this.has)
+          if (value.nodeStatus != houseApplyStatus && !this.has)
             this.active++;
-          if(value.nodeStatus == houseApplyStatus)
-          {
-            if(!this.has)
+          if (value.nodeStatus == houseApplyStatus) {
+            if (!this.has)
               this.active++;
             this.has = true;
           }
           this.attachmentList.push(obj);
 
-      });
-      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);
-    },
-    setFileStatus(file, status, message) {
-      file.status = status;
-      file.message = message;
-    },
-    checkFile(file) {
-      let mime = file.type;
-      if([
-        "image/png",
-        "image/jpeg",
-        "image/gif",
-        "image/bmp",
-      ].indexOf(mime) === -1)
-      {
-        this.notify('请上传jpg/png/gif/bmp等格式图片!', 'danger');
-        return false;
-      }
-      return true;
-    },
-    notify(message, type) {
-      Notify.clear();
-      Notify({ type: type || 'primary', message: message });
-    },
-  }
-};
+        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);
+        }
+      },
+      setFileStatus(file, status, message) {
+        file.status = status;
+        file.message = message;
+      },
+      checkFile(file) {
+        let mime = file.type;
+        if ([
+          "image/png",
+          "image/jpeg",
+          "image/gif",
+          "image/bmp",
+        ].indexOf(mime) === -1) {
+          this.notify('请上传jpg/png/gif/bmp等格式图片!', 'danger');
+          return false;
+        }
+        return true;
+      },
+      notify(message, type) {
+        Notify.clear();
+        Notify({type: type || 'primary', message: message});
+      },
+    }
+  };
 </script>
 <style scoped>
-.my_class >>> .el-upload--picture-card {
-  width: 72px;
-  height: 72px;
-  line-height: 78px;
-}
+  .my_class >>> .el-upload--picture-card {
+    width: 72px;
+    height: 72px;
+    line-height: 78px;
+  }
 
-.my_class >>> .el-upload-list__item {
-  width: 72px;
-  height: 72px;
-}
+  .my_class >>> .el-upload-list__item {
+    width: 72px;
+    height: 72px;
+  }
 
-.my_class >>> .el-upload-list__item-preview {
-  width: 20px;
-}
+  .my_class >>> .el-upload-list__item-preview {
+    width: 20px;
+  }
 
-.my_class >>> .el-upload-list__item-delete {
-  width: 20px;
-}
+  .my_class >>> .el-upload-list__item-delete {
+    width: 20px;
+  }
 
-.main_title{
-  font-size: 0.4rem;
-  color: #1D6FE9;
-  margin: 0.2rem 6%;
-  position: relative;
-}
+  .main_title {
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
 </style>

src/views/sunVillage_info/homeApplication/applicationNewList.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/sunVillage_info/homeApplication/proposerLiteNew.vue

@@ -1972,7 +1972,9 @@
             :proposer-id="houseApplyUploadCompStart.proposerId"
             :table-name="houseApplyUploadCompStart.tableName"
             :readonly="houseApplyUploadCompStart.readonly"
+            :userName="sysFarmer.memberName"
             :full="houseApplyUploadCompStart.full"
+            @uploadFinished="onUploadFinished"
           >
           </home-apply-upload-comp>
         </van-tab>
@@ -1983,8 +1985,10 @@
             :process-key="houseApplyUploadCompEnd.processKey"
             :proposer-id="houseApplyUploadCompEnd.proposerId"
             :table-name="houseApplyUploadCompEnd.tableName"
+            :userName="sysFarmer.memberName"
             :readonly="houseApplyUploadCompEnd.readonly"
             :full="houseApplyUploadCompEnd.full"
+            @uploadFinished="onUploadFinished"
           >
           </home-apply-upload-comp>
         </van-tab>
@@ -3556,20 +3560,27 @@
           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(() => {
           });
@@ -3676,6 +3687,7 @@
         }
 
         submitApplication(this.id).then((resp) => {
+          this.$toast.clear();
           this.notify("提交成功", 'success');
           this.goBack();
         }).catch((e) => {
@@ -3726,10 +3738,6 @@
                 comment = this.applicationDetail.ydjfsp.nyncbmscyj;
                 // if(this.$refs.pictureUploadApplyingTHouseApproveAgriculture && this.$refs.pictureUploadApplyingTHouseApproveAgriculture.isValid()) {
                 //   this.submitHouseApproveAgricultureOptions().then(item=>{
-                if (msg) {
-                  return;
-                }
-
                 saveHomeBaseInfo(this.applicationDetail).then((response) => {
                   this.complete(pass, comment);
                 }).catch(resp => {
@@ -3746,6 +3754,9 @@
                 break;
               case "building":
                 msg = this.validateBuildingForm(pass);
+                if (msg) {
+                  break;
+                }
                 comment = this.applicationDetail.ydjfsp.zfcxjsbmscyj;
                 // if(this.$refs.pictureUploadApplyingTHouseApproveOther && this.$refs.pictureUploadApplyingTHouseApproveOther.isValid()) {
                 // this.submitHouseApproveOtherOptions().then(item=>{
@@ -4399,19 +4410,27 @@
           return;
         }
         this.$set(this.applicationDetail, 'applyUserId', this.sysFarmer.id);
+        this.$toast.loading({
+          message: "数据处理中...",
+          forbidClick: true,
+        });
         saveHomeBaseInfo(this.applicationDetail).then((resp) => {
           if (submit) {
             submitStart(this.applicationDetail.id).then(resp => {
+              this.$toast.clear();
               this.notify("操作成功", 'success');
               this.goBack();
             }).catch((e) => {
+              this.$toast.clear();
               this.notify("操作失败!", 'danger');
             });
           } else {
+            this.$toast.clear();
             this.notify("保存成功", 'success');
             this.goBack();
           }
         }).catch((e) => {
+          this.$toast.clear();
           this.notify('保存失败', 'danger');
         });
       },
@@ -4432,19 +4451,27 @@
         //   }
         // }
         console.info(this.applicationDetail);
+        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.goBack();
           }
         }).catch(err => {
+          this.$toast.clear();
           this.notify('保存失败', 'danger');
         });
         // }).catch(e => {
@@ -4674,7 +4701,7 @@
         //   return "北至不能为空";
         // }
         if (this.checkString(this.applicationDetail.ydjfsp.zrzybmscyj)) {
-          return "说明不能为空";
+          return "自然资源部意见不能为空";
         } else if (this.checkString(this.applicationDetail.ydjfsp.zrzybmscrxm)) {
           return "自然资源签名不能为空";
         }
@@ -4693,7 +4720,7 @@
         //   return "村委会审查材料不能为空";
         // }
         if (this.checkString(this.applicationDetail.ydjfsp.nyncbmscyj)) {
-          return "说明不能为空";
+          return "农业农村部意见不能为空";
         }
         if (this.checkString(this.applicationDetail.ydjfsp.nyncbmscrxm)) {
           return "农村农业部门签名不能为空";
@@ -4751,7 +4778,7 @@
         //   return "北至不能为空";
         // }
         if (this.checkString(this.applicationDetail.ydjfsp.zfcxjsbmscyj)) {
-          return "说明不能为空";
+          return "住建部意见不能为空";
         }
         if (this.checkString(this.applicationDetail.ydjfsp.zfcxjsbmscrxm)) {
           return "住建部门签名不能为空";
@@ -4978,7 +5005,7 @@
         if (this.fileTypeList.indexOf("5") === -1) {
           return "请上传开工证书";
         } else if (this.fileTypeList.indexOf("6") === -1) {
-          return "请上传开工";
+          return "请上传开工合同";
         }
         return false;
       },

src/views/yinnong/doneCompleted/completedNew.vue

@@ -28,10 +28,10 @@
         <template #title>
           <van-row>
             <van-col span="6" :offset="1">
-              <p style="color: #878787" >{{item.data.createTime?item.data.createTime.substring(0,10):item.data.startTime.substring(0,10)}}</p>
+              <p style="color: #878787" >{{item.createTime?item.createTime.substring(0,10):item.data.updateTime.substring(0,10)}}</p>
             </van-col>
             <van-col span="10" :offset="1">
-              <p style="color: #878787">{{item.data.businessType}}</p>
+              <p style="color: #878787">{{item.businessType}}</p>
             </van-col>
             <van-col span="5" :offset="1">
               <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">{{activeName=='1'?'待审批':'已审批'}}</p>

src/views/yinnong/doneCompleted/doneNew.vue

@@ -28,7 +28,7 @@ done.vue<template>
         <template #title>
           <van-row>
             <van-col span="6" :offset="1">
-              <p style="color: #878787">{{item.data.createTime?item.data.createTime.substring(0,10):item.data.startTime.substring(0,10)}}</p>
+              <p style="color: #878787">{{item.auditTime.substring(0,10)}}</p>
             </van-col>
             <van-col span="10" :offset="1">
               <p style="color: #878787">{{item.businessType}}</p>

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

@@ -5,127 +5,219 @@
       <div class="return_btn" @click="onClickLeft"></div>
     </div>
     <van-form ref="_Form">
-    <div class="main_box">
-      <van-field v-model="circulation.shyqrdbxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod" />
-      <div id="dropList" v-show="showDropList"  style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;" >
-        <van-cell id="vanCell"  v-for="(item, index) in getObligeeOptions" :key="index" @click="shyqrdmxmChange(item)" style="position: relative; z-index: 999;">
-          {{item.sqrxm}}
-        </van-cell>
-      </div>
-      <van-field
-        readonly
-        v-model="circulation.zjddm"
-        label="宅基地代码"
-        input-align="right"
-        :rules="[{ required: true }]"
-        required
-      >
-        <template #button>
-          <van-button size="small" @click="mapLook" type="primary">查看地图</van-button>
-        </template>
-      </van-field>
-<!--      <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto"/>-->
-      <van-field
-        readonly
-        clickable
-        v-model="zjlx"
-        label="申请人证件类型"
-        placeholder="请选择"
-        @click="showzjlx = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-      />
-      <van-popup v-model="showzjlx" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="zjlxDictionaries"
-          @confirm="onConfirmZjlx"
-          @cancel="showzjlx = false"
+      <div class="main_box">
+        <van-field v-model="circulation.shyqrdbxm" label="申请人姓名" placeholder="申请人姓名" input-align="right"
+                   label-width="auto" :rules="[{ required: true }]" required @input="remoteTransfereeMethod"/>
+        <div id="dropList" v-show="showDropList"
+             style="width: 92vw; position: absolute; z-index: 99; left: 50%; margin-left: -46vw; border: 1px solid #E2E0E0;">
+          <van-cell id="vanCell" v-for="(item, index) in getObligeeOptions" :key="index" @click="shyqrdmxmChange(item)"
+                    style="position: relative; z-index: 999;">
+            {{item.sqrxm}}
+          </van-cell>
+        </div>
+        <van-field
+          readonly
+          v-model="circulation.zjddm"
+          label="宅基地代码"
+          input-align="right"
+          :rules="[{ required: true }]"
+          required
+        >
+          <template #button>
+            <van-button size="small" @click="mapLook" type="primary">查看地图</van-button>
+          </template>
+        </van-field>
+        <!--      <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto"/>-->
+        <van-field
+          readonly
+          clickable
+          v-model="zjlx"
+          label="申请人证件类型"
+          placeholder="请选择"
+          @click="showzjlx = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          :rules="[{ required: true }]"
+          required
         />
-      </van-popup>
-      <van-field v-model="circulation.sqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto"/>
-      <van-field v-model="circulation.ycsyfs" label="有偿使用方式" placeholder="有偿使用方式" input-align="right" label-width="auto"/>
+        <van-popup v-model="showzjlx" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="zjlxDictionaries"
+            @confirm="onConfirmZjlx"
+            @cancel="showzjlx = false"
+          />
+        </van-popup>
+        <van-field v-model="circulation.sqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right"
+                   label-width="auto" :rules="[{ required: true }]"
+                   required/>
+        <van-field v-model="circulation.ycsyfs" label="有偿使用方式" placeholder="有偿使用方式" input-align="right"
+                   label-width="auto" :rules="[{ required: true }]"
+                   required/>
 
 
-      <van-cell title="是否一户多宅">
-        <template #right-icon>
-<!--          @change="designPaperChange"-->
-          <van-radio-group v-model="circulation.sfyhdz" direction="horizontal">
-            <van-radio name="1">是</van-radio>
-            <van-radio name="0">否</van-radio  >
-          </van-radio-group>
-        </template>
-      </van-cell>
+        <van-cell title="是否一户多宅"   :rules="[{ required: true }]" required>
+          <template #right-icon>
+            <!--          @change="designPaperChange"-->
+            <van-radio-group v-model="circulation.sfyhdz" direction="horizontal" >
+              <van-radio name="1">是</van-radio>
+              <van-radio name="0">否</van-radio>
+            </van-radio-group>
+          </template>
+        </van-cell>
 
-      <van-field
-        readonly
-        clickable
-        name="picker"
-        v-model="circulation.ycsykssj"
-        label="有偿使用开始时间"
-        placeholder="选择开始时间"
-        @click="showycsykssj = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-      />
-      <van-popup v-model="showycsykssj" position="bottom">
-        <van-datetime-picker
-          v-model="currentDate"
-          type="date"
-          title="选择年月日"
-          :min-date="minDate"
-          :max-date="maxDate"
-          @confirm="onConfirmYcsykssj"
+        <van-field
+          readonly
+          clickable
+          name="picker"
+          v-model="circulation.ycsykssj"
+          label="有偿使用开始时间"
+          placeholder="选择开始时间"
+          @click="showycsykssj = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          :rules="[{ required: true }]"
+          required
         />
-      </van-popup>
+        <van-popup v-model="showycsykssj" position="bottom">
+          <van-datetime-picker
+            v-model="currentDate"
+            type="date"
+            title="选择年月日"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmYcsykssj"
+          />
+        </van-popup>
 
-      <van-field
-        readonly
-        clickable
-        name="picker"
-        v-model="circulation.ycsydqsj"
-        label="有偿使用到期时间"
-        placeholder="选择到期时间"
-        @click="showycsydqsj = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-      />
-      <van-popup v-model="showycsydqsj" position="bottom">
-        <van-datetime-picker
-          v-model="currentDate"
-          type="date"
-          title="选择年月日"
-          :min-date="minDate"
-          :max-date="maxDate"
-          @confirm="onConfirmYcsydqsj"
+        <van-field
+          readonly
+          clickable
+          name="picker"
+          v-model="circulation.ycsydqsj"
+          label="有偿使用到期时间"
+          placeholder="选择到期时间"
+          @click="showycsydqsj = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          :rules="[{ required: true }]"
+          required
         />
-      </van-popup>
-      <van-field v-model="circulation.ycsymj" label="有偿使用面积(㎡)" placeholder="请输入有偿使用面积㎡" input-align="right" label-width="auto">
-        <template #button>
-          <van-button size="small" @click="computeMJ" type="primary">计算</van-button>
-        </template>
-      </van-field>
-      <van-field v-model="circulation.ycsymjdj" label="有偿使用面积单价(元)" placeholder="请输入有偿使用面积单价" @change="changeDJ" input-align="right" label-width="auto"/>
-      <van-field v-model="circulation.ycsyfy" label="有偿使用费用(元)" placeholder="请输入有偿使用费用" input-align="right" label-width="auto">
-        <template #button>
-          <van-button size="small" @click="computeFY" type="primary">计算</van-button>
-        </template>
-      </van-field>
-      <van-field v-model="circulation.fkfs" label="付款方式" placeholder="请输入付款方式" input-align="right" label-width="auto"/>
-      <van-field v-model="circulation.bz" label="备注" placeholder="请输入内容" input-align="right" label-width="auto"/>
-
-    </div>
+        <van-popup v-model="showycsydqsj" position="bottom">
+          <van-datetime-picker
+            v-model="currentDate"
+            type="date"
+            title="选择年月日"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmYcsydqsj"
+          />
+        </van-popup>
+        <van-field v-model="circulation.ycsymj" label="有偿使用面积(㎡)" placeholder="请输入有偿使用面积㎡" input-align="right"  :rules="[{ required: true }]" required
+                   label-width="auto">
+          <template #button>
+            <van-button size="small" @click="computeMJ" type="primary">计算</van-button>
+          </template>
+        </van-field>
+        <van-field v-model="circulation.ycsymjdj" label="有偿使用面积单价(元)" placeholder="请输入有偿使用面积单价" @change="changeDJ"
+                   input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.ycsyfy" label="有偿使用费用(元)" placeholder="请输入有偿使用费用" input-align="right"
+                   label-width="auto" :rules="[{ required: true }]" required>
+          <template #button>
+            <van-button size="small" @click="computeFY" type="primary">计算</van-button>
+          </template>
+        </van-field>
+        <van-field v-model="circulation.fkfs" label="付款方式" placeholder="请输入付款方式" input-align="right"
+                   label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field
+          readonly
+          clickable
+          name="picker"
+          v-model="circulation.sqrq"
+          label="申请日期"
+          placeholder="选择申请日期"
+          @click="showycsysqrq = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          :rules="[{ required: true }]"
+          required
+        />
+        <van-popup v-model="showycsysqrq" position="bottom">
+          <van-datetime-picker
+            v-model="currentDate"
+            type="date"
+            title="选择年月日"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmYcsysqrq"
+          />
+        </van-popup>
+        <van-field
+          readonly
+          clickable
+          name="picker"
+          v-model="circulation.barq"
+          label="备案日期"
+          placeholder="选择备案日期"
+          @click="showycsybarq = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          :rules="[{ required: true }]"
+          required
+        />
+        <van-popup v-model="showycsybarq" position="bottom">
+          <van-datetime-picker
+            v-model="currentDate"
+            type="date"
+            title="选择年月日"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmYcsybarq"
+          />
+        </van-popup>
+        <van-field
+          readonly
+          clickable
+          name="picker"
+          v-model="circulation.pzrq"
+          label="批准日期"
+          placeholder="选择批准日期"
+          @click="showycsypzrq = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          :rules="[{ required: true }]"
+          required
+        />
+        <van-popup v-model="showycsypzrq" position="bottom">
+          <van-datetime-picker
+            v-model="currentDate"
+            type="date"
+            title="选择年月日"
+            :min-date="minDate"
+            :max-date="maxDate"
+            @confirm="onConfirmYcsypzrq"
+          />
+        </van-popup>
+        <van-field v-model="circulation.jbrxm" label="经办人姓名" placeholder="请输入经办人姓名" input-align="right"
+                   label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.bz" label="备注" placeholder="请输入内容" input-align="right" label-width="auto"/>
+      </div>
     </van-form>
     <van-dialog v-model="mapShow" show-cancel-button>
-      <MapGisObtainTc ref="zjdProductResh" :shqrxm="circulation.shyqrdbxm" :landStatus="landStatus" :deptId="circulation.deptId" @closeMoule="closeMoule"></MapGisObtainTc>
+      <MapGisObtainTc ref="zjdProductResh" :shqrxm="circulation.shyqrdbxm" :landStatus="landStatus"
+                      :deptId="circulation.deptId" @closeMoule="closeMoule"></MapGisObtainTc>
     </van-dialog>
     <div style="padding: 16px 0;">
       <van-row>
         <van-col span="12" align="center">
-          <van-button type="info" color="#B4B0B0" native-type="submit" class="submitButton" @click="goEdit">取消</van-button>
+          <van-button type="info" color="#B4B0B0" native-type="submit" class="submitButton" @click="goEdit">取消
+          </van-button>
         </van-col>
         <van-col span="12" align="center">
           <van-button type="info" native-type="submit" class="submitButton" @click="goSubmit">保存</van-button>
@@ -137,38 +229,39 @@
 </template>
 
 <script>
-  import { zjdzd,selectHomesteadObligeeMapList} from "@/api/onlineHome/homestead/circulation";
-  import { ycsyAdd  } from "@/api/onlineHome/homestead/paidUtilize";
-  import {  getShyqrs,getByLyZjddm} from "@/api/sunVillage_info/homestead/paidExit";
-  import { listYcsyjfbz} from "@/api/onlineHome/homestead/homeuseycsyjfbz";
+  import {zjdzd, selectHomesteadObligeeMapList} from "@/api/onlineHome/homestead/circulation";
+  import {ycsyAdd} from "@/api/onlineHome/homestead/paidUtilize";
+  import {getShyqrs, getByLyZjddm} from "@/api/sunVillage_info/homestead/paidExit";
+  import {listYcsyjfbz} from "@/api/onlineHome/homestead/homeuseycsyjfbz";
   import MapGisObtainTc from "@/components/Map/MapGisObtainTc";
   import {listProgramme} from "@/api/onlineHome/homestead/programme";
+
   export default {
     name: "paidUtilizeAdd",
     components: {MapGisObtainTc},
     data() {
       return {
-        tcqllxDictionaries:[],//退出权利类型
-        tclxDictionaries:[],//退出类型
-        tcfsDictionaries:[],//退出方式
-        zjlxDictionaries:[],//申请人证件类型
-        bcfsDictionaries:[],//补偿方式
-        zjdDictionaries:[],//宅基地代码
-        shyqrdmDictionaries:[],//使用权人
-        getObligeeOptions:[],//下拉框列表
+        tcqllxDictionaries: [],//退出权利类型
+        tclxDictionaries: [],//退出类型
+        tcfsDictionaries: [],//退出方式
+        zjlxDictionaries: [],//申请人证件类型
+        bcfsDictionaries: [],//补偿方式
+        zjdDictionaries: [],//宅基地代码
+        shyqrdmDictionaries: [],//使用权人
+        getObligeeOptions: [],//下拉框列表
         //计算有偿使用面积
-        jsmjData:{
-          zdmjSum:0.00,
-          hzdmj:0.00,
+        jsmjData: {
+          zdmjSum: 0.00,
+          hzdmj: 0.00,
         },
-        landStatus:"1",
-        tcqllx:'',
-        tclx:'',
-        tcfs:'',
-        zjlx:'身份证',
-        bcfs:'',
-        zjddm:'',
-        sysFarmer:{deptId:this.$store.state.user.loginDeptId,memberName:""},
+        landStatus: "1",
+        tcqllx: '',
+        tclx: '',
+        tcfs: '',
+        zjlx: '身份证',
+        bcfs: '',
+        zjddm: '',
+        sysFarmer: {deptId: this.$store.state.user.loginDeptId, memberName: ""},
         showtcqllx: false,
         showtclx: false,
         showtcfs: false,
@@ -178,11 +271,14 @@
         showshyqrdm: false,
         showycsykssj: false,
         showycsydqsj: false,
+        showycsysqrq: false,
+        showycsybarq: false,
+        showycsypzrq: false,
         showDropList: false,//是否显示下拉框
         mapShow: false,
-        circulation:{ ycsymj:0.00, ycsyfy:0.00, ycsymjdj:0.00,sfyhdz:"0"},
-        minDate: new Date(),
-        maxDate: new Date(2025, 10, 1),
+        circulation: {ycsymj: 0.00, ycsyfy: 0.00, ycsymjdj: 0.00, sfyhdz: "0"},
+        minDate: new Date(1950, 1, 1),
+        maxDate: new Date(2070, 10, 1),
         currentDate: new Date(),
       };
     },
@@ -190,84 +286,87 @@
       this.getDictionaries();
     },
     methods: {
-      getDictionaries(){
-          //退出权利类型
-          this.houseGetDicts("tcqllx").then((res) => {
-            for (var i = 0; i < res.data.length; i++) {
-              this.tcqllxDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
-            }
-          });
-          //退出类型
-          this.houseGetDicts("tclx").then((res) => {
-            for (var i = 0; i < res.data.length; i++) {
-              this.tclxDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
-            }
-          });
-          //退出方式
-          this.houseGetDicts("tcfs").then((res) => {
-            for (var i = 0; i < res.data.length; i++) {
-              this.tcfsDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
-            }
-          });
-          //申请人证件类型
-          this.houseGetDicts("zjlx").then((res) => {
-            for (var i = 0; i < res.data.length; i++) {
-              this.zjlxDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
-            }
-          });
-          //补偿方式
-          this.houseGetDicts("bcfs").then((res) => {
-            for (var i = 0; i < res.data.length; i++) {
-              this.bcfsDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
-            }
-          });
-          //宅基地代码
-          zjdzd().then(zjdRes => {
-            for (let i = 0; i < zjdRes.rows.length; i++) {
-              this.zjdDictionaries.push(zjdRes.rows[i].zjddm);
-            }
-          });
-          // //使用权人代码
-          // listByDeptId().then(zjdRes => {
-          //   for (let i = 0; i < zjdRes.rows.length; i++) {
-          //     this.shyqrdmDictionaries.push(zjdRes.rows[i].shyqrdm);
-          //   }
-          // });
+      getDictionaries() {
+        //退出权利类型
+        this.houseGetDicts("tcqllx").then((res) => {
+          for (var i = 0; i < res.data.length; i++) {
+            this.tcqllxDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+          }
+        });
+        //退出类型
+        this.houseGetDicts("tclx").then((res) => {
+          for (var i = 0; i < res.data.length; i++) {
+            this.tclxDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+          }
+        });
+        //退出方式
+        this.houseGetDicts("tcfs").then((res) => {
+          for (var i = 0; i < res.data.length; i++) {
+            this.tcfsDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+          }
+        });
+        //申请人证件类型
+        this.houseGetDicts("zjlx").then((res) => {
+          for (var i = 0; i < res.data.length; i++) {
+            this.zjlxDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+          }
+        });
+        //补偿方式
+        this.houseGetDicts("bcfs").then((res) => {
+          for (var i = 0; i < res.data.length; i++) {
+            this.bcfsDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+          }
+        });
+        //宅基地代码
+        zjdzd().then(zjdRes => {
+          for (let i = 0; i < zjdRes.rows.length; i++) {
+            this.zjdDictionaries.push(zjdRes.rows[i].zjddm);
+          }
+        });
+        // //使用权人代码
+        // listByDeptId().then(zjdRes => {
+        //   for (let i = 0; i < zjdRes.rows.length; i++) {
+        //     this.shyqrdmDictionaries.push(zjdRes.rows[i].shyqrdm);
+        //   }
+        // });
       },
-      shyqrdmxmChange(val){
+      shyqrdmxmChange(val) {
         this.$set(this.circulation, "shyqrdbxm", val.sqrxm);
+        this.$set(this.circulation, "shyqrdm", val.sqrdm);
         this.$set(this.circulation, "deptId", val.deptId);
         this.$set(this.circulation, "deptName", val.deptName);
         this.$set(this.circulation, "sqrzjhm", val.sqrzjhm);
         this.$set(this.circulation, "sqrzjlx", val.sqrzjlx);
-        this.getObligeeOptions=[];
+        this.getObligeeOptions = [];
         this.showDropList = false;
       },
       /** 查找地图中宅基地 */
       closeMoule: function (data) {
         getByLyZjddm(data).then((response) => {
           this.$set(this.circulation, "sfyhdz", response.data.isMore);
+          this.$set(this.circulation, "zjddm", data);
           // const baseImgUrl = this.$store.getters.baseRoutingUrl;
         });
       },
       /** 模糊查询人员信息 */
       remoteTransfereeMethod(query) {
         if (query !== "") {
-          getShyqrs({shyqrdbxm:query,status:1,deptId:this.sysFarmer.deptId}).then((response) => {
+          getShyqrs({shyqrdbxm: query, status: 1, deptId: this.sysFarmer.deptId}).then((response) => {
             if (response.code == 200) {
               this.getObligeeOptions = response.rows.map(function (item) {
                 return {
-                  sqrxm:item.shyqrdbxm,
-                  sqrxb:item.xb,
-                  sqrzjhm:item.shyqrdbzjhm,
-                  sqrnhdm:item.nhdm,
-                  sqrzjlx:item.shyqrdbzjlx,
-                  sqrdh:item.dh,
-                  gyfs:item.gyfs,
-                  dz:item.dz,
-                  deptId:item.deptId,
-                  deptName:item.deptName,
-                  zjddm:item.zjddm,
+                  sqrxm: item.shyqrdbxm,
+                  sqrdm: item.shyqrdm,
+                  sqrxb: item.xb,
+                  sqrzjhm: item.shyqrdbzjhm,
+                  sqrnhdm: item.nhdm,
+                  sqrzjlx: item.shyqrdbzjlx,
+                  sqrdh: item.dh,
+                  gyfs: item.gyfs,
+                  dz: item.dz,
+                  deptId: item.deptId,
+                  deptName: item.deptName,
+                  zjddm: item.zjddm,
                 }
               })
               //设置模糊查询的下拉框和滚动条
@@ -294,78 +393,93 @@
           this.showDropList = false;
         }
       },
-      onConfirmZjddm(data){
+      onConfirmZjddm(data) {
         console.log(data)
         this.circulation.zjddm = data;
         this.showzjddm = false;
       },
-      onConfirmZjlx(data){
+      onConfirmZjlx(data) {
         this.zjlx = data.text;
         this.circulation.sqrzjlx = data.value;
         this.showzjlx = false;
       },
-      onConfirmTcqllx(data){
+      onConfirmTcqllx(data) {
         this.tcqllx = data.text;
         this.circulation.tcqllx = data.value;
         this.showtcqllx = false;
       },
-      onConfirmTclx(data){
+      onConfirmTclx(data) {
         this.tclx = data.text;
         this.circulation.tclx = data.value;
         this.showtclx = false;
       },
-      onConfirmTcfs(data){
+      onConfirmTcfs(data) {
         this.tcfs = data.text;
         this.circulation.tcfs = data.value;
         this.showtcfs = false;
       },
-      onConfirmBcfs(data){
+      onConfirmBcfs(data) {
         this.bcfs = data.text;
         this.circulation.bcfs = data.value;
         this.showbcfs = false;
       },
-      onConfirmShyqrdm(data){
+      onConfirmShyqrdm(data) {
         this.circulation.shyqrdm = data;
         this.showshyqrdm = false;
       },
-      onConfirmYcsykssj(data){
-        this.circulation.ycsykssj = this.getNowFormatDate(data).substr(0,10);
+      onConfirmYcsykssj(data) {
+        this.circulation.ycsykssj = this.getNowFormatDate(data).substr(0, 10);
         this.showycsykssj = false;
       },
-      onConfirmYcsydqsj(data){
-        this.circulation.ycsydqsj = this.getNowFormatDate(data).substr(0,10);
+      onConfirmYcsydqsj(data) {
+        this.circulation.ycsydqsj = this.getNowFormatDate(data).substr(0, 10);
         this.showycsydqsj = false;
       },
-      goEdit(){
+      onConfirmYcsysqrq(data) {
+        this.circulation.sqrq = this.getNowFormatDate(data).substr(0, 10);
+        this.showycsysqrq = false;
+      },
+      onConfirmYcsybarq(data) {
+        this.circulation.barq = this.getNowFormatDate(data).substr(0, 10);
+        this.showycsybarq = false;
+      },
+      onConfirmYcsypzrq(data) {
+        this.circulation.pzrq = this.getNowFormatDate(data).substr(0, 10);
+        this.showycsypzrq = false;
+      },
+      goEdit() {
         window.location.replace("paidUtilizeList")
       },
-      mapLook(){
+      mapLook() {
         this.mapShow = true;
         setTimeout(() => {
           this.$refs.zjdProductResh.drawingLyPaceCountryDarw();
-        },1000);
+        }, 1000);
       },
       /** 有偿使用面积计算 */
-      computeMJ(){
-        if(this.circulation.shyqrdbxm == null || this.circulation.shyqrdbxm === ""){
-          return  this.$toast("请先选择使用权人");
+      computeMJ() {
+        if (this.circulation.shyqrdbxm == null || this.circulation.shyqrdbxm === "") {
+          return this.$toast("请先选择使用权人");
         }
         let _this = this;
-        _this.$set( _this.circulation, "ycsymj",  0.00);
-        _this.$set( _this.jsmjData, "hzdmj",  0.00);
-        _this.$set( _this.jsmjData, "zdmjSum",  0.00);
+        _this.$set(_this.circulation, "ycsymj", 0.00);
+        _this.$set(_this.jsmjData, "hzdmj", 0.00);
+        _this.$set(_this.jsmjData, "zdmjSum", 0.00);
         listProgramme({}).then((res) => {
-          if(res.rows.length > 0){
-            _this.$set( _this.jsmjData, "hzdmj", res.rows[0].maxArea);
+          if (res.rows.length > 0) {
+            _this.$set(_this.jsmjData, "hzdmj", res.rows[0].maxArea);
           }
-          selectHomesteadObligeeMapList({shyqrdbxm:_this.circulation.shyqrdbxm,landStatus:_this.landStatus}).then((response) => {
+          selectHomesteadObligeeMapList({
+            shyqrdbxm: _this.circulation.shyqrdbxm,
+            landStatus: _this.landStatus
+          }).then((response) => {
             if (response.code == 200) {
-              response.data.map(function(item){
-                _this.$set( _this.jsmjData, "zdmjSum", _this.jsmjData.zdmjSum + item.zjdzdxx.zdmj);
-                if(_this.jsmjData.zdmjSum - _this.jsmjData.hzdmj > 0){
-                  _this.$set( _this.circulation, "ycsymj",  (_this.jsmjData.zdmjSum - _this.jsmjData.hzdmj).toFixed(2));
-                }else{
-                  _this.$set( _this.circulation, "ycsymj", 0.00);
+              response.data.map(function (item) {
+                _this.$set(_this.jsmjData, "zdmjSum", _this.jsmjData.zdmjSum + item.zjdzdxx.zdmj);
+                if (_this.jsmjData.zdmjSum - _this.jsmjData.hzdmj > 0) {
+                  _this.$set(_this.circulation, "ycsymj", (_this.jsmjData.zdmjSum - _this.jsmjData.hzdmj).toFixed(2));
+                } else {
+                  _this.$set(_this.circulation, "ycsymj", 0.00);
                 }
 
               });
@@ -375,14 +489,14 @@
 
       },
       /**使用费用计算 */
-      computeFY(){
+      computeFY() {
         let _this = this;
-        _this.$set( _this.circulation, "ycsymjdj",  0.00);
-        _this.$set( _this.circulation, "ycsyfy",  0.00);
+        _this.$set(_this.circulation, "ycsymjdj", 0.00);
+        _this.$set(_this.circulation, "ycsyfy", 0.00);
         listYcsyjfbz({}).then(response => {
-          response.rows.map(function(item){
-            if(_this.circulation.ycsymj >= item.startArea && _this.circulation.ycsymj <= item.endArea){
-              _this.$set( _this.circulation, "ycsyfy",  (_this.circulation.ycsymj * item.feeAmount).toFixed(2));
+          response.rows.map(function (item) {
+            if (_this.circulation.ycsymj >= item.startArea && _this.circulation.ycsymj <= item.endArea) {
+              _this.$set(_this.circulation, "ycsyfy", (_this.circulation.ycsymj * item.feeAmount).toFixed(2));
             }
           });
         });
@@ -392,7 +506,7 @@
           this.circulation.ycsyfy = ((this.circulation.ycsymj * this.circulation.ycsymjdj)).toFixed(2);
         }
       },
-      goSubmit(){
+      goSubmit() {
         this.$refs._Form.validate().then(() => {
           ycsyAdd(this.circulation).then(response => {
             if (response.code = 200) {
@@ -410,7 +524,8 @@
 
 <style scoped lang="scss">
   .app-container {
-  .header_main{
+
+  .header_main {
     height: 116px;
     background: url('../../../../assets/images/sunVillage_info/list_head.png') no-repeat;
     background-size: 100% 100%;
@@ -423,7 +538,8 @@
     text-align: center;
     color: #fff;
     position: relative;
-  .return_btn{
+
+  .return_btn {
     width: 24px;
     height: 43.2px;
     background: url('../../../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat;
@@ -432,7 +548,8 @@
     left: 38px;
     top: 36px;
   }
-  .add_btn{
+
+  .add_btn {
     width: 56.4px;
     height: 40.8px;
     background: url('../../../../assets/images/sunVillage_info/list_icon_9.png') center center no-repeat;
@@ -441,23 +558,26 @@
     right: 38px;
     top: 36px;
   }
+
   }
   }
-  .main_title{
+  .main_title {
     font-size: 0.4rem;
     color: #1D6FE9;
     margin: 0.2rem 6%;
     position: relative;
   }
-  .main_box{
+
+  .main_box {
     width: 96%;
     margin: 0 auto;
     border-radius: 6px;
-    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.16);
     overflow: hidden;
     background-color: #FFF;
   }
-  .submitButton{
+
+  .submitButton {
     width: 80%;
     margin: 0 auto;
     background-color: #1D6FE9;

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

@@ -28,7 +28,7 @@
         <template #right>
           <van-row>
             <van-col>
-              <van-button square text="生成收费计划" v-if="item.syStatus == '1' && item.isDetail == '0'" @click="generateFeePlanClick(item)" type="info" class="add_btn" />
+              <van-button square text="生成收费计划" v-if="item.syStatus == '1' && item.isDetail == '0'" @click="generateFeePlanClick(item)" type="info" class="delete-button" />
             </van-col>
             <van-col>
               <van-button square text="收费计划" v-if="item.syStatus == '1' && item.isDetail == '1'"  @click="handleSfjh(item)" type="info" class="delete-button" />

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

@@ -62,7 +62,7 @@
           pageNum:1,
           pageSize:10,
           orderByColumn:'id',
-          isAsc:'desc'
+          isAsc:'asc'
         },
         //地图服务地址
         mapGeoServerUrl:"",
@@ -101,27 +101,32 @@
         window.location = 'paidUtilizeAdd';
       },
       getList(){
-        setTimeout(() => {
-          listYcsysfmx(this.queryParams).then(response => {
-            console.log(response)
-            // for (var i = 0; i < response.rows.length; i++) {
-            //   response.rows[i].tclx = this.selectDictLabel(this.tcqllxStatus, response.rows[i].tclx)
-            //   response.rows[i].tclx = this.selectDictLabel(this.tclxStatus, response.rows[i].tclx)
-            //   response.rows[i].tcfs = this.selectDictLabel(this.tcfsStatus, response.rows[i].tcfs)
-            //   response.rows[i].auditStatus = this.selectDictLabel(this.auditStatus, response.rows[i].auditStatus)
-            //   this.applicationList.push(response.rows[i]);
-            // }
-            this.applicationList = response.rows;
-            if(this.applicationList.length >= response.total){
-              this.finished = true;
-              return;
-            }else{
+        if(this.loading){
+          setTimeout(() => {
+            listYcsysfmx(this.queryParams).then(response => {
+              console.log(response)
+              let _this = this;
+              // for (var i = 0; i < response.rows.length; i++) {
+              //   response.rows[i].tclx = this.selectDictLabel(this.tcqllxStatus, response.rows[i].tclx)
+              //   response.rows[i].tclx = this.selectDictLabel(this.tclxStatus, response.rows[i].tclx)
+              //   response.rows[i].tcfs = this.selectDictLabel(this.tcfsStatus, response.rows[i].tcfs)
+              //   response.rows[i].auditStatus = this.selectDictLabel(this.auditStatus, response.rows[i].auditStatus)
+              //   this.applicationList.push(response.rows[i]);
+              // }
               this.loading = false;
-              this.finished = false;
-              this.queryParams.pageNum += 1 ;
-            }
-          });
-        }, 1000);
+              if(response.rows.length>0&& _this.applicationList.length<response.total){
+                response.rows.forEach(function(item){
+                  _this.applicationList.push(item);
+                });
+                this.queryParams.pageNum += 1 ;
+              }else{
+                this.finished = true;
+
+              }
+            });
+          }, 1000);
+        }
+
       },
       handlePay(row){
         this.$set(row, "isJf", "1");