Merge remote-tracking branch 'origin/V0.0.5' into V0.0.5

src/components/orgTreeSelect/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!--  弹出框  -->
-  <el-popover placement="bottom-start" :disabled="disabled" v-model="visible">
+  <el-popover placement="bottom-start" :trigger="trigger" :disabled="disabled" v-model="visible">
     <!--  tag盒子  -->
     <div slot="reference" class="tags-box" :class="{'tags-box-disabled':!disabled,'tags-box-mini':size === 'mini'}">
       <span v-show="sNodeList.length > 0" class="tags-num">{{sNodeList.length}}</span>
@@ -65,6 +65,10 @@ export default {
       type: String,
       default: 'small',
     },
+    trigger:{
+      type: String,
+      default: 'click',
+    },
     //组件禁用
     disabled: {
       type: Boolean,

src/views/core/accessPlan/index.vue

@@ -748,7 +748,7 @@ export default {
 
               })
               }else{
-                msg =  "因不存在已完成任务，本次修改内容将立即生效";
+                msg = "因存在已完成任务，本次修改内容将下周期生效";
                 this.$modal
               .confirm(msg)
               .then(function () {
@@ -765,7 +765,8 @@ export default {
               }
               
               }else{
-                msg = "因存在已完成任务，本次修改内容将下周期生效";
+                msg =  "因不存在已完成任务，本次修改内容将立即生效";
+              
                 this.$modal
               .confirm(msg)
               .then(function () {

src/views/core/message/index.vue

@@ -325,6 +325,7 @@
           <!--          <org-tree-select :queryData="form.tagOrgType" ref="orgTreeSelect" @selectNode="queryNode"
                            :placeholder="'请选择目标机构'" :disable="true"></org-tree-select>-->
           <org-tree-select
+            trigger="hover"
             v-model="form.tagOrgIds"
             :queryData="parseInt(form.tagOrgType)"
             ref="orgTreeSelect"

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;

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;