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

src/api/sunVillage_info/homestead/application.js

@@ -197,7 +197,13 @@ export function submitEndWLHT(id) {
     method: 'post',
   })
 }
-
+// 获取用地建房申请状态信息
+export function getHomeapplyydjfsqStatus(id) {
+  return request({
+    url: '/home/mobile/homeApplyStatus/' + id,
+    method: 'get'
+  })
+}
 //查询当前登录账号坐标
 export function getQueryLand(id) {
   return request({

src/views/sunVillage_info/homeApplication/proposerLite.vue

@@ -1329,7 +1329,7 @@
                       </van-col>
                     </van-row>
                   </div>
-                  <div class="main_box examine_box" v-if="isYiLong">
+                  <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">
@@ -1765,7 +1765,7 @@
 import HomeApplyUploadComp from "@/components/home/HomeApplyUploadComp";
 import HouseLocationPlanComp from "@/components/house/HouseLocationPlanComp";
 import FieldSelect from "@/components/form/FieldSelect";
-import { listHomeapplytype,getQueryLand, saveHomeBaseInfo  , getHomeMembers , allInformationWLHT, checkDuplicateBuilding, checkDuplicateBuildingQuery, customSubmitWLHT, submitStartWLHT, updateStart, submitEndWLHT, getWorkflow ,selectProposerNh} from "@/api/sunVillage_info/homestead/application";
+import { getHomeapplyydjfsqStatus,listHomeapplytype,getQueryLand, saveHomeBaseInfo  , getHomeMembers , allInformationWLHT, checkDuplicateBuilding, checkDuplicateBuildingQuery, customSubmitWLHT, submitStartWLHT, updateStart, submitEndWLHT, getWorkflow ,selectProposerNh} from "@/api/sunVillage_info/homestead/application";
 import CommonMap from "@/components/house/CommonMap";
 import FieldDatePicker from "@/components/form/FieldDatePicker";
 import FieldRadio from "@/components/form/FieldRadio";
@@ -1832,6 +1832,7 @@ export default {
       deptId:null,
       sysFarmer:JSON.parse(Cookies.get('user')),
       showZjddm:null,
+      region:null,
       showZjdzk:false,
       // 当前显示流程
       selectedTabName: 0,
@@ -2071,13 +2072,17 @@ export default {
     this.getDicts("building_type").then(response => {
       this.jflxColumns = response.data;
     });
+    getHomeapplyydjfsqStatus(this.id).then(response => {
+      this.region = response.data.region;
+    });
     listHomeapplytype({deptId: JSON.parse(Cookies.get('user')).deptId}).then(response => {
       let _this = this;
       _this.tytzList = response.rows;
     });
+
+    this.getDetail();
     this.getFormIntent();
     this.getLandCoord();
-    this.getDetail();
   },
   methods: {
     guidProduct(){
@@ -2101,6 +2106,7 @@ export default {
       if(this.id)
       {
         allInformationWLHT(this.id).then(response => {
+          console.info(this.region)
           this.init(response.data);
           for (let i = 0; i < this.tytzList.length; i++) {
             //_this.infoList[i].push({text: response.rows[i].name, value: response.rows[i].code});
@@ -2195,7 +2201,7 @@ export default {
     },
     // 全局初始化
     init(value) {
-      console.log(sessionStorage);
+      console.log(this.isYiLong());
       const role = this.$store.getters.roles;
       this.currentUserRole = role[0];
       console.log("当前用户角色: " + role);