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

src/views/project/projectDetail.vue

@@ -91,20 +91,16 @@
             <van-col span="24"><span>转出方名称</span>{{ detail.outName }}</van-col>
           </van-row>
           <van-row>
-            <van-col span="24"><span>住址（地址）</span>{{ detail.address }}</van-col>
+            <van-col span="24"><span>住址</span>{{ detail.address }}</van-col>
           </van-row>
           <van-row>
             <van-col span="12"><span>经济类型</span>{{ detail.economicType }}</van-col>
-            <van-col span="12"><span>机构代码证号</span>{{ detail.areaNum }}</van-col>
+            <van-col span="12"><span>统一社会信用代码</span>{{ detail.areaNum }}</van-col>
           </van-row>
           <van-row>
             <van-col span="12"><span>法人/负责人</span>{{ detail.legalPerson }}</van-col>
             <van-col span="12"><span>联系电话</span>{{ detail.phone }}</van-col>
           </van-row>
-          <van-row>
-            <!-- <van-col span="24"><span>身份证号</span>{{ detail.idCardNum }}</van-col>          -->
-            <van-col span="24"><span>身份证号</span>***************</van-col>
-          </van-row>
           <van-row>
             <van-col span="12"><span>项目类型</span>{{ detail.projectNumber }}</van-col>
             <van-col span="12"><span>农地性质</span>{{ detail.projectType }}</van-col>

src/views/sunVillage_info/homeApplication/proposerLite.vue

@@ -365,6 +365,57 @@
                   </div>
                 </div>
               </template>
+              <!-- 申请::现场踏勘 -->
+              <template v-if="formVisible.baseApplyForm.townFormVisible">
+                <div class="main_box examine_box">
+                  <van-row type="flex" justify="space-between" align="center">
+                    <van-col span="5">宅基地<br/>坐落平<br/>面位置图</van-col>
+                    <van-col span="19">
+                      <MultiImageUploadComp :value="applicationDetail.ydjfsp.zjdzlpmwzt" :uploadDisabled="!wztUpdate" @fileUpdate="fileUpdate"/>
+                      <van-row>
+                        <van-col span="12"><van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.ydjfsp.zckcryxm" label="踏勘人" placeholder="现场踏勘人员" input-align="left" label-width="auto"/></van-col>
+                        <van-col span="12">
+                          <field-date-picker
+                            v-model="applicationDetail.ydjfsp.zckcsj"
+                            label=""
+                            placeholder="选择日期"
+                            :rules="[{ required: true }]"
+                            formatter="yyyy-MM-dd"
+                            required
+                            :readonly="!formEnabled.baseApplyForm.townFormEnabled"
+                          />
+                        </van-col>
+                      </van-row>
+                      <van-row>
+                        <van-col span="12"><van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.ydjfsp.zjdzlpmwztztr" label="制图人" placeholder="制图人" input-align="left" label-width="auto"/></van-col>
+                        <van-col span="12">
+                          <field-date-picker
+                            v-model="applicationDetail.ydjfsp.zjdzlpmwzxctksj"
+                            label=""
+                            placeholder="选择日期"
+                            :rules="[{ required: true }]"
+                            formatter="yyyy-MM-dd"
+                            required
+                            :readonly="!formEnabled.baseApplyForm.townFormEnabled"
+                          />
+                        </van-col>
+                      </van-row>
+                    </van-col>
+                  </van-row>
+                  <van-row type="flex" justify="space-between" align="center">
+                    <van-col span="5">备注</van-col>
+                    <van-col span="19">
+                      <van-field
+                        autosize
+                        placeholder="备注"
+                        input-align="left"
+                        v-model="applicationDetail.bz"
+                        :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                      />
+                    </van-col>
+                  </van-row>
+                </div>
+              </template>
               <!-- 申请::村级审核 -->
               <template v-if="formVisible.baseApplyForm.villageFormVisible">
                 <div class="main_box examine_box">
@@ -672,45 +723,7 @@
                 </div>
               </template>
 
-              <!-- 申请::现场踏勘 -->
-              <template v-if="formVisible.baseApplyForm.townFormVisible">
-                <div class="main_box examine_box">
-                  <van-row type="flex" justify="space-between" align="center">
-                    <van-col span="5">宅基地<br/>坐落平<br/>面位置图</van-col>
-                    <van-col span="19">
-                      <MultiImageUploadComp :value="applicationDetail.ydjfsp.zjdzlpmwzt" :uploadDisabled="!wztUpdate" @fileUpdate="fileUpdate"/>
-                      <van-row>
-                        <van-col span="12"><van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.ydjfsp.zckcryxm" label="踏勘人" placeholder="现场踏勘人员" input-align="left" label-width="auto"/></van-col>
-                        <van-col span="12">
-                          <field-date-picker
-                            v-model="applicationDetail.ydjfsp.zckcsj"
-                            label=""
-                            placeholder="选择日期"
-                            :rules="[{ required: true }]"
-                            formatter="yyyy-MM-dd"
-                            required
-                            :readonly="!formEnabled.baseApplyForm.townFormEnabled"
-                          />
-                        </van-col>
-                      </van-row>
-                      <van-row>
-                        <van-col span="12"><van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.ydjfsp.zjdzlpmwztztr" label="制图人" placeholder="制图人" input-align="left" label-width="auto"/></van-col>
-                        <van-col span="12">
-                          <field-date-picker
-                            v-model="applicationDetail.ydjfsp.zjdzlpmwzxctksj"
-                            label=""
-                            placeholder="选择日期"
-                            :rules="[{ required: true }]"
-                            formatter="yyyy-MM-dd"
-                            required
-                            :readonly="!formEnabled.baseApplyForm.townFormEnabled"
-                          />
-                        </van-col>
-                      </van-row>
-                    </van-col>
-                  </van-row>
-                </div>
-              </template>
+
             </div>
           </template>
           <template v-if="selectedTabName == 1 && formVisible.landscopeVisible"> <!-- 开工申请 -->

src/views/sunVillage_info/paidExit/paidExitAdd.vue

@@ -90,7 +90,7 @@
         <van-field v-model="circulation.hkszd" label="户口所在地" placeholder="户口所在地" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
       </div>
 
-        <p class="main_title">拟申请退出宅基地-面积</p>
+        <p class="main_title">拟申请退出宅基地</p>
         <van-field v-model="circulation.tcmj" label="面积(㎡)" placeholder="请输入面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
         <field-select
           v-model="circulation.xz"
@@ -103,12 +103,10 @@
           remote-url="/open/zdzh/list/dsxz"
           :on-remote-response="'data'"
         />
-        <p class="main_title">拟申请退出宅基地-四至</p>
         <van-field v-model="circulation.zjdszd" label="东至" placeholder="东至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
         <van-field v-model="circulation.zjdszn" label="南至" placeholder="南至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
         <van-field v-model="circulation.zjdszx" label="西至" placeholder="西至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
         <van-field v-model="circulation.zjdszb" label="北至" placeholder="北至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
-        <p class="main_title">拟申请退出宅基地情况-地类</p>
         <field-select
           v-model="circulation.dldm"
           label="地类"

src/views/sunVillage_info/paidExit/paidExitDetail.vue

@@ -145,7 +145,7 @@
           </van-tabs>
         </div>
       </div>
-      <p class="main_title">拟申请退出宅基地-面积</p>
+      <p class="main_title">拟申请退出宅基地</p>
       <van-field readonly v-model="circulation.tcmj" label="面积(㎡)" placeholder="请输入面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
       <field-select
         readonly
@@ -159,12 +159,10 @@
         remote-url="/open/zdzh/list/dsxz"
         :on-remote-response="'data'"
       />
-      <p class="main_title">拟申请退出宅基地-四至</p>
       <van-field readonly v-model="circulation.zjdszd" label="东至" placeholder="东至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
       <van-field readonly v-model="circulation.zjdszn" label="南至" placeholder="南至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
       <van-field  readonly v-model="circulation.zjdszx" label="西至" placeholder="西至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
       <van-field readonly v-model="circulation.zjdszb" label="北至" placeholder="北至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
-      <p class="main_title">拟申请退出宅基地情况-地类</p>
       <field-select
         readonly
         v-model="circulation.dldm"

src/views/sunVillage_info/paidExit/paidExitModify.vue

@@ -81,7 +81,7 @@
         />
         <van-field v-model="circulation.hkszd" label="户口所在地" placeholder="户口所在地" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
       </div>
-      <p class="main_title">拟申请退出宅基地-面积</p>
+      <p class="main_title">拟申请退出宅基地</p>
       <van-field v-model="circulation.tcmj" label="面积(㎡)" placeholder="请输入面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
       <field-select
         v-model="circulation.xz"
@@ -94,12 +94,10 @@
         remote-url="/open/zdzh/list/dsxz"
         :on-remote-response="'data'"
       />
-      <p class="main_title">拟申请退出宅基地-四至</p>
       <van-field v-model="circulation.zjdszd" label="东至" placeholder="东至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
       <van-field v-model="circulation.zjdszn" label="南至" placeholder="南至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
       <van-field v-model="circulation.zjdszx" label="西至" placeholder="西至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
       <van-field v-model="circulation.zjdszb" label="北至" placeholder="北至" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
-      <p class="main_title">拟申请退出宅基地情况-地类</p>
       <field-select
         v-model="circulation.dldm"
         label="地类"

src/views/yinnong/homestead/paidExit/paidExitDetail.vue

@@ -67,7 +67,7 @@
         :on-remote-response="'data'"
       />
 
-      <van-field readonly v-model="circulation.sqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <van-field readonly v-model="circulation.sqrzjhm" label="证件号码" placeholder="证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
       <van-field readonly v-model="circulation.lxdh" label="联系电话" placeholder="联系电话" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
       <field-select
         readonly