凉纪 1 год назад
Родитель
Сommit
d1f63475dd
2 измененных файлов с 21 добавлено и 26 удалено
  1. 10 13
      src/views/system/workTimeSet/workTime.vue
  2. 11 13
      src/views/system/workTimeSet/workTimeWeek.vue

+ 10 - 13
src/views/system/workTimeSet/workTime.vue

@@ -184,16 +184,16 @@
                   type="text"
                   @click="showDetail(r.row)"
                 >查看</el-button>
-                <el-button
-                  size="mini"
-                  icon="el-icon-edit-outline"
-                  type="text"
-                  v-hasPermi="['system:time:edit']"
-                  v-if="hideEdit(r.row)"
-                  v-show="ifOrg(r.row)"
-                  @click="onEditTime(r.row)"
+                <span v-if="hideEdit(r.row)">
+                  <el-button
+                    size="mini"
+                    icon="el-icon-edit-outline"
+                    type="text"
+                    v-hasPermi="['system:time:edit']"
+                    @click="onEditTime(r.row)"
                   >编辑</el-button
-                >
+                  >
+                </span>
               </template>
             </el-table-column>
           </el-table>
@@ -299,9 +299,6 @@ export default {
     this.getNowTime();
   },
   methods: {
-    ifOrg(row){
-      console.log(row.orgId,this.orgId,'row')
-    },
     getNowTime() {
       const dateObj = new Date(); // 获取当前时间对象
       const year = dateObj.getFullYear(); // 获取年份
@@ -312,7 +309,7 @@ export default {
     hideEdit(row) {
       const startDate = new Date(row.ymdDate);
       const endDate = new Date(this.nowTime);
-      return startDate >= endDate;
+      return (startDate >= endDate) && (row.orgId === this.orgId);
     },
     getDefaultKey(key) {
       this.queryParams.orgId = key;

+ 11 - 13
src/views/system/workTimeSet/workTimeWeek.vue

@@ -89,24 +89,22 @@
             <el-table-column prop="updateTime" align="center" label="更新时间" width="180"></el-table-column>
             <el-table-column label="操作" align="center"  width="140" >
               <template slot-scope="r">
-                  <el-button
-                    size="mini"
-                    type="text"
-                    v-hasPermi="['system:time:edit']"
-                    v-if="r.row.timeCheck===0||r.row.timeCheck===3"
-                    v-show="ifOrg(r.row)"
-                    @click="onEdit(r.row)">
-                    编辑
-                  </el-button>
   <!--                <el-button type="text" v-if="r.row.timeCheck===0" @click="onDelete(r.row.id)">删除</el-button>-->
   <!--                <el-button type="text" v-if="r.row.timeCheck===1||r.row.timeCheck===2" @click="lookItem(r.row)">查看</el-button>-->
                   <el-button
                     size="mini"
                     type="text"
                     icon="el-icon-document"
-                    @click="lookItem(r.row)">
-                    查看
-                  </el-button>
+                    @click="lookItem(r.row)">查看</el-button>
+
+                  <span v-if="ifOrg(r.row)">
+                    <el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-edit-outline"
+                      v-hasPermi="['system:time:edit']"
+                      @click="onEdit(r.row)">编辑</el-button>
+                  </span>
               </template>
             </el-table-column>
           </el-table>
@@ -206,7 +204,7 @@ export default {
   methods: {
     ifOrg(row){
       console.log(row.orgId,this.orgId,'row')
-      return true
+      return row.orgId === this.orgId;
     },
     getDefaultKey(key) {
       this.queryParams.orgId = key;