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

src/views/onlineHome/homestead/circulation/circulationAdd.vue

@@ -278,7 +278,10 @@
           //流转方式
           this.houseGetDicts("lzfs").then((res) => {
             for( let i = 0 ; i < res.data.length ; i++){
-              this.lzfsDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue})
+              if(res.data[i].dictSort < 6){
+                this.lzfsDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue})
+              }
+
             }
           });
           //转入方证件类型

src/views/onlineHome/homestead/homeApplication/proposerLite.vue

@@ -114,7 +114,7 @@
                     <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyCurrentSituation.landArea" label="宅基地面积" placeholder="宅基地面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
 <!--                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyCurrentSituation.landPerArea" 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.tHouseApplyCurrentSituation.landCertificateNo" label="不动产单元号" placeholder="不动产单元号" input-align="right"/>-->
-                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyCurrentSituation.buildingArea" label="建筑面积" placeholder="建筑面积㎡" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
+                    <van-field :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyCurrentSituation.buildingArea" 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.tHouseApplyCurrentSituation.houseCertificateNo" label="权属证证书号" placeholder="权属证证书号" input-align="right"/>
                     <field-select
@@ -1988,10 +1988,10 @@ export default {
         case PROPOSER_VIEW:
           this.formVisible.baseApplyForm.groupFormVisible = hasGroupLevel && this.isNotProposeStatus(houseApplyStatus, ["1", '32']);
           this.formVisible.baseApplyForm.villageFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31"]);
-          this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, 'town_leader') ? -99 : '8']);
-          this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8']);
-          this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8']);
-          this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8']);
+          this.formVisible.baseApplyForm.townFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, 'town_leader') ? -99 : '7', this.isInRoles(role, 'town_leader') ? -99 : '8']);
+          this.formVisible.baseApplyForm.agricultureFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'agriculture']) ? -99 : '8']);
+          this.formVisible.baseApplyForm.buildingFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'building']) ? -99 : '8']);
+          this.formVisible.baseApplyForm.nature_resourceFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '7', this.isInRoles(role, ['town_leader', 'nature_resource']) ? -99 : '8']);
 
           this.formVisible.landscopeVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9', '10']);
           this.formVisible.landscopeForm.baseFormVisible = this.isNotProposeStatus(houseApplyStatus, ["1", "32", "2", "3", "31", '4', '5', '6', '7', '8', '9', '10']);
@@ -2001,7 +2001,6 @@ export default {
           this.formVisible.acceptingForm.townFormVisible = this.isProposeStatus(houseApplyStatus, [this.isInRoles(role, 'town_leader') ? '29' : -99, "26"]);
           this.formVisible.acceptingForm.agricultureFormVisible = this.isProposeStatus(houseApplyStatus, [this.isInRoles(role, ['town_leader', 'agriculture']) ? '29' : -99, "26"]);
           this.formVisible.acceptingForm.nature_resourceFormVisible = this.isProposeStatus(houseApplyStatus, [this.isInRoles(role, ['town_leader', 'nature_resource']) ? '29' : -99, "26"]);
-
           if(this.type =='done') {
             this.formVisible.editVisible = false;
           }
@@ -2565,7 +2564,8 @@ export default {
       }
 
       // 通用设置
-      if(this.type =='done' && this.applicationDetail.tHouseApplyEnd == null && this.applicationDetail.tHouseApplyEnd.taskId ==null){
+      // if(this.type =='done' && this.applicationDetail.tHouseApplyEnd == null && this.applicationDetail.tHouseApplyEnd.taskId ==null){
+      if(this.type =='done' && this.applicationDetail.tHouseApplyEnd == null){
         if (this.isAccepting()) {
           this.active = PROPOSER_STAGE_START;
           this.selectedTabName = PROPOSER_STAGE_START;
@@ -2595,6 +2595,10 @@ export default {
         } else if (this.isAccepting()) {
           this.active = PROPOSER_STAGE_END;
           this.selectedTabName = PROPOSER_STAGE_END;
+          if(this.isProposeStatus(houseApplyStatus, ["20"])){
+            this.selectedTabName = PROPOSER_STAGE_START;
+          }
+
           this.processKeyField = PROPOSER_STAGE_END_ACTIVITY;
           this.attachmentActive = PROPOSER_STAGE_END;
         }
@@ -2667,6 +2671,7 @@ export default {
         landPerArea: null, //人均宅基地面积
         landCertificateNo: null, //权属证书号
         buildingPerArea: null, //人均建筑面积
+        buildingArea:null,//建筑面积
         houseCertificateNo: null, //权属证书号
         landIsposal: null, // 现宅基地处置情况
         reservedArea: null, // 保留m²
@@ -2757,8 +2762,8 @@ export default {
     },
     //返回上一步操作
     goBack(){
-      this.$router.push({path: '/onlineHome/done'});
-      //this.$router.back(-1)
+      this.$router.push({path: '/onlineHome/workbench'});
+      // this.$router.back(-1);
       //this.$router.push({name: this.$router.back(-1)});
     },
     // 当地图绘制完成时

src/views/onlineHome/workbench.vue

@@ -455,14 +455,14 @@
             </div>
             <p style="margin-top: 5px;color: #666666;">使用权流转</p>
           </van-grid-item>
-          <van-grid-item text="使用权抵押"  @click="applicationList('mortgage')">
-            <div slot="default">
-              <div class="icon" style="background:#3ac2db;">
-                <img src="../../../static/images/onlineHome/icon_Z4.png" alt />
-              </div>
-            </div>
-            <p style="margin-top: 5px;color: #666666;">使用权抵押</p>
-          </van-grid-item>
+<!--          <van-grid-item text="使用权抵押"  @click="applicationList('mortgage')">-->
+<!--            <div slot="default">-->
+<!--              <div class="icon" style="background:#3ac2db;">-->
+<!--                <img src="../../../static/images/onlineHome/icon_Z4.png" alt />-->
+<!--              </div>-->
+<!--            </div>-->
+<!--            <p style="margin-top: 5px;color: #666666;">使用权抵押</p>-->
+<!--          </van-grid-item>-->
           <van-grid-item text="有偿退出" @click="applicationList('paidExit')">
             <div slot="default">
               <div class="icon" style="background:#539ffd;">

src/views/yinnong/homestead/circulation/circulationModify.vue

@@ -281,7 +281,9 @@ export default {
         //流转方式
         this.houseGetDicts("lzfs").then((res) => {
           for( let i = 0 ; i < res.data.length ; i++){
-            this.lzfsDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue})
+            if(res.data[i].dictSort < 6){
+              this.lzfsDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue})
+            }
           }
           this.lzfs = this.selectDictLabel(res.data, response.data.lzfs);
         });