From 6332203a106d3a5dce93b4ca337138700a2017e4 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Tue, 1 Dec 2020 11:07:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=A6=E6=B0=B4=E7=AC=AC=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/custom/archives.vue         | 10 ++++-
 .../custom/archivesdept-add-or-update.vue     | 41 ++++++++++---------
 src/views/modules/custom/archivesdept.vue     | 11 +++++
 src/views/modules/heart/actapplyinfo.vue      | 34 +++++++++++++++
 src/views/modules/user/unauthorized.vue       |  8 ++--
 src/views/modules/user/user-add-or-update.vue |  3 ++
 src/views/modules/user/user-detail.vue        |  6 ++-
 src/views/modules/user/user-grid.vue          |  5 +--
 .../modules/user/wait-authentication.vue      |  4 +-
 9 files changed, 90 insertions(+), 32 deletions(-)

diff --git a/src/views/modules/custom/archives.vue b/src/views/modules/custom/archives.vue
index 3fbed22..02e268f 100644
--- a/src/views/modules/custom/archives.vue
+++ b/src/views/modules/custom/archives.vue
@@ -40,6 +40,9 @@
         <el-form-item>
           <el-button  type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button  type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
         <el-form-item>
           <el-button type="info"
                      @click="exportMoudleHandle()">导出模板</el-button>
@@ -58,7 +61,12 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="index" width="50" label="序号"></el-table-column>
+        <el-table-column label="序号"
+                         width="70px">
+          <template slot-scope="scope">
+            {{scope.$index+1}}
+          </template>
+        </el-table-column>
         <el-table-column prop="dept" label="归属部门" header-align="center" align="center"></el-table-column>
         <el-table-column prop="archivesNum" label="档号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="docNum" label="文号" header-align="center" align="center"></el-table-column>
diff --git a/src/views/modules/custom/archivesdept-add-or-update.vue b/src/views/modules/custom/archivesdept-add-or-update.vue
index 78385c2..8b48758 100644
--- a/src/views/modules/custom/archivesdept-add-or-update.vue
+++ b/src/views/modules/custom/archivesdept-add-or-update.vue
@@ -17,6 +17,15 @@
                            label="描述文字"></el-input-number>
         </template>
       </el-form-item>
+      <el-form-item label="是否启用" prop="enableFlag">
+        <el-select v-model="dataForm.enableFlag" placeholder="是否启用" clearable>
+          <el-option v-for="item in enableFlagArr"
+                     :key="item.value"
+                     :label="item.label"
+                     :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
     </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
@@ -42,7 +51,17 @@ export default {
         createdTime: '',
         updatedBy: '',
         updatedTime: ''
-      }
+      },
+      enableFlagArr: [
+        {
+          label: '是',
+          value: '1'
+        },
+        {
+          label: '否',
+          value: '0'
+        }
+      ]
     }
   },
   computed: {
@@ -51,25 +70,7 @@ export default {
         dept: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        deptId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        revision: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedTime: [
+        enableFlag: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
diff --git a/src/views/modules/custom/archivesdept.vue b/src/views/modules/custom/archivesdept.vue
index 69b0e61..2d75102 100644
--- a/src/views/modules/custom/archivesdept.vue
+++ b/src/views/modules/custom/archivesdept.vue
@@ -45,6 +45,7 @@
                          label="归属部门排序"
                          header-align="center"
                          align="center"></el-table-column>
+        <el-table-column prop="enableFlag" label="是否启用" header-align="center" align="center" :formatter="enableFlagFormat"></el-table-column>
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
@@ -97,6 +98,16 @@ export default {
   },
   components: {
     AddOrUpdate
+  },
+  methods: {
+    enableFlagFormat: function (row, column) {
+      let enableFlag = row.enableFlag
+      if (enableFlag === '0') {
+        return '否'
+      } else if (enableFlag === '1') {
+        return '是'
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/modules/heart/actapplyinfo.vue b/src/views/modules/heart/actapplyinfo.vue
index 9ebdb8d..7633962 100644
--- a/src/views/modules/heart/actapplyinfo.vue
+++ b/src/views/modules/heart/actapplyinfo.vue
@@ -1,11 +1,45 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__actapplyinfo}">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model.trim="dataForm.actTitle"
+                    placeholder="志愿服务标题"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model.trim="dataForm.actContacts"
+                    placeholder="联系人"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model.trim="dataForm.actTel"
+                    placeholder="联系电话"
+                    clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <!-- <el-form-item>
+          <el-button v-if="$hasPermission('news:archivesdept:save')"
+                     type="primary"
+                     @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('news:archivesdept:delete')"
+                     type="danger"
+                     @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item> -->
+      </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
         <el-table-column prop="actTitle" label="志愿服务标题" header-align="center" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="actStatus" label="活动状态" header-align="center" align="center" :formatter="formatActStatus"></el-table-column>
         <el-table-column prop="createdTime" label="申请时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="actContacts" label="联系人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="actTel" label="联系电话" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button  type="text" size="small"  @click="phraseDetailHandle(scope.row.id)">查看</el-button>
diff --git a/src/views/modules/user/unauthorized.vue b/src/views/modules/user/unauthorized.vue
index 49385ce..a4e97a5 100644
--- a/src/views/modules/user/unauthorized.vue
+++ b/src/views/modules/user/unauthorized.vue
@@ -55,7 +55,7 @@
         <el-form-item label="手机号">
           <el-input v-model.trim="dataForm.mobile"
                     placeholder="请输入"
-                    clearable></el-input>
+                    clearable v-if="false"></el-input>
         </el-form-item>
         <!-- <div class="block"> -->
         <span class="demonstration">注册时间</span>&nbsp;&nbsp;
@@ -99,7 +99,7 @@
         <el-table-column prop="mobile"
                          label="手机号"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center" v-if="false"></el-table-column>
         <el-table-column prop="realName"
                          label="真实姓名"
                          header-align="center"
@@ -111,14 +111,14 @@
                          align="center"
                          v-if="false"></el-table-column>
         <el-table-column prop="createdTime"
-                         label="加入网格时间"
+                         label="注册时间"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="state"
                          label="注册状态"
                          :formatter="formatState"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center" v-if="false"></el-table-column>
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
diff --git a/src/views/modules/user/user-add-or-update.vue b/src/views/modules/user/user-add-or-update.vue
index dc29264..36da01a 100644
--- a/src/views/modules/user/user-add-or-update.vue
+++ b/src/views/modules/user/user-add-or-update.vue
@@ -97,6 +97,9 @@
                            label="是否为网格长"
                            :formatter="showLeaderFlagFormatter">
           </el-table-column>
+          <el-table-column prop="createdTime"
+                           label="加入网格时间">
+          </el-table-column>
         </el-table>
       </el-form-item>
       <!-- <el-form-item label="用户标签"
diff --git a/src/views/modules/user/user-detail.vue b/src/views/modules/user/user-detail.vue
index bac0be8..001d86c 100644
--- a/src/views/modules/user/user-detail.vue
+++ b/src/views/modules/user/user-detail.vue
@@ -75,6 +75,9 @@
                            label="是否为网格长"
                            :formatter="showLeaderFlagFormatter">
           </el-table-column>
+          <el-table-column prop="createdTime"
+                           label="加入网格时间">
+          </el-table-column>
         </el-table>
       </el-form-item>
       <!-- <el-form-item label="用户标签"
@@ -87,8 +90,7 @@
       </el-form-item> -->
     </el-form>
     <template slot="footer">
-      <el-button @click="visible = false"
-                 type="primary">{{ $t('confirm') }}</el-button>
+      <el-button @click="visible = false">关闭</el-button>
     </template>
   </el-dialog>
 </template>
diff --git a/src/views/modules/user/user-grid.vue b/src/views/modules/user/user-grid.vue
index e50284e..62a246e 100644
--- a/src/views/modules/user/user-grid.vue
+++ b/src/views/modules/user/user-grid.vue
@@ -17,6 +17,7 @@
       </el-table-column> -->
       <el-table-column prop="allDeptNames" label="街道-社区-网格"> </el-table-column>
       <el-table-column prop="grid" label="网格名称" v-if="false"> </el-table-column>
+      <el-table-column prop="createdTime" label="加入网格时间" > </el-table-column>
       <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
         <template slot-scope="scope">
           <el-button  type="text" size="small" @click="unbindGridHandle(scope.row.id,scope.row.userId)">解除</el-button>
@@ -24,9 +25,7 @@
       </el-table-column>
     </el-table>
     <template slot="footer">
-      <el-button @click="visible = false" type="primary">{{
-        $t("confirm")
-      }}</el-button>
+      <el-button @click="visible = false">关闭</el-button>
     </template>
   </el-dialog>
 </template>
diff --git a/src/views/modules/user/wait-authentication.vue b/src/views/modules/user/wait-authentication.vue
index ceec5a7..becfbbd 100644
--- a/src/views/modules/user/wait-authentication.vue
+++ b/src/views/modules/user/wait-authentication.vue
@@ -57,7 +57,7 @@
                     placeholder="请输入"
                     clearable></el-input>
         </el-form-item>
-        <!-- <div class="block"> -->
+         <div class="block">
         <span class="demonstration">注册时间</span>&nbsp;&nbsp;
         <el-date-picker @change='setRegistTime'
                         v-model="time"
@@ -74,7 +74,7 @@
                      type="primary"
                      @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
-        <!-- </div> -->
+         </div>
       </el-form>
       <el-table v-loading="dataListLoading"
                 :data="dataList"