宅基地手机端优化

src/api/login/index.js

@@ -1,6 +1,5 @@
 import request from '@/utils/request'
-import { encrypt } from '@/utils/jsencrypt' // 公钥,私钥都声明在里面
-
+import {encrypt} from "@/utils/jsencrypt";
 const VUE_APP_ENABLE_SECRET = true; // 登录账密凭据加密
 
 // 登录方法

src/api/onlineHome/homestead/supervision.js

@@ -4,7 +4,7 @@ import da from "element-ui/src/locale/lang/da";
 //查询列表
 export function getList(data){
   return request({
-    url:'/home/mobile/zjdjg/list',
+    url:'/house/mobile/zjdjg/list',
     method:'get',
     params:data
   })

src/api/sunVillage_info/homestead/application.js

@@ -213,9 +213,9 @@ export function getQueryLand(id) {
 }
 
 //查询当前登录账号坐标
-export function getWorkflow() {
+export function getWorkflow(deptId) {
   return request({
-    url: '/home/mobile/workflow',
+    url: '/home/mobile/workflow?deptId='+deptId,
     method: 'get'
   })
 }

src/views/sunVillage_info/arbitration/arbitrationDetail.vue

@@ -62,7 +62,7 @@
               <div>
                 <p class="main_title"><span style="color: red;">*</span>纠纷人</p>
                 <van-field :readonly="!allowCUD || !formEnabled.baseFormEnabled" v-model="arbitrationData.disputesName" label="纠纷人" placeholder="纠纷人" input-align="right" required :rules="[{ required: true }]"/>
-                <van-field required v-model="arbitrationData.disputesPhone" label="联系电话" placeholder="联系电话" input-align="right" type="digit" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]"/>
+                <van-field :readonly="!allowCUD || !formEnabled.baseFormEnabled" v-model="arbitrationData.disputesPhone" label="联系电话" placeholder="联系电话" input-align="right" type="digit"/>
               </div>
               <div>
                 <p class="main_title"><span style="color: red;">*</span>纠纷事项</p>
@@ -227,7 +227,7 @@ export default {
         this.closeMoule(response.rows[0].zjddm);
       }
     });
-    this.getDetail();
+    this.getDetailgetDetail();
     this.getUserHouseApplyProposer();
   },
   computed: {

src/views/sunVillage_info/homeApplication/applicationList.vue

@@ -81,6 +81,7 @@ export default {
       finished: false,
       refreshing: false,
       deptId:null,
+      idcard:null,
       total: 0,
       queryParams:{
         pageNum:1,
@@ -95,7 +96,8 @@ export default {
     this.houseGetDicts("home_stage_status").then((response) => {
       this.houseApplyStatus = response.data;
     });
-    this.deptId = Cookies.get('deptId')
+    this.deptId = Cookies.get('deptId');
+    this.idcard = Cookies.get('idcard');
     this.$set(this.queryParams, "deptId", this.deptId);
     this.$set(this.queryParams, "sqhhzsfzh", this.idcard);
     this.getList();

src/views/sunVillage_info/homeApplication/proposerLite.vue

@@ -174,7 +174,7 @@
                     <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.xzjdmj" label="宅基地面积" placeholder="宅基地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
                     <van-field :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.xjzmj" label="建筑面积" placeholder="建筑面积㎡" input-align="right" type="number" :rules="[{ required: true }]" required ><template #right-icon>㎡</template></van-field>
 <!--                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyCurrentSituation.buildingPerArea" label="人均建筑面积" placeholder="人均建筑面积" input-align="right" label-width="auto" type="number"><template #right-icon>㎡</template></van-field>-->
-                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.qszsh" label="权属证证书号" placeholder="权属证证书号" input-align="right"/>
+                    <van-field :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.qszsh" label="权属证书号" placeholder="权属证证书号" input-align="right"/>
                     <field-select
                       v-model="applicationDetail.xzjdczqk"
                       label="处置情况"
@@ -2087,7 +2087,7 @@ export default {
      this.sysFarmer = JSON.parse(Cookies.get('user'));
      listHomeapplytype({deptId:this.sysFarmer.deptId}).then(response => {
        let _this = this;
-       _this.tytzList = response.rows;
+       _this.tytzList = response.rows;;
      });
    }
     console.info( this.sysFarmer);
@@ -2122,8 +2122,10 @@ export default {
         allInformationWLHT(this.id).then(response => {
           listHomeapplytype({deptId: response.data.deptId}).then(res => {
             this.tytzList = res.rows;
+            console.info(this.tytzList);
             for (let i = 0; i < this.tytzList.length; i++) {
               //_this.infoList[i].push({text: response.rows[i].name, value: response.rows[i].code});
+              this.$set(this.tytzList[i], "tytzId", this.tytzList[i].id);
               if(this.tytzList[i].id = response.data.tyhxt){
                 this.tytzName = this.tytzList[i].name;
               }
@@ -2143,8 +2145,10 @@ export default {
       this.$nextTick(() => {
         let map = this.$refs.pointDarwMap;
         if(data === null)
+        if( this.applicationDetail.ydjfkg !== null){
           data = this.applicationDetail.ydjfkg.theGeomJson;
-        this.setMapData(map, data);
+          this.setMapData(map, data);
+        }
       });
     },
     // 绘制验收地图
@@ -2903,7 +2907,7 @@ export default {
           this.houseApplyUploadComp.proposerId = -1;
 
           this.pointDarw();
-          getWorkflow().then((resp) => {
+          getWorkflow(this.sysFarmer.deptId).then((resp) => {
 
             this.$set(this.applicationDetail, 'proposerActiveIndex', -1);
             this.$set(this.applicationDetail, 'startActiveIndex', -1);
@@ -2911,7 +2915,6 @@ export default {
             this.$set(this.applicationDetail, 'applyStepList', resp.data.applyStepList.name);
             this.$set(this.applicationDetail, 'startStepList', resp.data.startStepList.name);
             this.$set(this.applicationDetail, 'endStepList', resp.data.endStepList.name);
-            console.info(this.applicationDetail);
           });
           //this.initData();
           break;
@@ -3563,11 +3566,11 @@ export default {
                 return;
               } else {
                   setTimeout(() => {
-                    saveHomeBaseInfo(_this.applicationDetail).then((response) => {
-                      _this.complete(pass, comment);
+                    saveHomeBaseInfo(this.applicationDetail).then((response) => {
+                      this.complete(pass, comment);
                     }).catch(resp => {
-                      _this.notify(msg, 'danger');
-                      _this.notify("保存失败!", 'danger');
+                      this.notify(msg, 'danger');
+                      this.notify("保存失败!", 'danger');
                     });
                   }, 500);
               }
@@ -4663,7 +4666,7 @@ export default {
       return false;
     },
     onConfirmTytz(val){
-      this.$set(this.applicationDetail, 'tyhxt', val.value);
+      this.$set(this.applicationDetail, 'tyhxt', val.tytzId);
       this.tytzName = val.name;
       this.showTyt = false;
     },

打包.bat

@@ -11,4 +11,4 @@ npm run build
 
 
 @echo SUCCESS
-pause
+pause