宅基地优化

src/store/modules/user.js

@@ -210,6 +210,30 @@ const user = {
         chungengUserLogin(code).then(res => {
           setToken(res.token)
           commit('SET_TOKEN', res.token)
+          getInfo(res.token).then(response => {
+            const user = response.user;
+            //   const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+            const avatar = "";
+            if (response.roles && response.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+              commit('SET_ROLES', response.roles)
+              commit('SET_PERMISSIONS', response.permissions)
+            } else {
+              commit('SET_ROLES', ['ROLE_DEFAULT'])
+            }
+            commit('SET_BOOKNAME', user.bookName)
+            commit('SET_NAME', user.userName)
+            commit('SET_USERID', user.userId)
+            commit('SET_LOGINDEPTID', user.loginDeptId)
+            commit('SET_LOGINBOOKID', user.loginBookId)
+            commit('SET_DEPTNAME', user.deptName)
+            commit('SET_AVATAR', avatar)
+            commit('SET_NICKNAME', user.nickName);
+            commit('SET_businessLevel', user.businessLevel);
+            //commit('SET_businessLevel', 'TEST');
+            getSystemAttachmentUrl().then((resp) => {
+              commit('SET_baseRoutingUrl', resp.msg);
+            });
+          })
           Cookies.set("_Login_url", window.location.href);
           resolve(res.data)
         }).catch(error => {

src/views/sunVillage_info/homeApplication/proposerLite.vue

@@ -464,7 +464,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">{{applicationDetail.ydjfsp.zrzybmmc}}意见</van-col>
+                    <van-col span="5">{{applicationDetail.ydjfsp.zrzybmmc != null?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-->
@@ -533,7 +533,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">{{applicationDetail.ydjfsp.zfcxjsbmmc}}意见</van-col>
+                    <van-col span="5">{{applicationDetail.ydjfsp.zfcxjsbmmc != null?applicationDetail.ydjfsp.zfcxjsbmmc:'住建部'}}意见</van-col>
                     <van-col span="19">
                       <!--                      <field-select-->
                       <!--                        v-model="applicationDetail.tHouseApproveOtherOptions.buildingType"-->
@@ -609,7 +609,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">{{applicationDetail.ydjfsp.nyncbmmc}}意见</van-col>
+                    <van-col span="5">{{applicationDetail.ydjfsp.nyncbmmc != null?applicationDetail.ydjfsp.nyncbmmc:'农业农村部'}}意见</van-col>
                     <van-col span="19">
 <!--                      <field-radio-->
 <!--                        v-model="applicationDetail.tHouseApproveAgricultureOptions.isMembership"-->
@@ -1475,7 +1475,7 @@
             <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">{{applicationDetail.ydjfys.nyncbmmc}}意见</van-col>
+                  <van-col span="5">{{applicationDetail.ydjfys.nyncbmmc != null?applicationDetail.ydjfsp.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 }]">
@@ -1520,7 +1520,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">{{applicationDetail.ydjfys.zrzybmmc}}意见</van-col>
+                  <van-col span="5">{{applicationDetail.ydjfys.zrzybmmc != null?applicationDetail.ydjfsp.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 }]">
@@ -1562,7 +1562,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">{{applicationDetail.ydjfys.zfcxjsbmmc}}意见</van-col>
+                  <van-col span="5">{{applicationDetail.ydjfys.zfcxjsbmmc != null?applicationDetail.ydjfsp.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 }]">
@@ -2906,7 +2906,7 @@ export default {
           this.uploadImgAccepting.fileList = value.ydjfys ? value.ydjfys.jgpmjt : '';
           this.uploadImgAccepting.proposerId = this.applicationDetail.id;
 
-
+          console.info("-------------------------"+role+"-------------------------");
           //地图编辑
           this.pointDarw(null);
           // this.pointDarwNature(null);
@@ -3490,7 +3490,6 @@ export default {
               if (msg) {
                 break;
               }
-
               this.$set(this.applicationDetail, 'tHouseApproveTownOptions', null);
               this.$set(this.applicationDetail, 'tHouseApproveOtherOptions', null);
               this.$set(this.applicationDetail, 'tHouseApproveAgricultureOptions', null);
@@ -3647,7 +3646,12 @@ export default {
             }
             else {
               if(this.applicationDetail.ydjfkg.theGeomJson == null){
-                this.applicationDetail.ydjfkg.theGeomJson = this.convertGeom(this.applicationDetail.ydjfkg.theGeom);
+                if(this.applicationDetail.ydjfkg.theGeom == null){
+                  this.notify("请在地图上标注宅基地位置!", 'danger');
+                  break;
+                }else{
+                  this.applicationDetail.ydjfkg.theGeomJson = this.convertGeom(this.applicationDetail.ydjfkg.theGeom);
+                }
               }
             }
             saveHomeBaseInfo(this.applicationDetail).then((response) => {