From 4c9fec35420c70221fea59d7ea25d4e81ddbdfbd Mon Sep 17 00:00:00 2001
From: zhaochengke <beyondk2000@163.com>
Date: Wed, 15 Jun 2022 17:43:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arbitration/arbitrationDetail.vue         |  2 +-
 .../arbitration/arbitrationHandlerDetail.vue  |  2 +-
 .../arbitration/arbitrationHandlerList.vue    |  2 +-
 .../homestead/arbitration/arbitrationList.vue |  2 +-
 .../arbitration/arbitrationProcessDetail.vue  |  2 +-
 .../arbitration/arbitrationProcessList.vue    |  2 +-
 .../homestead/circulation/circulationAdd.vue  |  7 ++++--
 .../homeApplication/proposerLite.vue          | 19 +++++++++++----
 .../homestead/mortgage/mortgageAdd.vue        | 23 +++++++++++++------
 .../homestead/mortgage/mortgageModify.vue     |  8 +++----
 .../homestead/paidExit/paidExitAdd.vue        | 23 +++++++++++++------
 src/views/onlineHome/workbench.vue            | 20 ++++++++--------
 12 files changed, 70 insertions(+), 42 deletions(-)

diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationDetail.vue b/src/views/onlineHome/homestead/arbitration/arbitrationDetail.vue
index 6ebbc3bd..59e15f6f 100644
--- a/src/views/onlineHome/homestead/arbitration/arbitrationDetail.vue
+++ b/src/views/onlineHome/homestead/arbitration/arbitrationDetail.vue
@@ -181,7 +181,7 @@ export default {
   },
   computed: {
     allowCUD: function () {
-      return this.$store.getters.businessLevel == '2'
+      return this.$store.getters.businessLevel == '2' || true
     },
   },
   methods: {
diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationHandlerDetail.vue b/src/views/onlineHome/homestead/arbitration/arbitrationHandlerDetail.vue
index 02367c66..0ce7f91a 100644
--- a/src/views/onlineHome/homestead/arbitration/arbitrationHandlerDetail.vue
+++ b/src/views/onlineHome/homestead/arbitration/arbitrationHandlerDetail.vue
@@ -101,7 +101,7 @@ export default {
   },
   computed: {
     allowCUD: function () {
-      return this.$store.getters.businessLevel == '2'
+      return this.$store.getters.businessLevel == '2' || true
     },
   },
   methods: {
diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationHandlerList.vue b/src/views/onlineHome/homestead/arbitration/arbitrationHandlerList.vue
index 235fb616..4b481105 100644
--- a/src/views/onlineHome/homestead/arbitration/arbitrationHandlerList.vue
+++ b/src/views/onlineHome/homestead/arbitration/arbitrationHandlerList.vue
@@ -92,7 +92,7 @@ export default {
   },
   computed: {
     allowCUD: function () {
-      return this.$store.getters.businessLevel == '2'
+      return this.$store.getters.businessLevel == '2' || true
     },
   },
   methods: {
diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationList.vue b/src/views/onlineHome/homestead/arbitration/arbitrationList.vue
index 56a47bf7..a21ccfed 100644
--- a/src/views/onlineHome/homestead/arbitration/arbitrationList.vue
+++ b/src/views/onlineHome/homestead/arbitration/arbitrationList.vue
@@ -98,7 +98,7 @@ export default {
   },
   computed: {
     allowCUD: function () {
-      return this.$store.getters.businessLevel == '2'
+      return this.$store.getters.businessLevel == '2' || true;
     },
   },
   methods: {
diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationProcessDetail.vue b/src/views/onlineHome/homestead/arbitration/arbitrationProcessDetail.vue
index e52b118f..9d349bbd 100644
--- a/src/views/onlineHome/homestead/arbitration/arbitrationProcessDetail.vue
+++ b/src/views/onlineHome/homestead/arbitration/arbitrationProcessDetail.vue
@@ -126,7 +126,7 @@ export default {
   },
   computed: {
     allowCUD: function () {
-      return this.$store.getters.businessLevel == '2'
+      return this.$store.getters.businessLevel == '2' || true;
     },
   },
   methods: {
diff --git a/src/views/onlineHome/homestead/arbitration/arbitrationProcessList.vue b/src/views/onlineHome/homestead/arbitration/arbitrationProcessList.vue
index 1738f90c..fa1675f1 100644
--- a/src/views/onlineHome/homestead/arbitration/arbitrationProcessList.vue
+++ b/src/views/onlineHome/homestead/arbitration/arbitrationProcessList.vue
@@ -92,7 +92,7 @@ export default {
   },
   computed: {
     allowCUD: function () {
-      return this.$store.getters.businessLevel == '2'
+      return this.$store.getters.businessLevel == '2' || true;
     },
   },
   methods: {
diff --git a/src/views/onlineHome/homestead/circulation/circulationAdd.vue b/src/views/onlineHome/homestead/circulation/circulationAdd.vue
index 6b5e79ba..72361d6c 100644
--- a/src/views/onlineHome/homestead/circulation/circulationAdd.vue
+++ b/src/views/onlineHome/homestead/circulation/circulationAdd.vue
@@ -364,7 +364,7 @@
         houseAdd(this.circulation).then(response => {
           if(response.code = 200){
             this.$toast.success('保存成功');
-            this.$router.back(-1);
+            this.back();
           }
         })
         }).catch((e) => {
@@ -378,7 +378,7 @@
             goApply(response.data).then(response => {
               if(response.code = 200){
                 this.$toast.success('提交成功');
-                this.$router.back(-1);
+                this.back();
               }
             });
           }
@@ -387,6 +387,9 @@
           Notify({ type: 'danger', message: '请填写完整的表单项' });
         });
       },
+      back() {
+        setTimeout(() => this.$router.back(-1), 1000)
+      },
     },
   }
 </script>
diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
index fc3acf23..700b7229 100644
--- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
+++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
@@ -1102,17 +1102,17 @@
       <van-goods-action style="z-index: 999;">
         <van-goods-action-icon icon="label-o" text="附件" @click="openAttachment" color="#1D6FE9" />
         <template v-if="formVisible.editVisible">
-          <van-goods-action-button type="primary" text="保存"  @click="onSubmit('add')" :disabled="!formEnabled.baseApplyEnabled" v-if="formEnabled.baseApplyEnabled"/>
-          <van-goods-action-button type="primary" :text="formEnabled.baseApplyEnabled ? '保存并提交' : '提交'"  @click="onSubmit(formEnabled.baseApplyEnabled ? 'save_and_submit' : 'submit')" :disabled="!formEnabled.submitEnabled"/>
+          <van-goods-action-button type="info" text="保存"  @click="onSubmit('add')" :disabled="!formEnabled.baseApplyEnabled" v-if="formEnabled.baseApplyEnabled"/>
+          <van-goods-action-button type="info" :text="formEnabled.baseApplyEnabled ? '保存并提交' : '提交'"  @click="onSubmit(formEnabled.baseApplyEnabled ? 'save_and_submit' : 'submit')" :disabled="!formEnabled.submitEnabled"/>
         </template>
         <template v-else-if="formEnabled.landscopeEnabled">
-          <van-goods-action-button type="primary" text="提交开工"  @click="onSubmit('start_and_submit')"/>
+          <van-goods-action-button type="info" text="提交开工"  @click="onSubmit('start_and_submit')"/>
         </template>
         <template v-else-if="formEnabled.acceptingEnabled">
-          <van-goods-action-button type="primary" text="提交验收"  @click="onSubmit('end')"/>
+          <van-goods-action-button type="info" text="提交验收"  @click="onSubmit('end')"/>
         </template>
         <template v-else-if="formVisible.auditVisible">
-          <van-goods-action-button type="primary" text="同意"  @click="onSubmit('agree')"/>
+          <van-goods-action-button type="info" text="同意"  @click="onSubmit('agree')"/>
           <van-goods-action-button type="danger" text="驳回"  @click="onSubmit('reject')"/>
         </template>
       </van-goods-action>
@@ -3561,4 +3561,13 @@ export default {
   .van-goods-action {
     justify-content: center;
   }
+  .van-goods-action-button--first {
+    border-radius: 0.053333rem;
+  }
+  .van-goods-action-button--last {
+    border-radius: 0.053333rem;
+  }
+  .van-goods-action-button {
+    margin-left: 0.1rem;
+  }
 </style>
diff --git a/src/views/onlineHome/homestead/mortgage/mortgageAdd.vue b/src/views/onlineHome/homestead/mortgage/mortgageAdd.vue
index 1c933b5d..5b900c53 100644
--- a/src/views/onlineHome/homestead/mortgage/mortgageAdd.vue
+++ b/src/views/onlineHome/homestead/mortgage/mortgageAdd.vue
@@ -155,10 +155,10 @@
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
-            <van-button type="info" color="#B4B0B0" native-type="submit" class="submitButton" @click="back">关闭</van-button>
+            <van-button type="info" native-type="submit" class="submitButton" @click="goSubmit">保存</van-button>
           </van-col>
           <van-col span="12" align="center">
-            <van-button type="info" native-type="submit" class="submitButton" @click="goSubmit">保存</van-button>
+            <van-button type="info" native-type="submit" class="submitButton" @click="goSubmit(true)">提交</van-button>
           </van-col>
         </van-row>
         <div class="clear"></div>
@@ -167,7 +167,7 @@
 </template>
 
 <script>
-import { dyAdd } from "@/api/onlineHome/homestead/mortgage";
+import { dyAdd, dyApply } from "@/api/onlineHome/homestead/mortgage";
 import { zjdzd, getByZjddm } from "@/api/onlineHome/homestead/circulation";
 import {Notify} from "vant";
 export default {
@@ -269,12 +269,21 @@ export default {
       this.circulation.djsj = this.getNowFormatDate(data).substr(0,10);
       this.showdjsj = false;
     },
-    goSubmit(){
+    goSubmit(submit){
       this.$refs._Form.validate().then(() => {
       dyAdd(this.circulation).then(response => {
         if(response.code = 200){
-          this.$toast.success('保存成功');
-          this.back();
+          if(submit)
+          {
+            dyApply(response.data).then((resp) => {
+              this.$toast.success('提交成功');
+              this.back();
+            });
+          }
+          else {
+            this.$toast.success('保存成功');
+            this.back();
+          }
         }
       })
       }).catch((e) => {
@@ -282,7 +291,7 @@ export default {
       });
     },
     back() {
-      this.$router.back(-1);
+      setTimeout(() => this.$router.back(-1), 1000)
     },
   },
 }
diff --git a/src/views/onlineHome/homestead/mortgage/mortgageModify.vue b/src/views/onlineHome/homestead/mortgage/mortgageModify.vue
index 780656d8..d88393c7 100644
--- a/src/views/onlineHome/homestead/mortgage/mortgageModify.vue
+++ b/src/views/onlineHome/homestead/mortgage/mortgageModify.vue
@@ -279,7 +279,7 @@ export default {
         dyEdit(this.circulation).then(response => {
         if(response.code = 200){
           this.$toast.success('保存成功');
-          this.$router.back(-1);
+          setTimeout(() => this.$router.back(-1), 1000)
         }
       })
       }).catch((e) => {
@@ -290,10 +290,8 @@ export default {
       this.$refs._Form.validate().then(() => {
       dyApply(this.$route.query.id).then(response => {
         if(response.code = 200){
-          this.$toast.success('保存成功');
-          setTimeout(function(){
-            this.$router.back(-1);
-          },1000)
+          this.$toast.success('提交成功');
+          setTimeout(() => this.$router.back(-1), 1000)
         }
       })
       }).catch((e) => {
diff --git a/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue b/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue
index 0c8a9607..46f1285f 100644
--- a/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue
+++ b/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue
@@ -150,10 +150,10 @@
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
-            <van-button type="info" color="#B4B0B0" native-type="submit" class="submitButton" @click="back">关闭</van-button>
+            <van-button type="info" native-type="submit" class="submitButton" @click="goSubmit">保存</van-button>
           </van-col>
           <van-col span="12" align="center">
-            <van-button type="info" native-type="submit" class="submitButton" @click="goSubmit">保存</van-button>
+            <van-button type="info" native-type="submit" class="submitButton" @click="goSubmit(true)">提交</van-button>
           </van-col>
         </van-row>
         <div class="clear"></div>
@@ -163,7 +163,7 @@
 
 <script>
 import { zjdzd, getByZjddm } from "@/api/onlineHome/homestead/circulation";
-import { dyAdd } from "@/api/onlineHome/homestead/paidExit";
+import { dyAdd, zyyctcApply } from "@/api/onlineHome/homestead/paidExit";
 import {Notify} from "vant";
 export default {
   name: "paidExitAdd",
@@ -281,13 +281,22 @@ export default {
       this.circulation.bcfs = data.value;
       this.showbcfs = false;
     },
-    goSubmit(){
+    goSubmit(submit){
       console.log(this.circulation);
       this.$refs._Form.validate().then(() => {
       dyAdd(this.circulation).then(response => {
         if(response.code = 200){
-          this.$toast.success('保存成功');
-          this.back();
+          if(submit)
+          {
+            zyyctcApply(response.data).then((resp) => {
+              this.$toast.success('提交成功');
+              this.back();
+            });
+          }
+          else {
+            this.$toast.success('保存成功');
+            this.back();
+          }
         }
       })
       }).catch((e) => {
@@ -295,7 +304,7 @@ export default {
       });
     },
     back() {
-      this.$router.back(-1);
+      setTimeout(() => this.$router.back(-1), 1000)
     },
   },
 }
diff --git a/src/views/onlineHome/workbench.vue b/src/views/onlineHome/workbench.vue
index 20102f99..72ce093a 100644
--- a/src/views/onlineHome/workbench.vue
+++ b/src/views/onlineHome/workbench.vue
@@ -471,6 +471,14 @@
             </div>
             <p style="margin-top: 5px;color: #666666;">有偿退出</p>
           </van-grid-item>
+          <van-grid-item text="纠纷调请" :to="{name:'arbitrationList'}" >
+            <div slot="default">
+              <div class="icon" style="background:#1D6FE9;">
+                <img src="../../../static/images/onlineHome/icon_Z13.png"  alt />
+              </div>
+            </div>
+            <p style="margin-top: 5px;color: #666666;">纠纷调请</p>
+          </van-grid-item>
         </van-grid>
       </van-row>
 
@@ -505,14 +513,14 @@
             </div>
             <p style="margin-top: 5px;color: #666666;">宅基地利用</p>
           </van-grid-item>
-          <van-grid-item text="公示信息" :to="{name:'informationList'}" >
+<!--          <van-grid-item text="公示信息" :to="{name:'informationList'}" >
             <div slot="default">
               <div class="icon" style="background:#c568f5">
                 <img src="../../../static/images/onlineHome/icon_Z8.png" alt />
               </div>
             </div>
             <p style="margin-top: 5px;color: #666666;">公示信息</p>
-          </van-grid-item>
+          </van-grid-item>-->
         </van-grid>
       </van-row>
 
@@ -547,14 +555,6 @@
             </div>
             <p style="margin-top: 5px;color: #666666;">违法监管</p>
           </van-grid-item>
-          <van-grid-item text="纠纷调请" :to="{name:'arbitrationList'}" >
-            <div slot="default">
-              <div class="icon" style="background:#1D6FE9;">
-                <img src="../../../static/images/onlineHome/icon_Z13.png"  alt />
-              </div>
-            </div>
-            <p style="margin-top: 5px;color: #666666;">纠纷调请</p>
-          </van-grid-item>
         </van-grid>
       </van-row>