From 44f9cd5c403584c39c8bb893f69244e4835daab8 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期三, 19 二月 2020 12:13:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebService/src/main/resources/components/communityPackage/audit-enter-community-manage/auditEnterCommunityManage.html | 76 +++++++++++++++++++++++++++++++++++++-
1 files changed, 74 insertions(+), 2 deletions(-)
diff --git a/WebService/src/main/resources/components/communityPackage/audit-enter-community-manage/auditEnterCommunityManage.html b/WebService/src/main/resources/components/communityPackage/audit-enter-community-manage/auditEnterCommunityManage.html
index aa533f4..802a113 100644
--- a/WebService/src/main/resources/components/communityPackage/audit-enter-community-manage/auditEnterCommunityManage.html
+++ b/WebService/src/main/resources/components/communityPackage/audit-enter-community-manage/auditEnterCommunityManage.html
@@ -1,9 +1,75 @@
<div id="component">
<div class="row">
<div class="col-lg-12">
+ <div class="ibox ">
+ <div class="ibox-title">
+ <h5>鏌ヨ鏉′欢</h5>
+ <div class="ibox-tools" style="top:10px;">
+ <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
+ v-on:click="_moreCondition()">{{auditEnterCommunityManageInfo.moreCondition ==
+ true?'闅愯棌':'鏇村'}}
+ </button>
+ </div>
+ </div>
+ <div class="ibox-content">
+ <div class="row">
+ <div class="col-sm-4">
+ <div class="form-group">
+ <input type="text" placeholder="璇疯緭鍏ュ晢鎴峰悕绉�"
+ v-model="auditEnterCommunityManageInfo.conditions.name" class=" form-control">
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="form-group">
+ <input type="text" placeholder="璇疯緭鍏ュ皬鍖哄悕绉�"
+ v-model="auditEnterCommunityManageInfo.conditions.communityName"
+ class=" form-control">
+ </div>
+ </div>
+ <div class="col-sm-3">
+ <select class="custom-select"
+ v-model="auditEnterCommunityManageInfo.conditions.auditStatusCd">
+ <option selected value="">璇烽�夋嫨瀹℃牳鐘舵��</option>
+ <option value="1000">鏈鏍�</option>
+ <option value="1100">瀹℃牳閫氳繃</option>
+ <option value="1200">瀹℃牳鏈�氳繃</option>
+ </select></div>
+
+ <div class="col-sm-1">
+ <button type="button" class="btn btn-primary btn-sm"
+ v-on:click="_queryEnterCommunityMethod()">
+ <i class="glyphicon glyphicon-search"></i> 鏌ヨ
+ </button>
+ </div>
+ </div>
+ <div class="row" v-if="auditEnterCommunityManageInfo.moreCondition == true">
+ <div class="col-sm-4">
+ <select class="custom-select"
+ v-model="auditEnterCommunityManageInfo.conditions.memberTypeCd">
+ <option selected value="">璇烽�夋嫨鍟嗘埛绫诲瀷</option>
+ <option value="390001200002">鐗╀笟鍏徃</option>
+ <option value="390001200003">浠g悊鍟�</option>
+ </select>
+ </div>
+ <div class="col-sm-4">
+ <div class="form-group">
+ <input type="text" placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+ v-model="auditEnterCommunityManageInfo.conditions.tel"
+ class=" form-control">
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-lg-12">
<div class="ibox">
<div class="ibox-title">
- <h5>鍏ラ┗瀹℃牳</h5>
+ <h5>鍟嗘埛瀹℃牳</h5>
<div class="ibox-tools" style="top:10px;">
</div>
@@ -33,11 +99,17 @@
<td>{{community.address}}</td>
<td>{{community.stateName}}</td>
<td>
- <div class="btn-group">
+ <div class="btn-group" v-if="community.auditStatusCd=='1000'">
<button class="btn-white btn btn-xs"
v-on:click="_openEnterAuditCommunityModal(community)">瀹℃牳
</button>
</div>
+ <!--v-on:click="_openEnterAuditCommunityModal(community)"-->
+ <div class="btn-group" v-if="community.auditStatusCd!='1000'">
+ <button class="btn-white btn btn-xs"
+ >鎾ゅ洖瀹℃牳
+ </button>
+ </div>
</tr>
--
Gitblit v1.8.0