Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.5

src/api/resumption/outsourcing.js

@@ -50,9 +50,9 @@ export function delelteEvaluate(id) {
   });
 }
 // 发布计划
-export function publishEvaluate(id) {
+export function publishEvaluate(id,immediateEffect) {
   return request({
-    url: `/core/evaluatePlan/distribute/${id}`,
+    url: `/core/evaluatePlan/distribute/${id}/${immediateEffect}`,
     method: "get",
   });
 }

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

@@ -468,7 +468,6 @@ import { mapGetters } from "vuex";
 import DialogThreeState from "@/components/message/threeStateMessageBox.vue";
 import * as api from "@/api/core/accessPlan";
 export default {
-  name: "Plan",
   dicts: [
     "sys_org_type",
     "sys_access_cycle",
@@ -478,13 +477,14 @@ export default {
     "edu_plan_status",
     "monitor_org",
   ],
+
+  name: "Plan",
+
   components: {
     orgTree,
     DialogThreeState,
   },
-  computed: {
-    ...mapGetters(["orgId"]),
-  },
+
   data() {
     return {
       startDatepickerOptions: {
@@ -568,11 +568,17 @@ export default {
       issue: null,
     };
   },
+
+  computed: {
+    ...mapGetters(["orgId"]),
+  },
+
   created() {
     allRole().then((response) => {
       this.roleList = response.data;
     });
   },
+
   methods: {
     numChange(value) {
       if (value <= 0) this.form.planFrequency = 0;
@@ -748,7 +754,7 @@ export default {
 
               })
               }else{
-                msg =  "因不存在已完成任务，本次修改内容将立即生效";
+                msg = "因存在已完成任务，本次修改内容将下周期生效";
                 this.$modal
               .confirm(msg)
               .then(function () {
@@ -765,8 +771,9 @@ export default {
               }
               
               }else{
-                msg = "因存在已完成任务，本次修改内容将下周期生效";
-                this.$modal
+                if (request.isHaveTask==false) {
+                  msg = "是否确认修改?";
+              this.$modal
               .confirm(msg)
               .then(function () {
                 return updatePlan(request);
@@ -779,6 +786,24 @@ export default {
               })
               .catch(() => {
               });
+                }else{
+                  msg =  "因不存在已完成任务，本次修改内容将立即生效";
+              
+              this.$modal
+            .confirm(msg)
+            .then(function () {
+              return updatePlan(request);
+            })
+            .then(() => {
+              this.$modal.msgSuccess("编辑成功");
+              this.open = false;
+              this.getList();
+
+            })
+            .catch(() => {
+            });
+                }
+             
               }
               
             }else{
@@ -979,6 +1004,7 @@ export default {
         `plan_${new Date().getTime()}.xlsx`
       );
     },
-  },
+  }
 };
 </script>
+

src/views/core/drill/drillDictionary/dialog.info.vue

@@ -0,0 +1,128 @@
+<template>
+  <div class="edu-training-edit">
+    <DialogCom title="演练范本详情" :visible.sync="isShow" width="1000px" append-to-body>
+      <div class="page-body">
+        <el-descriptions
+          class="contentArea"
+          :column="1"
+          size="medium"
+          border
+          :contentStyle="content_style"
+          :label-style="labelStyle"
+        >
+          <el-descriptions-item labelClassName="gx_info_label" label="演练项目">
+            {{
+              getLabel(dict.type.core_drill_type, formData.drillType, "未知")
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="演练场景">
+            {{ formData.drillProjects }}
+          </el-descriptions-item>
+          <el-descriptions-item
+            labelClassName="gx_info_label"
+            span="2"
+            label="预设案由"
+          >
+            <p class="text-content text_nbsp"> {{ formData.defaultCause }}</p>
+          </el-descriptions-item>
+        </el-descriptions>
+      </div>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="onHide">关闭</el-button>
+      </div>
+    </DialogCom>
+  </div>
+</template>
+
+<script>
+import { mapState, mapMutations } from "vuex";
+import { getDrillDictionary } from "@/api/core/drill/drillDictionary";
+import { getLabel } from "@/views/commonOption";
+export default {
+  components: { },
+  dicts: ["drill_task_status", "core_drill_type"],
+  data() {
+    const params = this.$route.params;
+    return {
+      id: params ? params.id : null,
+      isShow: false,
+      formData: this.reset(),
+      drillTypeOptions: [],
+      formFileListDefualtValue: [],
+      labelStyle: {
+        color: "#000",
+        "text-align": "center",
+        height: "40px",
+        "min-width": "150px",
+        "word-break": "keep-all",
+      },
+      content_style: {
+        "text-align": "left",
+        "min-width": "300px",
+        "word-break": "break-all",
+      },
+      iconClasses: ["icon-rate-face-1", "icon-rate-face-2", "icon-rate-face-3"], // 等同于 { 2: 'icon-rate-face-1', 4: { value: 'icon-rate-face-2', excluded: true }, 5: 'icon-rate-face-3' }
+    };
+  },
+  props: {},
+  watch: {},
+  computed: {
+    ...mapState(["loginUser"]),
+  },
+  methods: {
+    ...mapMutations([]),
+    getLabel,
+    reset(other = {}) {
+      return {
+        id: null,
+        drillType: null,
+        defaultCause: null,
+        drillProjects: null,
+        ...other,
+      };
+    },
+    async refresh(id, other) {
+      if (!id) {
+        this.reset(other);
+      } else {
+        getDrillDictionary(id).then((response) => {
+          this.formData = response.data;
+          this.loading = false;
+      });
+        // getDrillTask(id).then((response) => {
+        //   this.formData = response.data;
+        //   this.formFileListDefualtValue = response.data.fileList;
+        //   this.formData.signImageList = this.getSingImageList();
+        //   this.loading = false;
+        // });
+      }
+    },
+    async show(id, other = {}) {
+      this.id = id;
+      await this.refresh(id, other);
+      this.isShow = true;
+    },
+    // 事件
+    onHide() {
+      this.isShow = false;
+    },
+    initDrillTypeOptions() {
+      initList().then((response) => {
+        this.drillTypeOptions = response;
+      });
+    },
+    // 事件
+    //apimark//
+  },
+  mounted() {},
+};
+</script>
+
+<style lang="scss" scoped>
+.text-content{
+  margin: 0;
+  max-height: 500px;
+  overflow: auto;
+}
+</style>

src/views/core/drill/drillDictionary/index.vue

@@ -177,13 +177,21 @@
                 <el-button
                   size="mini"
                   type="text"
+                  icon="el-icon-view"
+                  @click="handleDetail(scope.row.id)"
+                  v-hasPermi="['core:drillDictionary:list']"
+                  >详情
+                </el-button>
+                <el-button
+                  size="mini"
+                  type="text"
                   icon="el-icon-edit-outline"
                   v-if="canEdit(scope.row)"
                   @click="handleUpdate(scope.row)"
                   v-hasPermi="['core:drillDictionary:edit']"
                 >编辑
                 </el-button>
-                <BtnTip
+                <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-delete"
@@ -191,7 +199,7 @@
                   @click="handleDelete(scope.row)"
                   v-hasPermi="['core:drillDictionary:remove']"
                 >删除
-                </BtnTip>
+                </el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -260,7 +268,8 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </DialogCom>
-  </div>
+    <dialog-info ref="infoDialog" @success="handleQuery()"></dialog-info>
+  </div>  
 </template>
 
 <script>
@@ -277,10 +286,11 @@ import tableList from "@/mixins/tableList";
 import {queryKnowledgeList} from "@/api/core/edu/knowledge";
 import KTextarea from "@/components/common/textarea.vue";
 import {mapGetters} from "vuex";
+import DialogInfo from "./dialog.info";
 
 export default {
   name: "DrillDictionary",
-  components: {OrgTree, BtnTip, KTextarea},
+  components: {OrgTree, BtnTip, KTextarea,DialogInfo},
   dicts: ["core_drill_type", "core_drill_category"],
   mixins: [tableList],
   data() {
@@ -415,6 +425,9 @@ export default {
         this.title = "编辑演练范本";
       });
     },
+    handleDetail(id) {
+      this.$refs["infoDialog"].show(id, {});
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {
@@ -442,21 +455,16 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      delDrillDictionary(ids)
-        .then((response) => {
+      this.$modal
+        .confirm("是否确认删除？")
+        .then(function () {
+          return delDrillDictionary(ids);
+        })
+        .then(() => {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {
-          this.$modal.msgSuccess("删除失败");
-        });
-      // this.$modal.confirm('是否确认删除预案演练库编号为"' + ids + '"的数据项？').then(function () {
-      //   return delDrillDictionary(ids);
-      // }).then(() => {
-      //   this.getList();
-      //   this.$modal.msgSuccess("删除成功");
-      // }).catch(() => {
-      // });
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {

src/views/core/drill/plan/index.vue

@@ -669,7 +669,6 @@ export default {
     },
     //所属机构为当前用户登录机构时才显示 “编辑、删除”按钮
     checkCanEdit(row) {
-      console.log("checkCanEdit", this.$store.getters.orgId, row.belongOrgId)
       return (
         row.belongOrgId == this.$store.getters.orgId && row.createOrgId == this.$store.getters.orgId
       );
@@ -741,6 +740,7 @@ export default {
         category: null,
         checkSub: true,
         done: null,
+        hasTask: null,
       };
       this.resetForm("form");
     },
@@ -833,7 +833,6 @@ export default {
       this.$refs["form"].validate((valid) => {
         if (valid) {
           let request = {...this.form};
-          console.log("request", request);
           if (this.form.planExecOrgIdList) {
             const list = Array.isArray(this.form.planExecOrgIdList)
               ? this.form.planExecOrgIdList
@@ -845,10 +844,14 @@ export default {
           if (request.id != null) {
             let msg = "";
             if (this.form.planStatus == 1) {
-              if (this.form.done == 1) {
-                msg = "因存在已完成任务，本次修改内容将从下周期生效";
+              if (this.form.hasTask != 1) {
+                msg = "是否确认修改?";
               } else {
-                msg = "因不存在已完成任务，本次修改内容将立即生效";
+                if (this.form.done == 1) {
+                  msg = "因存在已完成任务，本次修改内容将从下周期生效";
+                } else {
+                  msg = "因不存在已完成任务，本次修改内容将立即生效";
+                }
               }
             } else {
               msg = "是否确认修改?";

src/views/core/drill/task/dialog.newtask.vue

@@ -63,13 +63,13 @@
                 <div style="display: flex;justify-content: flex-end; margin-bottom: 10px">
                   <el-button type="primary" @click="selectMaterials">参考演练范本库</el-button>
                 </div>
-                <k-textarea v-model="formData.presetCase" placeholder="请输入预设案由" :length="2000"/>
+                <k-textarea v-model="formData.presetCase" :row="10" placeholder="请输入预设案由" :length="2000"/>
               </el-form-item>
             </el-col>
 
             <el-col :span="24">
               <el-form-item prop="drillSituation" label="演练情况">
-                <k-textarea v-model="formData.drillSituation" placeholder="请输入演练情况" :length="2000"/>
+                <k-textarea v-model="formData.drillSituation" :row="10" placeholder="请结合实际演练情况录入" :length="2000"/>
               </el-form-item>
             </el-col>
             <el-col :span="24">

src/views/core/edu/plan/index.vue

@@ -919,10 +919,14 @@ export default {
           if (request.id != null) {
             let msg = "";
             if (this.form.planStatus == 1) {
-              if (this.form.done == 1) {
-                msg = "因存在已完成任务，本次修改内容将从下周期生效";
+              if (this.form.hasTask != 1) {
+                msg = "是否确认修改?";
               } else {
-                msg = "因不存在已完成任务，本次修改内容将立即生效";
+                if (this.form.done == 1) {
+                  msg = "因存在已完成任务，本次修改内容将从下周期生效";
+                } else {
+                  msg = "因不存在已完成任务，本次修改内容将立即生效";
+                }
               }
             } else {
               msg = "是否确认修改?";

src/views/core/edu/task/dialog.newTask.vue

@@ -66,13 +66,13 @@
             <!-- 内容 -->
             <el-col :span="24">
               <el-form-item prop="content" label="培训内容">
-                <k-textarea v-model="formData.content" placeholder="请输入培训内容" :length="2000"/>
+                <k-textarea v-model="formData.content" :row="10" placeholder="请输入培训内容" :length="2000"/>
               </el-form-item>
             </el-col>
 
             <el-col :span="24">
               <el-form-item prop="note" label="培训总结">
-                <k-textarea v-model="formData.note" placeholder="请输入培训总结" :length="2000"/>
+                <k-textarea v-model="formData.note" :row="10" placeholder="请输入培训总结" :length="2000"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">

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/index.vue

@@ -45,7 +45,8 @@
       <el-col :xs="24" :sm="12" :md="15"  :lg="15">
         <el-card class="chart-wrapper">
           <el-tabs type="border-card">
-            <el-tab-pane label="通知公告">
+            <el-tab-pane>
+              <span slot="label" class="tab_font">通知公告</span>
               <div class="tab-panel">
                 <div v-if="msgsList && msgsList.length > 0" class="msg-item" v-for="(v,i) in msgsList" :key="v.id" @click="showMsg(v)">
                     <span class="item-title">{{v.title}}</span>
@@ -55,6 +56,7 @@
               </div>
             </el-tab-pane>
             <el-tab-pane label="知识库">
+              <span slot="label" class="tab_font">知识库</span>
               <div class="tab-panel">
                 <div class="file-item" v-for="(v,i) in fileList" :key="i">
                   <a :href="imageUrl(v.url)" target="_blank">
@@ -73,7 +75,7 @@
     <DialogCom
       title="详情"
       :visible.sync="show"
-      width="800px"
+      width="1000px"
       append-to-body
       @close="handleClose">
       <div class="panel-box" v-if="selectMsg">
@@ -231,6 +233,10 @@ export default {
 }
 </style>
 <style lang="scss" scoped>
+.tab_font{
+  font-size: 16px;
+  font-weight: bold;
+}
 .home-container {
   padding: 20px;
   background-color: rgb(240, 242, 245);
@@ -338,6 +344,7 @@ export default {
     .card-panel-icon-wrapper {
       height: 120px;
       margin: 10px;
+      margin-left: 15%;
       padding: 10px;
       transition: all 0.38s ease-out;
       border-radius: 6px;
@@ -364,6 +371,7 @@ export default {
       justify-content: center;
       font-weight: bold;
       margin: 10px;
+      margin-right: 18%;
       .card-panel-text {
         text-align: center;
         line-height: 18px;

src/views/resumptionEvaluate/evaluate/addEvaluate.vue

@@ -3,7 +3,7 @@
     <DialogCom
       :visible.sync="isShow"
       :width="'500px'"
-      :title="`${id ? '编辑' : '新增'}外包履职评价计划`"
+      :title="`${id ? '编辑' : '新增'}外包履职评价任务`"
       @close="closeHandler"
       append-to-body
     >
@@ -43,13 +43,18 @@
         </el-form-item>
       </el-form>
     </DialogCom>
+    <DialogThreeState ref="DialogThreeState"> </DialogThreeState>
   </div>
 </template>
 <script>
 import { guid } from "@/utils/index.js";
+import DialogThreeState from "@/components/message/threeStateMessageBox.vue";
 export default {
-  name: "SocWebAddEvaluate",
   dicts: ["evaluate_type"],
+  name: "SocWebAddEvaluate",
+  components: {
+    DialogThreeState,
+  },
   data() {
     return {
       ruleForm: {},
@@ -102,8 +107,9 @@ export default {
   },
 };
 </script>
+
 <style lang="scss" scoped>
 .el-select {
   width: 100%;
 }
-</style>
+</style>

src/views/resumptionEvaluate/evaluate/editDialog.vue

@@ -2,7 +2,7 @@
   <div class="rule-type">
     <DialogCom
       @colse="onHide"
-      :title="`${id ? '编辑' : '新增'}外包履职评价计划`"
+      :title="`${id ? '编辑' : '新增'}外包履职评价任务`"
       :visible.sync="isShow"
       width="1500px"
     >
@@ -86,13 +86,13 @@
               </el-form-item>
             </el-col>
            
-            <el-col :span="4">
+            <!-- <el-col :span="4">
               <el-form-item prop="buildTaskNow" label="立即生效:" v-if="!(id&&(isDistribute==1))">
                 <el-checkbox v-model="formData.buildTaskNow" size="medium"
                   >勾选后当前周期开始生效</el-checkbox
                 >
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
         </el-form>
         <el-button
@@ -135,6 +135,7 @@
         :orgType="formData.orgType"
         @submitHandler="onSelect"
       ></DialogSelect>
+      <DialogThreeState ref="DialogThreeState"> </DialogThreeState>
     </DialogCom>
   </div>
 </template>
@@ -151,9 +152,19 @@ import {
   getEvaluateById,
   editEvaluate,
 } from "@/api/resumption/outsourcing.js";
-
 export default {
   dicts: ["evaluate_cycle", "sys_org_type"],
+  components: { DialogSelect },
+
+  props: {
+    orgTypeOptions: {
+      type: Array,
+    },
+    ruleTypeOptions: {
+      type: Array,
+    },
+  },
+
   data() {
     return {
       isDistribute:0,
@@ -194,20 +205,14 @@ export default {
       },
     };
   },
-  props: {
-    orgTypeOptions: {
-      type: Array,
-    },
-    ruleTypeOptions: {
-      type: Array,
-    },
-  },
-  watch: {},
+
   computed: {
     ...mapGetters(["orgId", "orgName"]),
   },
+
+  watch: {},
   mounted() {},
-  components: { DialogSelect },
+
   methods: {
     //数据格式化
     typeFormat(row) {
@@ -380,7 +385,7 @@ export default {
     },
     // 事件
     //apimark//
-  },
+  }
 };
 </script>
 
@@ -396,4 +401,4 @@ export default {
   color: #999;
   height: 10px;
 }
-</style>
+</style>

src/views/resumptionEvaluate/evaluate/index.vue

@@ -219,6 +219,7 @@
     </el-row>
 
     <editEvaluate ref="Evaluate" @success="getList()"></editEvaluate>
+    <DialogThreeState ref="DialogThreeState"> </DialogThreeState>
   </div>
 </template>
 <script>
@@ -233,12 +234,15 @@ import {
 } from "@/api/resumption/outsourcing.js";
 import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 import editEvaluate from "./editDialog.vue";
+import DialogThreeState from "@/components/message/threeStateMessageBox.vue";
+import * as api from "@/api/resumption/outsourcing";
 export default {
   name: "SocWebIndex",
   dicts: ["sys_org_type", "plan_status"],
   components: {
     OrgTree,
     editEvaluate,
+    DialogThreeState,
   },
   data() {
     const { params, query } = this.$route;
@@ -328,22 +332,53 @@ export default {
             });
           });
       } else {
-        this.$modal
-          .confirm("是否确认发布？")
-          .then(function () {})
-          .then(() => {
-            publishEvaluate(row.id).then((res) => {
-              let { code, msg } = res;
-              if (code == 200) {
-                this.getList();
-                this.$modal.msgSuccess("发布成功");
-              } else {
-                this.$modal.msgSuccess(msg);
-              }
-            });
-          });
+        // this.$modal
+        //   .confirm("是否确认发布？")
+        //   .then(function () {})
+        //   .then(() => {
+        //     publishEvaluate(row.id).then((res) => {
+        //       let { code, msg } = res;
+        //       if (code == 200) {
+        //         this.getList();
+        //         this.$modal.msgSuccess("发布成功");
+        //       } else {
+        //         this.$modal.msgSuccess(msg);
+        //       }
+        //     });
+        //   });
+        let   msg = "请选择下发后立即生成或下周期生成任务?";
+        this.$refs["DialogThreeState"].show(
+          msg,
+          (state) => {
+            if (state == 0 || state == 1) {
+            this.  distribute(row.id, state == 1);
+            }
+          },
+          {
+            yesText: "立即生成",
+            noText: "下周期",
+            cancelText: "取消",
+          }
+        );
       }
     },
+    distribute(id, immediateEffect) {
+      this.loading = true;
+      api
+        .publishEvaluate(id, immediateEffect)
+        .then((response) => {
+          if (response.data == 0) {
+            this.loading = false;
+          } else {
+            this.getList();
+            this.loading = false;
+          }
+        })
+        .catch((response) => {
+          this.getList();
+          this.loading = false;
+        });
+    },
     deleteHandler(row) {
       this.$modal
         .confirm("是否确认删除？")

src/views/safetyBook/aqbwbndjh/dialog.des.vue

@@ -90,7 +90,7 @@
             </el-form-item> -->
             <el-descriptions-item
               labelClassName="gx_info_label"
-              label="附件(word、pdf文件格式)"
+              label="文件资料"
             >
               <!-- <imgs-upload
                 :limit="5"

src/views/safetyBook/aqbwbndjh/dialog.edit.vue

@@ -62,7 +62,7 @@
             ></el-date-picker>
           </el-form-item>
 
-          <el-form-item label="上传附件（word、pdf文件格式）" prop="images">
+          <el-form-item label="文件资料" prop="images">
             <!-- <imgs-upload
               :limit="5"
               v-model="formData.images"
@@ -137,8 +137,8 @@ export default {
       deptOptions: [],
       formDataRules: {
         userIds: [{ required: true, message: "请选择参与人员" }],
-        date: [{ required: true, message: "请选择记录日期" }],
-        images: [{ required: true, message: "请选择照片" }],
+        date: [{ required: true, message: "请选择日期" }],
+        images: [{ required: true, message: "请上传年度工作计划文件" }],
         content: [{ required: true, message: "请输入内容" }],
         orgId: [{ required: true, message: "请选择机构" }],
         type: [{ required: true, message: "请输入文件种类" }],

src/views/safetyBook/newBook/dialog.edit.vue

@@ -67,7 +67,7 @@
             <div>
               <el-input
                 v-model="formData.partyAOrgName"
-                placeholder="请输入甲方机构"
+                placeholder="请输入甲方所属机构"
                 maxlength="50"
               ></el-input>
             </div>
@@ -79,7 +79,7 @@
               :show-count="true"
               :normalizer="tenantIdnormalizer"
               :props="{ checkStrictly: true, label: 'shortName' }"
-              placeholder="请选择乙方所属机构"
+              placeholder="请选择甲方所属机构"
             />
           </el-form-item>
           <el-form-item prop="partyB" label="乙方姓名:">
@@ -95,13 +95,13 @@
             <div>
               <el-input
                 v-model="formData.partyBOrgName"
-                placeholder="请输入甲方机构"
+                placeholder="请输入择乙方机构"
                 maxlength="50"
               ></el-input>
             </div>
           </el-form-item>
           <el-form-item prop="partyBOrg" label="乙方机构:" v-if="formData.type==1||formData.type==3">
-            <tree-select
+            <tree-
               v-model="formData.partyBOrg"
               :options="deptOptions"
               :show-count="true"
@@ -131,8 +131,8 @@
             </el-date-picker>
           </el-form-item>
 
-         
-         
+
+
           <el-col :xs="24" :sm="24" :md="24" :lg="24">
             <el-form-item label="上传文件" prop="files">
               <W-file-upload
@@ -206,15 +206,15 @@ export default {
       }
       return false;
     },
-   
+
     dayjs,
-   
+
     editII(row) {
-     
+
     },
     //新增签署
     openSelect() {
-     
+
     },
     /** 查询机构树数据 */
     getDeptTree() {

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;