bug

src/views/modules/worklog/icworklog-add-or-update.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : formType==='detail' ? '查看' : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :disabled="formType==='detail'" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
         <el-form-item label="所属网格"
                       prop="gridId">
             <el-select
@@ -87,7 +87,7 @@
             </el-upload>
           </el-form-item>
       </el-form>
-    <template slot="footer">
+    <template slot="footer" v-if="formType != 'detail'">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
       <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
     </template>
@@ -100,6 +100,7 @@ import { requestPost } from "@/js/dai/request"
 export default {
   data () {
     return {
+      formType: '',
       visible: false,
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
       logTypeArr: [],
@@ -170,6 +171,12 @@ export default {
           ...this.dataForm,
           ...res.data
         }
+        const { id } = this.$store.state.user
+        if (this.dataForm.createdBy == id) { // 是本人可以修改
+          this.formType = 'update'
+        } else { // 不是本人只能查看
+          this.formType = 'detail'
+        }
       }).catch(() => {})
     },
     // 字典

src/views/modules/worklog/icworklog.vue

@@ -36,7 +36,6 @@
                     placeholder="请输入网格员姓名">
           </el-input>
         </el-form-item>
-        <br/>
         <el-form-item label="联系电话"
                                      prop="createdUser">
         <el-input v-model="dataForm.mobile"
@@ -45,7 +44,7 @@
                   placeholder="请输入联系电话">
         </el-input>
       </el-form-item>
-        <el-form-item label="日志时间" prop="startTime" label-width="100px">
+        <el-form-item label="日志时间" prop="startTime">
           <el-date-picker v-model="dataForm.startTime"
                           type="date"
                           :picker-options="pickerBeginDateBefore"
@@ -66,18 +65,25 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" size="small"  @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" size="small" class="diy-button--search" @click="getDataList()">{{ $t('query') }}</el-button>
+
+          <el-button  style="margin-left:10px"
+                      size="small"
+                      type="primary"
+                      class="diy-button--reset"
+                      @click="resetSearch">重置</el-button>
         </el-form-item>
-        <el-button style="margin-left:10px"
+        <!-- <el-button style="margin-left:10px"
                    size="small"
+                   type="primary"
                    class="diy-button--reset"
-                   @click="resetSearch">重置</el-button>
+                   @click="resetSearch">重置</el-button> -->
 <!--        <el-form-item>-->
 <!--          <el-button type="primary" size="small"  @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 size="small" style="margin-left:10px" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+       </el-form-item> -->
       </el-form>
       </el-card>
       <el-card class="resi-card-table">
@@ -91,6 +97,7 @@
           <el-button @click="exportHandle()" class="diy-button--reset" size="small"
           >导出</el-button
           >
+          <el-button size="small" type="danger" @click="deleteHandle()">批量删除</el-button>
         </div>
       <el-table class="resi-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>
@@ -101,8 +108,8 @@
         <el-table-column prop="mobile" 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="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)"> {{ userId == scope.row.createdBy ? $t('update') : '查看' }}</el-button>
+            <el-button type="text" v-if="userId == scope.row.createdBy" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -137,6 +144,7 @@ export default {
         deleteIsBatch: true,
         exportURL: '/gov/org/icWorkLog/export'
       },
+      userId: this.$store.state.user.id,
       agencyIdArray:[],
       orgOptions: [],
       logTypeArr: [],