From 99a9433c926b8f437f2d6c81da7d225acccafe74 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 15 Apr 2022 16:43:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E7=A7=80=E5=85=9A=E5=91=98=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/party/partyMember/AppPartyMember.vue |  4 +--
 packages/party/partyMember/components/Add.vue | 28 ++++++++-----------
 .../party/partyMember/components/List.vue     | 28 +++++++++----------
 vue.config.js                                 |  2 +-
 4 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/packages/party/partyMember/AppPartyMember.vue b/packages/party/partyMember/AppPartyMember.vue
index f162a065..d241cc7a 100644
--- a/packages/party/partyMember/AppPartyMember.vue
+++ b/packages/party/partyMember/AppPartyMember.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="AppPartyMember">
-    <component ref="component" :is="component" :selected.sync="selected" :instance="instance"
-               :dict="dict"/>
+    <component ref="component" :is="component" :selected.sync="selected" :instance="instance" :dict="dict"/>
   </div>
 </template>
 
@@ -39,6 +38,7 @@ export default {
     }
   },
   created() {
+    this.dict.load("yesOrNo")
     let {organizationId: id, organizationName: name} = this.user.info
     this.selected = {id, name}
   },
diff --git a/packages/party/partyMember/components/Add.vue b/packages/party/partyMember/components/Add.vue
index 1af1ddb0..40bfad70 100644
--- a/packages/party/partyMember/components/Add.vue
+++ b/packages/party/partyMember/components/Add.vue
@@ -1,14 +1,6 @@
 <template>
   <ai-detail class="party">
-    <template slot="title">
-      <ai-title
-          :title="isEdit ? '编辑党员' : '添加党员'"
-          isShowBack
-          isShowBottomBorder
-          @onBackClick="cancel(false)"
-      >
-      </ai-title>
-    </template>
+    <ai-title slot="title" :title="isEdit ? '编辑党员' : '添加党员'" isShowBack isShowBottomBorder @onBackClick="cancel"/>
     <template slot="content">
       <el-form
           ref="form"
@@ -153,13 +145,13 @@
             </div>
           </template>
         </ai-card>
-<!--        <ai-card title="审核状态" v-if="isEdit">-->
-<!--          <template #content>-->
-<!--            <el-form-item label="审核状态" style="width: 100%">-->
-<!--              <span :class="'audit-' + form.auditStatus" v-text="dict.getLabel('auditStatus', form.auditStatus)"/>-->
-<!--            </el-form-item>-->
-<!--          </template>-->
-<!--        </ai-card>-->
+        <!--        <ai-card title="审核状态" v-if="isEdit">-->
+        <!--          <template #content>-->
+        <!--            <el-form-item label="审核状态" style="width: 100%">-->
+        <!--              <span :class="'audit-' + form.auditStatus" v-text="dict.getLabel('auditStatus', form.auditStatus)"/>-->
+        <!--            </el-form-item>-->
+        <!--          </template>-->
+        <!--        </ai-card>-->
         <ai-card title="联络信息">
           <div class="ai-form" slot="content">
             <el-form-item label="联系方式" prop="phone">
@@ -319,6 +311,9 @@
                   :maxLength="20"
               ></el-input>
             </el-form-item>
+            <el-form-item label="优秀党员" prop="isOutstandingParty">
+              <ai-select v-model="form.isOutstandingParty" :selectList="dict.getDict('yesOrNo')"/>
+            </el-form-item>
           </div>
         </ai-card>
         <ai-card title="流动信息">
@@ -825,6 +820,7 @@ export default {
         lossTime: "",
         inTime: "",
         education: "",
+        isOutstandingParty: "0"
       },
       isShowStarForm: false,
       isShowJobForm: false,
diff --git a/packages/party/partyMember/components/List.vue b/packages/party/partyMember/components/List.vue
index e6a7dc75..1a8e6c42 100644
--- a/packages/party/partyMember/components/List.vue
+++ b/packages/party/partyMember/components/List.vue
@@ -86,12 +86,10 @@
           <el-input
               v-model="search.con"
               size="small"
-              v-throttle="() => {search.current = 1, getList()}"
               placeholder="请输入姓名或身份证"
               clearable
-              @clear="search.current = 1, search.con = '', getList()"
-              suffix-icon="iconfont iconSearch">
-          </el-input>
+              @change="search.current=1,getList()"
+              suffix-icon="iconfont iconSearch"/>
         </template>
       </ai-search-bar>
       <ai-search-bar>
@@ -106,16 +104,16 @@
         </template>
       </ai-search-bar>
       <ai-table
-        :dict="dict"
-        :tableData="tableData"
-        :col-configs="colConfigs"
-        :total="total"
-        v-loading="loading"
-        style="margin-top: 6px;"
-        :current.sync="search.current"
-        :size.sync="search.size"
-        @handleSelectionChange="handleSelectionChange"
-        @getList="getList">
+          :dict="dict"
+          :tableData="tableData"
+          :col-configs="colConfigs"
+          :total="total"
+          v-loading="loading"
+          style="margin-top: 6px;"
+          :current.sync="search.current"
+          :size.sync="search.size"
+          @handleSelectionChange="handleSelectionChange"
+          @getList="getList">
         <el-table-column slot="options" width="160px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
@@ -211,7 +209,7 @@ export default {
       this.getList(e.id)
     },
 
-    onSearch (v) {
+    onSearch(v) {
       this.orgTree.filter(v)
     },
 
diff --git a/vue.config.js b/vue.config.js
index d1c02023..f365a93e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -64,7 +64,7 @@ module.exports = {
     proxy: {
       //设置代理,可解决跨5
       '/lan': {
-        target: 'https://sdtestweb.sdvillage.cn',
+        target: 'http://192.168.1.87:9000',
         changeOrigin: true,
         pathRewrite: {
           //地址重写