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

src/components/common/textarea.vue

@@ -46,7 +46,7 @@ export default {
 
   &__length {
     position: absolute;
-    bottom: 0;
+    bottom: -25px;
     right: 12px;
     font-size: 12px;
   }

src/components/orgTree/orgQuerySelector.vue

@@ -15,7 +15,7 @@
       clearValueText="清除"
       :placeholder="placeholder"
     />
-    <el-checkbox v-model="checkSub" @change="changeCheckBox"
+    <el-checkbox v-if="showCheckSub" v-model="checkSub" @change="changeCheckBox"
       >关联所有下级数据</el-checkbox
     >
   </div>
@@ -80,6 +80,10 @@ export default {
     placeholder:{
       type:String,
       default:'请选择机构'
+    },
+    showCheckSub:{
+      type: Boolean,
+      default: true,
     }
   },
   watch: {

src/store/getters.js

@@ -8,6 +8,7 @@ const getters = {
   token: state => state.user.token,
   avatar: state => state.user.avatar,
   name: state => state.user.name,
+  isAdmin:state => state.user.isAdmin,
   userId: state => state.user.userId,
   deptId: state => state.user.deptId,
   orgId: state => state.user.orgId,

src/store/modules/user.js

@@ -12,6 +12,7 @@ const user = {
     token: getToken(),
     name: "",
     userId: "",
+    isAdmin:false,
     orgId: "",
     avatar: "",
     roles: [],
@@ -76,6 +77,10 @@ const user = {
     SET_WHOLETREE: (state, val) => {
       state.wholeTree = val;
     },
+    SET_IS_ADMIN: (state, val) => {
+      state.isAdmin = val;
+    },
+    
   },
 
   actions: {
@@ -160,6 +165,7 @@ const user = {
             commit("SET_ORG_NAME", user.orgName);
             commit("SET_ORG_SHORT_NAME", user.orgShortName);
             commit("SET_ORG_TYPE", user.orgType);
+            commit("SET_IS_ADMIN", user.admin);
             resolve(res);
           })
           .catch((error) => {

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

@@ -179,7 +179,7 @@
                   type="text"
                   icon="el-icon-view"
                   @click="handleDetail(scope.row.id)"
-                  v-hasPermi="['core:drillDictionary:list']"
+                  v-hasPermi="['core:drillDictionary:query']"
                   >详情
                 </el-button>
                 <el-button
@@ -269,7 +269,7 @@
       </div>
     </DialogCom>
     <dialog-info ref="infoDialog" @success="handleQuery()"></dialog-info>
-  </div>  
+  </div>
 </template>
 
 <script>

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

@@ -22,6 +22,8 @@
                 {{ formData.orgName }}
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="12">
               <el-form-item label="演练项目" prop="type">
                 <el-select style="width: 100%;" v-model="formData.type" placeholder="请选择演练项目">
@@ -70,7 +72,7 @@
 
             <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" placeholder="请结合实际演练情况填写" :length="2000"/>
               </el-form-item>
             </el-col>
 

src/views/core/message/index.vue

@@ -21,6 +21,7 @@
                   @defaultKey="getDefaultKey"
                   @checkChange="checkChange"
                   @click="clickTreeNode"
+                  hangsheTree
                   ref="orgTree"
                 ></org-tree>
               </el-form-item>

src/views/dashboard/PanelGroup.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="panel-group">
-      <el-row :gutter="20">
+      <el-row v-if="menusList.length > 0" :gutter="20">
         <el-col class="item-col" :span="2.18" v-for="(v,i) in menusList" :key="i">
           <div class="card-panel" @click="handleClick(v)" >
             <div class="card-panel-icon-wrapper" :class="`color${v.meta.colorIndex}`" :style="{color:v.meta.color}">
@@ -14,6 +14,9 @@
           </div>
         </el-col>
       </el-row>
+      <div class="empty-box" v-else>
+        <el-empty ></el-empty>
+      </div>
     </div>
 </template>
 
@@ -98,6 +101,13 @@ export default {
   //grid-column-gap: 20px;
   justify-content: flex-start;
   //flex-wrap: wrap;
+  min-height: 146px;
+  .empty-box{
+    height: 146px;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+  }
   .item-col{
     margin: 10px 0;
   }

src/views/evaluationRule/addEvaluate.vue

@@ -2,9 +2,9 @@
   <div>
     <!-- :visible.sync="isShow" -->
     <DialogCom
-    :visible.sync="isShow"
+      :visible.sync="isShow"
       :width="'500px'"
-      :title="`${id ? '编辑' : '新增'}扣分规则`"
+      :title="`${!id ? '编辑' : '新增'}扣分规则`"
       @close="closeHandler"
       append-to-body
     >
@@ -104,17 +104,18 @@ export default {
   mounted() {},
 
   methods: {
-    show() {
+    show(val) {
+      console.log(this.id );
+      this.id = val;
+
       this.isShow = true;
     },
     resetFormHandler() {
       this.isShow = false;
     },
     closeHandler() {
-      if(this.$refs.ruleForm){
-
-
-        this.$refs.ruleForm.resetFields()
+      if (this.$refs.ruleForm) {
+        this.$refs.ruleForm.resetFields();
       }
       this.ruleForm = {};
     },
@@ -128,9 +129,9 @@ export default {
             //当前是新增
             this.ruleForm.uid = guid();
           }
-          let obj=JSON.parse(JSON.stringify(this.ruleForm))
+          let obj = JSON.parse(JSON.stringify(this.ruleForm));
           this.$emit("submitHandler", obj);
-         
+
           this.isShow = false;
         } else {
           return false;

src/views/evaluationRule/editEvaluationRuleDialog.vue

@@ -339,7 +339,7 @@ export default {
     },
 
     openSelect() {
-      this.$refs.dialogEvaluate.show();
+      this.$refs.dialogEvaluate.show(1);
     },
     onSubmit() {
       this.$refs.form.validate(async (isValidate) => {

src/views/index.vue

@@ -16,10 +16,10 @@
       <el-col :xs="24" :sm="12" :md="9"  :lg="9">
         <el-card class="card-group">
           <p class="card-title">待办事项</p>
-          <el-row :gutter="20">
+          <el-row v-if="dataList.length > 0" :gutter="20">
             <el-col :xs="24" :sm="12" :md="12"  :lg="12" v-for="(v,i) in dataList" :key="i">
               <div class="card-panel">
-                <div class="card-panel-icon-wrapper icon-people">
+                <div class="card-panel-icon-wrapper icon-people"  @click="clickNum(v)">
 <!--                  <svg-icon icon-class="example" class-name="card-panel-icon" />-->
                   <img class="card-item-icon" :src="require(`../assets/icons/home/${v.taskTypeText}.png`)" alt="">
                   <div class="card-icon-text">
@@ -38,6 +38,9 @@
               </div>
             </el-col>
           </el-row>
+          <div style="padding: 25px;" v-else>
+            <el-empty  description="暂无数据"></el-empty>
+          </div>
         </el-card>
       </el-col>
 
@@ -48,9 +51,11 @@
             <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)">
+                <div v-if="msgsList.length > 0">
+                  <div  class="msg-item" v-for="(v,i) in msgsList" :key="v.id" @click="showMsg(v)">
                     <span class="item-title">{{v.title}}</span>
                     <span class="item-time">{{v.publishTime}}</span>
+                  </div>
                 </div>
                 <el-empty v-else description="暂无数据"></el-empty>
               </div>
@@ -58,12 +63,15 @@
             <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">
-                    <span><i class="el-icon-document"></i>{{v.name}}</span>
-                    <span>{{v.createTime}}</span>
-                  </a>
+                <div v-if="fileList.length > 0">
+                  <div class="file-item" v-for="(v,i) in fileList" :key="i">
+                    <a :href="imageUrl(v.url)" target="_blank">
+                      <span><i class="el-icon-document"></i>{{v.name}}</span>
+                      <span>{{v.createTime}}</span>
+                    </a>
+                  </div>
                 </div>
+                <el-empty v-else description="暂无数据"></el-empty>
               </div>
             </el-tab-pane>
           </el-tabs>
@@ -73,17 +81,17 @@
 
     <!--  新闻详情  -->
     <DialogCom
-      title="详情"
+      title="通知公告"
       :visible.sync="show"
       width="1000px"
       append-to-body
       @close="handleClose">
       <div class="panel-box" v-if="selectMsg">
         <h2>{{selectMsg.title}}</h2>
-        <p>{{selectMsg.publishTime}}</p>
+        <p>发布日期：{{selectMsg.publishTime}}</p>
         <div class="content-box">
-          <p>{{selectMsg.content}}</p>
-          <div>
+          <p class="text-box">{{selectMsg.content}}</p>
+          <div v-if="selectMsg.fileList && selectMsg.fileList.length > 0">
             附件：
             <ul v-if="selectMsg.fileList && selectMsg.fileList.length > 0">
               <li v-for="(v,i) in selectMsg.fileList" :key="v.url">
@@ -105,6 +113,7 @@ import CountTo from 'vue-count-to'
 import {homeData,fileList} from '@/api/login'
 import {imageUrl} from "@/utils/ruoyi";
 import dayjs from 'dayjs'
+import {mapGetters} from "vuex";
 export default {
   name: 'Index',
   components: {
@@ -165,6 +174,9 @@ export default {
   mounted(){
     this.getData();
   },
+  computed: {
+    ...mapGetters(["roleList",'isAdmin']),
+  },
   methods: {
     imageUrl,
     clickNum(item){
@@ -185,22 +197,31 @@ export default {
       this.selectMsg = null;
     },
     getData(){
-      homeData().then(res=>{
-        this.dataList = res.data;
-      });
-      fileList().then(res=>{
-        let {index1,index2} = res.data;
-        if(index1){
-          this.msgsList = index1;
-        }
-        if(!index2)return;
-        this.fileList = index2.map(v=>{
-          return JSON.parse(v)
+      console.log(this.roleList,'1213')
+      if(this.roleList.length > 0 && this.roleList[0] !== "ROLE_DEFAULT"){
+        homeData().then(res=>{
+          this.dataList = res.data;
         });
-        this.fileList.forEach(v=>{
-          v.createTime = dayjs(v.createTime).format('YYYY-MM-DD')
+        fileList().then(res=>{
+          let {index1,index2} = res.data;
+          if(index1){
+            this.msgsList = index1;
+          }
+          if(!index2)return;
+          this.fileList = index2.map(v=>{
+            return JSON.parse(v)
+          });
+          this.fileList.forEach(v=>{
+            v.createTime = dayjs(v.createTime).format('YYYY-MM-DD')
+          })
         })
-      })
+      } else {
+        if(!this.isAdmin){
+          this.$alert('请尽快联系管理员设置角色信息', '提示', {
+            confirmButtonText: '确定',
+          });
+        }
+      }
     }
   }
 }
@@ -256,6 +277,7 @@ export default {
   background: linear-gradient(to right, #71bfe3, #fff);
 }
 .card-group{
+  height: 528px;
   .card-title{
     margin: 0;
   }
@@ -390,6 +412,7 @@ export default {
 .panel-box{
   >h2{
     text-align: center;
+    margin-top: 0;
   }
   >p{
     font-size: 14px;
@@ -397,15 +420,19 @@ export default {
     text-align: end;
   }
   .content-box{
-    max-height: 600px;
-    overflow: auto;
     >p{
       text-indent: 2em;
       word-break: break-word;
       white-space: pre-wrap;
       text-align: justify;
-      width: 100%;
+      margin-left: 34px;
+      margin-right: 34px;
       color: #777;
+      height: 450px;
+      overflow: auto;
+      background-color: #f5f5f5;
+      padding: 10px;
+      line-height: 1.5;
     }
     >div{
       >ul{

src/views/resumptionEvaluate/evaluate/editDialog.vue

@@ -135,7 +135,7 @@
         :orgType="formData.orgType"
         @submitHandler="onSelect"
       ></DialogSelect>
-      <DialogThreeState ref="DialogThreeState"> </DialogThreeState>
+      <!-- <DialogThreeState ref="DialogThreeState"> </DialogThreeState> -->
     </DialogCom>
   </div>
 </template>
@@ -351,17 +351,88 @@ export default {
           }
           if (this.formData.id) {
             //编辑
+            let msg = "";
+            if(obj.status=='1'&&obj.isDistribute=='0'){
+            console.log(obj.status=='1'&&obj.isDistribute=='0')
+              msg = "是否确认修改?";
+              this.$modal
+              .confirm(msg)
+              .then(function () {
+                return editEvaluate(obj);
+              })
+              .then(() => {
+                this.$message.success("编辑成功");
+                 this.$emit("success");
+                 this.onHide();
+                this.getList();
+              })
+              .catch(() => {
+              });
+            }else{
+              if(obj.isComplete==true){
+              msg = "因存在已完成任务，本次修改内容将下周期生效";
+                this.$modal
+              .confirm(msg)
+              .then(function () {
+                return editEvaluate(obj);
+              })
+              .then(() => {
+                this.$message.success("编辑成功");
+                 this.$emit("success");
+                 this.onHide();
+                this.getList();
 
-            editEvaluate(obj).then((res) => {
-              let { code, msg } = res;
-              if (code == 200) {
-                this.$message.success(msg);
-                this.$emit("success");
-                this.onHide();
-              } else {
-                this.$message.error(msg);
-              }
+              })
+              .catch(() => {
+              });
+            }else{
+              if(obj.isHaveTask==false){
+                msg = "是否确认修改?";
+              this.$modal
+              .confirm(msg)
+              .then(function () {
+                return editEvaluate(obj);
+              })
+              .then(() => {
+                this.$message.success("编辑成功");
+                 this.$emit("success");
+                 this.onHide();
+                this.getList();
+              })
+              .catch(() => {
+              });
+              }else{
+                msg =  "因不存在已完成任务，本次修改内容将立即生效";
+              
+              this.$modal
+            .confirm(msg)
+            .then(function () {
+              return editEvaluate(obj);
+            })
+            .then(() => {
+              this.$message.success("编辑成功");
+                 this.$emit("success");
+                 this.onHide();
+                this.getList();
+
+            })
+            .catch(() => {
             });
+              }
+            }
+            }
+        
+            // editEvaluate(obj).then((res) => {
+            //   console.log(obj);
+            //   let { code, msg } = res;
+            //   if (code == 200) {
+            //     this.$message.success(msg);
+            //     this.$emit("success");
+            //     this.onHide();
+            //   } else {
+            //     this.$message.error(msg);
+            //   }
+            // });
           } else {
             //新增
             addEvaluate(obj).then((res) => {

src/views/resumptionEvaluate/evaluate/index.vue

@@ -28,6 +28,7 @@
                   @defaultKey="getDefaultKey"
                   @checkChange="checkChange"
                   @click="clickTreeNode"
+                  hangsheTree
                   ref="orgTree"
                 ></org-tree>
               </el-form-item>

src/views/safetyBook/aqbwbndjh/index.vue

@@ -42,8 +42,8 @@
             >
             </DataRangePicker>
           </el-form-item>
-          <el-form-item class="formTreeItem" label="组织机构" prop="orgId">
-            <tree-select
+          <el-form-item label="组织机构" prop="orgId">
+            <!-- <tree-select
               v-model="queryParams.orgId"
               :noChildrenText="''"
               :normalizer="tenantIdnormalizer"
@@ -54,7 +54,16 @@
               noOptionsText="没有数据"
               noResultsText="没有搜索结果"
               placeholder="请选择组织机构"
-            />
+            /> -->
+            <org-tree
+                  v-model="queryParams.orgId"
+                  @defaultKey="getDefaultKey"
+                  @checkChange="checkChange"
+                  @click="clickTreeNode"
+                  hangsheTree
+                  :defaultCheckSub="true"
+                  ref="orgTree"
+                ></org-tree>
           </el-form-item>
         </el-form>
         <el-row :gutter="10">
@@ -183,7 +192,7 @@ import DialogEdit from "./dialog.edit";
 import DialogDes from "./dialog.des";
 import {deptTreeSelect} from "@/api/system/public";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import OrgTree from "@/components/orgTree/index.vue";
+import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 import kOrgTree from "@/components/k-orgTree/index.vue";
 import KFileUpload from "@/components/K-FileUpload/index.vue";
 import tableList from "@/mixins/tableList";
@@ -259,7 +268,7 @@ export default {
     },
   },
   created() {
-    this.getDeptTree();
+    // this.getDeptTree();
     this.getConfigKey("sys.user.initPassword").then((response) => {
       this.initPassword = response.msg;
     });

src/views/safetyBook/hsggbsdj/index.vue

@@ -40,8 +40,8 @@
             >
             </DataRangePicker>
           </el-form-item>
-          <el-form-item class="formTreeItem" label="组织机构" prop="orgId">
-            <tree-select
+          <el-form-item label="组织机构" prop="orgId">
+            <!-- <tree-select
               v-model="queryParams.orgId"
               :noChildrenText="''"
               :normalizer="tenantIdnormalizer"
@@ -52,7 +52,16 @@
               noOptionsText="没有数据"
               noResultsText="没有搜索结果"
               placeholder="请选择组织机构"
-            />
+            /> -->
+            <org-tree
+                  v-model="queryParams.orgId"
+                  @defaultKey="getDefaultKey"
+                  @checkChange="checkChange"
+                  @click="clickTreeNode"
+                  hangsheTree
+                  :defaultCheckSub="true"
+                  ref="orgTree"
+                ></org-tree>
           </el-form-item>
         </el-form>
         <el-row :gutter="10">
@@ -197,12 +206,13 @@ import DialogEdit from "./dialog.edit";
 import DialogDes from "./dialog.des";
 import {deptTreeSelect} from "@/api/system/public";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import OrgTree from "@/components/orgTree/index.vue";
+// import OrgTree from "@/components/orgTree/index.vue";
 import kOrgTree from "@/components/k-orgTree/index.vue";
 import KFileUpload from "@/components/K-FileUpload/index.vue";
 import tableList from "@/mixins/tableList";
 import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 import dayjs from "dayjs";
+import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 
 export default {
   dicts: ["safety_book_type"],
@@ -275,7 +285,7 @@ export default {
     },
   },
   created() {
-    this.getDeptTree();
+    // this.getDeptTree();
     this.getConfigKey("sys.user.initPassword").then((response) => {
       this.initPassword = response.msg;
     });

src/views/safetyBook/newBook/index.vue

@@ -47,8 +47,8 @@
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="签署机构" prop="partyBOrg"   class="formTreeItem">
-            <tree-select
+          <el-form-item label="签署机构" prop="partyBOrg">
+            <!-- <tree-select
               v-model="queryParams.partyBOrg"
               :options="deptOptions"
               :show-count="true"
@@ -59,8 +59,16 @@
               :noChildrenText="''"
               noOptionsText="没有数据"
               noResultsText="没有搜索结果"
-            />
-          </el-form-item>
+            /> -->
+            <org-tree
+                  v-model="queryParams.partyBOrg"
+                  @defaultKey="getDefaultKey"
+                  @checkChange="checkChange"
+                  @click="clickTreeNode"
+                  :defaultCheckSub="true"
+                  ref="orgTree"
+                ></org-tree>
+          </el-form-item>          
         </el-form>
 
         <el-row :gutter="10">
@@ -213,23 +221,22 @@ import DialogEdit from "./dialog.edit";
 import DialogDes from "./dialog.des";
 import { deptTreeSelect } from "@/api/system/public";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import OrgTree from "@/components/orgTree/index.vue";
 import kOrgTree from "@/components/k-orgTree/index.vue";
 import KFileUpload from "@/components/K-FileUpload/index.vue";
 import tableList from "@/mixins/tableList";
-import orgTree from "@/components/orgTree";
 import dayjs from "dayjs";
 import {imageUrl} from "@/utils/ruoyi";
+import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
+
 export default {
   dicts: ["safety_book_type"],
   name: "safetyBook",
   components: {
-    OrgTree,
     kOrgTree,
     KFileUpload,
     DialogEdit,
-    orgTree,
     DialogDes,
+    OrgTree
   },
   mixins: [tableList],
   data() {
@@ -288,7 +295,7 @@ export default {
     },
   },
   created() {
-    this.getDeptTree();
+    // this.getDeptTree();
     this.getConfigKey("sys.user.initPassword").then((response) => {
       this.initPassword = response.msg;
     });
@@ -335,7 +342,7 @@ export default {
 
     // 节点单击事件
     clickTreeNode(data) {
-      this.queryParams.orgId = data.id;
+      this.queryParams.partyBOrg = data.id;
       this.handleQuery();
     },
     /** 下穿状态改变*/
@@ -344,7 +351,7 @@ export default {
     },
 
     getDefaultKey(key) {
-      this.queryParams.orgId = key;
+      this.queryParams.partyBOrg = key;
       this.getList();
     },
     //单选框状态改变

src/views/scorestatistics/index.vue

@@ -12,8 +12,8 @@
             :model="queryParams"
             size="small"
           >
-            <el-form-item class="formTreeItem" label="组织机构">
-              <tree-select
+            <el-form-item label="组织机构">
+              <!-- <tree-select
                 v-model="queryParams.orgId"
                 :clearable="false"
                 :noChildrenText="''"
@@ -25,7 +25,16 @@
                 noOptionsText="没有数据"
                 noResultsText="没有搜索结果"
                 placeholder="请选择归属机构"
-              />
+              /> -->
+              <org-tree
+                  v-model="queryParams.orgId"
+                  @defaultKey="getDefaultKey"
+                  @checkChange="checkChange"
+                  @click="clickTreeNode"
+                  :defaultCheckSub="true"
+                  :showCheckSub="false"
+                  ref="orgTree"
+                ></org-tree>
             </el-form-item>
             <el-form-item label="查询年月">
               <el-date-picker
@@ -168,7 +177,7 @@
 <script>
 import {mapGetters} from "vuex";
 import {anewDetail, list} from "@/api/scorestatistics/scorestatistics.js";
-import OrgTree from "@/components/orgTree";
+import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 import {newDateMonth} from "@/utils/index.js";
 import scorestatisticsDialog from "./scorestatisticsDialog.vue";
 import {deptTreeSelect} from "@/api/system/public";
@@ -194,7 +203,6 @@ export default {
       queryParams: {
         orgId: null,
         date: newDateMonth("", "1"),
-
         pageNum: 1,
         pageSize: 10,
       },
@@ -208,7 +216,7 @@ export default {
   created() {
     this.queryParams.orgId = this.orgId;
     this.getList();
-    this.getDeptTree();
+    // this.getDeptTree();
   },
   mounted() {
   },
@@ -236,6 +244,16 @@ export default {
     formatterScore({dataYear, dataMonth}) {
       return dataYear + "-" + dataMonth;
     },
+    getDefaultKey(key) {
+      this.queryParams.orgId = key;
+      this.getList();
+    },
+    
+     // 节点单击事件
+     clickTreeNode(data) {
+      this.queryParams.orgId = data.id;
+      this.handleQuery();
+    },
 
     //获取列表
     getList() {

src/views/system/user/index.vue

@@ -306,6 +306,7 @@
                     size="mini"
                     type="text"
                     icon="el-icon-edit-outline"
+                    v-if="!($store.getters.isAdmin && $store.getters.userId==scope.row.id)"
                     @click="handleUpdate(scope.row)"
                     v-hasPermi="['system:user:edit']"
                     >编辑</el-button
@@ -314,7 +315,7 @@
                     size="mini"
                     type="text"
                     icon="el-icon-delete"
-                    v-if="scope.row.source == 0"
+                    v-if="scope.row.source == 0 && !($store.getters.isAdmin && $store.getters.userId==scope.row.id)"
                     @click="handleDelete(scope.row)"
                     v-hasPermi="['system:user:remove']"
                     >删除</el-button
@@ -323,7 +324,7 @@
                     size="mini"
                     type="text"
                     icon="el-icon-key"
-                    v-if="scope.row.source == 0"
+                    v-if="scope.row.source == 0 && !($store.getters.isAdmin && $store.getters.userId==scope.row.id)"
                     @click="handleRestPassword(scope.row)"
                     v-hasPermi="['system:user:resetPwd']"
                     >重置密码</el-button

src/views/system/workTimeSet/dialog.add.vue

@@ -256,12 +256,13 @@ export default {
       let workTime = this.workTimeList[index];
       for (let i = 0; i < this.workTimeList.length; i++) {
         this.workTimeList[i].isEnable = workTime.isEnable;
-        // this.workTimeList[i].workTime = workTime.workTime;
+        this.workTimeList[i].isDuty = workTime.isDuty;
+        this.workTimeList[i].workTime = workTime.workTime;
         this.workTimeList[i].openTime = workTime.openTime;
         // this.workTimeList[i].noonbreakStart = workTime.noonbreakStart;
         // this.workTimeList[i].noonbreakEnd = workTime.noonbreakEnd;
         this.workTimeList[i].closeTime = workTime.closeTime;
-        // this.workTimeList[i].workOffTime = workTime.workOffTime;
+        this.workTimeList[i].workOffTime = workTime.workOffTime;
       }
     },
     deleteData(row, index) {
@@ -335,8 +336,8 @@ export default {
         workTime.closeTime = null;
         // workTime.noonbreakStart = null;
         // workTime.noonbreakEnd = null;
-        // workTime.workTime = null;
-        // workTime.workOffTime = null;
+        workTime.workTime = null;
+        workTime.workOffTime = null;
       }
     },
     async onSubmit() {