From 8f4f648b2067d7dc6cbe7de71d8bcfb8118d1db0 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 13 Apr 2020 13:56:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BA=E8=8C=83=E7=BD=91=E6=A0=BC=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/workRecord/monthexcellentcase.vue |  2 +-
 .../workRecord/monthexcellentcaseDetail.vue   |  2 +-
 .../modules/workRecord/monthexcellentgrid.vue | 19 +++++++++----------
 .../workRecord/monthexcellentgridDetail.vue   |  2 +-
 .../modules/workRecord/monthrecordinfo.vue    |  6 +++---
 .../workRecord/monthrecordinfoDetail.vue      |  2 +-
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/views/modules/workRecord/monthexcellentcase.vue b/src/views/modules/workRecord/monthexcellentcase.vue
index 0337ea9e..70aed4a5 100644
--- a/src/views/modules/workRecord/monthexcellentcase.vue
+++ b/src/views/modules/workRecord/monthexcellentcase.vue
@@ -97,7 +97,7 @@ export default {
         getDataListIsPage: true,
         deleteURL: '/workRecord/monthexcellentcase',
         deleteIsBatch: true,
-        exportURL: '/workRecord/monthrecordinfo/export'
+        exportURL: '/workRecord/monthexcellentcase/export'
       },
       dataForm: {
         id: '',
diff --git a/src/views/modules/workRecord/monthexcellentcaseDetail.vue b/src/views/modules/workRecord/monthexcellentcaseDetail.vue
index 9859c510..a57c4412 100644
--- a/src/views/modules/workRecord/monthexcellentcaseDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentcaseDetail.vue
@@ -249,7 +249,7 @@ export default {
           ...res.data
         }
         // 判断是否存在九张照片，九张照片隐藏上传操作按钮(非查看状态下)
-        if (!this.$route.query.disabled) {
+        if (this.$route.query.disabled === '0') {
           this.hideUpload = this.dataForm.images.length >= 9
         }
       }).catch(() => {})
diff --git a/src/views/modules/workRecord/monthexcellentgrid.vue b/src/views/modules/workRecord/monthexcellentgrid.vue
index 11f51143..62803410 100644
--- a/src/views/modules/workRecord/monthexcellentgrid.vue
+++ b/src/views/modules/workRecord/monthexcellentgrid.vue
@@ -53,20 +53,19 @@
         </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 prop="id" label="主键" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="infoId" label="信息ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deptId" label="部门ID" header-align="center" align="center"></el-table-column>
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="nickName" label="发布人" header-align="center" align="center"></el-table-column>
         <el-table-column prop="deptName" label="部门名称" header-align="center" align="center"></el-table-column>
         <el-table-column prop="content" label="内容" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="逻辑删除标识" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" 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 :disabled="scope.row.isUpdate == '0'" type="text" size="small" @click="addHandle(scope.row.id,'0')">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="addHandle(scope.row.id,'1')">{{ '查看' }}</el-button>
             <el-button v-if="$hasPermission('news:monthexcellentgrid:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('news:monthexcellentgrid:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
diff --git a/src/views/modules/workRecord/monthexcellentgridDetail.vue b/src/views/modules/workRecord/monthexcellentgridDetail.vue
index eb83806b..c8e08353 100644
--- a/src/views/modules/workRecord/monthexcellentgridDetail.vue
+++ b/src/views/modules/workRecord/monthexcellentgridDetail.vue
@@ -272,7 +272,7 @@ export default {
           ...res.data
         }
         // 判断是否存在九张照片，九张照片隐藏上传操作按钮(非查看状态下)
-        if (!this.$route.query.disabled) {
+        if (this.$route.query.disabled === '0') {
           this.hideUpload = this.dataForm.images.length >= 9
         }
       }).catch(() => {})
diff --git a/src/views/modules/workRecord/monthrecordinfo.vue b/src/views/modules/workRecord/monthrecordinfo.vue
index beefd157..ac32cdb9 100644
--- a/src/views/modules/workRecord/monthrecordinfo.vue
+++ b/src/views/modules/workRecord/monthrecordinfo.vue
@@ -49,7 +49,7 @@
           <el-button v-if="$hasPermission('news:monthrecordinfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item> -->
         <el-form-item>
-          <el-button type="primary" @click="addHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="addHandle('','0')">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
@@ -75,8 +75,8 @@
           <template slot-scope="scope">
             <el-button :disabled="scope.row.isUpdate == '0'" type="text" size="small" @click="addHandle(scope.row.id,'0')">{{ $t('update') }}</el-button>
             <el-button type="text" size="small" @click="addHandle(scope.row.id,'1')">{{ '查看' }}</el-button>
-            <el-button type="text" size="small" @click="addCaseHandle(scope.row.id,'0')">{{ '新建优秀案例' }}</el-button>
-            <el-button type="text" size="small" @click="addGridHandle(scope.row.id,'0')">{{ '新建示范网格' }}</el-button>
+            <el-button :disabled="scope.row.isUpdate == '0'" type="text" size="small" @click="addCaseHandle(scope.row.id,'0')">{{ '新建优秀案例' }}</el-button>
+            <el-button :disabled="scope.row.isUpdate == '0'" type="text" size="small" @click="addGridHandle(scope.row.id,'0')">{{ '新建示范网格' }}</el-button>
             <el-button v-if="$hasPermission('news:monthrecordinfo:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
diff --git a/src/views/modules/workRecord/monthrecordinfoDetail.vue b/src/views/modules/workRecord/monthrecordinfoDetail.vue
index 5b0593bd..b2b38e6c 100644
--- a/src/views/modules/workRecord/monthrecordinfoDetail.vue
+++ b/src/views/modules/workRecord/monthrecordinfoDetail.vue
@@ -241,7 +241,7 @@ export default {
           ...res.data
         }
         // 判断是否存在九张照片，九张照片隐藏上传操作按钮(非查看状态下)
-        if (!this.$route.query.disabled) {
+        if (this.$route.query.disabled === '0') {
           this.hideUpload = this.dataForm.images.length >= 9
         }
       }).catch(() => {})