From d2b82a037f0cdbc42c3240377bb2b0064d9de181 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 10 Jun 2020 16:11:42 +0800
Subject: [PATCH] =?UTF-8?q?=20PC=E7=AB=AF=E9=A1=B5=E9=9D=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=9A=E7=BB=BC=E6=B2=BB=E7=9F=9B=E8=B0=83=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/conflict/conflictmediate.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/conflict/conflictmediate.vue b/src/views/modules/conflict/conflictmediate.vue
index 7e75278..ad39a0b 100644
--- a/src/views/modules/conflict/conflictmediate.vue
+++ b/src/views/modules/conflict/conflictmediate.vue
@@ -39,6 +39,11 @@
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('conflict:conflictmediate:export')"
+                     type="primary"
+                     @click="exportHandle()">{{ $t('export') }}</el-button>
+        </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('conflict:conflictmediate:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
@@ -47,7 +52,13 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column
+                label="序号"
+                width="35px">
+          <template slot-scope="scope">
+            {{scope.$index+1}}
+          </template>
+        </el-table-column>
         <el-table-column prop="userName" label="上报网格长" header-align="center" align="center"></el-table-column>
         <el-table-column prop="allDeptNames" label="所属机构" header-align="center" align="center"></el-table-column>
         <el-table-column prop="conflictType" label="矛盾纠纷类型" header-align="center" align="center"></el-table-column>
@@ -94,7 +105,8 @@ export default {
         getDataListURL: '/property/conflictmediate/page',
         getDataListIsPage: true,
         deleteURL: '/property/conflictmediate',
-        deleteIsBatch: true
+        deleteIsBatch: true,
+        exportURL: '/property/conflictmediate/export'
       },
       dataForm: {
         id: ''