确权调查测试问题修改

src/views/contracted/village/contractor/contractWord.vue

@@ -49,7 +49,7 @@
           />
         </van-popup>
         <van-field v-model="form.cbfbm" label="承包方代码：" placeholder="请输入承包方代码" required :rules="[{ required: true }]" :border="false" input-align="left" :disabled="isDisabled" maxlength="18" />
-        <van-field v-model="form.cbfmc" label="承包方名称：" placeholder="请输入承包方名称" required :rules="[{ required: true }]" :border="false" input-align="left" />
+        <van-field v-model="form.cbfmc" label="承包方名称：" placeholder="请输入承包方名称" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="50" />
         <van-field
           v-model="cbfsText"
           label="承包方式："

src/views/contracted/village/contractor/contractorDetail.vue

@@ -42,7 +42,7 @@
             @cancel="showType = false"
           />
         </van-popup>
-        <van-field v-model="form.cbfmc" label="名称：" placeholder="请输入名称" required :rules="[{ required: true }]" :border="false" input-align="left" />
+        <van-field v-model="form.cbfmc" label="名称：" placeholder="请输入名称" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="50" />
         <van-field
           v-model="form.cbfzjlxText"
           label="证件类型："
@@ -66,11 +66,11 @@
           />
         </van-popup>
 
-        <van-field v-model="form.cbfzjhm" label="证件号码：" placeholder="请输入证件号码" required :rules="[{ required: true }]" :border="false" input-align="left" />
-        <van-field v-model="form.cbfdz" label="地址：" placeholder="请输入地址" required :rules="[{ required: true }]" :border="false" input-align="left" />
+        <van-field v-model="form.cbfzjhm" label="证件号码：" placeholder="请输入证件号码" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="20" />
+        <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" />
-        <van-field v-model="form.cbfdcjs" label="调查记事：" type="textarea" rows="3" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="left" />
+        <van-field v-model="form.lxdh" label="电话：" placeholder="请输入电话" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="15" />
+        <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>
     </div>

src/views/contracted/village/contractor/contractorDetailAdd.vue

@@ -38,7 +38,7 @@
             @cancel="showType = false"
           />
         </van-popup>
-        <van-field v-model="form.cbfmc" label="名称：" placeholder="请输入名称" required :rules="[{ required: true }]" :border="false" input-align="left" />
+        <van-field v-model="form.cbfmc" label="名称：" placeholder="请输入名称" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="50" />
         <van-field
           v-model="cbfzjlxText"
           label="证件类型："
@@ -62,11 +62,11 @@
           />
         </van-popup>
 
-        <van-field v-model="form.cbfzjhm" label="证件号码：" placeholder="请输入证件号码" required :rules="[{ required: true }]" :border="false" input-align="left" />
-        <van-field v-model="form.cbfdz" label="地址：" placeholder="请输入地址" required :rules="[{ required: true }]" :border="false" input-align="left" />
+        <van-field v-model="form.cbfzjhm" label="证件号码：" placeholder="请输入证件号码" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="20" />
+        <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" />
-        <van-field v-model="form.cbfdcjs" label="调查记事：" type="textarea" rows="3" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="left" />
+        <van-field v-model="form.lxdh" label="电话：" placeholder="请输入电话" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="15" />
+        <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>
     </div>

src/views/contracted/village/contractor/contractorFamilyDetail.vue

@@ -19,7 +19,7 @@
 
     <div class="list_main">
       <van-form ref="formData">
-        <van-field v-model="form.cyxm" label="姓名：" placeholder="请输入姓名" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field v-model="form.cyxm" label="姓名：" placeholder="请输入姓名" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
         <van-field label="性别：" required :border="false" input-align="right" >
           <template #input>
             <van-radio-group v-model="form.cyxb" direction="horizontal">
@@ -78,7 +78,7 @@
             @cancel="showCredentialType = false"
           />
         </van-popup>
-        <van-field v-model="form.cyzjhm" label="证件号码：" placeholder="请输入证件号码" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field v-model="form.cyzjhm" label="证件号码：" placeholder="请输入证件号码" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="20" />
         <van-field
           v-model="cybzText"
           label="成员备注："
@@ -99,7 +99,7 @@
             @cancel="showMemberRemark = false"
           />
         </van-popup>
-        <van-field v-model="form.cybzsm" label="备注说明：" placeholder="请输入备注说明" :border="false" input-align="right" />
+        <van-field v-model="form.cybzsm" label="备注说明：" placeholder="请输入备注说明" type="textarea" rows="3" :border="false" input-align="right" maxlength="250" />
         <!-- <van-field v-model="form.cycgfs" label="持股份数：" type="number" placeholder="请输入持股份数" :border="false" input-align="right" />
         <van-field v-model="form.gqzbh" label="股权编号：" placeholder="请输入股权编号" :border="false" input-align="right" /> -->
       </van-form>

src/views/contracted/village/contractor/contractorLandDetail.vue

@@ -12,7 +12,7 @@
     <div class="list_main">
       <van-form ref="formData">
         <van-field v-model="form.dkbm" label="地块代码：" placeholder="请选择地块代码" required :rules="[{ required: true }]" :border="false"
-                   input-align="right" right-icon="arrow-down" readonly clickable @click="openLandCodePopup" :disabled="isDisabled" />
+                   input-align="right" right-icon="arrow-down" readonly clickable @click="openLandCodePopup" :disabled="isDisabled" maxlength="19" />
         <van-popup v-model="showLandCode" position="bottom">
           <van-picker
             ref="landCodePicker"
@@ -28,7 +28,7 @@
             </template>
           </van-picker>
         </van-popup>
-        <van-field v-model="form.dkmc" label="地块名称：" placeholder="请输入地块名称" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field v-model="form.dkmc" label="地块名称：" placeholder="请输入地块名称" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
         <van-field
           v-model="tdlylxText"
           label="土地利用类型："
@@ -103,12 +103,12 @@
           </template>
         </van-field>
         <van-field v-model="form.htmjm" type="number" label="合同面积(亩)：" placeholder="请输入合同面积(亩)" required :rules="[{ required: true }]" :border="false" input-align="right" />
-        <van-field v-model="form.zjrxm" label="指界人姓名：" placeholder="请输入指界人姓名" required :rules="[{ required: true }]" :border="false" input-align="right" />
-        <van-field v-model="form.dkdz" label="地块东至：" placeholder="请输入地块东至" required :rules="[{ required: true }]" :border="false" input-align="right" />
-        <van-field v-model="form.dkxz" label="地块西至：" placeholder="请输入地块西至" required :rules="[{ required: true }]" :border="false" input-align="right" />
-        <van-field v-model="form.dknz" label="地块南至：" placeholder="请输入地块南至" required :rules="[{ required: true }]" :border="false" input-align="right" />
-        <van-field v-model="form.dkbz" label="地块北至：" placeholder="请输入地块北至" required :rules="[{ required: true }]" :border="false" input-align="right" />
-        <van-field v-model="form.dkbzxx" label="地块备注信息：" placeholder="请输入地块备注信息" :border="false" input-align="right" />
+        <van-field v-model="form.zjrxm" label="指界人姓名：" placeholder="请输入指界人姓名" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="100" />
+        <van-field v-model="form.dkdz" label="地块东至：" placeholder="请输入地块东至" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
+        <van-field v-model="form.dkxz" label="地块西至：" placeholder="请输入地块西至" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
+        <van-field v-model="form.dknz" label="地块南至：" placeholder="请输入地块南至" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
+        <van-field v-model="form.dkbz" label="地块北至：" placeholder="请输入地块北至" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
+        <van-field v-model="form.dkbzxx" label="地块备注信息：" placeholder="请输入地块备注信息" type="textarea" rows="3" :border="false" input-align="right" maxlength="250" />
 
         <div class="mapBox">
           <common-map ref="contractedLandMap" :minMapZoom="15" :maxMapZoom="18" :allowDraw="true" @drawFinished="onMapDrawFinished" />

src/views/contracted/village/employer/employer.vue

@@ -23,8 +23,8 @@
             <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
           </template>
         </van-field>
-        <van-field v-model="form.fbfmc" label="名称：" placeholder="请输入名称" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
-        <van-field v-model="form.fbffzrxm" label="负责人姓名：" placeholder="请输入负责人姓名" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
+        <van-field v-model="form.fbfmc" label="名称：" placeholder="请输入名称" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="50" />
+        <van-field v-model="form.fbffzrxm" label="负责人姓名：" placeholder="请输入负责人姓名" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="50" />
         <van-field v-model="credentialTypeText" label="证件类型："
           placeholder="请选择证件类型"
           required
@@ -46,11 +46,11 @@
             @cancel="showCredentialType = false"
           />
         </van-popup>
-        <van-field v-model="form.fzrzjhm" label="证件号码：" placeholder="请输入证件号码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
-        <van-field v-model="form.lxdh" label="联系电话：" placeholder="请输入联系电话" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
-        <van-field v-model="form.fbfdz" label="地址：" placeholder="请输入地址" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
+        <van-field v-model="form.fzrzjhm" label="证件号码：" placeholder="请输入证件号码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="30" />
+        <van-field v-model="form.lxdh" label="联系电话：" placeholder="请输入联系电话" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="15" />
+        <van-field v-model="form.fbfdz" label="地址：" placeholder="请输入地址" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="100" />
         <van-field v-model="form.yzbm" label="邮政编码：" placeholder="请输入邮政编码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="6" />
-        <van-field v-model="form.fbfdcjs" label="调查记事：" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" />
+        <van-field v-model="form.fbfdcjs" label="调查记事：" placeholder="请输入调查记事" type="textarea" rows="3" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="200" />
         <van-field label="签字图片：" readonly :border="false" label-width="auto" />
         <img :src="'/api'+form.fbfdcqz" width="100%" alt="" />
       </van-form>

src/views/contracted/village/map/map.vue

@@ -36,12 +36,12 @@
     <div class="landPopup">
       <van-dialog v-model="open" :title="title" :show-confirm-button="false" :show-cancel-button="false">
         <van-form ref="landForm">
-          <van-field v-model="form.dkbm" label="地块代码：" placeholder="请输入地块代码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" > <!-- :disabled="isDisabled" -->
+          <van-field v-model="form.dkbm" label="地块代码：" placeholder="请输入地块代码" required :rules="[{ required: true }]" :border="false" input-align="right" label-width="auto" maxlength="19" > <!-- :disabled="isDisabled" -->
             <template #button v-if="!isDisabled">
               <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
             </template>
           </van-field>
-          <van-field v-model="form.dkmc" label="地块名称：" placeholder="请输入地块名称" required :rules="[{ required: true }]" :border="false" input-align="right" />
+          <van-field v-model="form.dkmc" label="地块名称：" placeholder="请输入地块名称" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
           <van-field v-model="syqxzText" label="所有权性质："
                      placeholder="请选择所有权性质"
                      required
@@ -152,12 +152,12 @@
             </template>
           </van-field>
           <van-field v-model="form.scmjm" type="number" label="实测面积(亩)：" placeholder="请输入实测面积(亩)" required :rules="[{ required: true }]" :border="false" input-align="right" />
-          <van-field v-model="form.zjrxm" label="指界人姓名：" placeholder="请输入指界人姓名" required :rules="[{ required: true }]" :border="false" input-align="right" />
-          <van-field v-model="form.dkdz" label="地块东至：" placeholder="请输入地块东至" required :rules="[{ required: true }]" :border="false" input-align="right" />
-          <van-field v-model="form.dkxz" label="地块西至：" placeholder="请输入地块西至" required :rules="[{ required: true }]" :border="false" input-align="right" />
-          <van-field v-model="form.dknz" label="地块南至：" placeholder="请输入地块南至" required :rules="[{ required: true }]" :border="false" input-align="right" />
-          <van-field v-model="form.dkbz" label="地块北至：" placeholder="请输入地块北至" required :rules="[{ required: true }]" :border="false" input-align="right" />
-          <van-field v-model="form.dkbzxx" label="地块备注信息：" placeholder="请输入地块备注信息" :border="false" input-align="right" />
+          <van-field v-model="form.zjrxm" label="指界人姓名：" placeholder="请输入指界人姓名" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="100" />
+          <van-field v-model="form.dkdz" label="地块东至：" placeholder="请输入地块东至" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
+          <van-field v-model="form.dkxz" label="地块西至：" placeholder="请输入地块西至" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
+          <van-field v-model="form.dknz" label="地块南至：" placeholder="请输入地块南至" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
+          <van-field v-model="form.dkbz" label="地块北至：" placeholder="请输入地块北至" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
+          <van-field v-model="form.dkbzxx" label="地块备注信息：" placeholder="请输入地块备注信息" type="textarea" rows="3" :border="false" input-align="right" maxlength="250" />
         </van-form>
         <div class="footer_main">
           <van-button type="default" hairline size="large" @click="closePopup">关闭弹窗</van-button>
@@ -221,6 +221,9 @@
       });
       this.getDicts("land_type").then(response => {
         this.dklbOptions = response.data;
+        // 去除地块类别中的承包地块选项
+        let index = this.dklbOptions.findIndex(item => item.dictValue === '10');
+        this.dklbOptions.splice(index, 1);
       });
       this.getDicts("land_grade").then(response => {
         this.dldjOptions = response.data;
@@ -560,11 +563,11 @@
           deptId: null,
           dkbm: null,
           dkmc: null,
-          syqxz: null,
-          dklb: null,
-          tdlylx: null,
-          dldj: null,
-          tdyt: null,
+          syqxz: '30',
+          dklb: '99',
+          tdlylx: '01',
+          dldj: '01',
+          tdyt: '1',
           sfjbnt: '1',
           scmjm: null,
           zjrxm: null,
@@ -575,11 +578,11 @@
           dkbzxx: null,
           theGeom: null
         };
-        this.syqxzText = null;
-        this.dklbText = null;
-        this.dldjText = null;
-        this.tdytText = null;
-        this.tdlylxText = null;
+        this.syqxzText = '集体土地所有权';
+        this.dklbText = '其他集体土地';
+        this.tdlylxText = '【1】耕地';
+        this.dldjText = '一等地';
+        this.tdytText = '种植业';
       },
     },
   };

src/views/contracted/village/massif/massifDetail.vue

@@ -23,7 +23,7 @@
             <van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
           </template>
         </van-field>
-        <van-field v-model="form.dkmc" label="地块名称：" placeholder="请输入地块名称" required :rules="[{ required: true }]" :border="false" input-align="right" />
+        <van-field v-model="form.dkmc" label="地块名称：" placeholder="请输入地块名称" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
         <van-field v-model="syqxzText" label="所有权性质："
                    placeholder="请选择所有权性质"
                    required
@@ -134,12 +134,12 @@
           </template>
         </van-field>
         <van-field v-model="form.scmjm" type="number" label="实测面积(亩)：" placeholder="请输入实测面积(亩)" required :rules="[{ required: true }]" :border="false" input-align="right" />
-        <van-field v-model="form.zjrxm" label="指界人姓名：" placeholder="请输入指界人姓名" required :rules="[{ required: true }]" :border="false" input-align="right" />
-        <van-field v-model="form.dkdz" label="地块东至：" placeholder="请输入地块东至" required :rules="[{ required: true }]" :border="false" input-align="right" />
-        <van-field v-model="form.dkxz" label="地块西至：" placeholder="请输入地块西至" required :rules="[{ required: true }]" :border="false" input-align="right" />
-        <van-field v-model="form.dknz" label="地块南至：" placeholder="请输入地块南至" required :rules="[{ required: true }]" :border="false" input-align="right" />
-        <van-field v-model="form.dkbz" label="地块北至：" placeholder="请输入地块北至" required :rules="[{ required: true }]" :border="false" input-align="right" />
-        <van-field v-model="form.dkbzxx" label="地块备注信息：" placeholder="请输入地块备注信息" :border="false" input-align="right" />
+        <van-field v-model="form.zjrxm" label="指界人姓名：" placeholder="请输入指界人姓名" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="100" />
+        <van-field v-model="form.dkdz" label="地块东至：" placeholder="请输入地块东至" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
+        <van-field v-model="form.dkxz" label="地块西至：" placeholder="请输入地块西至" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
+        <van-field v-model="form.dknz" label="地块南至：" placeholder="请输入地块南至" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
+        <van-field v-model="form.dkbz" label="地块北至：" placeholder="请输入地块北至" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="50" />
+        <van-field v-model="form.dkbzxx" label="地块备注信息：" placeholder="请输入地块备注信息" type="textarea" rows="3" :border="false" input-align="right" maxlength="250" />
 
         <div class="mapBox">
           <common-map ref="landMap" :minMapZoom="15" :maxMapZoom="18" :allowDraw="true" @drawFinished="onMapDrawFinished" />
@@ -218,11 +218,14 @@
       });
       this.getDicts("land_type").then(response => {
         this.dklbOptions = response.data;
-        // 新增地块信息的时候，去除地块类别中的承包地块选项
+        /* // 新增地块信息的时候，去除地块类别中的承包地块选项
         if (!this.$route.query.id) {
           let index = this.dklbOptions.findIndex(item => item.dictValue === '10');
           this.dklbOptions.splice(index, 1);
-        }
+        } */
+        // 去除地块类别中的承包地块选项
+        let index = this.dklbOptions.findIndex(item => item.dictValue === '10');
+        this.dklbOptions.splice(index, 1);
       });
       this.getDicts("land_grade").then(response => {
         this.dldjOptions = response.data;

src/views/sunVillage_info/list_cbht.vue

@@ -115,6 +115,9 @@
           pageNum: 1,
           pageSize: 10,
           translate_dict: 1,
+          // 查询排序
+          orderByColumn: "id",
+          isAsc: "desc",
         },
         showBtn: true,