From adb3396a340b01c3909e50009f287040c1294528 Mon Sep 17 00:00:00 2001
From: xuyuanqing <392009588@qq.com>
Date: Thu, 13 Jun 2024 11:00:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E8=BD=AE=E5=BB=B6=E5=8C=85-=E6=89=BF?=
 =?UTF-8?q?=E5=8C=85=E6=96=B9=E3=80=81=E6=89=BF=E5=8C=85=E6=96=B9=E5=AE=B6?=
 =?UTF-8?q?=E5=BA=AD=E6=88=90=E5=91=98=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../village/contractor/contractorDetail.vue   | 66 ++++++++++++++++-
 .../contractor/contractorDetailAdd.vue        | 74 ++++++++++++++++++-
 .../contractor/contractorFamilyDetail.vue     | 54 +++++++++++++-
 3 files changed, 190 insertions(+), 4 deletions(-)

diff --git a/src/views/contracted/village/contractor/contractorDetail.vue b/src/views/contracted/village/contractor/contractorDetail.vue
index 83b3c5b6..bfa2fdb8 100644
--- a/src/views/contracted/village/contractor/contractorDetail.vue
+++ b/src/views/contracted/village/contractor/contractorDetail.vue
@@ -70,6 +70,52 @@
         <van-field v-model="form.cbfdz" label="地址：" placeholder="请输入地址" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="100" />
         <van-field v-model="form.yzbm" label="邮编：" placeholder="请输入邮编" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="6" />
         <van-field v-model="form.lxdh" label="电话：" placeholder="请输入电话" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="15" />
+        <FieldRadio
+          v-model="form.sfyzf"
+          label="是否有住房"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/open/zdzh/list/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfzcjz"
+          label="是否在村居住"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/open/zdzh/list/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <van-field
+          v-model="form.householdStatus"
+          label="整户状态："
+          placeholder="请选择整户状态"
+          required
+          :rules="[{ required: true }]"
+          :border="false"
+          input-align="left"
+          right-icon="arrow-down"
+          readonly
+          clickable
+          @click="showZhzt = true"
+        />
+        <van-popup v-model="showZhzt" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="householdStatusOptions"
+            value-key="dictLabel"
+            @confirm="householdStatusOptions"
+            @cancel="showZhzt = false"
+          />
+        </van-popup>
+        <van-field v-model="form.totalArea" label="总面积(亩)：" placeholder="请输入总面积㎡" input-align="left"  type="number"/>
+        <van-field v-model="form.qqArea" label="确权面积(亩)：" placeholder="请输入确权面积㎡" input-align="left"  type="number"/>
+        <van-field v-model="form.qtArea" label="其他面积(亩)：" placeholder="请输入总面积㎡" input-align="left" required type="number"/>
+        <van-field v-model="form.dks" label="地块数：" placeholder="请输入地块数" input-align="left"   type="number"/>
+        <van-field v-model="form.zzjyArea" label="自主经营面积(亩)：" placeholder="请输入自主经营面积㎡" input-align="left"   type="number"/>
+        <van-field v-model="form.lzcArea" label="流转出面积(亩)：" placeholder="请输入流转出面积㎡" input-align="left"   type="number"/>
+        <van-field v-model="form.shArea" label="损毁面积(亩)：" placeholder="请输入损毁面积㎡" input-align="left"   type="number"/>
+        <van-field v-model="form.zzArea" label="征占面积(亩)：" placeholder="请输入征占面积㎡" input-align="left"   type="number"/>
         <van-field v-model="form.cbfdcjs" label="调查记事：" type="textarea" rows="3" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="250" />
       </van-form>
       <p class="btn" @click="submitForm" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">保存</p>
@@ -81,17 +127,19 @@
 <script>
   import Cookies from "js-cookie";
   import contractorHeader from "./contractorHeader";
+  import FieldRadio from "@/components/form/FieldRadio";
   import { getCbf, updateCbf } from "@/api/contracted/cbf";
 
   export default {
     name: "contractedVillageContractor",
     components: {
-      contractorHeader
+      contractorHeader,FieldRadio
     },
     data() {
       return {
         showType:false,
         showZjType:false,
+        showZhzt:false,
         // 承包方信息表单
         form: {},
         // 承包方类型字典
@@ -100,6 +148,8 @@
         credentialTypeOptions: [],
         // 调查任务的完成状态：1表示已完成，2表示未完成
         taskStatus: null,
+        // 整户状态类型字典
+        householdStatusOptions: [],
       };
     },
     created() {
@@ -110,6 +160,9 @@
       this.getDicts("cert_type").then(response => {
         this.credentialTypeOptions = response.data;
       });
+      this.getDicts("household_status").then(response => {
+        this.householdStatusOptions = response.data;
+      });
     },
     mounted() {
       setTimeout(() => {
@@ -178,7 +231,16 @@
     padding: 0 4vw;
     overflow: hidden;
   }
-
+  /deep/ .van-field__label {
+    -webkit-box-flex: 0;
+    flex: none;
+    box-sizing: border-box;
+    width: 9em;
+    margin-right: 0.32rem;
+    color: #646566;
+    text-align: left;
+    word-wrap: break-word;
+  }
   /deep/ .van-nav-bar{
     background: transparent;
   }
diff --git a/src/views/contracted/village/contractor/contractorDetailAdd.vue b/src/views/contracted/village/contractor/contractorDetailAdd.vue
index edaaf8da..55087863 100644
--- a/src/views/contracted/village/contractor/contractorDetailAdd.vue
+++ b/src/views/contracted/village/contractor/contractorDetailAdd.vue
@@ -66,6 +66,52 @@
         <van-field v-model="form.cbfdz" label="地址：" placeholder="请输入地址" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="100" />
         <van-field v-model="form.yzbm" label="邮编：" placeholder="请输入邮编" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="6" />
         <van-field v-model="form.lxdh" label="电话：" placeholder="请输入电话" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="15" />
+        <FieldRadio
+          v-model="form.sfyzf"
+          label="是否有住房"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/open/zdzh/list/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.sfzcjz"
+          label="是否在村居住"
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/open/zdzh/list/house_yes_no"
+          :on-remote-response="'data'"
+        />
+        <van-field
+          v-model="householdStatusText"
+          label="整户状态："
+          placeholder="请选择整户状态"
+          required
+          :rules="[{ required: true }]"
+          :border="false"
+          input-align="left"
+          right-icon="arrow-down"
+          readonly
+          clickable
+          @click="showZhzt = true"
+        />
+        <van-popup v-model="showZhzt" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="householdStatusOptions"
+            value-key="dictLabel"
+            @confirm="onConfirmHouseholdStatusOptions"
+            @cancel="showZhzt = false"
+          />
+        </van-popup>
+        <van-field v-model="form.totalArea" label="总面积(亩)：" placeholder="请输入总面积㎡" input-align="left"  type="number"/>
+        <van-field v-model="form.qqArea" label="确权面积(亩)：" placeholder="请输入确权面积㎡" input-align="left"  type="number"/>
+        <van-field v-model="form.qtArea" label="其他面积(亩)：" placeholder="请输入总面积㎡" input-align="left" required type="number"/>
+        <van-field v-model="form.dks" label="地块数：" placeholder="请输入地块数" input-align="left"   type="number"/>
+        <van-field v-model="form.zzjyArea" label="自主经营面积(亩)：" placeholder="请输入自主经营面积㎡" input-align="left"   type="number"/>
+        <van-field v-model="form.lzcArea" label="流转出面积(亩)：" placeholder="请输入流转出面积㎡" input-align="left"   type="number"/>
+        <van-field v-model="form.shArea" label="损毁面积(亩)：" placeholder="请输入损毁面积㎡" input-align="left"   type="number"/>
+        <van-field v-model="form.zzArea" label="征占面积(亩)：" placeholder="请输入征占面积㎡" input-align="left"   type="number"/>
         <van-field v-model="form.cbfdcjs" label="调查记事：" type="textarea" rows="3" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="250" />
       </van-form>
       <p class="btn" @click="submitForm">保存</p>
@@ -77,13 +123,19 @@
 <script>
   import Cookies from "js-cookie";
   import { addCbf, generateContractorCode } from "@/api/contracted/cbf";
+  import FieldRadio from "@/components/form/FieldRadio";
+  import FieldSelect from "@/components/form/FieldSelect";
 
   export default {
     name: "contractedVillageContractorAdd",
+    components: {
+      FieldRadio,FieldSelect
+    },
     data() {
       return {
         showType:false,
         showZjType:false,
+        showZhzt:false,
         // 承包方信息表单
         form: {
           deptId: null,
@@ -102,10 +154,13 @@
         cbflxText: '农户',
         // 承包方证件类型(标签名)
         cbfzjlxText: '居民身份证',
+        householdStatusText:"",
         // 承包方类型字典
         contractorTypeOptions: [],
         // 承包方证件类型字典
         credentialTypeOptions: [],
+        // 整户状态类型字典
+        householdStatusOptions: [],
       };
     },
     created() {
@@ -115,6 +170,9 @@
       this.getDicts("cert_type").then(response => {
         this.credentialTypeOptions = response.data;
       });
+      this.getDicts("household_status").then(response => {
+        this.householdStatusOptions = response.data;
+      });
     },
     methods: {
       onConfirmTypeOptions(value){
@@ -127,6 +185,11 @@
         this.cbfzjlxText = value.dictLabel;
         this.showZjType = false;
       },
+      onConfirmHouseholdStatusOptions(value){
+        this.form.householdStatus = value.dictValue;
+        this.householdStatusText = value.dictLabel;
+        this.showZhzt = false;
+      },
       submitForm() {
         this.$refs.formData.validate().then(() => {
           this.form.deptId = this.$route.params.deptId;
@@ -164,7 +227,16 @@
     padding: 0 4vw;
     overflow: hidden;
   }
-
+  /deep/ .van-field__label {
+    -webkit-box-flex: 0;
+    flex: none;
+    box-sizing: border-box;
+    width: 9em;
+    margin-right: 0.32rem;
+    color: #646566;
+    text-align: left;
+    word-wrap: break-word;
+  }
   /deep/ .van-nav-bar{
     background: transparent;
   }
diff --git a/src/views/contracted/village/contractor/contractorFamilyDetail.vue b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
index ebb0478d..e9402d89 100644
--- a/src/views/contracted/village/contractor/contractorFamilyDetail.vue
+++ b/src/views/contracted/village/contractor/contractorFamilyDetail.vue
@@ -79,6 +79,43 @@
           />
         </van-popup>
         <van-field v-model="form.cyzjhm" label="证件号码：" placeholder="请输入证件号码" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="20" />
+        <FieldRadio
+          v-model="form.sfitijzzcy"
+          label="是否集体经济组织成员："
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/open/zdzh/list/sys_yes_no"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-model="form.isNew"
+          label="是否新数据："
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/open/zdzh/list/sys_yes_no"
+          :on-remote-response="'data'"
+        />
+        <van-field v-model="form.elcbshjd" class = "elcbshjd_css" label="二轮承包时户籍地：" placeholder="请输入二轮承包时户籍地" :border="false" input-align="right" />
+        <van-field v-model="form.xhjd" label="现户籍地：" placeholder="请输入现户籍地" :border="false" input-align="right" />
+        <field-select
+          v-if="form.sfgyr == '2'"
+          v-model="form.wdyy"
+          label="无地原因："
+          value-key="dictLabel"
+          data-key="dictValue"
+          placeholder="选择无地原因"
+          remote-url="/open/zdzh/list/wdyy_type"
+          :on-remote-response="'data'"
+        />
+        <FieldRadio
+          v-if="form.sfgyr == '2'"
+          v-model="form.sfhdr"
+          label="是否侯地人员："
+          value-key="dictLabel"
+          data-key="dictValue"
+          remote-url="/open/zdzh/list/sys_yes_no"
+          :on-remote-response="'data'"
+        />
         <van-field
           v-model="cybzText"
           label="成员备注："
@@ -111,10 +148,15 @@
 </template>
 <script>
   import Cookies from "js-cookie";
+  import FieldRadio from "@/components/form/FieldRadio";
+  import FieldSelect from "@/components/form/FieldSelect";
   import { getJtcy, addJtcy, updateJtcy } from "@/api/contracted/cbfjtcy";
 
   export default {
     name: "contractedVillageContractor",
+    components: {
+      FieldRadio,FieldSelect
+    },
     data() {
       return {
         titleName: '',                  // 顶部标题名
@@ -267,7 +309,17 @@
     padding: 0 4vw;
     overflow: hidden;
   }
-
+  /deep/ .elcbshjd_css .van-field__label {
+    -webkit-box-flex: 0;
+    -webkit-flex: none;
+    flex: none;
+    box-sizing: border-box;
+    width: 10.2em;
+    margin-right: 0.32rem;
+    color: #646566;
+    text-align: left;
+    word-wrap: break-word;
+  }
   /deep/ .van-nav-bar{
     background: transparent;
   }