From 61bacc274208ddd75547744f6db7a70c7cb10b3e Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 7 Jun 2022 14:04:06 +0800
Subject: [PATCH] BUG 30021

---
 .../grid/AppGridMember/components/add.vue     | 15 --------
 .../grid/AppGridMember/components/list.vue    | 34 ++++++-------------
 2 files changed, 11 insertions(+), 38 deletions(-)

diff --git a/project/beta/grid/AppGridMember/components/add.vue b/project/beta/grid/AppGridMember/components/add.vue
index d5a5141a..395a729f 100644
--- a/project/beta/grid/AppGridMember/components/add.vue
+++ b/project/beta/grid/AppGridMember/components/add.vue
@@ -12,7 +12,6 @@
             size="small"
             label-suffix="："
             label-width="136px">
-          <ai-edit-card
           <ai-card title="基础信息">
             <template #right v-if="title=='网格员详情'">
               <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="editOne==false" @click="editOne=true">修改</span>
@@ -32,16 +31,6 @@
                       </template>
                     </el-input>
                   </el-form-item>
-                  <el-form-item label="选用日期" prop="selectionDate">
-                    <el-date-picker
-                        v-model="forms.selectionDate"
-                        type="date"
-                        style="width: 100%"
-                        value-format="yyyy-MM-dd"
-                        size="medium"
-                        placeholder="选择日期">
-                    </el-date-picker>
-                  </el-form-item>
                   <el-form-item label="身份证号" prop="idNumber">
                     <el-input v-model="forms.idNumber" placeholder="请输入…" maxlength="18" show-word-limit></el-input>
                   </el-form-item>
@@ -91,7 +80,6 @@
                   <div class="left">
                     <ai-wrapper label-width="120px" :columnsNumber="1" style="margin-top: 16px;">
                       <ai-info-item label="网格员姓名："><span>{{ forms.name }}</span></ai-info-item>
-                      <ai-info-item label="选用日期："><span>{{ forms.selectionDate }}</span></ai-info-item>
                       <ai-info-item label="身份证号："><span>{{ forms.idNumber }}</span></ai-info-item>
                       <ai-info-item label="性别："><span>{{ dict.getLabel('sex', forms.sex) }}</span></ai-info-item>
                       <ai-info-item label="出生日期："><span>{{ forms.birthday }}</span></ai-info-item>
@@ -330,9 +318,6 @@ export default {
         name: [
           {required: true, message: "请输入网格员姓名", trigger: "change"},
         ],
-        selectionDate: [
-          {required: true, message: "请选择选用日期", trigger: "change"},
-        ],
         phone: [{required: true, validator: phonePass, trigger: "blur"}],
         girdInfoList: [
           {required: true, message: "请选择责任网络", trigger: "change"},
diff --git a/project/beta/grid/AppGridMember/components/list.vue b/project/beta/grid/AppGridMember/components/list.vue
index c52021dd..67c43799 100644
--- a/project/beta/grid/AppGridMember/components/list.vue
+++ b/project/beta/grid/AppGridMember/components/list.vue
@@ -1,28 +1,6 @@
 <template>
   <ai-list class="list" isTabs>
     <template slot="content">
-      <ai-search-bar bottomBorder>
-        <template slot="left">
-          <el-date-picker
-              v-model="searchObj.selectionDate"
-              type="date"
-              @change="(page.current = 1), getList()"
-              value-format="yyyy-MM-dd"
-              size="small"
-              placeholder="选用时间">
-          </el-date-picker>
-        </template>
-        <template slot="right">
-          <el-input
-              v-model="searchObj.name"
-              size="small"
-              placeholder="网格员/责任网格"
-              v-throttle="() => {page.current = 1, getList()}"
-              clearable
-              @clear="(searchObj.name = '', page.current = 1), getList()"
-              suffix-icon="iconfont iconSearch"/>
-        </template>
-      </ai-search-bar>
       <ai-search-bar style="padding: 16px 0 0">
         <template slot="left">
           <el-button
@@ -41,6 +19,16 @@
           </el-button
           >
         </template>
+        <template slot="right">
+          <el-input
+              v-model="searchObj.name"
+              size="small"
+              placeholder="网格员/责任网格"
+              v-throttle="() => {page.current = 1, getList()}"
+              clearable
+              @clear="(searchObj.name = '', page.current = 1), getList()"
+              suffix-icon="iconfont iconSearch"/>
+        </template>
       </ai-search-bar>
       <ai-table
           :tableData="tableData"
@@ -103,7 +91,7 @@ export default {
         {prop: "name", label: "网格员姓名"},
         {prop: "girdInfoListStr", align: "center", label: "责任网格"},
         {prop: "phone", align: "center", label: "联系电话"},
-        {prop: "selectionDate", align: "center", label: "选用时间"},
+        {prop: "createTime", align: "center", label: "创建时间"},
       ];
     },
   },