From 5c4dd77b82db02708b516577206a69ec34d0db3d Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Mon, 9 Jan 2023 14:24:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/global.js                           |   3 +
 .../homeApplication/proposerLite.vue          | 411 ++++++++++--------
 2 files changed, 239 insertions(+), 175 deletions(-)

diff --git a/src/utils/global.js b/src/utils/global.js
index ea73f392..c01d56bb 100644
--- a/src/utils/global.js
+++ b/src/utils/global.js
@@ -6,3 +6,6 @@ export default
   deptId,//区县ID
   severApi,//全局API
 }
+export const REGION = {
+  YI_LONG_XIAN: '仪陇',
+}
diff --git a/src/views/sunVillage_info/homeApplication/proposerLite.vue b/src/views/sunVillage_info/homeApplication/proposerLite.vue
index 5c937d9a..3653b242 100644
--- a/src/views/sunVillage_info/homeApplication/proposerLite.vue
+++ b/src/views/sunVillage_info/homeApplication/proposerLite.vue
@@ -412,7 +412,7 @@
               <template v-if="formVisible.baseApplyForm.nature_resourceFormVisible">
                 <div class="main_box examine_box">
                   <van-row type="flex" justify="space-between" align="center">
-                    <van-col span="5">乡镇<br/>自然<br/>资源<br/>部门<br/>意见</van-col>
+                    <van-col span="5">{{applicationDetail.ydjfsp.zrzybmmc}}意见</van-col>
                     <van-col span="19">
                       <!--                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.landArea" label="用地面积" placeholder="请输入" input-align="right" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>-->
                       <!--                      <field-select-->
@@ -481,7 +481,7 @@
               <template v-if="formVisible.baseApplyForm.buildingFormVisible">
                 <div class="main_box examine_box">
                   <van-row type="flex" justify="space-between" align="center">
-                    <van-col span="5">乡镇<br/>住建<br/>部门<br/>意见<br/></van-col>
+                    <van-col span="5">{{applicationDetail.ydjfsp.zfcxjsbmmc}}意见</van-col>
                     <van-col span="19">
                       <!--                      <field-select-->
                       <!--                        v-model="applicationDetail.tHouseApproveOtherOptions.buildingType"-->
@@ -557,7 +557,7 @@
               <template v-if="formVisible.baseApplyForm.agricultureFormVisible">
                 <div class="main_box examine_box">
                   <van-row type="flex" justify="space-between" align="center">
-                    <van-col span="5">乡镇<br/>农业<br/>农村<br/>部门<br/>审查<br/>意见</van-col>
+                    <van-col span="5">{{applicationDetail.ydjfsp.nyncbmmc}}意见</van-col>
                     <van-col span="19">
 <!--                      <field-radio-->
 <!--                        v-model="applicationDetail.tHouseApproveAgricultureOptions.isMembership"-->
@@ -1253,19 +1253,24 @@
                   <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.ydjfys.pjcs" label="批建层数" placeholder="批建层数" input-align="right" label-width="auto" type="digit" :rules="[{ required: true }]"><template #right-icon>层</template></van-field>
                   <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.ydjfys.jggd" label="竣工高度" placeholder="竣工高度" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]"><template #right-icon>m</template></van-field>
                   <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.ydjfys.jgcs" label="竣工层数" placeholder="竣工层数" input-align="right" label-width="auto" type="digit" :rules="[{ required: true }]"><template #right-icon>层</template></van-field>
-<!--                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.buildingOtherArea" label="配套附属设施建筑面积" placeholder="配套附属设施建筑面积" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>-->
-<!--                  <field-select-->
-<!--                    v-model="applicationDetail.tHouseApplyEnd.designPaper"-->
-<!--                    label="建筑风貌"-->
-<!--                    value-key="dictLabel"-->
-<!--                    data-key="dictValue"-->
-<!--                    placeholder="选择建筑风貌"-->
-<!--                    :rules="[{ required: true }]"-->
-<!--                    required-->
-<!--                    :readonly="!formEnabled.acceptingForm.baseFormEnabled"-->
-<!--                    remote-url="/system/dict/data/type/design_paper"-->
-<!--                    :on-remote-response="'data'"-->
-<!--                  />-->
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.ydjfys.zjzmj" label="总建筑面积" placeholder="总建筑面积" input-align="right" type="number" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.ydjfys.fwzjmj" label="其中: 房屋建筑面积" placeholder="房屋建筑面积" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.ydjfys.ptfsssjzmj" label="配套附属设施建筑面积" placeholder="配套附属设施建筑面积" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.ydjfys.zfzj" label="住房造价" placeholder="住房造价" input-align="right" type="number" :rules="[{ required: true }]"><template #right-icon>万元</template></van-field>
+                  <field-select
+                    v-model="applicationDetail.ydjfys.jglx"
+                    label="结构类型"
+                    value-key="dictLabel"
+                    data-key="dictValue"
+                    placeholder="选择结构类型"
+                    :rules="[{ required: true }]"
+                    required
+                    :readonly="!formEnabled.acceptingForm.baseFormEnabled"
+                    remote-url="/system/dict/data/type/design_paper"
+                    :on-remote-response="'data'"
+                  />
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.ydjfys.wlmys" label="外立面颜色" placeholder="外立面颜色" input-align="right" label-width="auto" :rules="[{ required: true }]"/>
+
                   <field-select
                     v-model="applicationDetail.ydjfys.cjhtzjdqk"
                     label="旧宅基地退还情况"
@@ -1278,31 +1283,29 @@
                     remote-url="/system/dict/data/type/old_house_status"
                     :on-remote-response="'data'"
                   />
-<!--                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.houseCost" label="住房造价" placeholder="住房造价" input-align="right" type="number" :rules="[{ required: true }]"><template #right-icon>万元</template></van-field>-->
-<!--                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.facadeColor" label="外立面颜色" placeholder="外立面颜色" input-align="right" label-width="auto" :rules="[{ required: true }]"/>-->
-<!--                  <field-radio-->
-<!--                    v-model="applicationDetail.tHouseApplyEnd.isEnjoySubsidy"-->
-<!--                    label="是否享受住房建设补助政策"-->
-<!--                    value-key="dictLabel"-->
-<!--                    data-key="dictValue"-->
-<!--                    :rules="[{ required: true }]"-->
-<!--                    required-->
-<!--                    :readonly="!formEnabled.acceptingForm.baseFormEnabled"-->
-<!--                    :columns="yesNoOptions"-->
-<!--                  />-->
-<!--                  <field-select-->
-<!--                    v-if="applicationDetail.tHouseApplyEnd.isEnjoySubsidy === 'Y'"-->
-<!--                    v-model="applicationDetail.tHouseApplyEnd.enjoySubsidyContent"-->
-<!--                    label="住房建设补助政策"-->
-<!--                    value-key="dictLabel"-->
-<!--                    data-key="dictValue"-->
-<!--                    placeholder="选择住房建设补助政策"-->
-<!--                    :rules="[{ required: true }]"-->
-<!--                    required-->
-<!--                    :readonly="!formEnabled.acceptingForm.baseFormEnabled"-->
-<!--                    remote-url="/system/dict/data/type/house_subsidy_policy"-->
-<!--                    :on-remote-response="'data'"-->
-<!--                  />-->
+                  <field-radio
+                    v-model="applicationDetail.ydjfys.sfxszfjsbzzc"
+                    label="是否享受住房建设补助政策"
+                    value-key="dictLabel"
+                    data-key="dictValue"
+                    :rules="[{ required: true }]"
+                    required
+                    :readonly="!formEnabled.acceptingForm.baseFormEnabled"
+                    :columns="yesNoOptions"
+                  />
+                  <field-select
+                    v-if="applicationDetail.ydjfys.sfxszfjsbzzc === '1'"
+                    v-model="applicationDetail.ydjfys.zfjsbzzc"
+                    label="住房建设补助政策"
+                    value-key="dictLabel"
+                    data-key="dictValue"
+                    placeholder="选择住房建设补助政策"
+                    :rules="[{ required: true }]"
+                    required
+                    :readonly="!formEnabled.acceptingForm.baseFormEnabled"
+                    remote-url="/system/dict/data/type/house_subsidy_policy"
+                    :on-remote-response="'data'"
+                  />
 <!--                  <van-cell title="农房验收位置"></van-cell>-->
 <!--                  <div class="mapBox">-->
 <!--                    <common-map ref="pointDarwAcceptanceMap" style="height:200px;"-->
@@ -1314,85 +1317,150 @@
 <!--                  </div>-->
 <!--                  <van-field rows="3" :autosize="true" type="textarea" readonly label="备注" label-width="auto" placeholder="" input-align="left" value="1.村民旧宅基地属于应退未退的，不得发放本验收意见表。-->
 <!--2.本验收意见表是向不动产登记部门申请办理不动产登记的要件之一，请妥善保管。"></van-field>-->
+                  <div class="main_box examine_box">
+                    <van-row type="flex" justify="space-between" align="center">
+                      <van-col span="5">竣工<br/>平面<br/>简图<br/>
+                        (标注<br/>长宽<br/>及四至)</van-col>
+                      <van-col span="19">
+                        <house-location-plan-comp ref="pictureUploadAccepting" :uploadDisabled="!formEnabled.acceptingForm.townFormEnabled" :jsonData="uploadImgAccepting.fileList" :proposer-id="uploadImgAccepting.proposerId" tableName="t_homeapply_ydjfys"
+                                                  @uploadFileChanged="(x) => {this.uploadImgAccepting.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgAccepting.removeFileList = x;}"
+                        />
+                        <van-field required :readonly="!formEnabled.acceptingForm.townFormEnabled" v-model="applicationDetail.ydjfys.jgpmjtjbr"  placeholder="经办人" label="经办人" input-align="left" :rules="[{ required: true }]"/>
+                      </van-col>
+                    </van-row>
+                  </div>
+                  <div class="main_box examine_box" v-if="isYiLong">
+                    <van-row type="flex" justify="space-between" align="center">
+                      <van-col span="5">住房<br/>竣工<br/>验收<br/>内容</van-col>
+                      <van-col span="19">
+                        <field-checkbox
+                          v-model="applicationDetail.ydjfys.qtysnr.sfywcgcsjhhtyddgxnr"
+                          label="1.是否已完成工程设计和合同约定的各项内容"
+                          true-label="1"
+                          false-label="0"
+                          :rules="[{ required: true }]"
+                          :readonly="!formEnabled.ysnrEnable"
+                          label-width="5.6rem"
+                        />
+                        <field-checkbox
+                          v-model="applicationDetail.ydjfys.qtysnr.clrdwgzfzlzcsfhhg"
+                          label="2.承揽人对完工住房质量自查是否合格"
+                          true-label="1"
+                          false-label="0"
+                          :rules="[{ required: true }]"
+                          :readonly="!formEnabled.ysnrEnable"
+                          label-width="5.6rem"
+                        />
+                        <field-checkbox
+                          v-model="applicationDetail.ydjfys.qtysnr.sfysgjlzl"
+                          label="3.是否有施工记录资料"
+                          true-label="1"
+                          false-label="0"
+                          :rules="[{ required: true }]"
+                          :readonly="!formEnabled.ysnrEnable"
+                          label-width="5.6rem"
+                        />
+                        <field-checkbox
+                          v-model="applicationDetail.ydjfys.qtysnr.jfcmhclrsfyjgtqsnczfzlbxs"
+                          label="4.建房村民和承揽人是否已经共同签署农村住房质量保修书"
+                          true-label="1"
+                          false-label="0"
+                          :rules="[{ required: true }]"
+                          :readonly="!formEnabled.ysnrEnable"
+                          label-width="5.6rem"
+                        />
+                        <field-checkbox
+                          v-model="applicationDetail.ydjfys.qtysnr.zfcxjsxzzgbmhxzrmzfzlzgdwtsfqbzgwb"
+                          label="5.住房城乡建设行政主管部门或乡（镇）人民政府责令整改的问题是否全部整改完毕"
+                          true-label="1"
+                          false-label="0"
+                          :rules="[{ required: true }]"
+                          :readonly="!formEnabled.ysnrEnable"
+                          label-width="5.6rem"
+                        />
+                        <field-checkbox
+                          v-model="applicationDetail.ydjfys.qtysnr.jzfmsfysjtjbyz"
+                          label="6.建筑风貌是否与设计图基本一致"
+                          true-label="1"
+                          false-label="0"
+                          :rules="[{ required: true }]"
+                          :readonly="!formEnabled.ysnrEnable"
+                          label-width="5.6rem"
+                        />
+                        <field-checkbox
+                          v-model="applicationDetail.ydjfys.qtysnr.flfggddqtystjwcqk"
+                          label="7.法律、法规规定的其他验收条件完成情况"
+                          true-label="1"
+                          false-label="0"
+                          :rules="[{ required: true }]"
+                          :readonly="!formEnabled.ysnrEnable"
+                          label-width="5.6rem"
+                        />
+                      </van-col>
+                    </van-row>
+                    <div class="main_box examine_box">
+                      <van-row type="flex" justify="space-between" align="center">
+                        <van-col span="5">承揽人<br/>（姓名/<br/>单位/<br/>职务）</van-col>
+                        <van-col span="19">
+                          <van-field required :readonly="!formEnabled.ysnrEnable" v-model="applicationDetail.ydjfys.qtysnr.clr" label="签字" placeholder="外立面颜色" input-align="right" label-width="auto" :rules="[{ required: true }]"/>
+                          <!--                    </van-cell>-->
+                          <field-date-picker
+                            v-model="applicationDetail.ydjfys.qtysnr.clrsj"
+                            label="签字日期"
+                            placeholder="选择日期"
+                            :rules="[{ required: true }]"
+                            formatter="yyyy-MM-dd"
+                            required
+                            :readonly="!formEnabled.ysnrEnable"
+                          />
+                        </van-col>
+                      </van-row>
+                    </div>
+                    <div class="main_box examine_box">
+                      <van-row type="flex" justify="space-between" align="center">
+                        <van-col span="5">第三服务方</van-col>
+                        <van-col span="19">
+                          <van-field required :readonly="!formEnabled.ysnrEnable" v-model="applicationDetail.ydjfys.qtysnr.dsfwf" label="签字" placeholder="外立面颜色" input-align="right" label-width="auto" :rules="[{ required: true }]"/>
+                          <!--                    </van-cell>-->
+                          <field-date-picker
+                            v-model="applicationDetail.ydjfys.qtysnr.dsfwfsj"
+                            label="签字日期"
+                            placeholder="选择日期"
+                            :rules="[{ required: true }]"
+                            formatter="yyyy-MM-dd"
+                            required
+                            :readonly="!formEnabled.ysnrEnable"
+                          />
+                        </van-col>
+                      </van-row>
+                    </div>
+                    <div class="main_box examine_box">
+                      <van-row type="flex" justify="space-between" align="center">
+                        <van-col span="5">专业技<br/>术人员）</van-col>
+                        <van-col span="19">
+                          <van-field required :readonly="!formEnabled.ysnrEnable" v-model="applicationDetail.ydjfys.qtysnr.zyjsry" label="签字" placeholder="外立面颜色" input-align="right" label-width="auto" :rules="[{ required: true }]"/>
+                          <!--                    </van-cell>-->
+                          <field-date-picker
+                            v-model="applicationDetail.ydjfys.qtysnr.zyjsrysj"
+                            label="签字日期"
+                            placeholder="选择日期"
+                            :rules="[{ required: true }]"
+                            formatter="yyyy-MM-dd"
+                            required
+                            :readonly="!formEnabled.ysnrEnable"
+                          />
+                        </van-col>
+                      </van-row>
+                    </div>
+                  </div>
                 </div>
               </div>
             </template>
 
-<!--              <div class="main_box examine_box">
-                              <van-row type="flex" justify="space-between" align="center">
-                                <van-col span="5">住房<br/>竣工<br/>验收<br/>内容</van-col>
-                                <van-col span="19">
-                                  <field-checkbox
-                                    v-model="applicationDetail.tHouseApplyEnd.isProjectFinished"
-                                    label="1.是否已完成工程设计和合同约定的各项内容"
-                                    true-label="Y"
-                                    false-label="N"
-                                    :rules="[{ required: true }]"
-                                    :readonly="!formEnabled.acceptingForm.townFormEnabled"
-                                    label-width="5.6rem"
-                                  />
-                                  <field-checkbox
-                                    v-model="applicationDetail.tHouseApplyEnd.isQualifiedQuality"
-                                    label="2.承揽人对完工住房质量自查是否合格"
-                                    true-label="Y"
-                                    false-label="N"
-                                    :rules="[{ required: true }]"
-                                    :readonly="!formEnabled.acceptingForm.townFormEnabled"
-                                    label-width="5.6rem"
-                                  />
-                                  <field-checkbox
-                                    v-model="applicationDetail.tHouseApplyEnd.hasBuildingRecord"
-                                    label="3.是否有施工记录资料"
-                                    true-label="Y"
-                                    false-label="N"
-                                    :rules="[{ required: true }]"
-                                    :readonly="!formEnabled.acceptingForm.townFormEnabled"
-                                    label-width="5.6rem"
-                                  />
-                                  <field-checkbox
-                                    v-model="applicationDetail.tHouseApplyEnd.isSignWarranty"
-                                    label="4.建房村民和承揽人是否已经共同签署农村住房质量保修书"
-                                    true-label="Y"
-                                    false-label="N"
-                                    :rules="[{ required: true }]"
-                                    :readonly="!formEnabled.acceptingForm.townFormEnabled"
-                                    label-width="5.6rem"
-                                  />
-                                  <field-checkbox
-                                    v-model="applicationDetail.tHouseApplyEnd.isHandleProblem"
-                                    label="5.住房城乡建设行政主管部门或乡（镇）人民政府责令整改的问题是否全部整改完毕"
-                                    true-label="Y"
-                                    false-label="N"
-                                    :rules="[{ required: true }]"
-                                    :readonly="!formEnabled.acceptingForm.townFormEnabled"
-                                    label-width="5.6rem"
-                                  />
-                                  <field-checkbox
-                                    v-model="applicationDetail.tHouseApplyEnd.isDesignPaperSame"
-                                    label="6.建筑风貌是否与设计图基本一致"
-                                    true-label="Y"
-                                    false-label="N"
-                                    :rules="[{ required: true }]"
-                                    :readonly="!formEnabled.acceptingForm.townFormEnabled"
-                                    label-width="5.6rem"
-                                  />
-                                  <field-checkbox
-                                    v-model="applicationDetail.tHouseApplyEnd.isOtherAcceptanceFinished"
-                                    label="7.法律、法规规定的其他验收条件完成情况"
-                                    true-label="Y"
-                                    false-label="N"
-                                    :rules="[{ required: true }]"
-                                    :readonly="!formEnabled.acceptingForm.townFormEnabled"
-                                    label-width="5.6rem"
-                                  />
-                                </van-col>
-                              </van-row>
-                            </div>-->
-
             <template v-if="formVisible.acceptingForm.agricultureFormVisible">
               <div class="main_box examine_box">
                 <van-row type="flex" justify="space-between" align="center">
-                  <van-col span="5">乡镇<br/>农业<br/>农村<br/>部门<br/>意见</van-col>
+                  <van-col span="5">{{applicationDetail.ydjfys.nyncbmmc}}意见</van-col>
                   <van-col span="19">
                     <van-field required :readonly="!formEnabled.acceptingForm.agricultureFormEnabled" rows="2" v-model="applicationDetail.ydjfys.nyncbmysyj" :autosize="true" type="textarea" placeholder="乡镇农业农村部门意见" :rules="[{ required: true }]"/>
                     <van-cell title="负责人:" :rules="[{ required: true }]">
@@ -1437,7 +1505,7 @@
             <template v-if="formVisible.acceptingForm.nature_resourceFormVisible">
               <div class="main_box examine_box">
                 <van-row type="flex" justify="space-between" align="center">
-                  <van-col span="5">乡镇<br/>自然<br/>资源<br/>部门<br/>意见</van-col>
+                  <van-col span="5">{{applicationDetail.ydjfys.zrzybmmc}}意见</van-col>
                   <van-col span="19">
                     <van-field required :readonly="!formEnabled.acceptingForm.nature_resourceFormEnabled" rows="2" v-model="applicationDetail.ydjfys.zrzybmysyj" :autosize="true" type="textarea" placeholder="乡镇自然资源部门意见" :rules="[{ required: true }]"/>
                     <van-cell title="负责人:" :rules="[{ required: true }]">
@@ -1479,7 +1547,7 @@
             <template v-if="formVisible.acceptingForm.buildingFormVisible">
               <div class="main_box examine_box">
                 <van-row type="flex" justify="space-between" align="center">
-                  <van-col span="5">乡镇<br/>住建<br/>部门<br/>意见</van-col>
+                  <van-col span="5">{{applicationDetail.ydjfys.zfcxjsbmmc}}意见</van-col>
                   <van-col span="19">
                     <van-field required :readonly="!formEnabled.acceptingForm.buildingFormEnabled" v-model="applicationDetail.ydjfys.zfcxjsbmysyj" rows="2" autosize  type="textarea" placeholder="审批意见" :rules="[{ required: true }]"/>
                     <van-cell title="负责人:"  :rules="[{ required: true }]">
@@ -1519,19 +1587,6 @@
               </div>
             </template>
             <template v-if="formVisible.acceptingForm.townFormVisible">
-              <div class="main_box examine_box">
-                <van-row type="flex" justify="space-between" align="center">
-                  <van-col span="5">竣工<br/>平面<br/>简图<br/>
-                    (标注<br/>长宽<br/>及四至)</van-col>
-                  <van-col span="19">
-                    <house-location-plan-comp ref="pictureUploadAccepting" :uploadDisabled="!formEnabled.acceptingForm.townFormEnabled" :jsonData="uploadImgAccepting.fileList" :proposer-id="uploadImgAccepting.proposerId" tableName="t_homeapply_ydjfys"
-                                              @uploadFileChanged="(x) => {this.uploadImgAccepting.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgAccepting.removeFileList = x;}"
-                    />
-                    <van-field required :readonly="!formEnabled.acceptingForm.townFormEnabled" v-model="applicationDetail.ydjfys.jgpmjtjbr"  placeholder="经办人" label="经办人" input-align="left" :rules="[{ required: true }]"/>
-                  </van-col>
-                </van-row>
-              </div>
-
               <div class="main_box examine_box">
                 <van-row type="flex" justify="space-between" align="center">
                   <van-col span="5">乡镇<br/>政府<br/>验收<br/>意见</van-col>
@@ -1720,6 +1775,7 @@ import request from '@/utils/request'
 import {Notify, Dialog} from "vant";
 import {uploadFile} from "@/api/homesteadSurvey/zjdzd";
 import {updateOpretion} from "@/api/onlineHome/homestead/application";
+import {REGION} from '@/utils/global';
 import Cookies from "js-cookie";
 import axios from "axios";
 
@@ -1818,6 +1874,7 @@ export default {
       formEnabled: {
         baseApplyEnabled: false,
         submitEnabled: false,
+        ysnrEnable:false,
         baseApplyForm: {
           baseFormEnabled: false,
           homesteadFormEnabled: false,
@@ -2030,6 +2087,9 @@ export default {
         return v.toString(16);
       });
     },
+    isYiLong: function() {
+      return this.region === REGION.YI_LONG_XIAN;
+    },
     // 打开工作流程
     goFlow(){
       this.flowVisible = true;
@@ -2195,14 +2255,14 @@ export default {
           this.formVisible.baseApplyForm.villageFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11","14"]);
           this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11","12","13","14", "15", "17", "19", this.isInRoles(role, 'town_leader') ? -99 : '7', this.isInRoles(role, 'town_leader') ? -99 : '8']);
           this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11","12","13","14", "15", "17", this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8']);
-          this.formVisible.baseApplyForm.buildingFormVisible = this.isProposeStatus(homeApplyStatus, ["11","12","13","14", "15", "17",, this.isInRoles(role, ['town_leader', 'building']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8']);
-          this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11","12","13","14", "15", "17",, this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8']);
+          this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11","12","13","14", "15", "17", this.isInRoles(role, ['town_leader', 'building']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8']);
+          this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11","12","13","14", "15", "17", this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8']);
 
           this.formVisible.landscopeVisible = this.isNotProposeStatus(homeApplyStatus, ["11","12","13","14", "15", "17", "19", "1C", "1D", "1F"]);
           this.formVisible.landscopeForm.baseFormVisible = this.isNotProposeStatus(homeApplyStatus, ["11","12","13","14", "15", "17", "19", "1C", "1D", "1F"]);
 
-          this.formVisible.acceptingVisible = this.isProposeStatus(homeApplyStatus, ["71", "72", "74", "79", "7C", "7F"]);
-          this.formVisible.acceptingForm.baseFormVisible = this.isProposeStatus(homeApplyStatus, ["71", "72", "74", "79", "7C", "7F"]);
+          this.formVisible.acceptingVisible = this.isProposeStatus(homeApplyStatus, ["71", "72", "74","77", "79", "7C", "7F"]);
+          this.formVisible.acceptingForm.baseFormVisible = this.isProposeStatus(homeApplyStatus, ["71", "72", "74","77", "79", "7C", "7F"]);
           this.formVisible.acceptingForm.townFormVisible = this.isProposeStatus(homeApplyStatus, [this.isInRoles(role, 'town_leader') ? '7C' : -99, "26"]);
           this.formVisible.acceptingForm.agricultureFormVisible = this.isProposeStatus(homeApplyStatus, [this.isInRoles(role, ['town_leader', 'agriculture']) ? '79' : -99, this.isInRoles(role, ['town_leader', 'agriculture']) ? '25' : -99, "26"]);
           this.formVisible.acceptingForm.nature_resourceFormVisible = this.isProposeStatus(homeApplyStatus, [this.isInRoles(role, ['town_leader', 'nature_resource']) ? '79' : -99, this.isInRoles(role, ['town_leader', 'nature_resource']) ? '25' : -99, "26"]);
@@ -2259,45 +2319,44 @@ export default {
           this.pointDarwNature(null);
           this.pointWrapAcceptance(null);
           this.paintStartNatureMap(null);
-          if(value.homeApplyStage == "1" ){
-            if(this.applicationDetail.cjxzscyj !=null && this.applicationDetail.cjxzscyj !=''){
-              this.formVisible.baseApplyForm.villageFormVisible = true;
-            }
-            console.info( this.formVisible.baseApplyForm.villageFormVisible);
-            if(this.applicationDetail.ydjfsp != null && this.applicationDetail.ydjfsp.zfcxjsbmscyj !=null && this.applicationDetail.ydjfsp.zfcxjsbmscyj !=''){
-              this.formVisible.baseApplyForm.buildingFormVisible = true;
-            }
-            if(this.applicationDetail.ydjfsp != null && this.applicationDetail.ydjfsp.nyncbmscyj !=null && this.applicationDetail.ydjfsp.nyncbmscyj !=''){
-              this.formVisible.baseApplyForm.agricultureFormVisible = true;
-            }
-            if(this.applicationDetail.ydjfsp != null && this.applicationDetail.ydjfsp.zrzybmscyj !=null && this.applicationDetail.ydjfsp.zrzybmscyj !=''){
-              this.formVisible.baseApplyForm.nature_resourceFormVisible = true;
-            }
-            if(this.applicationDetail.ydjfsp != null && this.applicationDetail.ydjfsp.xzzfshpzyj !=null && this.applicationDetail.ydjfsp.xzzfshpzyj !=''){
-              this.formVisible.baseApplyForm.townFormVisible = true;
-            }
-          }
-
-          if(value.homeApplyStage == "3" ){
-            // if(this.applicationDetail.ydjfys.villageOption !=null && this.applicationDetail.ydjfys.villageOption !=''){
-            //   this.formVisible.baseApplyForm.villageFormVisible = true;
-            // }
-            // if(this.applicationDetail.tHouseApproveOtherOptions.approveOption !=null && this.applicationDetail.tHouseApproveOtherOptions.approveOption !=''){
-            //   this.formVisible.acceptingForm.baseFormVisible = false;
-            // }
-            if(this.applicationDetail.ydjfys.nyncbmysyj !=null && this.applicationDetail.ydjfys.nyncbmysyj !=''){
-              this.formVisible.acceptingForm.agricultureFormVisible = true;
-            }
-            if(this.applicationDetail.ydjfys.zrzybmysyj !=null && this.applicationDetail.ydjfys.zrzybmysyj !=''){
-              this.formVisible.acceptingForm.nature_resourceFormVisible = true;
-            }
-            if(this.applicationDetail.ydjfys.zfcxjsbmysyj !=null && this.applicationDetail.ydjfys.zfcxjsbmysyj !=''){
-              this.formVisible.acceptingForm.buildingFormVisible = true;
-            }
-            if(this.applicationDetail.ydjfys.xzzfysyj !=null && this.applicationDetail.ydjfys.xzzfysyj !=''){
-              this.formVisible.acceptingForm.townFormVisible = true
-            }
-          }
+          // if(value.homeApplyStage == "1" ){
+          //   if(this.applicationDetail.cjxzscyj !=null && this.applicationDetail.cjxzscyj !=''){
+          //     this.formVisible.baseApplyForm.villageFormVisible = true;
+          //   }
+          //   console.info( this.formVisible.baseApplyForm.villageFormVisible);
+          //   if(this.applicationDetail.ydjfsp != null && this.applicationDetail.ydjfsp.zfcxjsbmscyj !=null && this.applicationDetail.ydjfsp.zfcxjsbmscyj !=''){
+          //     this.formVisible.baseApplyForm.buildingFormVisible = true;
+          //   }
+          //   if(this.applicationDetail.ydjfsp != null && this.applicationDetail.ydjfsp.nyncbmscyj !=null && this.applicationDetail.ydjfsp.nyncbmscyj !=''){
+          //     this.formVisible.baseApplyForm.agricultureFormVisible = true;
+          //   }
+          //   if(this.applicationDetail.ydjfsp != null && this.applicationDetail.ydjfsp.zrzybmscyj !=null && this.applicationDetail.ydjfsp.zrzybmscyj !=''){
+          //     this.formVisible.baseApplyForm.nature_resourceFormVisible = true;
+          //   }
+          //   if(this.applicationDetail.ydjfsp != null && this.applicationDetail.ydjfsp.xzzfshpzyj !=null && this.applicationDetail.ydjfsp.xzzfshpzyj !=''){
+          //     this.formVisible.baseApplyForm.townFormVisible = true;
+          //   }
+          // }
+          // if(value.homeApplyStage == "3" ){
+          //   // if(this.applicationDetail.ydjfys.villageOption !=null && this.applicationDetail.ydjfys.villageOption !=''){
+          //   //   this.formVisible.baseApplyForm.villageFormVisible = true;
+          //   // }
+          //   // if(this.applicationDetail.tHouseApproveOtherOptions.approveOption !=null && this.applicationDetail.tHouseApproveOtherOptions.approveOption !=''){
+          //   //   this.formVisible.acceptingForm.baseFormVisible = false;
+          //   // }
+          //   if(this.applicationDetail.ydjfys.nyncbmysyj !=null && this.applicationDetail.ydjfys.nyncbmysyj !=''){
+          //     this.formVisible.acceptingForm.agricultureFormVisible = true;
+          //   }
+          //   if(this.applicationDetail.ydjfys.zrzybmysyj !=null && this.applicationDetail.ydjfys.zrzybmysyj !=''){
+          //     this.formVisible.acceptingForm.nature_resourceFormVisible = true;
+          //   }
+          //   if(this.applicationDetail.ydjfys.zfcxjsbmysyj !=null && this.applicationDetail.ydjfys.zfcxjsbmysyj !=''){
+          //     this.formVisible.acceptingForm.buildingFormVisible = true;
+          //   }
+          //   if(this.applicationDetail.ydjfys.xzzfysyj !=null && this.applicationDetail.ydjfys.xzzfysyj !=''){
+          //     this.formVisible.acceptingForm.townFormVisible = true
+          //   }
+          // }
           break;
 
         // 编辑/审批
@@ -2362,7 +2421,9 @@ export default {
               }
             }
           }
-          console.info(this.applicationDetail);
+          if(this.isProposeStatus(homeApplyStatus, ["71","72","74",'77',"79","7C"])){
+            this.formEnabled.ysnrEnable = true;
+          }
           this.formVisible.auditVisible = this.type === 'done' || this.type === 'todo';
           // 申请-组级审批 初始化表单
           if(hasGroupLevel)
@@ -2831,7 +2892,7 @@ export default {
 
       // 通用设置
       // if(this.type =='done' && this.applicationDetail.tHouseApplyEnd == null && this.applicationDetail.tHouseApplyEnd.taskId ==null){
-      if(this.type =='done' && this.applicationDetail.tHouseApplyEnd == null){
+      if(this.type =='done' && this.applicationDetail.ydjfys == null){
         if (this.isAccepting()) {
           this.active = PROPOSER_STAGE_START;
           this.selectedTabName = PROPOSER_STAGE_START;
@@ -2867,7 +2928,7 @@ export default {
           this.active = PROPOSER_STAGE_END;
           this.selectedTabName = PROPOSER_STAGE_END;
           // 编辑时且为申请通过状态 -> 查看验收草稿
-          if(this.proposerStatus == PROPOSER_VIEW && this.isProposeStatus(homeApplyStatus, ["20"])){
+          if(this.proposerStatus == PROPOSER_VIEW && this.isProposeStatus(homeApplyStatus, ["3F"])){
             this.selectedTabName = PROPOSER_STAGE_START;
           }
           this.processKeyField = PROPOSER_STAGE_END_ACTIVITY;
@@ -2878,7 +2939,7 @@ export default {
           this.selectedTabName = PROPOSER_STAGE_BASE_APPLY;
           this.attachmentActive = PROPOSER_STAGE_BASE_APPLY;
           // 编辑时且为申请通过状态 -> 填写开工
-          if(this.proposerStatus == PROPOSER_EDIT && homeApplyStatus == '10')
+          if(this.proposerStatus == PROPOSER_EDIT && homeApplyStatus == '1F')
           {
             this.active = PROPOSER_STAGE_START;
             this.selectedTabName = PROPOSER_STAGE_START;