优化 新增宗地、房

src/views/homestead/index.vue

@@ -422,14 +422,14 @@
         <div class="info_title">
           {{ this.farmhouseStatus == 0 ? "录入宗地信息" : "录入农地信息" }}
         </div>
-        <!--  -->
+        <!--  农房  -->
         <div class="flex_main" v-if="this.farmhouseStatus == 0">
           <div class="flex_block">
             <div class="number_s50 mr50">
               <div class="title_m">农房编号</div>
               <div class="input_m">
                 <van-field
-                  v-model="message"
+                  v-model="houseInfoList.xh"
                   placeholder="农房编号"
                   class="landHomesteadEdit_input"
                 />
@@ -439,7 +439,7 @@
               <div class="title_m">房屋所有人名称</div>
               <div class="input_m">
                 <van-field
-                  v-model="message"
+                  v-model="houseInfoList.fwsyrmc"
                   placeholder="房屋所有人名称"
                   class="landHomesteadEdit_input"
                 />
@@ -452,7 +452,7 @@
               <div class="title_m">地址</div>
               <div class="input_m">
                 <van-field
-                  v-model="message"
+                  v-model="houseInfoList.dz"
                   placeholder="地址"
                   class="landHomesteadEdit_input"
                 />
@@ -463,20 +463,21 @@
               <div class="input_m select">
                 <i class="dropDown_icon"></i>
                 <van-field
-                  v-model="message"
+                  v-model="tdxzOptionsValue"
                   readonly
                   clickable
                   name="picker"
                   placeholder="农房权属"
                   class="landHomesteadEdit_input"
-                  @click="showPicker = true"
+                  @click="tdxzOptionsVibile = true"
                 />
-                <van-popup v-model="showPicker" position="bottom">
+                <van-popup v-model="tdxzOptionsVibile" position="bottom">
                   <van-picker
                     show-toolbar
-                    :columns="columns"
-                    @confirm="onConfirm"
-                    @cancel="showPicker = false"
+                    :columns="tdxzOptions"
+                    value-key="dictLabel"
+                    @confirm="tdxzOptionsFun"
+                    @cancel="tdxzOptionsVibile = false"
                   />
                 </van-popup>
               </div>
@@ -489,20 +490,20 @@
               <div class="input_m select">
                 <i class="dropDown_icon"></i>
                 <van-field
-                  v-model="message"
+                  v-model="houseInfoList.sfyspsx"
                   readonly
                   clickable
                   name="picker"
                   placeholder="审批手续"
                   class="landHomesteadEdit_input"
-                  @click="showPicker = true"
+                  @click="xfCirculationVisbile = true"
                 />
-                <van-popup v-model="showPicker" position="bottom">
+                <van-popup v-model="xfCirculationVisbile" position="bottom">
                   <van-picker
                     show-toolbar
-                    :columns="columns"
-                    @confirm="onConfirm"
-                    @cancel="showPicker = false"
+                    :columns="xfApprovalOptions"
+                    @confirm="xfCirculationFun"
+                    @cancel="xfCirculationVisbile = false"
                   />
                 </van-popup>
               </div>
@@ -512,7 +513,7 @@
               <div class="input_m about">
                 <span class="about_symbol">≈</span>
                 <van-field
-                  v-model="message"
+                  v-model="houseInfoList.jzmj"
                   placeholder="建筑面积"
                   class="landHomesteadEdit_input"
                 />
@@ -522,21 +523,23 @@
               <div class="title_m">现状情况</div>
               <div class="input_m select">
                 <i class="dropDown_icon"></i>
+                <!--  -->
                 <van-field
-                  v-model="message"
+                  v-model="houseInfoList.xzqk"
                   readonly
                   clickable
                   name="picker"
                   placeholder="现状情况"
                   class="landHomesteadEdit_input"
-                  @click="showPicker = true"
+                  @click="xzqkOptionsVisbile = true"
                 />
-                <van-popup v-model="showPicker" position="bottom">
+                <van-popup v-model="xzqkOptionsVisbile" position="bottom">
                   <van-picker
                     show-toolbar
-                    :columns="columns"
-                    @confirm="onConfirm"
-                    @cancel="showPicker = false"
+                    :columns="xzqkOptions"
+                    @confirm="xzqkOptionsFun"
+                    value-key="dictLabel"
+                    @cancel="xzqkOptionsVisbile = false"
                   />
                 </van-popup>
               </div>
@@ -548,7 +551,7 @@
               <div class="title_m">房屋所有权证号</div>
               <div class="input_m">
                 <van-field
-                  v-model="message"
+                  v-model="houseInfoList.fwsyqh"
                   placeholder="房屋所有权证号"
                   class="landHomesteadEdit_input"
                 />
@@ -558,7 +561,7 @@
               <div class="title_m">土地证号</div>
               <div class="input_m">
                 <van-field
-                  v-model="message"
+                  v-model="houseInfoList.tdzh"
                   placeholder="土地证号"
                   class="landHomesteadEdit_input"
                 />
@@ -571,7 +574,7 @@
               <div class="title_m">土地性质</div>
               <div class="input_m">
                 <van-field
-                  v-model="message"
+                  v-model="houseInfoList.tdzx"
                   placeholder="土地性质"
                   class="landHomesteadEdit_input"
                 />
@@ -582,7 +585,7 @@
               <div class="input_m about">
                 <span class="about_symbol">≈</span>
                 <van-field
-                  v-model="message"
+                  v-model="houseInfoList.tdmj"
                   placeholder="土地面积"
                   class="landHomesteadEdit_input"
                 />
@@ -593,20 +596,20 @@
               <div class="input_m select">
                 <i class="dropDown_icon"></i>
                 <van-field
-                  v-model="message"
+                  v-model="houseInfoList.xzfwsfylzy"
                   readonly
                   clickable
                   name="picker"
                   placeholder="是否有流转意向"
                   class="landHomesteadEdit_input"
-                  @click="showPicker = true"
+                  @click="xflzCirculationVisbile = true"
                 />
-                <van-popup v-model="showPicker" position="bottom">
+                <van-popup v-model="xflzCirculationVisbile" position="bottom">
                   <van-picker
                     show-toolbar
-                    :columns="columns"
-                    @confirm="onConfirm"
-                    @cancel="showPicker = false"
+                    :columns="xfCirculationOptions"
+                    @confirm="xflzCirculationFun"
+                    @cancel="xflzCirculationVisbile = false"
                   />
                 </van-popup>
               </div>
@@ -618,7 +621,7 @@
               <div class="title_m">租赁人</div>
               <div class="input_m">
                 <van-field
-                  v-model="message"
+                  v-model="houseInfoList.zlrxm"
                   placeholder="租赁人"
                   class="landHomesteadEdit_input"
                 />
@@ -628,7 +631,7 @@
               <div class="title_m">租赁年限</div>
               <div class="input_m">
                 <van-field
-                  v-model="message"
+                  v-model="houseInfoList.zlsynx"
                   placeholder="租赁年限"
                   class="landHomesteadEdit_input"
                 />
@@ -638,12 +641,19 @@
           <!--1-->
           <div class="flex_block">
             <div class="number_s100">
-              <div class="title_m">租赁人</div>
+              <div class="title_m">租赁合同截止日期</div>
               <div class="input_m">
                 <van-field
-                  v-model="message"
-                  placeholder="租赁人"
+                  v-model="houseInfoList.zlhtjzrq"
+                  placeholder="流转合同截止日期"
                   class="landHomesteadEdit_input"
+                  readonly
+                  @click="landHomesteadEditcalendar = true"
+                />
+                <van-calendar
+                  v-model="landHomesteadEditcalendar"
+                  @confirm="landHomesteadEdConfirm"
+                  type="range"
                 />
               </div>
             </div>
@@ -656,6 +666,7 @@
             </div>
           </div>
         </div>
+        <!--  农地  -->
         <div class="flex_main" v-else-if="this.farmhouseStatus == 1">
           <!--1-->
           <div class="flex_block">
@@ -663,7 +674,7 @@
               <div class="title_m">农地编号</div>
               <div class="input_m">
                 <van-field
-                  v-model="message"
+                  v-model="landInfoList.xh"
                   placeholder="农地编号"
                   class="landHomesteadEdit_input"
                 />
@@ -673,7 +684,7 @@
               <div class="title_m">农地使用人名称</div>
               <div class="input_m">
                 <van-field
-                  v-model="message"
+                  v-model="landInfoList.cbrmc"
                   placeholder="农地使用人名称"
                   class="landHomesteadEdit_input"
                 />
@@ -686,7 +697,7 @@
               <div class="title_m">村名</div>
               <div class="input_m">
                 <van-field
-                  v-model="message"
+                  v-model="landInfoList.cm"
                   placeholder="村名"
                   class="landHomesteadEdit_input"
                 />
@@ -696,7 +707,7 @@
               <div class="title_m">土地证号</div>
               <div class="input_m">
                 <van-field
-                  v-model="message"
+                  v-model="landInfoList.tdzh"
                   placeholder="土地证号"
                   class="landHomesteadEdit_input"
                 />
@@ -710,20 +721,20 @@
               <div class="input_m select">
                 <i class="dropDown_icon"></i>
                 <van-field
-                  v-model="message"
+                  v-model="landInfoList.sfyspsx"
                   readonly
                   clickable
                   name="picker"
                   placeholder="是否有审批手续"
                   class="landHomesteadEdit_input"
-                  @click="showPicker = true"
+                  @click="xdCirculationVisbile = true"
                 />
-                <van-popup v-model="showPicker" position="bottom">
+                <van-popup v-model="xdCirculationVisbile" position="bottom">
                   <van-picker
                     show-toolbar
-                    :columns="columns"
-                    @confirm="onConfirm"
-                    @cancel="showPicker = false"
+                    :columns="xdApprovalOptions"
+                    @confirm="xdCirculationFun"
+                    @cancel="xdCirculationVisbile = false"
                   />
                 </van-popup>
               </div>
@@ -733,20 +744,21 @@
               <div class="input_m select">
                 <i class="dropDown_icon"></i>
                 <van-field
-                  v-model="message"
+                  v-model="landInfoList.xzqk"
                   readonly
                   clickable
                   name="picker"
                   placeholder="现状情况"
                   class="landHomesteadEdit_input"
-                  @click="showPicker = true"
+                  @click="ndxzqkOptionsVisbile = true"
                 />
-                <van-popup v-model="showPicker" position="bottom">
+                <van-popup v-model="ndxzqkOptionsVisbile" position="bottom">
                   <van-picker
                     show-toolbar
-                    :columns="columns"
-                    @confirm="onConfirm"
-                    @cancel="showPicker = false"
+                    :columns="ndxzqkOptions"
+                    @confirm="ndxzqkOptionsFun"
+                    value-key="dictLabel"
+                    @cancel="ndxzqkOptionsVisbile = false"
                   />
                 </van-popup>
               </div>
@@ -760,20 +772,21 @@
               <div class="input_m select">
                 <i class="dropDown_icon"></i>
                 <van-field
-                  v-model="message"
+                  v-model="nydlxOptionsValue"
                   readonly
                   clickable
                   name="picker"
                   placeholder="农用地类型"
                   class="landHomesteadEdit_input"
-                  @click="showPicker = true"
+                  @click="nydlxOptionsVibile = true"
                 />
-                <van-popup v-model="showPicker" position="bottom">
+                <van-popup v-model="nydlxOptionsVibile" position="bottom">
                   <van-picker
                     show-toolbar
-                    :columns="columns"
-                    @confirm="onConfirm"
-                    @cancel="showPicker = false"
+                    :columns="nydlxOptions"
+                    value-key="dictLabel"
+                    @confirm="nydlxOptionsFun"
+                    @cancel="nydlxOptionsVibile = false"
                   />
                 </van-popup>
               </div>
@@ -783,7 +796,7 @@
               <div class="input_m about">
                 <span class="about_symbol">≈</span>
                 <van-field
-                  v-model="message"
+                  v-model="landInfoList.mj"
                   placeholder="土地面积"
                   class="landHomesteadEdit_input"
                 />
@@ -794,20 +807,20 @@
               <div class="input_m select">
                 <i class="dropDown_icon"></i>
                 <van-field
-                  v-model="message"
+                  v-model="landInfoList.sfylzyx"
                   readonly
                   clickable
                   name="picker"
                   placeholder="是否有流转意向"
                   class="landHomesteadEdit_input"
-                  @click="showPicker = true"
+                  @click="xdlzCirculationVisbile = true"
                 />
-                <van-popup v-model="showPicker" position="bottom">
+                <van-popup v-model="xdlzCirculationVisbile" position="bottom">
                   <van-picker
                     show-toolbar
-                    :columns="columns"
-                    @confirm="onConfirm"
-                    @cancel="showPicker = false"
+                    :columns="xdCirculationOptions"
+                    @confirm="xdCirculationOptionsFun"
+                    @cancel="xdlzCirculationVisbile = false"
                   />
                 </van-popup>
               </div>
@@ -830,7 +843,7 @@
               <div class="title_m">流转剩余年限</div>
               <div class="input_m">
                 <van-field
-                  v-model="message"
+                  v-model="landInfoList.lzsynx"
                   placeholder="流转剩余年限"
                   class="landHomesteadEdit_input"
                 />
@@ -946,7 +959,7 @@ export default {
       //地图绘制坐标存储
       coordinateList: [],
       //新建选择农房土地弹窗 显隐
-      farmlandEditSwitchVisbule: false, //
+      farmlandEditSwitchVisbule: false, //false
       //编辑房屋土地信息--显隐
       landHomesteadEditVisbile: false,
       //查看编辑房屋、土地--类型  0 农房 1 农地
@@ -956,12 +969,87 @@ export default {
       //选择顺序
       selectChooseOrder: 0,
 
-      // <van-calendar v-model="landHomesteadEditcalendar" @confirm="" />
+      //农地新增、修改保存数据
+      landInfoList: {
+        id: "", //String		是		主键id
+        orgCode: "", //	String		否		行政区代码
+        cdm: "", //	String		否		村代码
+        cm: "", //String		否		村名
+        xh: "", //	String		否		序号
+        cbrmc: "", //String		否		承包人名称
+        syrmc: "", //String		否		使用人名称
+        nydlx: "", //	String		否		农用地类型
+        mj: "", //	String		否		面积
+        lzsynx: "", //	String		否		流转剩余年限
+        zlhtjzrq: "", //	String		否		日期
+        sfylzyx: "", //	String		否		是否流转意向
+        xzqk: "", //	String		否		现状情况
+        theGeom: "", //String		否		空间坐标
+        xzqkKey: "", //	String		否		忽略
+        nydlxKey: "", //	String		否		忽略
+        frontland: "", //String		否		图片前
+        behindland: "", //String		否		图片后
+      },
+
+      //农房新增、修改保存数据
+      houseInfoList: {
+        id: "", //	String		是		主键id
+        orgCode: "", //	String		否		行政区代码
+        cdm: "", //	String		否		村代码
+        cm: "", //	String		否		村名
+        xh: "", //	String		否		序号
+        tdxz: "", //土地性质
+        fwsyrmc: "", //	String		否		房屋所有人名称
+        fwsyqh: "", //	String		否		房屋所有权证号
+        tdzh: "", //	String		否		土地证号
+        jzmj: "", //	String		否		建筑面积
+        tdmj: "", //	String		否		土地面积
+        tdzx: "", //	String		否		土地性质
+        sfyspsx: "", //	String		否		是否有审批手续
+        xzqk: "", //	String		否		现状情况
+        theGeom: "", //	String		否		空间坐标
+        xzqkKey: "", //	String		否		忽略传null
+        tdxzKey: "", //	String		否		忽略传null
+        frontHouse: "", //	String		否		图片前
+        behindHouse: "", //	String		否		图片后
+        dz: "", //	String		否		地址
+        zlrxm: "", //	String		否		租赁人姓名
+        zlhtjzrq: "", //					租赁合同截止日期
+        zlsynx: "", //					租赁剩余年限
+        xzfwsfylzy: "", //					闲置房屋是否有流转意愿
+        tdfl: "", //					集体/个人
+      },
+
+      //农房 - 农房权属
+      tdxzOptions: [],
+      tdxzOptionsVibile: false, //农房 - 农房权属 -弹窗
+      tdxzOptionsValue: "", //农房 - 农房权属  值
+      //农房 - 现状情况
+      xzqkOptions: [],
+      xzqkOptionsVisbile: false, //农房 - 现状情况 弹窗
+      //农房 - 是否有流转
+      xfCirculationOptions: ["是", "否"],
+      xflzCirculationVisbile: false, //农房 - 是否有流转  弹窗
+      //农房 - 是否有审批
+      xfApprovalOptions: ["是", "否"],
+      xfCirculationVisbile: false, //农房 - 是否有审批  -弹窗
+
+      //农地 -- 是否有审批手续
+      xdApprovalOptions: ["是", "否"],
+      xdCirculationVisbile: false, //农房 - 是否有审批  -弹窗
+      //农地 -- 现状情况
+      ndxzqkOptions: [],
+      ndxzqkOptionsVisbile: false,
+      //农地 -- 农用地类型
+      nydlxOptions: [],
+      nydlxOptionsVibile: false, // 农地 -- 农用地类型--弹窗
+      nydlxOptionsValue: "", //  农地 -- 农用地类型--值
+
+      //农地 -- 是否有流转意向
+      xdCirculationOptions: ["是", "否"],
+      xdlzCirculationVisbile: false, //农房 - 是否有流转  弹窗
 
       //以下删
-      message: "",
-      showPicker: false,
-      columns: ["杭州", "宁波", "温州", "嘉兴", "湖州"],
       fileList: [],
     };
   },
@@ -1083,6 +1171,32 @@ export default {
     initAxios() {
       //获取区
       this.mapAreaSelectValue();
+      //农房---字典项
+      this.nfDictionary();
+      //农地---字典项
+      this.ndDictionary();
+    },
+    nfDictionary() {
+      //农房权属
+      this.getDicts("build_land_type").then((response) => {
+        this.tdxzOptions = response.data;
+      });
+      //农房情况
+      this.getDicts("geo_hc_house").then((response) => {
+        this.xzqkOptions = response.data;
+      });
+    },
+    ndDictionary() {
+      //农用地类型
+      this.getDicts("sub_object_type").then((response) => {
+        console.log(response);
+        this.nydlxOptions = response.data;
+      });
+      //现状情况
+      this.getDicts("geo_hc_land").then((response) => {
+        console.log(response);
+        this.ndxzqkOptions = response.data;
+      });
     },
     styleSteup() {
       let smallTop = this.$refs.sliderSmall.getBoundingClientRect().top;
@@ -2094,10 +2208,47 @@ export default {
       //开始绘制地图  ------------------- end
     },
 
-    /*以下删*/
-    onConfirm(time) {
-      this.message = time;
-      this.showPicker = false;
+    //农房 - 农房权属 选择值
+    tdxzOptionsFun(value) {
+      this.houseInfoList.tdxz = value.dictValue;
+      this.tdxzOptionsValue = value.dictLabel;
+      this.tdxzOptionsVibile = false;
+    },
+    //农房 - 是否有审批 选择值
+    xfCirculationFun(value) {
+      this.xfCirculationVisbile = false;
+      this.houseInfoList.sfyspsx = value;
+    },
+    //农房 - 现状情况 选择值
+    xzqkOptionsFun(value) {
+      this.houseInfoList.xzqk = value.dictValue;
+      this.xzqkOptionsVisbile = false;
+    },
+    //农房 - 是否有流转 选择值
+    xflzCirculationFun(value) {
+      this.xflzCirculationVisbile = false;
+      this.houseInfoList.xzfwsfylzy = value;
+    },
+    //农地 - 是否有审批 选择值
+    xdCirculationFun(value) {
+      this.xdCirculationVisbile = false;
+      this.landInfoList.sfyspsx = value;
+    },
+    //农地 - 现状情况 选择值
+    ndxzqkOptionsFun(value) {
+      this.landInfoList.xzqk = value.dictValue;
+      this.ndxzqkOptionsVisbile = false;
+    },
+    //农地 - 农用地类型 选择值
+    nydlxOptionsFun(value) {
+      this.landInfoList.nydlx = value.dictValue;
+      this.nydlxOptionsValue = value.dictLabel;
+      this.nydlxOptionsVibile = false;
+    },
+    //农地 - 是否有流转 选择值
+    xdCirculationOptionsFun(value) {
+      this.xdlzCirculationVisbile = false;
+      this.landInfoList.sfylzyx = value;
     },
   },
 };