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

src/views/homesteadSurvey/add.vue

@@ -124,6 +124,7 @@
             name="宅基地证书号"
             label="宅基地证书号"
             placeholder="宅基地证书号"
+            maxlength="50"
             autocomplete="off"
           />
           <van-field
@@ -134,6 +135,7 @@
             label="宅基地批准面积(㎡)"
             placeholder="单位：平方米"
             type="number"
+            maxlength="15"
           />
           <van-field
             autocomplete="off"
@@ -143,6 +145,7 @@
             name="宗地面积(㎡)"
             label="宗地面积(㎡)"
             placeholder="宗地面积(㎡)"
+            maxlength="15"
           />
 
           <van-field
@@ -171,6 +174,7 @@
             name="宗地四至-东"
             label="宗地四至-东"
             placeholder="宗地四至-东"
+            maxlength="150"
             required
             :rules="[{ required: true, message: '宗地四至-东不能为空' }]"
           />
@@ -181,6 +185,7 @@
             name="宗地四至-南"
             label="宗地四至-南"
             placeholder="宗地四至-南"
+            maxlength="150"
             required
             :rules="[{ required: true, message: '宗地四至-南不能为空' }]"
           />
@@ -190,6 +195,7 @@
             name="宗地四至-西"
             label="宗地四至-西"
             placeholder="宗地四至-西"
+            maxlength="150"
             required
             :rules="[{ required: true, message: '宗地四至-西不能为空' }]"
           />
@@ -200,6 +206,7 @@
             name="宗地四至-北"
             label="宗地四至-北"
             placeholder="宗地四至-北"
+            maxlength="150"
             required
             :rules="[{ required: true, message: '宗地四至-北不能为空' }]"
           />
@@ -224,6 +231,7 @@
             name="宅基地闲置原因"
             label="宅基地闲置原因"
             placeholder="宅基地闲置原因"
+            maxlength="200"
           />
           <van-field
             autocomplete="off"
@@ -274,6 +282,7 @@
             name="被惩处备注"
             label="被惩处备注"
             placeholder="被惩处备注"
+            maxlength="200"
           />
           <van-field name="radio" label="宅基地取得方式" input-align="right" autocomplete="off">
             <template #input>
@@ -308,6 +317,7 @@
             name="价格（万元）"
             label="价格（万元）"
             placeholder="价格（万元）"
+            maxlength="15"
             type="number"
           />
           <van-field
@@ -389,6 +399,7 @@
             name="宗地图"
             label="宗地图"
             placeholder="宗地图"
+            maxlength="200"
           />
           <van-field
             autocomplete="off"
@@ -397,6 +408,7 @@
             name="图幅号"
             label="图幅号"
             placeholder="图幅号"
+            maxlength="50"
           />
           <van-field
             autocomplete="off"
@@ -430,6 +442,7 @@
             name="备注"
             label="备注"
             placeholder="备注"
+            maxlength="200"
           />
           <MapGisDrawing ref="drewingClickLoading" :message="form.theGeom" v-on:formSubmit="MapTag"></MapGisDrawing>
           <div style="margin: 16px;">
@@ -629,6 +642,7 @@
             name="使用权人代表姓名"
             label="使用权人代表姓名"
             placeholder="使用权人代表姓名"
+            maxlength="50"
             required
             :rules="[{ required: true, message: '使用权人代表姓名不能为空' }]"
           />
@@ -654,6 +668,7 @@
             name="使用权人代表证件号码"
             label="使用权人代表证件号码"
             placeholder="使用权人代表证件号码"
+            maxlength="30"
             required
             :rules="[{ required: true, message: '使用权人代表证件号码不能为空' }]"
           />
@@ -664,6 +679,7 @@
             name="不动产单元号"
             label="不动产单元号"
             placeholder="分配了不动产单元号时填写"
+            maxlength="28"
           />
           <van-field
             autocomplete="off"
@@ -672,6 +688,7 @@
             name="不动产权证号"
             label="不动产权证号"
             placeholder="不动产权证号"
+            maxlength="50"
             v-show="form1.bdcdyh!=null&&form1.bdcdyh!=''"
           />
           <van-field
@@ -681,6 +698,7 @@
             name="权证印刷序列号"
             label="权证印刷序列号"
             placeholder="权证印刷序列号"
+            maxlength="100"
           />
           <van-field
             autocomplete="off"
@@ -689,6 +707,7 @@
             name="发证机关"
             label="发证机关"
             placeholder="发证机关"
+            maxlength="100"
           />
           <van-field
             autocomplete="off"
@@ -697,6 +716,7 @@
             name="所属行业"
             label="所属行业"
             placeholder="所属行业"
+            readonly
             @click="showsyqrsshy = true"
           />
           <van-field
@@ -720,14 +740,21 @@
             label="权利比例"
             placeholder="单独为1，共有时2位小数"
             type="number"
+            maxlength="20"
           />
           <van-field
             autocomplete="off"
             input-align="right"
-            v-model="form1.hjszss"
+            v-model="form1.hjszssName"
             name="户籍所在省市"
             label="户籍所在省市"
             placeholder="户籍所在省市"
+            readonly
+            @click="showhjszss = true"
+          />
+          <van-field
+            style="display:none"
+            v-model="form1.hjszss"
           />
           <van-field name="radio" label="性别" input-align="right" autocomplete="off">
             <template #input>
@@ -1825,6 +1852,15 @@
         </van-form>
       </div>
     </van-popup>
+    <van-popup v-model="showhjszss" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="hjszssOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhjszss"
+        @cancel="showhjszss = false"
+      />
+    </van-popup>
     <van-popup v-model="showsjly" position="bottom">
       <van-picker
         show-toolbar
@@ -2157,15 +2193,6 @@
         @cancel="showfwzt = false"
       />
     </van-popup>
-    <!--<van-popup v-model="showsyqrnhdmlist" position="bottom">
-      <van-picker
-        show-toolbar
-        :columns="syqrnhdmlist"
-        value-key="hzxm"
-        @confirm="onConfirmsyqrnhdmlist"
-        @cancel="showsyqrnhdmlist = false"
-      />
-    </van-popup>-->
     <van-popup v-model="showsyqrnhdmlist" position="bottom">
       <van-search v-model="nhdmValue" placeholder="请输入搜索关键词" @input="getnhdmlist"/>
       <van-picker
@@ -2874,6 +2901,7 @@
         bgColor: "", // 画布的背景颜色
         resultImg: "", // 最终画布生成的base64图片
         isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
+        showhjszss:false,
         showdj:false,
         shownmfw:false,
         showsyqrsshy:false,
@@ -3043,6 +3071,8 @@
         tddjOptions:[],
         // 所属行业
         industryOptions:[],
+        // 户籍所在省市
+        hjszssOptions:[],
 
         // 图片上传路径
         baseUrl:"",
@@ -3121,6 +3151,9 @@
       this.getDicts("zjlx").then(response => {
         this.zjlxOptions = response.data;
       });
+      this.getDicts("hjszss").then(response => {
+        this.hjszssOptions = response.data;
+      });
       this.getDicts("family_status").then(response => {
         var arr = [];response.data.forEach(function (item) {
           if (item.dictLabel !== '户主') {
@@ -3176,8 +3209,8 @@
           let zrz = this.$cookies.get("search").mapZrzAData
           let fsss = this.$cookies.get("search").mapFsssAData
           this.getnhdmlist();
-          this.getZjd();
           this.getBaseUrl();
+          this.getZjd();
           if(this.$cookies.get("search").active=="3"){
             this.showzrz= true
             this.getZrzList()
@@ -3194,15 +3227,17 @@
           }
         }else{
           this.item = this.$cookies.get("search")
+          this.getBaseUrl();
           this.getnhdmlist();
           this.getZjd();
-          this.getBaseUrl();
+
         }
       }else{
         this.$set(this.item,"deptId",this.$cookies.get("item").deptId)
+        this.getBaseUrl();
         this.getnhdmlist();
         this.getZjd();
-        this.getBaseUrl();
+
       }
     },
     mounted(){
@@ -3494,6 +3529,7 @@
       },
       // 使用权人农户代码弹出框
       onConfirmsyqrnhdmlist(value){
+        this.nhdmValue = null
         this.form1.nhdm = value.nhdm
         this.form1.shyqrdbxm = value.hzxm
         this.form1.shyqrdbzjhm = value.hzzjhm
@@ -3507,6 +3543,7 @@
       },
       // 农名房屋农户代码弹出框
       onConfirmnmfwnhdm(value){
+        this.nhdmValue = null
         this.nmfwform.nhdm = value.nhdm
         this.shownmfwnhdm = false
       },
@@ -3618,6 +3655,12 @@
         this.form1.gyfs = value.dictValue
         this.showgyfs = false
       },
+      // 使用权人户籍所在省市弹出框
+      onConfirmhjszss(value){
+        this.form1.hjszssName = value.dictLabel
+        this.form1.hjszss = value.dictValue
+        this.showhjszss = false
+      },
       // 农民房屋户型弹出框
       onConfirmhx(value){
         this.nmfwform.hxName = value.dictLabel
@@ -4265,6 +4308,8 @@
               gyfs:'1',
               gyfsName:'单独所有',
               qlbl:'1',
+              hjszss:"150000",
+              hjszssName:"内蒙古自治区",
             }
           }else{
             this.form1 = item
@@ -4294,6 +4339,10 @@
             if(this.form1.qlbl==null||this.form1.qlbl==""){
               this.form1.qlbl = '1'
             }
+            if(this.form1.hjszss==null||this.form1.hjszss==""){
+              this.form1.hjszss = '150000'
+              this.form1.hjszssName = '内蒙古自治区'
+            }
             this.industryOptions.map(res => {
               if(res.dictValue == this.form1.sshy){
                 this.form1.sshyName = res.dictLabel
@@ -5029,4 +5078,7 @@
   >>> .delete-button {
     height: 100%;
   }
+  >>> .van-swipe-cell__wrapper{
+    margin-right:-1px;
+  }
 </style>