宅基地bug修改

src/views/onlineHome/homestead/arbitration/arbitrationDetail.vue

@@ -87,17 +87,17 @@
       <!-- 底部按钮 -->
       <van-goods-action style="z-index: 999;" v-if="allowCUD && (formVisible.editVisible || formVisible.operationVisible || formVisible.approvalVisible)">
         <template v-if="formVisible.editVisible">
-          <van-goods-action-button type="primary" text="保存"  @click="onSubmit('add')" :disabled="!formEnabled.baseFormEnabled" v-if="formEnabled.baseFormEnabled"/>
-          <van-goods-action-button type="primary" :text="formEnabled.baseFormEnabled ? '保存并提交' : '提交'"  @click="onSubmit(formEnabled.baseFormEnabled ? 'save_and_submit' : 'submit')" v-if="formEnabled.submitEnabled"/>
+          <van-goods-action-button type="info" text="保存"  @click="onSubmit('add')" :disabled="!formEnabled.baseFormEnabled" v-if="formEnabled.baseFormEnabled"/>
+          <van-goods-action-button type="info" text="提交"  @click="onSubmit(formEnabled.baseFormEnabled ? 'save_and_submit' : 'submit')" v-if="formEnabled.submitEnabled"/>
         </template>
         <template v-if="formVisible.approvalVisible">
-          <van-goods-action-button type="primary" text="受理"  @click="onSubmit('agree')" :disabled="!formEnabled.approvalEnabled"/>
+          <van-goods-action-button type="info" text="受理"  @click="onSubmit('agree')" :disabled="!formEnabled.approvalEnabled"/>
           <van-goods-action-button type="danger" text="驳回"  @click="onSubmit('reject')" v-if="formEnabled.rejectEnabled"/>
         </template>
         <template v-if="formVisible.operationVisible">
-          <van-goods-action-button type="primary" text="调解"  @click="onSubmit('mediate')" v-if="formEnabled.mediateEnabled"/>
+          <van-goods-action-button type="info" text="调解"  @click="onSubmit('mediate')" v-if="formEnabled.mediateEnabled"/>
           <van-goods-action-button type="danger" text="仲裁"  @click="onSubmit('arbitrate')" v-if="formEnabled.arbitrateEnabled"/>
-          <van-goods-action-button type="primary" text="归档"  @click="onSubmit('archive')" v-if="formEnabled.archiveEnabled"/>
+          <van-goods-action-button type="info" text="归档"  @click="onSubmit('archive')" v-if="formEnabled.archiveEnabled"/>
         </template>
       </van-goods-action>
 
@@ -269,6 +269,7 @@ export default {
         case INTENT_ADD:
           this.formEnabled.baseFormEnabled = true;
           this.formVisible.editVisible = true;
+          this.formEnabled.submitEnabled = true;
           break;
       }
     },
@@ -374,8 +375,10 @@ export default {
         }*/
         console.log("进行保存", this.arbitrationData);
         (this.arbitrationData.id ? editArbitration : addArbitration)(this.arbitrationData).then((response) => {
-          if(submit && this.arbitrationData.id)
+          if(submit)
           {
+            if(!this.arbitrationData.id)
+              this.arbitrationData.id = response.data;
             this.submitArbitration();
           }
           else
@@ -611,4 +614,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>

src/views/onlineHome/homestead/arbitration/arbitrationHandlerDetail.vue

@@ -41,7 +41,8 @@
 
       <!-- 底部按钮 -->
       <van-goods-action style="z-index: 999;" v-if="allowCUD">
-        <van-goods-action-button type="primary" text="保存"  @click="onSubmit('add')" v-if="formEnabled.baseFormEnabled" />
+        <van-goods-action-button style="background-color: rgb(180, 176, 176); color: #FFFFFF;" text="关闭"  @click="$router.back()" v-if="formEnabled.baseFormEnabled" />
+        <van-goods-action-button type="info" text="保存"  @click="onSubmit('add')" v-if="formEnabled.baseFormEnabled" />
         <van-goods-action-button type="danger" text="删除"  @click="onSubmit('del')" v-if="formEnabled.removeEnabled" />
       </van-goods-action>
     </div>
@@ -428,4 +429,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>

src/views/onlineHome/homestead/arbitration/arbitrationProcessDetail.vue

@@ -66,7 +66,8 @@
 
       <!-- 底部按钮 -->
       <van-goods-action style="z-index: 999;" v-if="allowCUD">
-        <van-goods-action-button type="primary" text="保存"  @click="onSubmit('add')" v-if="formEnabled.baseFormEnabled" />
+        <van-goods-action-button style="background-color: rgb(180, 176, 176); color: #FFFFFF;" text="关闭"  @click="$router.back()" v-if="formEnabled.baseFormEnabled" />
+        <van-goods-action-button type="info" text="保存"  @click="onSubmit('add')" v-if="formEnabled.baseFormEnabled" />
         <van-goods-action-button type="danger" text="删除"  @click="onSubmit('del')" v-if="formEnabled.removeEnabled" />
       </van-goods-action>
     </div>
@@ -453,4 +454,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>

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

@@ -21,10 +21,11 @@
         @load="getList"
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.shyqrdm" :value="item.auditStatus" center :to="{name:'circulationDetail', query: {id:item.id}}">
+          <van-cell :title="item.shyqrdm" :value="formatDict(auditStatus, item.auditStatus)" center :to="{name:'circulationDetail', query: {id:item.id}}">
             <template #icon>
               <van-icon name="../../../static/images/onlineHome/icon_zjd2.png" size="30" color="#539FFD" style="margin-right: 10px;" />
             </template>
+            <span :style="{color: item.auditStatus == '2' ? '#F56C6C' : (item.auditStatus == '0' ? '#67c23a' : ''),}">{{ item.auditStatus == '2' ? '已驳回' : formatDict(auditStatus, item.auditStatus) }} </span>
             <template #label>
               <p><b style="color: #FFA63E;">{{item.lzfs}}</b><i style="margin-right: 0.5rem;"></i><b style="color: #333333;">{{item.zrfdbmc}}</b><i style="margin-right: 0.5rem;"></i>{{item.lzmj}}㎡</p>
             </template>
@@ -32,13 +33,13 @@
           <template #right>
             <van-row>
               <van-col>
-                <van-button square text="修改" type="info" v-if="item.auditStatus=='草稿'" class="delete-button" :to="{name:'circulationModify', query: {id:item.id}}" />
+                <van-button square text="修改" type="info" v-if="item.auditStatus=='0'" class="delete-button" :to="{name:'circulationModify', query: {id:item.id}}" />
               </van-col>
               <van-col>
-                <van-button square text="提交" type="primary" v-if="item.auditStatus=='草稿'" class="delete-button" @click="submit(item)" />
+                <van-button square text="提交" type="primary" v-if="item.auditStatus=='0'" class="delete-button" @click="submit(item)" />
               </van-col>
               <van-col>
-                <van-button square text="删除" type="danger" v-if="item.auditStatus=='草稿'" @click="deleteList(item.id,index)" class="delete-button" />
+                <van-button square text="删除" type="danger" v-if="item.auditStatus=='0'" @click="deleteList(item.id,index)" class="delete-button" />
               </van-col>
             </van-row>
           </template>
@@ -85,8 +86,6 @@ export default {
           for (var i = 0; i < response.rows.length; i++) {
             var houseApplyStatus = this.selectDictLabel(this.houseApplyStatus, response.rows[i].lzfs);
             response.rows[i].lzfs = houseApplyStatus;
-            var auditStatus = this.selectDictLabel(this.auditStatus, response.rows[i].auditStatus);
-            response.rows[i].auditStatus = auditStatus;
             this.applicationList.push(response.rows[i]);
           }
           console.log(this.applicationList.length >= response.total)
@@ -141,6 +140,9 @@ export default {
       this.applicationList = [];
       this.getList();
     },
+    formatDict(dict, value) {
+      return this.selectDictLabel(dict, value);
+    },
   },
 }
 </script>

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

@@ -34,9 +34,9 @@
             <template #icon>
               <van-icon name="../../../static/images/onlineHome/icon_zjd1.png" size="30" color="#539FFD" style="margin-right: 10px;" />
             </template>
-            <span v-if="item.auditStatus === '0'">{{ item.houseApplyStatusName}} </span>
-            <span v-else-if="item.auditStatus !== '0' && item.auditStatus === '2' " style="color: #F56C6C">{{ item.houseApplyStatusName + ' ● 已驳回' }} </span>
-            <span  v-else style="color: #67c23a;">{{item.houseApplyStatusName }} </span>
+            <span v-if="item.auditStatus === '0'">{{ formatDict(houseApplyStatus, item.houseApplyStatus) }} </span>
+            <span v-else-if="item.auditStatus !== '0' && item.auditStatus === '2' " style="color: #F56C6C">{{ formatDict(houseApplyStatus, item.houseApplyStatus) + ' ● 已驳回' }} </span>
+            <span  v-else style="color: #67c23a;">{{ formatDict(houseApplyStatus, item.houseApplyStatus) }} </span>
             <template #label>
               <p>{{item.projectName}}</p>
             </template>
@@ -44,13 +44,13 @@
           <template #right>
             <van-row>
               <van-col>
-                <van-button square text="提交" type="primary" v-if="item.houseApplyStatusName=='申请草稿'" @click="submitApplyProposer(item)" class="delete-button" />
+                <van-button square text="提交" type="primary" v-if="item.houseApplyStatus=='1'" @click="submitApplyProposer(item)" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button square text="修改" type="info" v-if="item.houseApplyStatusName=='申请草稿'" :to="{name:'proposerLite', query: {id:item.id, type: 'modify'}}" class="delete-button" />
+                <van-button square text="修改" type="info" v-if="item.houseApplyStatus=='1'" :to="{name:'proposerLite', query: {id:item.id, type: 'modify'}}" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button square text="删除" type="danger" v-if="item.houseApplyStatusName=='申请草稿'" @click="deleteList(item.id,index)" class="delete-button" />
+                <van-button square text="删除" type="danger" v-if="item.houseApplyStatus=='1'" @click="deleteList(item.id,index)" class="delete-button" />
               </van-col>
             </van-row>
           </template>
@@ -83,10 +83,9 @@ export default {
   },
   created() {
     this.houseGetDicts("house_apply_status").then((response) => {
-      console.log(response)
       this.houseApplyStatus = response.data;
-      this.getList();
     });
+    this.getList();
   },
   methods: {
     goAdd(){
@@ -137,11 +136,11 @@ export default {
           return;
         }
         for (var i = 0; i < response.rows.length; i++) {
-          var houseApplyStatusName = this.selectDictLabel(this.houseApplyStatus, response.rows[i].houseApplyStatus);
+          /*var houseApplyStatusName = this.selectDictLabel(this.houseApplyStatus, response.rows[i].houseApplyStatus);
           // if(response.rows[i].auditStatus !== '0' && response.rows[i].auditStatus === '2'){
           //   houseApplyStatusName = houseApplyStatusName+ ' ● 已驳回';
           // }
-          response.rows[i].houseApplyStatusName = houseApplyStatusName;
+          response.rows[i].houseApplyStatusName = houseApplyStatusName;*/
           this.applicationList.push(response.rows[i]);
         }
         this.total += response.rows.length;
@@ -151,6 +150,9 @@ export default {
         this.refreshing = false;
       });
     },
+    formatDict(dict, value) {
+      return this.selectDictLabel(dict, value);
+    },
     deleteList(id,index){
       this.$dialog.confirm({
         message: '您确认删除申请草稿？',

src/views/onlineHome/homestead/mortgage/mortgageList.vue

@@ -22,6 +22,7 @@
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
           <van-cell :title="item.zjddm" :value="item.auditStatus" center :to="{name:'mortgageDetail', query: {id:item.id}}" >
+            <span :style="{color: item.auditStatus == '2' ? '#F56C6C' : (item.auditStatus == '0' ? '#67c23a' : ''),}">{{ item.auditStatus == '2' ? '已驳回' : formatDict(auditStatus, item.auditStatus) }} </span>
             <template #icon>
               <van-icon name="../../../static/images/onlineHome/icon_zjd4.png" size="30" color="#539FFD" style="margin-right: 10px;" />
             </template>
@@ -32,10 +33,10 @@
           <template #right>
             <van-row>
               <van-col>
-                <van-button square text="修改" v-if="item.auditStatus=='草稿'" :to="{name:'mortgageModify', query: {id:item.id}}" type="info" class="delete-button" />
+                <van-button square text="修改" v-if="item.auditStatus=='0'" :to="{name:'mortgageModify', query: {id:item.id}}" type="info" class="delete-button" />
               </van-col>
               <van-col>
-                <van-button square text="删除" v-if="item.auditStatus=='草稿'" @click="deleteList(item.id,index)" type="danger" class="delete-button" />
+                <van-button square text="删除" v-if="item.auditStatus=='0'" @click="deleteList(item.id,index)" type="danger" class="delete-button" />
               </van-col>
             </van-row>
           </template>
@@ -87,7 +88,6 @@ export default {
           for (var i = 0; i < response.rows.length; i++) {
             response.rows[i].dybdclx = this.selectDictLabel(this.dybdclxStatus, response.rows[i].dybdclx)
             response.rows[i].dyfs = this.selectDictLabel(this.dyfsStatus, response.rows[i].dyfs)
-            response.rows[i].auditStatus = this.selectDictLabel(this.auditStatus, response.rows[i].auditStatus)
             this.applicationList.push(response.rows[i]);
           }
           if(this.applicationList.length >= response.total){
@@ -116,7 +116,10 @@ export default {
       .catch(() => {
         // on cancel
       });
-    }
+    },
+    formatDict(dict, value) {
+      return this.selectDictLabel(dict, value);
+    },
   },
 }
 </script>
@@ -126,7 +129,7 @@ export default {
     padding: 0.2rem 3%;
   }
   /deep/.van-cell__title{
-    flex: 0.9;
+    flex: 0.8;
   }
   /deep/.van-cell__title span{
     font-family: Arial;
@@ -134,7 +137,7 @@ export default {
     font-weight: normal;
   }
   /deep/.van-cell__value{
-    flex: 0.1;
+    flex: 0.2;
     color: #1D6FE9;
     font-weight: bold;
   }