Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/api/onlineHome/homestead/circulation.js

@@ -32,6 +32,14 @@ export function zjdzd(){
     method:'get'
   })
 }
+//通过宅基地编码查询宅基地信息
+export function queryGeoZjdzd(query) {
+  return request({
+    url: '/house/lz/queryGeoZjdzd',
+    method: 'get',
+    params: query
+  })
+}
 
 //宅基地退出申请人信息
 export function getExitProposerDetail() {
@@ -49,6 +57,7 @@ export function obligeeList(query) {
     params: query
   })
 }
+
 // 条件查询使用权人列表
 export function selectTHouseBaseObligeeMapList(query) {
   return request({
@@ -117,3 +126,12 @@ export function getByLyZjddm(data){
     method:'get',
   })
 }
+
+//宅基地使用权流转农户查询
+export function queryHouserBaseNh(query) {
+  return request({
+    url: '/house/lz/queryHouserBaseNh',
+    method: 'get',
+    params: query
+  })
+}

src/api/onlineHome/homestead/lzspyj.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询宅基地使用权流转审批列表
+export function listLzspyj(query) {
+  return request({
+    url: '/house/lzspyj/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出宅基地使用权流转审批
+export function exportLzspyj(query) {
+  return request({
+    url: '/house/lzspyj/export',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询宅基地使用权流转审批详细
+export function getLzspyj(id) {
+  return request({
+    url: '/house/lzspyj/get/' + id,
+    method: 'get'
+  })
+}
+
+// 新增宅基地使用权流转审批
+export function addLzspyj(data) {
+  return request({
+    url: '/house/lzspyj/add',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改宅基地使用权流转审批
+export function updateLzspyj(data) {
+  return request({
+    url: '/house/lzspyj/edit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除宅基地使用权流转审批
+export function delLzspyj(id) {
+  return request({
+    url: '/house/lzspyj/remove/' + id,
+    method: 'get'
+  })
+}
+

src/views/onlineHome/done.vue

@@ -40,14 +40,14 @@
       <van-cell>
         <template #title>
           <van-row>
-            <van-col span="6" :offset="1">
+            <van-col span="6" :offset="0">
               <p style="color: #878787">{{item.createTime?item.createTime.substring(0,10):item.startTime.substring(0,10)}}</p>
             </van-col>
             <van-col span="11" :offset="2">
 <!--              <p style="color: #878787">{{item.formData.activityBusinessType}}</p>-->
               <p style="color: #878787">{{item.taskName}}</p>
             </van-col>
-            <van-col span="3" :offset="1">
+            <van-col span="4" :offset="1">
               <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">{{activeName=='1'?'待审批':'已审批'}}</p>
             </van-col>
           </van-row>

src/views/onlineHome/homestead/circulation/circulationAdd.vue

@@ -68,7 +68,33 @@
       <!--              @cancel="showShyqrdm = false"-->
       <!--            />-->
       <!--          </van-popup>-->
-
+      <van-field
+        v-model="circulation.hncysl"
+        label="家庭人口"
+        placeholder="家庭人口"
+        label-width="auto"
+        input-align="right"
+      />
+      <van-field
+        v-model="circulation.zjdsyqr"
+        label="使用权人"
+        label-width="auto"
+        placeholder="使用权人"
+        input-align="right"
+      />
+      <van-field
+        v-model="circulation.currentResidence"
+        label="现居住地"
+        label-width="auto"
+        placeholder="现居住地"
+        input-align="right"
+      />
+      <van-field
+        v-model="circulation.householdRegister"
+        label="户口所在地"
+        label-width="auto"
+        input-align="right"
+      />
       <van-cell title="是否本集体经济组织成员">
         <template #right-icon>
           <van-radio-group v-model="circulation.zcfsfbjtjjzzcy" direction="horizontal">
@@ -78,90 +104,73 @@
         </template>
       </van-cell>
     </div>
-
     <p class="main_title">流转信息</p>
     <div class="main_box">
-      <van-field label="流转面积(㎡)" v-model="circulation.lzmj" placeholder="请输入流转面积(㎡)" input-align="right" label-width="auto" type="number"/>
-      <van-field label="流转单价(元)" v-model="circulation.lzdj" placeholder="请输入流转单价(元)" input-align="right" label-width="auto" type="number"/>
-      <van-field label="流转费用(元)" v-model="circulation.lzfy" placeholder="请输入流转费用(元)" input-align="right" label-width="auto" type="number"/>
-      <van-field
-        readonly
-        clickable
-        v-model="circulation.lzqsrq"
-        label="流转起始时间"
-        placeholder="请选择起始时间"
-        @click="showlzqsrq = true"
-        input-align="right"
-        right-icon="arrow-down"
-      />
-      <van-popup v-model="showlzqsrq" position="bottom">
-        <van-datetime-picker
-          :value="new Date"
-          type="date"
-          title="选择年月日"
-          @confirm="onConfirmLzqsrq"
-          @cancel="showlzqsrq = false"
-        />
-      </van-popup>
+      <van-field label="房屋层数" v-model="zjdData.fwcs" placeholder="房屋层数" input-align="right" label-width="auto" type="number"/>
+      <van-field label="建筑面积(㎡)" v-model="zjdData.jzmj" placeholder="流转面积(㎡)" input-align="right" label-width="auto" type="number"/>
+      <van-field label="宅基地面积(㎡)" v-model="zjdData.zjdmj" placeholder="宅基地面积(㎡)" input-align="right" label-width="auto" type="number"/>
+      <van-field label="不动产证书编号" v-model="zjdData.zjdzsh" placeholder="不动产证书编号(㎡)" input-align="right" label-width="auto" type="number"/>
+<!--      <van-field label="流转单价(元)" v-model="circulation.lzdj" placeholder="请输入流转单价(元)" input-align="right" label-width="auto" type="number"/>-->
+<!--      <van-field label="流转费用(元)" v-model="circulation.lzfy" placeholder="请输入流转费用(元)" input-align="right" label-width="auto" type="number"/>-->
+<!--      <van-field-->
+<!--        readonly-->
+<!--        clickable-->
+<!--        v-model="circulation.lzqsrq"-->
+<!--        label="流转起始时间"-->
+<!--        placeholder="请选择起始时间"-->
+<!--        @click="showlzqsrq = true"-->
+<!--        input-align="right"-->
+<!--        right-icon="arrow-down"-->
+<!--      />-->
+<!--      <van-popup v-model="showlzqsrq" position="bottom">-->
+<!--        <van-datetime-picker-->
+<!--          :value="new Date"-->
+<!--          type="date"-->
+<!--          title="选择年月日"-->
+<!--          @confirm="onConfirmLzqsrq"-->
+<!--          @cancel="showlzqsrq = false"-->
+<!--        />-->
+<!--      </van-popup>-->
 
-      <van-field
-        readonly
-        clickable
-        v-model="circulation.lzjsrq"
-        label="流转结束时间"
-        placeholder="请选择结束时间"
-        @click="showlzjsrq = true"
-        input-align="right"
-        right-icon="arrow-down"
-      />
-      <van-popup v-model="showlzjsrq" position="bottom">
-        <van-datetime-picker
-          :value="new Date"
-          type="date"
-          title="选择年月日"
-          @confirm="onConfirmLzjsrq"
-          @cancel="showlzjsrq = false"
-        />
-      </van-popup>
+<!--      <van-field-->
+<!--        readonly-->
+<!--        clickable-->
+<!--        v-model="circulation.lzjsrq"-->
+<!--        label="流转结束时间"-->
+<!--        placeholder="请选择结束时间"-->
+<!--        @click="showlzjsrq = true"-->
+<!--        input-align="right"-->
+<!--        right-icon="arrow-down"-->
+<!--      />-->
+<!--      <van-popup v-model="showlzjsrq" position="bottom">-->
+<!--        <van-datetime-picker-->
+<!--          :value="new Date"-->
+<!--          type="date"-->
+<!--          title="选择年月日"-->
+<!--          @confirm="onConfirmLzjsrq"-->
+<!--          @cancel="showlzjsrq = false"-->
+<!--        />-->
+<!--      </van-popup>-->
 
-      <van-field
-        readonly
-        clickable
-        v-model="lzqfwyt"
-        label="流转前房屋用途"
-        placeholder="请选择流转前房屋用途"
-        @click="showLzqfwyt = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-      />
-      <van-popup v-model="showLzqfwyt" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="lzqfwytDictionaries"
-          @confirm="onConfirmLzqfwyt"
-          @cancel="showLzqfwyt = false"
-        />
-      </van-popup>
-
-      <van-field
-        readonly
-        clickable
-        v-model="lzhfwyt"
-        label="流转后房屋用途"
-        placeholder="请选择流转后房屋用途"
-        @click="showLzhfwyt = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-      />
-      <van-popup v-model="showLzhfwyt" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="lzhfwytDictionaries"
-          @confirm="onConfirmLzhfwyt"
-          @cancel="showLzhfwyt = false"
-        />
+<!--      <van-field-->
+<!--        readonly-->
+<!--        clickable-->
+<!--        v-model="lzqfwyt"-->
+<!--        label="流转前房屋用途"-->
+<!--        placeholder="请选择流转前房屋用途"-->
+<!--        @click="showLzqfwyt = true"-->
+<!--        input-align="right"-->
+<!--        right-icon="arrow-down"-->
+<!--        label-width="auto"-->
+<!--      />-->
+<!--      <van-popup v-model="showLzqfwyt" position="bottom">-->
+<!--        <van-picker-->
+<!--          show-toolbar-->
+<!--          :columns="lzqfwytDictionaries"-->
+<!--          @confirm="onConfirmLzqfwyt"-->
+<!--          @cancel="showLzqfwyt = false"-->
+<!--        />-->
+<!--      </van-popup>-->
       </van-popup>
     </div>
 
@@ -170,7 +179,7 @@
       <van-field
         v-model="circulation.zrfdbmc"
         label="转入方代表名称"
-        placeholder="请输入转入方代表名称"
+        placeholder="转入方代表名称"
         label-width="auto"
         input-align="right" :rules="[{ required: true }]" required
       />
@@ -202,8 +211,8 @@
           @cancel="showZrfdbzjlx = false"
         />
       </van-popup>
-
-      <van-field label="转入方代表证件号码" v-model="circulation.zrfdbzjhm" placeholder="请输入证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <van-field label="户口所在地" v-model="circulation.transfereeHouseholdRegister" placeholder="户口所在地" input-align="right" label-width="auto" />
+      <van-field label="转入方代表证件号码" v-model="circulation.zrfdbzjhm" placeholder="证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
       <van-cell title="是否本集体经济组织成员">
         <template #right-icon>
           <van-radio-group  v-model="circulation.zrfsfbjtjjzzcy" direction="horizontal">
@@ -212,6 +221,27 @@
           </van-radio-group>
         </template>
       </van-cell>
+      <van-field
+        readonly
+        clickable
+        v-model="lzhfwyt"
+        label="流转后房屋用途"
+        placeholder="流转后房屋用途"
+        @click="showLzhfwyt = true"
+        input-align="right"
+        right-icon="arrow-down"
+        label-width="auto"
+      />
+      <van-popup v-model="showLzhfwyt" position="bottom">
+        <van-picker
+          show-toolbar
+          :columns="lzhfwytDictionaries"
+          @confirm="onConfirmLzhfwyt"
+          @cancel="showLzhfwyt = false"
+        />
+      </van-popup>
+      <van-field label="流转金额" v-model="circulation.lzfy" placeholder="流转金额" input-align="right" label-width="auto" type="number"/>
+      <van-field label="集体收益金额" v-model="circulation.jtsyje" placeholder="集体收益金额" input-align="right" label-width="auto" type="number"/>
     </div>
 
     <p class="main_title">其他</p>
@@ -220,16 +250,135 @@
       <van-field label="所有权人意见" v-model="circulation.suyqryj" placeholder="请输入内容" input-align="right" label-width="auto"/>
       <van-field label="备注" v-model="circulation.bz" placeholder="请输入备注" input-align="right" label-width="auto"/>
     </div>
+      <p class="main_title">转入方意见</p>
+      <div class="main_box">
+        <van-field label="意见" v-model="lzspyjData.zrryj" placeholder="转入方意见" input-align="right" label-width="auto"/>
+        <van-field label="签字" v-model="lzspyjData.zrrqz" placeholder="转入方签字" input-align="right" label-width="auto"/>
+              <van-field
+                readonly
+                clickable
+                v-model="lzspyjData.zrryjrq"
+                label="签字日期"
+                placeholder="签字日期"
+                @click="showlzqsrq = true"
+                input-align="right"
+                right-icon="arrow-down"
+              />
+              <van-popup v-model="showlzqsrq" position="bottom">
+                <van-datetime-picker
+                  :value="new Date"
+                  type="date"
+                  title="选择年月日"
+                  @confirm="onConfirmLzqsrq"
+                  @cancel="showlzqsrq = false"
+                />
+              </van-popup>
+      </div>
+      <p class="main_title">转出方意见</p>
+      <div class="main_box">
+        <van-field label="意见" v-model="lzspyjData.zcryj" placeholder="转出方意见" input-align="right" label-width="auto"/>
+        <van-field label="签字" v-model="lzspyjData.zcrqz" placeholder="转出方签字" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          clickable
+          v-model="lzspyjData.zcryjrq"
+          label="签字日期"
+          placeholder="签字日期"
+          @click="showzcfqzrq = true"
+          input-align="right"
+          right-icon="arrow-down"
+        />
+        <van-popup v-model="showzcfqzrq" position="bottom">
+          <van-datetime-picker
+            :value="new Date"
+            type="date"
+            title="选择年月日"
+            @confirm="onConfirmzcfqzrq"
+            @cancel="showzcfqzrq = false"
+          />
+        </van-popup>
+      </div>
+      <p class="main_title">村集体经济组织意见</p>
+      <div class="main_box">
+        <van-field label="意见" v-model="lzspyjData.cjtjjzzyj" placeholder="村集体经济组织意见" input-align="right" label-width="auto"/>
+        <van-field label="签字" v-model="lzspyjData.cjtjjzzqz" placeholder="村集体经济组织签字" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          clickable
+          v-model="lzspyjData.cjtjjzzyjrq"
+          label="签字日期"
+          placeholder="签字日期"
+          @click="showcjtqzrq = true"
+          input-align="right"
+          right-icon="arrow-down"
+        />
+        <van-popup v-model="showcjtqzrq" position="bottom">
+          <van-datetime-picker
+            :value="new Date"
+            type="date"
+            title="选择年月日"
+            @confirm="onConfirmcjtqzrq"
+            @cancel="showcjtqzrq = false"
+          />
+        </van-popup>
+      </div>
+      <p class="main_title">宅基地审批管理办公室意见</p>
+      <div class="main_box">
+        <van-field label="意见" v-model="lzspyjData.zzjdspyj" placeholder="审批管理办公室意见" input-align="right" label-width="auto"/>
+        <van-field label="签字" v-model="lzspyjData.zzjdspqz" placeholder="审批管理办公室签字" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          clickable
+          v-model="lzspyjData.zzjdspyjrq"
+          label="签字日期"
+          placeholder="签字日期"
+          @click="showzzjdqzrq = true"
+          input-align="right"
+          right-icon="arrow-down"
+        />
+        <van-popup v-model="showzzjdqzrq" position="bottom">
+          <van-datetime-picker
+            :value="new Date"
+            type="date"
+            title="选择年月日"
+            @confirm="onConfirmzzjdqzrq"
+            @cancel="showzzjdqzrq = false"
+          />
+        </van-popup>
+      </div>
+      <p class="main_title">镇级人民政府意见</p>
+      <div class="main_box">
+        <van-field label="意见" v-model="lzspyjData.zjrmzfyj" placeholder="镇级人民政府意见" input-align="right" label-width="auto"/>
+        <van-field label="签字" v-model="lzspyjData.zjrmzfqz" placeholder="镇级人民政府签字" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          clickable
+          v-model="lzspyjData.zjrmzfyjrq"
+          label="签字日期"
+          placeholder="签字日期"
+          @click="showzjrmzfdqzrq = true"
+          input-align="right"
+          right-icon="arrow-down"
+        />
+        <van-popup v-model="showzjrmzfdqzrq" position="bottom">
+          <van-datetime-picker
+            :value="new Date"
+            type="date"
+            title="选择年月日"
+            @confirm="onConfirmzjrmzfqzrq"
+            @cancel="showzjrmzfdqzrq = false"
+          />
+        </van-popup>
+      </div>
     </van-form>
-
     <div style="padding: 16px 0;">
       <van-row>
-        <van-col span="12" align="center">
+        <van-col span="24" align="center">
           <van-button type="info" native-type="submit" class="submitButton" @click="goEdit">保<i style="margin-right: 1em;"></i>存</van-button>
         </van-col>
-        <van-col span="12" align="center">
-          <van-button type="info" native-type="submit" class="submitButton" @click="goSubmit">提<i style="margin-right: 1em;"></i>交</van-button>
-        </van-col>
+<!--        <van-col span="12" align="center">-->
+<!--          <van-button type="info" native-type="submit" class="submitButton" @click="goSubmit">提<i style="margin-right: 1em;"></i>交</van-button>-->
+<!--        </van-col>-->
       </van-row>
       <div class="clear"></div>
     </div>
@@ -237,7 +386,8 @@
 </template>
 
 <script>
-  import { getLz , zjdzd , getByZjddm , edit , goApply,houseAdd } from "@/api/onlineHome/homestead/circulation";
+  import { getLz , zjdzd ,queryGeoZjdzd,queryHouserBaseNh, getByZjddm , edit , goApply,houseAdd, } from "@/api/onlineHome/homestead/circulation";
+  import { listLzspyj,addLzspyj,updateLzspyj } from "@/api/onlineHome/homestead/lzspyj";
   import {Notify} from "vant";
 
   export default {
@@ -251,13 +401,20 @@
         zrfdbmcDictionaries: [],//转入方代表名称
         zrfdbzjlxDictionaries: [],//转入方证件类型
         zjdDictionaries: [],//宅基地列表
-        lzfs: '',//流转方式
+        //流转审批意见
+        lzspyjData:{},
+        lzfs: '转让',//流转方式
         shyqrdm: '',//转出方使用权人代码
         lzqfwyt: '',//流转前房屋类型
         lzhfwyt: '',//流转后房屋类型
         zrfdbmc: '',//转入方代表名称
         zrfdbzjlx: '',//转入方证件类型
         zjd: [],//宅基地列表
+        zjdData:{
+          jzmj:null,
+          fwcs:null,
+          zjdmj:null
+        },
         showLzfs: false,
         showShyqrdm: false,
         showLzqfwyt: false,
@@ -267,7 +424,11 @@
         showZjd:false,
         showlzqsrq:false,
         showlzjsrq:false,
-        circulation: {}
+        showzcfqzrq:false,
+        showcjtqzrq:false,
+        showzzjdqzrq:false,
+        showzjrmzfdqzrq:false,
+        circulation: { lzfs: '01'}
       };
     },
     created() {
@@ -290,8 +451,9 @@
               this.zrfdbzjlxDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue})
             }
           });
+
           //宅基地代码
-          zjdzd().then(zjdRes => {
+        zjdzd().then(zjdRes => {
             for( let i = 0 ; i < zjdRes.rows.length ; i++){
               this.zjdDictionaries.push(zjdRes.rows[i].zjddm);
             }
@@ -312,20 +474,49 @@
             }
           });
       },
+      zjddmChange(value){
+        let _this = this;
+        queryGeoZjdzd({zjddm:value}).then(zjdRes => {
+          if(zjdRes.data != null){
+            _this.$set(this.zjdData, "zjdzsh", zjdRes.data.zjdzsh);
+            if(zjdRes.data.thouseBaseStandardNmfw.length > 0){
+              zjdRes.data.thouseBaseStandardNmfw.forEach(function (item) {
+                if(_this.zjdData.jzmj != null &&  _this.zjdData.jzmj !== ""){
+                  _this.$set(_this.zjdData, "jzmj", parseInt(_this.zjdData.jzmj) + parseInt(item.jzmj));
+                }else{
+                  _this.$set(_this.zjdData, "jzmj", item.jzmj);
+                }
+              })
+
+              this.$set(this.zjdData, "fwcs", zjdRes.data.thouseBaseStandardNmfw[0].sjcs);
+            }
+            if(zjdRes.data.thouseBaseStandardZjdzdxx.length > 0){
+              this.$set(this.zjdData, "zjdmj", zjdRes.data.thouseBaseStandardZjdzdxx[0].zjdpzmj);
+            }
+          }
+        });
+      },
       onConfirmLzfs(value) {
         this.lzfs = value.text;
         this.circulation.lzfs = value.value;
         this.showLzfs = false;
       }, //流转方式
       onConfirmZjd(value) {
+        this.zjddmChange(value);
         this.circulation.zjddm = value;
         var form = {};
         form.zjddm = value;
         getByZjddm(form).then(qlrRes => {
           let data = qlrRes.data;
-          console.log(data)
           this.circulation.shyqrdm = data.shyqrdm;
+          let queryMember = {
+            hzxm :  data.shyqrdbxm,
+          };
+          queryHouserBaseNh(queryMember).then((response) => {
+            this.$set(this.circulation, 'hncysl', response.rows[0].hncysl);
+            });
           this.$set(this.circulation, 'suyqrdbxm', data.shyqrdbxm);
+          this.$set(this.circulation, 'zjdsyqr', data.shyqrdbxm);
           this.$set(this.circulation, 'zcfsfbjtjjzzcy', data.sfbncjtjjzzcy == '1' || data.sfbncjtjjzzcy == 'Y' ? 'Y' : 'N');
           this.$forceUpdate();
         });
@@ -355,17 +546,40 @@
         this.showZrfdbzjlx = false;
       }, //转入方代表证件类型
       onConfirmLzqsrq(value) {
-        this.circulation.lzqsrq = this.getNowFormatDate(value).substr(0,10);
+        this.lzspyjData.zrryjrq = this.getNowFormatDate(value).substr(0,10);
         this.showlzqsrq = false;
-      }, //流转起始时间
-      onConfirmLzjsrq(value) {
-        this.circulation.lzjsrq = this.getNowFormatDate(value).substr(0,10);
-        this.showlzjsrq = false;
-      }, //流转结束时间
+      }, //转出方时间
+      onConfirmzcfqzrq(value) {
+        this.lzspyjData.zcryjrq = this.getNowFormatDate(value).substr(0,10);
+        this.showzcfqzrq = false;
+      },
+      onConfirmcjtqzrq(value) {
+        this.lzspyjData.cjtjjzzyjrq = this.getNowFormatDate(value).substr(0,10);
+        this.showcjtqzrq = false;
+      }, //村集体签字日期
+      onConfirmzzjdqzrq(value) {
+        this.lzspyjData.zzjdspyjrq = this.getNowFormatDate(value).substr(0,10);
+        this.showzzjdqzrq = false;
+      },//宅基地审批管理办公室签字日期
+      onConfirmzjrmzfqzrq(value) {
+        this.lzspyjData.zjrmzfyjrq = this.getNowFormatDate(value).substr(0,10);
+        this.showzjrmzfdqzrq = false;
+      },//镇级人民政府签字日期
+      // onConfirmLzjsrq(value) {
+      //   this.circulation.zrryjrq = this.getNowFormatDate(value).substr(0,10);
+      //   this.showlzjsrq = false;
+      // }, //流转结束时间
       goEdit(){
         console.log(this.circulation)
         this.$refs._Form.validate().then(() => {
         houseAdd(this.circulation).then(response => {
+          if(this.lzspyjData != null){
+            this.$set(this.lzspyjData, "lzId",response.data );
+            addLzspyj(this.lzspyjData).then((res) => {
+              this.$toast.success('保存成功');
+              window.location.replace("circulationList");
+            });
+          }
           if(response.code = 200){
             this.$toast.success('保存成功');
             this.back();

src/views/onlineHome/homestead/circulation/circulationDetail.vue

@@ -35,50 +35,53 @@
           />
           <van-field
             readonly
-            v-model="circulation.zcfsfbjtjjzzcy == 'Y' ? '是' : '否'"
-            label="是否本集体经济组织成员"
+            v-model="circulation.hncysl"
+            label="家庭人口"
+            placeholder="家庭人口"
             label-width="auto"
             input-align="right"
-
           />
-        </div>
-
-        <p class="main_title">流转信息</p>
-        <div class="main_box">
-          <van-field label="流转面积(㎡)" readonly v-model="circulation.lzmj" input-align="right" label-width="auto"/>
-          <van-field label="流转单价(元)" readonly v-model="circulation.lzdj" input-align="right" label-width="auto"/>
-          <van-field label="流转费用(元)" readonly v-model="circulation.lzfy" input-align="right" label-width="auto"/>
           <van-field
             readonly
-            label="流转起始时间"
+            v-model="circulation.zjdsyqr"
+            label="使用权人"
+            label-width="auto"
+            placeholder="使用权人"
             input-align="right"
-            v-model="circulation.lzqsrq"
           />
-
           <van-field
             readonly
-            label="流转结束时间"
+            v-model="circulation.currentResidence"
+            label="现居住地"
+            label-width="auto"
+            placeholder="现居住地"
             input-align="right"
-            v-model="circulation.lzjsrq"
           />
-
           <van-field
             readonly
-            label="流转前房屋用途"
-            input-align="right"
+            v-model="circulation.householdRegister"
+            label="户口所在地"
             label-width="auto"
-            v-model="circulation.lzqfwyt"
+            input-align="right"
           />
-
           <van-field
             readonly
-            label="流转后房屋用途"
-            input-align="right"
+            v-model="circulation.zcfsfbjtjjzzcy == 'Y' ? '是' : '否'"
+            label="是否本集体经济组织成员"
             label-width="auto"
-            v-model="circulation.lzhfwyt"
+            input-align="right"
+
           />
         </div>
 
+        <p class="main_title">流转信息</p>
+        <div class="main_box">
+          <van-field readonly label="房屋层数" v-model="zjdData.fwcs" placeholder="房屋层数" input-align="right" label-width="auto" type="number"/>
+          <van-field readonly label="建筑面积(㎡)" v-model="zjdData.jzmj" placeholder="流转面积(㎡)" input-align="right" label-width="auto" type="number"/>
+          <van-field readonly label="宅基地面积(㎡)" v-model="zjdData.zjdmj" placeholder="宅基地面积(㎡)" input-align="right" label-width="auto" type="number"/>
+          <van-field readonly label="不动产证书编号" v-model="zjdData.zjdzsh" placeholder="不动产证书编号(㎡)" input-align="right" label-width="auto" type="number"/>
+        </div>
+
         <p class="main_title">转入方信息</p>
         <div class="main_box">
           <van-field
@@ -98,6 +101,23 @@
           />
           <van-field readonly label="转入方代表证件号码" v-model="circulation.zrfdbzjhm" input-align="right" label-width="auto"/>
           <van-field readonly label="是否本集体经济组织成员" v-model="circulation.zrfsfbjtjjzzcy == 'Y' ? '是' : '否'" input-align="right" label-width="auto"/>
+          <van-field
+            readonly
+            v-model="circulation.lzhfwyt"
+            label="流转后房屋用途"
+            placeholder="流转后房屋用途"
+            input-align="right"
+            right-icon="arrow-down"
+            label-width="auto"
+          />
+<!--          <van-popup v-model="showLzhfwyt" position="bottom">-->
+<!--            <van-picker-->
+<!--              show-toolbar-->
+<!--              :columns="lzhfwytDictionaries"-->
+<!--            />-->
+          </van-popup>
+          <van-field readonly label="流转金额" v-model="circulation.lzfy" placeholder="流转金额" input-align="right" label-width="auto" type="number"/>
+          <van-field readonly label="集体收益金额" v-model="circulation.jtsyje" placeholder="集体收益金额" input-align="right" label-width="auto" type="number"/>
         </div>
 
         <p class="main_title">其他</p>
@@ -106,6 +126,36 @@
           <van-field readonly label="所有权人意见" v-model="circulation.suyqryj" input-align="right" label-width="auto"/>
           <van-field readonly label="备注" v-model="circulation.bz" input-align="right" label-width="auto"/>
         </div>
+      <p class="main_title">转入方意见</p>
+      <div class="main_box">
+        <van-field readonly label="意见" v-model="lzspyjData.zrryj" placeholder="转入方意见" input-align="right" label-width="auto"/>
+        <van-field readonly label="签字" v-model="lzspyjData.zrrqz" placeholder="转入方签字" input-align="right" label-width="auto"/>
+        <van-field readonly label="签字日期" v-model="lzspyjData.zrryjrq" placeholder="签字日期" input-align="right" label-width="auto"/>
+      </div>
+      <p class="main_title">转出方意见</p>
+      <div class="main_box">
+        <van-field readonly label="意见" v-model="lzspyjData.zcryj" placeholder="转出方意见" input-align="right" label-width="auto"/>
+        <van-field readonly label="签字" v-model="lzspyjData.zcrqz" placeholder="转出方签字" input-align="right" label-width="auto"/>
+        <van-field readonly label="签字" v-model="lzspyjData.zcryjrq" placeholder="签字日期" input-align="right" label-width="auto"/>
+      </div>
+      <p class="main_title">村集体经济组织意见</p>
+      <div class="main_box">
+        <van-field readonly label="意见" v-model="lzspyjData.cjtjjzzyj" placeholder="村集体经济组织意见" input-align="right" label-width="auto"/>
+        <van-field readonly label="签字" v-model="lzspyjData.cjtjjzzqz" placeholder="村集体经济组织签字" input-align="right" label-width="auto"/>
+        <van-field readonly label="签字日期" v-model="lzspyjData.cjtjjzzyjrq" placeholder="签字日期" input-align="right" label-width="auto"/>
+      </div>
+      <p class="main_title">宅基地审批管理办公室意见</p>
+      <div class="main_box">
+        <van-field readonly label="意见" v-model="lzspyjData.zzjdspyj" placeholder="审批管理办公室意见" input-align="right" label-width="auto"/>
+        <van-field readonly label="签字" v-model="lzspyjData.zzjdspqz" placeholder="审批管理办公室签字" input-align="right" label-width="auto"/>
+        <van-field readonly label="签字日期" v-model="lzspyjData.zzjdspyjrq" placeholder="签字日期" input-align="right" label-width="auto"/>
+      </div>
+      <p class="main_title">镇级人民政府意见</p>
+      <div class="main_box">
+        <van-field readonly label="意见" v-model="lzspyjData.zjrmzfyj" placeholder="镇级人民政府意见" input-align="right" label-width="auto"/>
+        <van-field readonly label="签字" v-model="lzspyjData.zjrmzfqz" placeholder="镇级人民政府签字" input-align="right" label-width="auto"/>
+        <van-field readonly label="签字日期" v-model="lzspyjData.zjrmzfyjrq" placeholder="签字日期" input-align="right" label-width="auto"/>
+      </div>
 
       <!-- 审批 -->
       <template v-if="approval.type === 'todo'">
@@ -132,7 +182,8 @@
 </template>
 
 <script>
-import { getLz } from "@/api/onlineHome/homestead/circulation";
+import { getLz,queryGeoZjdzd,queryHouserBaseNh, getByZjddm ,} from "@/api/onlineHome/homestead/circulation";
+import { listLzspyj } from "@/api/onlineHome/homestead/lzspyj";
 import request from '@/utils/request';
 import {Notify} from "vant";
 export default {
@@ -142,6 +193,7 @@ export default {
       value: '',
       circulation:[],
       houseApplyStatus:[],
+      lzhfwytDictionaries: [],//流转后房屋类型
       approval: {
         taskId: null,
         instanceId: null,
@@ -149,6 +201,14 @@ export default {
         id: null,
         comment: '',
       },
+      zjdData:{
+        jzmj:null,
+        fwcs:null,
+        zjdmj:null
+      },
+      lzhfwyt:null,
+      //流转审批意见
+      lzspyjData:{},
     };
   },
   created() {
@@ -175,7 +235,20 @@ export default {
           this.circulation.lzqfwyt = this.selectDictLabel(res.data, response.data.lzqfwyt);
           this.circulation.lzhfwyt = this.selectDictLabel(res.data, response.data.lzhfwyt);
         });
+        //流转后房屋用途
+        this.houseGetDicts("fwyt").then((res) => {//流转后房屋用途
+          for( let i = 0 ; i < res.data.length ; i++){
+            this.lzhfwytDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue})
+          }
+        });
+        this.onConfirmZjd(response.data.zjddm);
+        listLzspyj({lzId:response.data.id}).then((response) => {
+          if(response.rows.length > 0){
+            this.lzspyjData = response.rows[0];
+          }
+        });
       });
+
     },
     complete(pass) {
       if(!this.approval.taskId || !this.approval.instanceId || this.approval.type !== 'todo')
@@ -208,6 +281,50 @@ export default {
       });
       return true;
     },
+    zjddmChange(value){
+      let _this = this;
+      queryGeoZjdzd({zjddm:value}).then(zjdRes => {
+        if(zjdRes.data != null){
+          _this.$set(this.zjdData, "zjdzsh", zjdRes.data.zjdzsh);
+          if(zjdRes.data.thouseBaseStandardNmfw.length > 0){
+            zjdRes.data.thouseBaseStandardNmfw.forEach(function (item) {
+              if(_this.zjdData.jzmj != null &&  _this.zjdData.jzmj !== ""){
+                _this.$set(_this.zjdData, "jzmj", parseInt(_this.zjdData.jzmj) + parseInt(item.jzmj));
+              }else{
+                _this.$set(_this.zjdData, "jzmj", item.jzmj);
+              }
+            })
+
+            this.$set(this.zjdData, "fwcs", zjdRes.data.thouseBaseStandardNmfw[0].sjcs);
+          }
+          if(zjdRes.data.thouseBaseStandardZjdzdxx.length > 0){
+            this.$set(this.zjdData, "zjdmj", zjdRes.data.thouseBaseStandardZjdzdxx[0].zjdpzmj);
+          }
+        }
+      });
+    },
+    onConfirmZjd(value) {
+      this.zjddmChange(value);
+      this.circulation.zjddm = value;
+      let form = {};
+      form.zjddm = value;
+      getByZjddm(form).then(qlrRes => {
+        let data = qlrRes.data;
+        this.circulation.shyqrdm = data.shyqrdm;
+        let queryMember = {
+          hzxm :  data.shyqrdbxm,
+        };
+        queryHouserBaseNh(queryMember).then((response) => {
+          this.$set(this.circulation, 'hncysl', response.rows[0].hncysl);
+        });
+        this.$set(this.circulation, 'suyqrdbxm', data.shyqrdbxm);
+        this.$set(this.circulation, 'zjdsyqr', data.shyqrdbxm);
+        this.$set(this.circulation, 'zcfsfbjtjjzzcy', data.sfbncjtjjzzcy == '1' || data.sfbncjtjjzzcy == 'Y' ? 'Y' : 'N');
+        this.$forceUpdate();
+      });
+      this.showZjd = false;
+
+    },
     notify(message, type) {
       Notify.clear();
       Notify({ type: type || 'primary', message: message });

src/views/onlineHome/homestead/circulation/circulationList.vue

@@ -33,13 +33,13 @@
           <template #right>
             <van-row>
               <van-col>
-                <van-button square text="修改" type="info" v-if="item.auditStatus=='0'" class="delete-button" :to="{name:'circulationModify', query: {id:item.id}}" />
+                <van-button square text="修改" type="info" class="delete-button" :to="{name:'circulationModify', query: {id:item.id}}" />
               </van-col>
+<!--              <van-col>-->
+<!--                <van-button square text="提交" type="primary" v-if="item.auditStatus=='0'" class="delete-button" @click="submit(item)" />-->
+<!--              </van-col>-->
               <van-col>
-                <van-button square text="提交" type="primary" v-if="item.auditStatus=='0'" class="delete-button" @click="submit(item)" />
-              </van-col>
-              <van-col>
-                <van-button square text="删除" type="danger" v-if="item.auditStatus=='0'" @click="deleteList(item.id,index)" class="delete-button" />
+                <van-button square text="删除" type="danger" @click="deleteList(item.id,index)" class="delete-button" />
               </van-col>
             </van-row>
           </template>

src/views/onlineHome/homestead/circulation/circulationModify.vue

@@ -68,101 +68,49 @@
 <!--              @cancel="showShyqrdm = false"-->
 <!--            />-->
 <!--          </van-popup>-->
-
-          <van-cell title="是否本集体经济组织成员">
-            <template #right-icon>
-              <van-radio-group v-model="circulation.zcfsfbjtjjzzcy" direction="horizontal">
-                <van-radio name="Y">是</van-radio>
-                <van-radio name="N">否</van-radio>
-              </van-radio-group>
-            </template>
-          </van-cell>
-        </div>
-
-        <p class="main_title">流转信息</p>
-        <div class="main_box">
-          <van-field label="流转面积(㎡)" v-model="circulation.lzmj" placeholder="请输入流转面积(㎡)" input-align="right" label-width="auto" type="number"/>
-          <van-field label="流转单价(元)" v-model="circulation.lzdj" placeholder="请输入流转单价(元)" input-align="right" label-width="auto" type="number"/>
-          <van-field label="流转费用(元)" v-model="circulation.lzfy" placeholder="请输入流转费用(元)" input-align="right" label-width="auto" type="number"/>
           <van-field
-            readonly
-            clickable
-            v-model="circulation.lzqsrq"
-            label="流转起始时间"
-            placeholder="请选择起始时间"
-            @click="showlzqsrq = true"
+            v-model="circulation.hncysl"
+            label="家庭人口"
+            placeholder="家庭人口"
+            label-width="auto"
             input-align="right"
-            right-icon="arrow-down"
           />
-          <van-popup v-model="showlzqsrq" position="bottom">
-            <van-datetime-picker
-              :value="new Date"
-              type="date"
-              title="选择年月日"
-              @confirm="onConfirmLzqsrq"
-              @cancel="showlzqsrq = false"
-            />
-          </van-popup>
-
           <van-field
-            readonly
-            clickable
-            v-model="circulation.lzjsrq"
-            label="流转结束时间"
-            placeholder="请选择结束时间"
-            @click="showlzjsrq = true"
+            v-model="circulation.zjdsyqr"
+            label="使用权人"
+            label-width="auto"
+            placeholder="使用权人"
             input-align="right"
-            right-icon="arrow-down"
           />
-          <van-popup v-model="showlzjsrq" position="bottom">
-            <van-datetime-picker
-              :value="new Date"
-              type="date"
-              title="选择年月日"
-              @confirm="onConfirmLzjsrq"
-              @cancel="showlzjsrq = false"
-            />
-          </van-popup>
-
           <van-field
-            readonly
-            clickable
-            v-model="lzqfwyt"
-            label="流转前房屋用途"
-            placeholder="请选择流转前房屋用途"
-            @click="showLzqfwyt = true"
-            input-align="right"
-            right-icon="arrow-down"
+            v-model="circulation.currentResidence"
+            label="现居住地"
             label-width="auto"
+            placeholder="现居住地"
+            input-align="right"
           />
-          <van-popup v-model="showLzqfwyt" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="lzqfwytDictionaries"
-              @confirm="onConfirmLzqfwyt"
-              @cancel="showLzqfwyt = false"
-            />
-          </van-popup>
-
           <van-field
-            readonly
-            clickable
-            v-model="lzhfwyt"
-            label="流转后房屋用途"
-            placeholder="请选择流转后房屋用途"
-            @click="showLzhfwyt = true"
-            input-align="right"
-            right-icon="arrow-down"
+            v-model="circulation.householdRegister"
+            label="户口所在地"
             label-width="auto"
+            input-align="right"
           />
-          <van-popup v-model="showLzhfwyt" position="bottom">
-            <van-picker
-              show-toolbar
-              :columns="lzhfwytDictionaries"
-              @confirm="onConfirmLzhfwyt"
-              @cancel="showLzhfwyt = false"
-            />
-          </van-popup>
+          <van-cell title="是否本集体经济组织成员">
+            <template #right-icon>
+              <van-radio-group v-model="circulation.zcfsfbjtjjzzcy" direction="horizontal">
+                <van-radio name="Y">是</van-radio>
+                <van-radio name="N">否</van-radio>
+              </van-radio-group>
+            </template>
+          </van-cell>
+        </div>
+
+        <p class="main_title">流转信息</p>
+        <div class="main_box">
+          <van-field label="房屋层数" v-model="zjdData.fwcs" placeholder="房屋层数" input-align="right" label-width="auto" type="number"/>
+          <van-field label="建筑面积(㎡)" v-model="zjdData.jzmj" placeholder="流转面积(㎡)" input-align="right" label-width="auto" type="number"/>
+          <van-field label="宅基地面积(㎡)" v-model="zjdData.zjdmj" placeholder="宅基地面积(㎡)" input-align="right" label-width="auto" type="number"/>
+          <van-field label="不动产证书编号" v-model="zjdData.zjdzsh" placeholder="不动产证书编号(㎡)" input-align="right" label-width="auto" type="number"/>
         </div>
 
         <p class="main_title">转入方信息</p>
@@ -212,6 +160,27 @@
               </van-radio-group>
             </template>
           </van-cell>
+          <van-field
+            readonly
+            clickable
+            v-model="lzhfwyt"
+            label="流转后房屋用途"
+            placeholder="流转后房屋用途"
+            @click="showLzhfwyt = true"
+            input-align="right"
+            right-icon="arrow-down"
+            label-width="auto"
+          />
+          <van-popup v-model="showLzhfwyt" position="bottom">
+            <van-picker
+              show-toolbar
+              :columns="lzhfwytDictionaries"
+              @confirm="onConfirmLzhfwyt"
+              @cancel="showLzhfwyt = false"
+            />
+          </van-popup>
+          <van-field label="流转金额" v-model="circulation.lzfy" placeholder="流转金额" input-align="right" label-width="auto" type="number"/>
+          <van-field label="集体收益金额" v-model="circulation.jtsyje" placeholder="集体收益金额" input-align="right" label-width="auto" type="number"/>
         </div>
 
         <p class="main_title">其他</p>
@@ -220,16 +189,133 @@
           <van-field label="所有权人意见" v-model="circulation.suyqryj" placeholder="请输入内容" input-align="right" label-width="auto"/>
           <van-field label="备注" v-model="circulation.bz" placeholder="请输入备注" input-align="right" label-width="auto"/>
         </div>
+        <p class="main_title">转入方意见</p>
+        <div class="main_box">
+          <van-field label="意见" v-model="lzspyjData.zrryj" placeholder="转入方意见" input-align="right" label-width="auto"/>
+          <van-field label="签字" v-model="lzspyjData.zrrqz" placeholder="转入方签字" input-align="right" label-width="auto"/>
+          <van-field
+            readonly
+            clickable
+            v-model="lzspyjData.zrryjrq"
+            label="签字日期"
+            placeholder="签字日期"
+            @click="showlzqsrq = true"
+            input-align="right"
+            right-icon="arrow-down"
+          />
+          <van-popup v-model="showlzqsrq" position="bottom">
+            <van-datetime-picker
+              :value="new Date"
+              type="date"
+              title="选择年月日"
+              @confirm="onConfirmLzqsrq"
+              @cancel="showlzqsrq = false"
+            />
+          </van-popup>
+        </div>
+        <p class="main_title">转出方意见</p>
+        <div class="main_box">
+          <van-field label="意见" v-model="lzspyjData.zcryj" placeholder="转出方意见" input-align="right" label-width="auto"/>
+          <van-field label="签字" v-model="lzspyjData.zcrqz" placeholder="转出方签字" input-align="right" label-width="auto"/>
+          <van-field
+            readonly
+            clickable
+            v-model="lzspyjData.zcryjrq"
+            label="签字日期"
+            placeholder="签字日期"
+            @click="showzcfqzrq = true"
+            input-align="right"
+            right-icon="arrow-down"
+          />
+          <van-popup v-model="showzcfqzrq" position="bottom">
+            <van-datetime-picker
+              :value="new Date"
+              type="date"
+              title="选择年月日"
+              @confirm="onConfirmzcfqzrq"
+              @cancel="showzcfqzrq = false"
+            />
+          </van-popup>
+        </div>
+        <p class="main_title">村集体经济组织意见</p>
+        <div class="main_box">
+          <van-field label="意见" v-model="lzspyjData.cjtjjzzyj" placeholder="村集体经济组织意见" input-align="right" label-width="auto"/>
+          <van-field label="签字" v-model="lzspyjData.cjtjjzzqz" placeholder="村集体经济组织签字" input-align="right" label-width="auto"/>
+          <van-field
+            readonly
+            clickable
+            v-model="lzspyjData.cjtjjzzyjrq"
+            label="签字日期"
+            placeholder="签字日期"
+            @click="showcjtqzrq = true"
+            input-align="right"
+            right-icon="arrow-down"
+          />
+          <van-popup v-model="showcjtqzrq" position="bottom">
+            <van-datetime-picker
+              :value="new Date"
+              type="date"
+              title="选择年月日"
+              @confirm="onConfirmcjtqzrq"
+              @cancel="showcjtqzrq = false"
+            />
+          </van-popup>
+        </div>
+        <p class="main_title">宅基地审批管理办公室意见</p>
+        <div class="main_box">
+          <van-field label="意见" v-model="lzspyjData.zzjdspyj" placeholder="审批管理办公室意见" input-align="right" label-width="auto"/>
+          <van-field label="签字" v-model="lzspyjData.zzjdspqz" placeholder="审批管理办公室签字" input-align="right" label-width="auto"/>
+          <van-field
+            readonly
+            clickable
+            v-model="lzspyjData.zzjdspyjrq"
+            label="签字日期"
+            placeholder="签字日期"
+            @click="showzzjdqzrq = true"
+            input-align="right"
+            right-icon="arrow-down"
+          />
+          <van-popup v-model="showzzjdqzrq" position="bottom">
+            <van-datetime-picker
+              :value="new Date"
+              type="date"
+              title="选择年月日"
+              @confirm="onConfirmzzjdqzrq"
+              @cancel="showzzjdqzrq = false"
+            />
+          </van-popup>
+        </div>
+        <p class="main_title">镇级人民政府意见</p>
+        <div class="main_box">
+          <van-field label="意见" v-model="lzspyjData.zjrmzfyj" placeholder="镇级人民政府意见" input-align="right" label-width="auto"/>
+          <van-field label="签字" v-model="lzspyjData.zjrmzfqz" placeholder="镇级人民政府签字" input-align="right" label-width="auto"/>
+          <van-field
+            readonly
+            clickable
+            v-model="lzspyjData.zjrmzfyjrq"
+            label="签字日期"
+            placeholder="签字日期"
+            @click="showzjrmzfdqzrq = true"
+            input-align="right"
+            right-icon="arrow-down"
+          />
+          <van-popup v-model="showzjrmzfdqzrq" position="bottom">
+            <van-datetime-picker
+              :value="new Date"
+              type="date"
+              title="选择年月日"
+              @confirm="onConfirmzjrmzfqzrq"
+              @cancel="showzjrmzfdqzrq = false"
+            />
+          </van-popup>
+        </div>
       </van-form>
 
         <div style="padding: 16px 0;">
           <van-row>
-            <van-col span="12" align="center">
+            <van-col span="24" align="center">
               <van-button type="info" native-type="submit" class="submitButton" @click="goEdit">保<i style="margin-right: 1em;"></i>存</van-button>
             </van-col>
-            <van-col span="12" align="center">
-              <van-button type="info" native-type="submit" class="submitButton" @click="goSubmit">提<i style="margin-right: 1em;"></i>交</van-button>
-            </van-col>
           </van-row>
           <div class="clear"></div>
         </div>
@@ -237,7 +323,8 @@
 </template>
 
 <script>
-import { getLz , zjdzd , getByZjddm , edit , goApply } from "@/api/onlineHome/homestead/circulation";
+import { getLz , zjdzd ,queryGeoZjdzd,queryHouserBaseNh, getByZjddm , edit , goApply } from "@/api/onlineHome/homestead/circulation";
+import { listLzspyj,updateLzspyj } from "@/api/onlineHome/homestead/lzspyj";
 import {Notify} from "vant";
 export default {
     name: "circulationModify",
@@ -257,6 +344,13 @@ export default {
       zrfdbmc: '',//转入方代表名称
       zrfdbzjlx: '',//转入方证件类型
       zjd: [],//宅基地列表
+      zjdData:{
+        jzmj:null,
+        fwcs:null,
+        zjdmj:null
+      },
+      //流转审批意见
+      lzspyjData:{},
       showLzfs: false,
       showShyqrdm: false,
       showLzqfwyt: false,
@@ -266,6 +360,15 @@ export default {
       showZjd:false,
       showlzqsrq:false,
       showlzjsrq:false,
+      showzcfqzrq:false,
+      showcjtqzrq:false,
+      showzzjdqzrq:false,
+      showzjrmzfdqzrq:false,
+      zrryjrq:null,
+      zcryjrq:null,
+      cjtjjzzyjrq:null,
+      zzjdspyjrq:null,
+      zjrmzfyjrq:null,
       circulation:[]
     };
   },
@@ -318,16 +421,63 @@ export default {
         });
 
         this.circulation = response.data;
+        this.onConfirmZjd(response.data.zjddm);
+        listLzspyj({lzId:response.data.id}).then((response) => {
+          if(response.rows.length > 0){
+            this.lzspyjData = response.rows[0];
+          }
+        });
+      });
+    },
+    zjddmChange(value){
+      let _this = this;
+      queryGeoZjdzd({zjddm:value}).then(zjdRes => {
+        if(zjdRes.data != null){
+          _this.$set(this.zjdData, "zjdzsh", zjdRes.data.zjdzsh);
+          if(zjdRes.data.thouseBaseStandardNmfw.length > 0){
+            zjdRes.data.thouseBaseStandardNmfw.forEach(function (item) {
+              if(_this.zjdData.jzmj != null &&  _this.zjdData.jzmj !== ""){
+                _this.$set(_this.zjdData, "jzmj", parseInt(_this.zjdData.jzmj) + parseInt(item.jzmj));
+              }else{
+                _this.$set(_this.zjdData, "jzmj", item.jzmj);
+              }
+            })
+
+            this.$set(this.zjdData, "fwcs", zjdRes.data.thouseBaseStandardNmfw[0].sjcs);
+          }
+          if(zjdRes.data.thouseBaseStandardZjdzdxx.length > 0){
+            this.$set(this.zjdData, "zjdmj", zjdRes.data.thouseBaseStandardZjdzdxx[0].zjdpzmj);
+          }
+        }
       });
     },
+    onConfirmZjd(value) {
+      this.zjddmChange(value);
+      this.circulation.zjddm = value;
+      let form = {};
+      form.zjddm = value;
+      getByZjddm(form).then(qlrRes => {
+        let data = qlrRes.data;
+        this.circulation.shyqrdm = data.shyqrdm;
+        let queryMember = {
+          hzxm :  data.shyqrdbxm,
+        };
+        queryHouserBaseNh(queryMember).then((response) => {
+          this.$set(this.circulation, 'hncysl', response.rows[0].hncysl);
+        });
+        this.$set(this.circulation, 'suyqrdbxm', data.shyqrdbxm);
+        this.$set(this.circulation, 'zjdsyqr', data.shyqrdbxm);
+        this.$set(this.circulation, 'zcfsfbjtjjzzcy', data.sfbncjtjjzzcy == '1' || data.sfbncjtjjzzcy == 'Y' ? 'Y' : 'N');
+        this.$forceUpdate();
+      });
+      this.showZjd = false;
+
+    },
     onConfirmLzfs(value) {
       this.lzfs = value.text;
       this.circulation.lzfs = value.value;
       this.showLzfs = false;
     }, //流转方式
-    onConfirmZjd(value) {
-      this.showZjd = false;
-    }, //宅基地列表
     onConfirmShyqrdm(value) {
       this.showShyqrdm = false;
     }, //转出方使用权人代码
@@ -351,19 +501,38 @@ export default {
       this.showZrfdbzjlx = false;
     }, //转入方代表证件类型
     onConfirmLzqsrq(value) {
-      this.circulation.lzqsrq = this.getNowFormatDate(value).substr(0,10);
+      this.lzspyjData.zrryjrq = this.getNowFormatDate(value).substr(0,10);
       this.showlzqsrq = false;
-    }, //流转起始时间
-    onConfirmLzjsrq(value) {
-      this.circulation.lzjsrq = this.getNowFormatDate(value).substr(0,10);
-      this.showlzjsrq = false;
-    }, //流转结束时间
+    }, //转出方时间
+    onConfirmzcfqzrq(value) {
+      this.lzspyjData.zcryjrq = this.getNowFormatDate(value).substr(0,10);
+      this.showzcfqzrq = false;
+    },
+    onConfirmcjtqzrq(value) {
+      this.lzspyjData.cjtjjzzyjrq = this.getNowFormatDate(value).substr(0,10);
+      this.showcjtqzrq = false;
+    }, //村集体签字日期
+    onConfirmzzjdqzrq(value) {
+      this.lzspyjData.zzjdspyjrq = this.getNowFormatDate(value).substr(0,10);
+      this.showzzjdqzrq = false;
+    },//宅基地审批管理办公室签字日期
+    onConfirmzjrmzfqzrq(value) {
+      this.lzspyjData.zjrmzfyjrq = this.getNowFormatDate(value).substr(0,10);
+      this.showzjrmzfdqzrq = false;
+    },//镇级人民政府签字日期
+
     goEdit(){
       this.$refs._Form.validate().then(() => {
       edit(this.circulation).then(response => {
         if(response.code = 200){
+          if(this.lzspyjData != null){
+            updateLzspyj(this.lzspyjData).then((res) => {
+              this.$toast.success('保存成功');
+              window.location.replace("circulationList")
+            });
+          }
           this.$toast.success('保存成功');
-          this.$router.back(-1);
+          window.location.replace("circulationList");
         }
       })
         }).catch((e) => {

src/views/onlineHome/homestead/homeApplication/proposerLite.vue

@@ -3117,19 +3117,19 @@ export default {
               }
               break;
             case "town_leader":
-              msg = this.validateAgricultureForm(pass);
-              if (msg) {
-                break;
-              }
-              msg = this.validateNatureForm();
-              if (msg) {
-                break;
-              }
-
-              msg = this.validateBuildingForm();
-              if (msg) {
-                break;
-              }
+              // msg = this.validateAgricultureForm(pass);
+              // if (msg) {
+              //   break;
+              // }
+              // msg = this.validateNatureForm();
+              // if (msg) {
+              //   break;
+              // }
+              //
+              // msg = this.validateBuildingForm();
+              // if (msg) {
+              //   break;
+              // }
               msg = this.validateTownForm();
               if (msg) {
                 break;
@@ -3163,15 +3163,21 @@ export default {
                                   });
                                 });
                               }else{
+
                                 if (this.checkString(this.applicationDetail.tHouseApproveLocationplanOptions.locationPlan)) {
-                                  msg =  "现场踏勘不能为空";
+                                  _this.notify("现场踏勘不能为空", 'danger');
+                                  _this.$refs.form.validate().then(() => {}).catch((e)=>{})
                                 }
                               }
                             });
                           } else {
                             if (this.checkString(this.applicationDetail.tHouseApproveTownOptions.townPlan)) {
-                              msg =  "镇政府审批现场拍照不能为空";
+                              _this.notify("镇政府审批现场拍照不能为空", 'danger');
+                              _this.$refs.form.validate().then(() => {}).catch((e)=>{})
                             }else{
+                            if(!pass){
+                              comment = "驳回";
+                            }
                               setTimeout(() => {
                                 saveHouseBaseInfo(_this.applicationDetail).then((response) => {
                                   _this.complete(pass, comment);
@@ -3326,9 +3332,9 @@ export default {
               }
               comment = this.applicationDetail.tHouseApplyEnd.zhenOption;
               if(this.$refs.tHouseApplyEndZhen && this.$refs.tHouseApplyEndZhen.isValid()) {
+                if (_this.$refs.pictureUploadAccepting && _this.$refs.pictureUploadAccepting.isValid()) {
                 this.submitHouseApproveEndBZhenOptions().then(item=>{
                   comment = this.applicationDetail.tHouseApplyEnd.zhenOption;
-                  if (_this.$refs.pictureUploadAccepting && _this.$refs.pictureUploadAccepting.isValid()) {
                     this.submitHouseApplyEndLocationplanOptions(pass).then(item2=>{
                       updateEnd(_this.applicationDetail.tHouseApplyEnd).then((response) => {
                         _this.complete(pass, comment);
@@ -3336,12 +3342,14 @@ export default {
                         _this.notify('保存失败', 'danger');
                       });
                     });
-                  }else{
-                    if (this.checkString(this.applicationDetail.tHouseApplyEnd.locationPlan)) {
-                      msg =  "竣工平面简图不能为空";
-                    }
-                  }
+
                 });
+                }else{
+                  if (this.checkString(this.applicationDetail.tHouseApplyEnd.locationPlan)) {
+                    msg =  "竣工平面简图不能为空";
+                  }
+
+                }
               } else {
                 if (this.checkString(this.applicationDetail.tHouseApplyEnd.zhenPlan)) {
                   msg =  "乡镇政府现场拍照不能为空";