Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/api/resumption/outsourcing.js

@@ -17,7 +17,7 @@ export function addEvaluate(data) {
     data,
   });
 }
-//修改开关启用禁用
+//修改开关启用停用
 export function swtichHandler(data) {
   return request({
     url: "/core/evaluatePlan/updateStatus",

src/views/check/dialog.edit.vue

@@ -535,8 +535,8 @@ export default {
       } else return true;
     },
     handleSelectable(row) {
-      // 在这里根据特定条件判断是否禁用多选框行
-      return this.getshenglianshe(row); // 返回 true 禁用，返回 false 不禁用
+      // 在这里根据特定条件判断是否停用多选框行
+      return this.getshenglianshe(row); // 返回 true 停用，返回 false 不停用
     },
     // 监听行选中事件，将选中的行数据存入 selectedRows 数组中
     handleSelectionChange(selection) {

src/views/check/index.vue

@@ -420,9 +420,9 @@ export default {
       isShow: false,
       loading: false,
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/core/accessPlan/index.vue

@@ -210,9 +210,9 @@
         // 选中数组
         ids: [],
         names: [],
-        // 非单个禁用
+        // 非单个停用
         single: true,
-        // 非多个禁用
+        // 非多个停用
         multiple: true,
         // 显示搜索条件
         showSearch: true,
@@ -408,7 +408,7 @@
        this.issue=null;
         this.open = true;
         this.title = "新增监控调阅任务";
-        
+
       },
       /** 修改按钮操作 */
       handleUpdate(row) {

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

@@ -186,9 +186,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

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

@@ -284,9 +284,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,
@@ -437,10 +437,10 @@ export default {
         return this.form.planCycle != 0
       }else {
         //如果是编辑的情况下，判断是否是标准计划
-        if (this.form.standard==1){
+        /*if (this.form.standard==1){
           return this.form.planCycle != 0&&this.form.issue == 0
-        }
-        return false;
+        }*/
+        return this.form.planStatus==0;
       }
     },
     /** 查询机构树数据 */
@@ -582,6 +582,7 @@ export default {
               this.$modal.msgSuccess("编辑成功");
               this.open = false;
               this.getList();
+              this.$refs["upload"].clearFiles();
             }).catch(() => {
             });
 
@@ -590,6 +591,7 @@ export default {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+              this.$refs["upload"].clearFiles();
             });
           }
         }

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

@@ -1,144 +1,99 @@
 <template>
   <div class="edu-training-edit">
-    <DialogCom title="演练任务详情" :visible.sync="isShow" width="960px">
+    <DialogCom title="演练任务详情" :visible.sync="isShow" width="1200px">
       <div class="page-body">
-        <el-form :model="formData" size="small" ref="form" label-position="right" label-width="120px"
-                 label-suffix=":">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item prop="type" label="任务名称">{{
-                  formData.title
-                }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="type" label="演练类型">{{
-                  formData.categoryText
-                }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="type" label="任务进度">{{
-                  getLabel(dict.type.drill_task_status, formData.status,"未知")
-                }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="任务时间">{{
-                  formData.startDate +" ~ " + formData.endDate
-                }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="演练机构">{{
-                  formData.orgName
-                }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="指挥人">{{
-                  formData.hostName
-                }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="登记人">{{
-                  formData.recorderName
-                }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="演练项目">{{
-                  formData.typeText
-                }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="演练地点">{{
-                  formData.drillSite
-                }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="drillStartTime" label="演练开始时间">
-                {{ formData.drillStartTime }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="drillEndTime" label="演练结束时间">
-                {{ formData.drillEndTime }}
-              </el-form-item>
-            </el-col>
+        <el-descriptions class="margin-top" :column="2" size="medium" border :label-style="labelStyle" :contentStyle="content_style">
+          <el-descriptions-item labelClassName="gx_info_label" label="任务名称" >
+            {{
+            formData.title
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="演练类型" >
+            {{
+            formData.categoryText
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="任务进度" >
+            {{
+            getLabel(dict.type.drill_task_status, formData.status,"未知")
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="任务时间" >
+            {{formData.startDate}}-{{formData.endDate}}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="演练机构" >
+            {{
+            formData.orgName
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="指挥人" >
+            {{
+            formData.hostName
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="登记人" >
+            {{
+            formData.recorderName
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="演练开始时间" >
+            {{
+            formData.drillStartTime
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="演练结束时间" >
+            {{
+            formData.drillEndTime
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item span="2" labelClassName="gx_info_label" label="预设案由" >
+            {{
+            formData.presetCase
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item span="2" labelClassName="gx_info_label" label="演练情况" >
+            {{
+            formData.drillSituation
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item span="2" labelClassName="gx_info_label" label="点评总结" >
+            {{
+            formData.comment
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="参与人数" >
+            {{
+            formData.taskUserList ? formData.taskUserList.filter((x) => x.type === 1)
+            .map((v) => v.userName).join(",") : ""
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="缺席人数" >
+            {{
+            formData.taskUserList ? formData.taskUserList.filter((x) => x.type === 2)
+            .map((v) => v.userName).join(",") : ""
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="演练图片" >
+            <ImageListPreview v-model="formData.imageList"></ImageListPreview>
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="参演人员签名图片" >
+            <ImageListPreview v-model="formData.signImageList"></ImageListPreview>
+          </el-descriptions-item>
+          <el-descriptions-item span="2" labelClassName="gx_info_label" label="评分" >
+            <el-rate
+              v-model="formData.commentScore"
+              :max="10"
+              :disabled="true"
+              :colors="['#99A9BF', '#F7BA2A', '#FF9900']">
+            </el-rate>
+          </el-descriptions-item>
+          <el-descriptions-item span="2" labelClassName="gx_info_label" label="资料文件" >
+            <K-file-upload ref="upload" :isShowUploadBtn="false"
+                           :defaultValue="formFileListDefualtValue"
+                           v-model="formData.fileList"/>
+          </el-descriptions-item>
 
-            <el-col :span="24">
-              <el-form-item prop="hostId" label="预设案由">{{
-                  formData.presetCase
-                }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item prop="hostId" label="演练情况">{{
-                  formData.drillSituation
-                }}
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="24">
-              <el-form-item prop="comment" label="点评总结">{{
-                  formData.comment
-                }}
-              </el-form-item>
-            </el-col>
-
-            <!-- 参与人数 -->
-            <el-col :span="12">
-              <el-form-item prop="dueCount" label="参与人员">{{
-                  formData.taskUserList ? formData.taskUserList.filter((x) => x.type === 1)
-                    .map((v) => v.userName).join(",") : ""
-                }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="dueCount" label="缺席人员">{{
-                  formData.taskUserList ? formData.taskUserList.filter((x) => x.type === 2)
-                    .map((v) => v.userName).join(",") : ""
-                }}
-              </el-form-item>
-            </el-col>
-            <!-- 图片 -->
-            <el-col :span="12">
-              <el-form-item prop="imageList" label="演练图片">
-                <ImageListPreview v-model="formData.imageList"></ImageListPreview>
-              </el-form-item>
-            </el-col>
-            <!-- 图片 -->
-            <el-col :span="12">
-              <el-form-item prop="imageList" label="参演人员签名图片">
-                <ImageListPreview v-model="formData.signImageList"></ImageListPreview>
-              </el-form-item>
-            </el-col>
-
-
-            <el-col :span="24" class="block">
-              <el-form-item prop="commentScore" label="评分">
-                <el-rate
-                  v-model="formData.commentScore"
-                  :max="10"
-                  :disabled="true"
-                  :colors="['#99A9BF', '#F7BA2A', '#FF9900']">
-                </el-rate>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="24">
-            <el-form-item label="资料文件" prop="fileList">
-              <K-file-upload ref="upload" :isShowUploadBtn="false"
-                             :defaultValue="formFileListDefualtValue"
-                             v-model="formData.fileList"/>
-            </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+        </el-descriptions>
       </div>
 
       <div slot="footer" class="dialog-footer">
@@ -149,107 +104,119 @@
 </template>
 
 <script>
-import {mapState, mapMutations} from "vuex";
-import {getEduTask} from "@/api/core/edu/eduTask";
-import {getDrillTask} from "@/api/core/drill/drillTask";
-import {initList} from "@/api/core/drill/drillDictionary";
-import KFileUpload from "@/components/K-FileUpload/index.vue";
-import { getLabel } from "@/views/commonOption";
-export default {
-  components: {KFileUpload},
-  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: [],
-      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 = {}) {
+  import {mapState, mapMutations} from "vuex";
+  import {getEduTask} from "@/api/core/edu/eduTask";
+  import {getDrillTask} from "@/api/core/drill/drillTask";
+  import {initList} from "@/api/core/drill/drillDictionary";
+  import KFileUpload from "@/components/K-FileUpload/index.vue";
+  import { getLabel } from "@/views/commonOption";
+  export default {
+    components: {KFileUpload},
+    dicts: ['drill_task_status', 'core_drill_type'],
+    data() {
+      const params = this.$route.params;
       return {
-        id: null,
-        type: null,
-        host: null,
-        drillSite: null,
-        drillTime: null,
-        hostName: null,
-        presetCase: null,
-        drillSituation: null,
-        imageList: null,
-        signImageList: null,
-        commentScore: 5,
-
-        org: {},
-        ...other,
+        id: params ? params.id : null,
+        isShow: false,
+        formData: this.reset(),
+        drillTypeOptions: [],
+        formFileListDefualtValue: [],
+        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' }
+        labelStyle: {
+          'color': '#000',
+          'text-align': 'center',
+          'height': '40px',
+          'min-width': '200px',
+          'word-break': 'keep-all'
+        },
+        content_style: {
+          'text-align': 'left',
+          'min-width': '300px',
+          'word-break': 'break-all'
+        },
       };
     },
-    async refresh(id, other) {
-      if (!id) {
-        this.reset(other);
-      } else {
-        getDrillTask(id).then(response => {
-          this.formData = response.data;
-          this.formFileListDefualtValue=response.data.fileList;
-          this.formData.signImageList = this.getSingImageList();
-          this.loading = false;
+    props: {},
+    watch: {},
+    computed: {
+      ...mapState(["loginUser"]),
+    },
+    methods: {
+      ...mapMutations([]),
+      getLabel,
+      reset(other = {}) {
+        return {
+          id: null,
+          type: null,
+          host: null,
+          drillSite: null,
+          drillTime: null,
+          hostName: null,
+          presetCase: null,
+          drillSituation: null,
+          imageList: null,
+          signImageList: null,
+          commentScore: 5,
+
+          org: {},
+          ...other,
+        };
+      },
+      async refresh(id, other) {
+        if (!id) {
+          this.reset(other);
+        } else {
+          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;
+      },
+      onDownload(url, filename) {
+        let this_ = this;
+        this.getBlob(url, function (blob) {
+          this_.saveAs(blob, filename);
+        });
+      },
+      getSingImageList() {
+        let res = this.formData.taskUserList ? this.formData.taskUserList.filter((x) => x.type === 1 && x.sign == 1)
+          .map((v) => v.signImage).join(",") : null;
+        console.log("getSingImage", res)
+        return res;
+      },
+      getBlob(url, cb) {
+        var xhr = new XMLHttpRequest();
+        xhr.open("GET", url, true);
+        xhr.responseType = "blob";
+        xhr.onload = function () {
+          if (xhr.status === 200) {
+            cb(xhr.response);
+          }
+        };
+        xhr.send();
+      },
+      initDrillTypeOptions() {
+        initList().then(response => {
+          this.drillTypeOptions = response;
         })
       }
+      // 事件
+      //apimark//
     },
-    async show(id, other = {}) {
-      this.id = id;
-      await this.refresh(id, other);
-      this.isShow = true;
-    },
-    // 事件
-    onHide() {
-      this.isShow = false;
-    },
-    onDownload(url, filename) {
-      let this_ = this;
-      this.getBlob(url, function (blob) {
-        this_.saveAs(blob, filename);
-      });
-    },
-    getSingImageList() {
-      let res = this.formData.taskUserList ? this.formData.taskUserList.filter((x) => x.type === 1 && x.sign == 1)
-        .map((v) => v.signImage).join(",") : null;
-      console.log("getSingImage", res)
-      return res;
-    },
-    getBlob(url, cb) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", url, true);
-      xhr.responseType = "blob";
-      xhr.onload = function () {
-        if (xhr.status === 200) {
-          cb(xhr.response);
-        }
-      };
-      xhr.send();
+    mounted() {
     },
-    initDrillTypeOptions() {
-      initList().then(response => {
-        this.drillTypeOptions = response;
-      })
-    }
-    // 事件
-    //apimark//
-  },
-  mounted() {
-  },
-};
+  };
 </script>
 
 <!-- <style lang="less">

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

@@ -3,7 +3,7 @@
     <el-row :gutter="10">
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.orgId" @defaultOrg="getDefaultOrg" @checkChange="checkChange"
-                  @click="clickTreeNode" businessTree></org-tree>
+                  @click="clickTreeNode"></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
         <div class="main-right-box">
@@ -215,9 +215,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

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

@@ -327,9 +327,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,
@@ -434,10 +434,10 @@ export default {
        return this.form.planCycle != 0
       }else {
         //如果是编辑的情况下，判断是否是标准计划
-        if (this.form.standard==1){
+        /*if (this.form.standard==1){
           return this.form.planCycle != 0&&this.form.issue == 0
-        }
-        return false;
+        }*/
+        return this.form.planStatus==0;
       }
     },
     /** 查询教育培训计划列表 */
@@ -662,6 +662,7 @@ export default {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
+              this.$refs["upload"].clearFiles();
             }).catch(() => {
             });
 
@@ -670,6 +671,7 @@ export default {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
+              this.$refs["upload"].clearFiles();
             });
           }
         }

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

@@ -1,167 +1,86 @@
 <template>
   <div class="edu-training-edit">
-    <DialogCom title="培训任务详情" :visible.sync="isShow" width="960px">
+    <DialogCom title="培训任务详情" :visible.sync="isShow" width="1200px" >
       <div class="page-body">
-        <el-form :model="formData" size="small" ref="form" label-position="right" label-width="120px"
-                 label-suffix=":">
-          <el-row>
+        <el-descriptions class="margin-top" :column="2" size="medium" border :label-style="labelStyle" :contentStyle="content_style">
+          <el-descriptions-item labelClassName="gx_info_label" label="任务名称" >
+            {{
+            formData.title
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="培训类型" >
+            {{
+            formData.typeText
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="任务进度" >
+            {{
+            formData.statusText
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="任务时间" >
+            {{formData.startDate}}-{{formData.endDate}}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="受训机构" >
+            {{formData.orgName}}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="主持人" >
+            {{
+            formData.hostName
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="登记人" >
+            {{
+            formData.recorderName
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="培训开始时间" >
+            {{
+            formData.trainingStartDateTime
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="培训结束时间" >
+            {{
+            formData.trainingEndDateTime
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="" >
+          </el-descriptions-item>
+          <el-descriptions-item span="2" labelClassName="gx_info_label" label="培训内容" >
+            {{
+            formData.content
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item span="2" labelClassName="gx_info_label" label="培训总结" >
+            {{
+            formData.note
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="参会人员" >
+            {{
+            formData.taskUserList ? formData.taskUserList.filter((x) => x.type === 1)
+            .map((v) => v.userName).join(",") : ""
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="缺席人员" >
+            {{
+            formData.taskUserList ? formData.taskUserList.filter((x) => x.type === 2)
+            .map((v) => v.userName).join(",") : ""
+            }}
+          </el-descriptions-item>
+          <el-descriptions-item span="2" labelClassName="gx_info_label" label="培训图片" >
+            <ImageListPreview v-model="formData.imageList"></ImageListPreview>
+          </el-descriptions-item>
+          <el-descriptions-item span="2" labelClassName="gx_info_label" label="参会人员签名" >
+            <ImageListPreview v-model="formData.signImageList"></ImageListPreview>
+          </el-descriptions-item>
+          <el-descriptions-item labelClassName="gx_info_label" label="资料文件" >
+            <K-file-upload ref="upload" :isShowUploadBtn="false"
+                           :defaultValue="formFileListDefualtValue"
+                           v-model="formData.fileList"/>
+          </el-descriptions-item>
 
-            <!-- 培训主题 -->
-            <el-col :span="24">
-              <el-form-item prop="type" label="任务名称">{{
-                  formData.title
-                }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="typeText" label="培训类型">{{
-                  formData.typeText
-                }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="statusText" label="任务进度">{{
-                  formData.statusText
-                }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="startDate" label="任务时间">{{
-                  formData.startDate
-                }}-{{ formData.endDate }}
-              </el-form-item>
-            </el-col>
-
-            <!-- 机构 -->
-            <el-col :span="12">
-              <el-form-item label="受训机构">{{
-                  formData.orgName
-                }}
-              </el-form-item>
-            </el-col>
-            <!-- 执行角色 -->
-            <!-- <el-col :span="12">
-                <el-form-item prop="eduJobId" label="执行角色">{{
-                    formData.eduJobNames
-                }}</el-form-item>
-            </el-col> -->
-            <!-- 类型 -->
-            <!--                        <el-col :span="12">
-                                        <el-form-item label="类型">
-                                            <template>
-                                                <dict-tag :options="dict.type.edu_type" :value="formData.type" />
-                                            </template>
-                                        </el-form-item>
-                                    </el-col>-->
-            <!-- 主持人 -->
-            <el-col :span="12">
-              <el-form-item prop="hostId" label="主持人">{{
-                  formData.hostName
-                }}
-              </el-form-item>
-            </el-col>
-            <!-- 记录人 -->
-            <el-col :span="12">
-              <el-form-item prop="recorderId" label="登记人">{{
-                  formData.recorderName
-                }}
-              </el-form-item>
-            </el-col>
-
-            <!-- 培训开始时间 -->
-            <el-col :span="12">
-              <el-form-item prop="trainingStartDateTime" label="培训开始时间">{{
-                  formData.trainingStartDateTime
-                }}
-              </el-form-item>
-            </el-col>
-            <!-- 培训截止时间 -->
-            <el-col :span="12">
-              <el-form-item prop="trainingEndDateTime" label="培训结束时间">{{
-                  formData.trainingEndDateTime
-                }}
-              </el-form-item>
-            </el-col>
-            <!-- 开始日期 -->
-            <!-- <el-col :span="12">
-                <el-form-item prop="dateTime" label="开始日期">{{
-                    formData.startDate
-                }}</el-form-item>
-            </el-col> -->
-            <!-- 截止日期 -->
-            <!-- <el-col :span="12">
-                <el-form-item prop="dateTime" label="截止日期">{{
-                    formData.endDate
-                }}</el-form-item>
-            </el-col> -->
-            <!-- 内容 -->
-            <el-col :span="24">
-              <el-form-item prop="content" label="培训内容">{{
-                  formData.content
-                }}
-              </el-form-item>
-            </el-col>
-            <!-- 总结 -->
-            <el-col :span="24">
-              <el-form-item prop="note" label="培训总结">{{
-                  formData.note
-                }}
-              </el-form-item>
-            </el-col>
-
-
-            <!-- 参与人数 -->
-            <el-col :span="12">
-              <el-form-item prop="dueCount" label="参会人员">{{
-                  formData.taskUserList ? formData.taskUserList.filter((x) => x.type === 1)
-                    .map((v) => v.userName).join(",") : ""
-                }}
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="dueCount" label="缺席人员">{{
-                  formData.taskUserList ? formData.taskUserList.filter((x) => x.type === 2)
-                    .map((v) => v.userName).join(",") : ""
-                }}
-              </el-form-item>
-            </el-col>
-            <!-- 图片 -->
-            <el-col :span="24">
-              <el-form-item prop="imageList" label="培训图片">
-                <ImageListPreview v-model="formData.imageList"></ImageListPreview>
-                <!-- <k-multi-upload :disabled="!!id" v-model="formData.imageList" limit="4" byModule
-                    moduleName="edu-training" v-if="isShow" /> -->
-              </el-form-item>
-            </el-col>
-            <!-- 图片 -->
-            <el-col :span="24">
-              <el-form-item prop="imageList" label="参会人员签名">
-                <ImageListPreview v-model="formData.signImageList"></ImageListPreview>
-                <!-- <k-multi-upload :disabled="!!id" v-model="formData.imageList" limit="4" byModule
-                    moduleName="edu-training" v-if="isShow" /> -->
-              </el-form-item>
-            </el-col>
-
-            <!-- 文件 -->
-            <el-col :span="24">
-              <el-form-item label="资料文件" prop="fileList">
-                <K-file-upload ref="upload" :isShowUploadBtn="false"
-                               :defaultValue="formFileListDefualtValue"
-                               v-model="formData.fileList"/>
-              </el-form-item>
-            </el-col>
-            <!--                        <el-col :span="24">
-                                        <el-form-item prop="fileList" label="文件" :disabled="true">
-                                            <div v-for="(v, i) in formData.fileList" :key="i">
-                                                <a class="downloadLink" @click="onDownload(JSON.parse(v).url, JSON.parse(v).name)">
-                                                    {{ JSON.parse(v).name }}
-                                                </a>
-                                            </div>
-
-                                        </el-form-item>
-                                    </el-col>-->
-          </el-row>
-        </el-form>
+        </el-descriptions>
       </div>
 
       <div slot="footer" class="dialog-footer">
@@ -172,119 +91,125 @@
 </template>
 
 <script>
-import {mapState, mapMutations} from "vuex";
-import {getEduTask} from "@/api/core/edu/eduTask";
-import KFileUpload from "@/components/K-FileUpload/index.vue";
-
-export default {
-  components: {KFileUpload},
-  dicts: ['edu_type', 'edu_task_status'],
-  data() {
-    const params = this.$route.params;
-    return {
-      id: params ? params.id : null,
-      isShow: false,
-      formData: this.reset(),
-      formFileListDefualtValue: [],
-    };
-  },
-  props: {},
-  watch: {},
-  computed: {
-    ...mapState(["loginUser"]),
-  },
-  methods: {
-    ...mapMutations([]),
-    reset(other = {}) {
+  import { mapState, mapMutations } from "vuex";
+  import { getEduTask } from "@/api/core/edu/eduTask";
+  import KFileUpload from "@/components/K-FileUpload/index.vue";
+  export default {
+    components: {KFileUpload},
+    dicts: ['edu_type', 'edu_task_status'],
+    data() {
+      const params = this.$route.params;
       return {
-        id: null,
-        type: null,
-        host: {},
-        recorder: {},
-        dateTime: null,
-        dueCount: null,
-        actualCount: null,
-        content: null,
-        imageList: null,
-        signImageList: null,
-        typeText: null,
-        org: {},
-        ...other,
+        id: params ? params.id : null,
+        isShow: false,
+        formData: this.reset(),
+        formFileListDefualtValue: [],
+        labelStyle: {
+          'color': '#000',
+          'text-align': 'center',
+          'height': '40px',
+          'min-width': '200px',
+          'word-break': 'keep-all'
+        },
+        content_style: {
+          'text-align': 'left',
+          'min-width': '300px',
+          'word-break': 'break-all'
+        },
       };
     },
-    async refresh(id, other) {
-      if (!id) {
-        this.reset(other);
-      } else {
-        getEduTask(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;
+    props: {},
+    watch: {},
+    computed: {
+      ...mapState(["loginUser"]),
     },
-    // 事件
-    onHide() {
-      this.isShow = false;
-    },
-    onDownload(url, filename) {
-      let this_ = this;
-      this.getBlob(url, function (blob) {
-        this_.saveAs(blob, filename);
-      });
-    },
-    getSingImageList() {
-      let res = this.formData.taskUserList ? this.formData.taskUserList.filter((x) => x.type === 1 && x.sign == 1)
-        .map((v) => v.signImage).join(",") : null;
-      return res;
-    },
-    getBlob(url, cb) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", url, true);
-      xhr.responseType = "blob";
-      xhr.onload = function () {
-        if (xhr.status === 200) {
-          cb(xhr.response);
+    methods: {
+      ...mapMutations([]),
+      reset(other = {}) {
+        return {
+          id: null,
+          type: null,
+          host: {},
+          recorder: {},
+          dateTime: null,
+          dueCount: null,
+          actualCount: null,
+          content: null,
+          imageList: null,
+          signImageList: null,
+          typeText: null,
+          org: {},
+          ...other,
+        };
+      },
+      async refresh(id, other) {
+        if (!id) {
+          this.reset(other);
+        } else {
+          getEduTask(id).then(response => {
+            this.formData = response.data;
+            this.formFileListDefualtValue = response.data.fileList;
+            this.formData.signImageList = this.getSingImageList();
+            this.loading = false;
+          })
         }
-      };
-      xhr.send();
-    },
-    saveAs(blob, filename) {
-      console.log("saveAs", blob, filename)
-      if (window.navigator.msSaveOrOpenBlob) {
-        navigator.msSaveBlob(blob, filename);
-      } else {
-        let link = document.createElement("a");
-        let body = document.querySelector("body");
+      },
+      async show(id, other = {}) {
+        this.id = id;
+        await this.refresh(id, other);
+        this.isShow = true;
+      },
+      // 事件
+      onHide() {
+        this.isShow = false;
+      },
+      onDownload(url, filename) {
+        let this_ = this;
+        this.getBlob(url, function (blob) {
+          this_.saveAs(blob, filename);
+        });
+      },
+      getSingImageList() {
+        let res = this.formData.taskUserList ? this.formData.taskUserList.filter((x) => x.type === 1 && x.sign == 1)
+          .map((v) => v.signImage).join(",") : null;
+        return res;
+      },
+      getBlob(url, cb) {
+        var xhr = new XMLHttpRequest();
+        xhr.open("GET", url, true);
+        xhr.responseType = "blob";
+        xhr.onload = function () {
+          if (xhr.status === 200) {
+            cb(xhr.response);
+          }
+        };
+        xhr.send();
+      },
+      saveAs(blob, filename) {
+        console.log("saveAs", blob, filename)
+        if (window.navigator.msSaveOrOpenBlob) {
+          navigator.msSaveBlob(blob, filename);
+        } else {
+          let link = document.createElement("a");
+          let body = document.querySelector("body");
 
-        link.href = URL.createObjectURL(blob);
-        link.download = filename;
+          link.href = URL.createObjectURL(blob);
+          link.download = filename;
 
-        // fix Firefox
-        link.style.display = "none";
-        body.appendChild(link);
+          // fix Firefox
+          link.style.display = "none";
+          body.appendChild(link);
 
-        link.click();
-        body.removeChild(link);
+          link.click();
+          body.removeChild(link);
 
-        window.URL.revokeObjectURL(link.href);
-      }
+          window.URL.revokeObjectURL(link.href);
+        }
+      },
+      // 事件
+      //apimark//
     },
-    // 事件
-    //apimark//
-  },
-  mounted() {
-  },
-};
+    mounted() {
+    },
+  };
 </script>
-
-<!-- <style lang="less">
-.edu-training-edit {
-}
-</style> -->

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

@@ -3,7 +3,7 @@
     <el-row :gutter="10">
       <el-col :span="4" :xs="24">
         <org-tree v-model="queryParams.orgId" @defaultOrg="getDefaultOrg" @checkChange="checkChange"
-                  @click="clickTreeNode" businessTree></org-tree>
+                  @click="clickTreeNode"></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
         <div class="main-right-box">
@@ -235,9 +235,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/core/knowledge/index.vue

@@ -117,9 +117,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/core/letter/letterAudit/index.vue

@@ -98,9 +98,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/core/letter/letterIndex/index.vue

@@ -138,9 +138,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/core/materials/index.vue

@@ -220,9 +220,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/core/message/index.vue

@@ -246,9 +246,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/core/outIn/approve/index.vue

@@ -3,7 +3,7 @@
     <div class="main-right-box">
           <div class="main-search-box">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px" >
-      
+
       <el-form-item label="出入事由" prop="reasons">
         <el-input
           v-model="queryParams.reasons"
@@ -62,20 +62,20 @@
             </template>
       </el-table-column>
       <el-table-column label="出入事由" header-align="center" align="left" prop="reasons"/>
-      <el-table-column label="介绍信编号" align="center" prop="letterNo" width="120">       
+      <el-table-column label="介绍信编号" align="center" prop="letterNo" width="120">
       </el-table-column>
-      <el-table-column label="介绍信" align="center" prop="letterNo" width="250">  
+      <el-table-column label="介绍信" align="center" prop="letterNo" width="250">
         <template slot-scope="scope">
         <template v-if="scope.row.letterFile">
           <K-file-upload ref="upload" :isShowUploadBtn="false"
                                          :defaultValue="scope.row.letterFile"
                                          />
-              <!-- <el-tag style="cursor: pointer;margin-right: 5px;" v-for="(item, index) in scope.row.letterFile" size="mini" type="success" effect="plain" @click="downLoadFile(JSON.parse(item).url)" 
+              <!-- <el-tag style="cursor: pointer;margin-right: 5px;" v-for="(item, index) in scope.row.letterFile" size="mini" type="success" effect="plain" @click="downLoadFile(JSON.parse(item).url)"
                       :key="index">
                 {{ JSON.parse(item).name }}
               </el-tag> -->
-            </template>     
-       </template>     
+            </template>
+       </template>
       </el-table-column>
       <el-table-column label="出入有效期" align="center" width="250">
         <template slot-scope="scope">
@@ -83,7 +83,7 @@
         </template>
       </el-table-column>
       <el-table-column label="审批时间" width="150" header-align="center" align="left"  prop="approveTime" />
-      
+
       <el-table-column label="审批状态" align="center" width="100" prop="approveStatus" >
         <template slot-scope="scope">
               <dict-tag :options="dict.type.out_in_approve_status" :value="scope.row.approveStatus"/>
@@ -141,9 +141,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,
@@ -199,7 +199,7 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.handleQuery();
-    },    
+    },
     handleApproveLetter(row)
     {
       this.$refs["dialogApproveLetter"].show(row.id ,{});
@@ -211,8 +211,8 @@ export default {
     },
     handleDetailInfo(row)
     {
-      this.$refs["dialogApproveLetterDetail"].show(row.id);      
-    },    
+      this.$refs["dialogApproveLetterDetail"].show(row.id);
+    },
   }
 };
 </script>

src/views/core/outIn/letter/index.vue

@@ -53,7 +53,7 @@
           </div>
     <el-table v-loading="loading" height="650" border :data="letterList">
       <el-table-column label="出入事由" header-align="center" align="left" prop="reasons"  width="300"/>
-      <el-table-column label="介绍信编号" align="center" prop="letterNo" width="120">       
+      <el-table-column label="介绍信编号" align="center" prop="letterNo" width="120">
       </el-table-column>
       <el-table-column label="介绍信有效期" align="center" width="250">
         <template slot-scope="scope">
@@ -61,7 +61,7 @@
         </template>
       </el-table-column>
       <el-table-column label="接待机构" header-align="center" align="left"  prop="receptionOrgNames" />
-      
+
       <el-table-column label="状态" align="center" width="100" prop="status" >
         <template slot-scope="scope">
               <dict-tag :options="dict.type.letter_status" :value="scope.row.status"/>
@@ -131,9 +131,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,
@@ -191,7 +191,7 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    
+
     /** 新增按钮操作 */
     handleAdd() {
       this.$refs["dialogAddLetter"].show(null,{});
@@ -201,7 +201,7 @@ export default {
       // this.reset();
       // const id = row.id || this.ids
       this.$refs["dialogAddLetter"].show(row.id ,{});
-      
+
     },
     handleUseLetter(row)
     {

src/views/core/outIn/outInLog/index.vue

@@ -87,7 +87,7 @@
             height="650"
             border
             :data="outInRecrodList"
-            
+
           >
           <el-table-column label="序号"  align="center"  type="index" width="70" />
           <el-table-column label="出入人员" prop="userName"  align="center" width="100" />
@@ -98,7 +98,7 @@
               <dict-tag :options="dict.type.out_in_type" :value="scope.row.type"/>
             </template>
           </el-table-column>
-            <el-table-column 
+            <el-table-column
               label="出入事由"
               header-align="center"
               align="left"
@@ -122,18 +122,18 @@
             <el-table-column label="核验结果" width="250" align="center" prop="checkImage">
                     <template slot-scope="scope">
                       <ImageListPreview v-model="scope.row.imgFile"></ImageListPreview>
-                    </template> </el-table-column>  
-            <el-table-column label="介绍信" align="center" width="250">  
+                    </template> </el-table-column>
+            <el-table-column label="介绍信" align="center" width="250">
               <template slot-scope="scope">
               <template v-if="scope.row.letterFile">
                 <K-file-upload ref="upload" :isShowUploadBtn="false"
                                               :defaultValue="scope.row.letterFile"
                                               />
                   </template>
-          </template>     
+          </template>
           </el-table-column>
-            
-            
+
+
             <el-table-column
               label="操作"
               header-align="center"
@@ -150,7 +150,7 @@
                   @click="handleDetailInfo(scope.row)"
                   v-hasPermi="['core:record:list']"
                   >详情</el-button
-                >                
+                >
               </template>
             </el-table-column>
           </el-table>
@@ -189,9 +189,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,
@@ -264,7 +264,7 @@ export default {
     },
     handleDetailInfo(row) {
       this.$refs["dialogDetail"].show(row.id);
-    },    
+    },
   },
 };
 </script>

src/views/core/reportForms/intrusionTestReport.vue

@@ -38,7 +38,7 @@
             height="700"
             size="small"
             v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
-       
+
             <el-table-column label="序号" align="center" min-width="50">
               <template v-slot:default="scope">
                 <span v-text="getPageIndex(scope.$index)"> </span>
@@ -57,10 +57,10 @@
           <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
                       :limit.sync="queryParams.pageSize"
                       @pagination="getList"/>
-  
+
     </div>
   </template>
-  
+
   <script>
     import tableList from '@/mixins/tableList'
     import {listIntrusionTestReport} from "@/api/core/reportForms/resumptionReport";
@@ -90,11 +90,11 @@
           // 选中数组
           ids: [],
           names: [],
-          // 非单个禁用
+          // 非单个停用
           single: true,
           //搜索tree
           deptName: null,
-          // 非多个禁用
+          // 非多个停用
           multiple: true,
           // 显示搜索条件
           showSearch: true,
@@ -137,7 +137,7 @@
             children: "children",
             label: "name"
           },
-  
+
           rules: {
             areaId: [
               {required: true, message: '请选择区域', trigger: 'blur'},
@@ -150,7 +150,7 @@
             ],
           },
           defaultKeys: []
-  
+
         };
       },
       created() {
@@ -192,8 +192,8 @@
         ...this.queryParams
       }, `${'【'+this.orgName+'】'+'-检查统计报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
     },
-    
-     
+
+
         getList() {
           this.loading = true;
           listIntrusionTestReport(this.queryParams).then(response => {
@@ -208,8 +208,8 @@
         this.orgOptions = response.data;
       })
     },
- 
-    
+
+
         // 取消按钮
         cancel() {
           this.open = false;
@@ -248,7 +248,7 @@
           this.single = selection.length !== 1
           this.multiple = !selection.length
         },
-  
+
       }
     };
   </script>
@@ -258,4 +258,4 @@
       width: 264px;
     }
   }
-  </style>
+  </style>

src/views/core/reportForms/monitorAccessReport.vue

@@ -20,7 +20,7 @@
             />
           </el-form-item>
 
-             
+
         <el-form-item label="周期" prop="cycle">
             <el-select v-model="queryParams.cycle" placeholder="请选择周期">
               <el-option v-for="dict in dict.type.repot_cycle" :key="dict.value" :label="dict.label"
@@ -41,13 +41,13 @@
             height="666"
             size="small"
             v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
-       
+
             <el-table-column label="序号" align="center" min-width="50">
               <template v-slot:default="scope">
                 <span v-text="getPageIndex(scope.$index)"> </span>
               </template>
             </el-table-column>
-          
+
             <el-table-column label="机构名称" align="center" prop="orgName" />
             <el-table-column label="网点数量" align="left" prop="networkNumber"/>
             <el-table-column label="应调阅次数" align="center" prop="planAccessNumber"/>
@@ -57,10 +57,10 @@
           <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
                       :limit.sync="queryParams.pageSize"
                       @pagination="getList"/>
-  
+
     </div>
   </template>
-  
+
   <script>
     import tableList from '@/mixins/tableList'
     import {listReport} from "@/api/core/reportForms/monitorAccessReport";
@@ -81,11 +81,11 @@
           // 选中数组
           ids: [],
           names: [],
-          // 非单个禁用
+          // 非单个停用
           single: true,
           //搜索tree
           deptName: null,
-          // 非多个禁用
+          // 非多个停用
           multiple: true,
           // 显示搜索条件
           showSearch: true,
@@ -128,7 +128,7 @@
             children: "children",
             label: "name"
           },
-  
+
           rules: {
             areaId: [
               {required: true, message: '请选择区域', trigger: 'blur'},
@@ -141,7 +141,7 @@
             ],
           },
           defaultKeys: []
-  
+
         };
       },
       created() {
@@ -183,8 +183,8 @@
         ...this.queryParams
       }, `${'【'+this.orgName+'】'+'-检查统计报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
     },
-    
-     
+
+
         getList() {
           this.loading = true;
           listReport(this.queryParams).then(response => {
@@ -199,8 +199,8 @@
         this.orgOptions = response.data;
       })
     },
- 
-    
+
+
         // 取消按钮
         cancel() {
           this.open = false;
@@ -239,7 +239,7 @@
           this.single = selection.length !== 1
           this.multiple = !selection.length
         },
-  
+
       }
     };
   </script>
@@ -249,4 +249,4 @@
       width: 264px;
     }
   }
-  </style>
+  </style>

src/views/core/reportForms/resumptionReport.vue

@@ -38,7 +38,7 @@
             height="700"
             size="small"
             v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
-       
+
             <el-table-column label="序号" align="center" min-width="50">
               <template v-slot:default="scope">
                 <span v-text="getPageIndex(scope.$index)"> </span>
@@ -47,7 +47,7 @@
             <el-table-column label="地区" align="center" prop="city" />
             <el-table-column label="单位名称" align="center" prop="orgName" width="100"/>
             <el-table-column label="网点数量" align="left" prop="networkNumber" width="100"/>
-          
+
                 <el-table-column label="总计" align="center">
            <el-table-column label="应履职次数" align="center" prop="totalPlanNumber" width="120"/>
             <el-table-column label="已履职次数" align="center" prop="totalRealityNumber" width="120"/>
@@ -63,10 +63,10 @@
           <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
                       :limit.sync="queryParams.pageSize"
                       @pagination="getList"/>
-  
+
     </div>
   </template>
-  
+
   <script>
     import tableList from '@/mixins/tableList'
     import {listReport} from "@/api/core/reportForms/resumptionReport";
@@ -94,11 +94,11 @@
           // 选中数组
           ids: [],
           names: [],
-          // 非单个禁用
+          // 非单个停用
           single: true,
           //搜索tree
           deptName: null,
-          // 非多个禁用
+          // 非多个停用
           multiple: true,
           // 显示搜索条件
           showSearch: true,
@@ -141,7 +141,7 @@
             children: "children",
             label: "name"
           },
-  
+
           rules: {
             areaId: [
               {required: true, message: '请选择区域', trigger: 'blur'},
@@ -154,7 +154,7 @@
             ],
           },
           defaultKeys: []
-  
+
         };
       },
       created() {
@@ -196,8 +196,8 @@
         ...this.queryParams
       }, `${'【'+this.orgName+'】'+'-检查统计报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
     },
-    
-     
+
+
         getList() {
           this.loading = true;
           console.log(this.queryParams.day+"122344")
@@ -213,8 +213,8 @@
         this.orgOptions = response.data;
       })
     },
- 
-    
+
+
         // 取消按钮
         cancel() {
           this.open = false;
@@ -253,7 +253,7 @@
           this.single = selection.length !== 1
           this.multiple = !selection.length
         },
-  
+
       }
     };
   </script>
@@ -263,4 +263,4 @@
       width: 264px;
     }
   }
-  </style>
+  </style>

src/views/core/reportForms/safetyInspectReport.vue

@@ -33,14 +33,14 @@
       type="year"
       placeholder="选择年份">
     </el-date-picker>
-        </el-form-item> 
+        </el-form-item>
 
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             </el-form-item>
           </el-form>
-  
+
           <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
               <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
@@ -54,28 +54,28 @@
             height="800"
             size="small"
             v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
-       
+
             <el-table-column label="序号" align="center" min-width="50">
               <template v-slot:default="scope">
                 <span v-text="getPageIndex(scope.$index)"> </span>
               </template>
             </el-table-column>
-          
+
             <el-table-column label="单位名称" align="center" prop="orgName" />
             <el-table-column label="网点数量" align="left" prop="networkNumber"/>
             <el-table-column label="应检查次数" align="center" prop="planInspectNumber"/>
             <el-table-column label="已检查次数" align="center" prop="realityInspectNumber"/>
             <el-table-column label="检查率" align="center" prop="inspectRate"/>
             <el-table-column label="隐患问题数" align="center" prop="pitfallNumber"/>
-  
+
           </el-table>
           <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
                       :limit.sync="queryParams.pageSize"
                       @pagination="getList"/>
-  
+
     </div>
   </template>
-  
+
   <script>
     import tableList from '@/mixins/tableList'
     import {listReport,selectAllOrg} from "@/api/core/reportForms/safetyInspectReport";
@@ -96,11 +96,11 @@
           // 选中数组
           ids: [],
           names: [],
-          // 非单个禁用
+          // 非单个停用
           single: true,
           //搜索tree
           deptName: null,
-          // 非多个禁用
+          // 非多个停用
           multiple: true,
           // 显示搜索条件
           showSearch: true,
@@ -141,7 +141,7 @@
             children: "children",
             label: "name"
           },
-  
+
           rules: {
             areaId: [
               {required: true, message: '请选择区域', trigger: 'blur'},
@@ -154,7 +154,7 @@
             ],
           },
           defaultKeys: []
-  
+
         };
       },
       created() {
@@ -197,8 +197,8 @@
         ...this.queryParams
       }, `${'【'+this.orgName+'】'+'-检查统计报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
     },
-    
-     
+
+
         getList() {
           this.loading = true;
           listReport(this.queryParams).then(response => {
@@ -213,8 +213,8 @@
         this.orgOptions = response.data;
       })
     },
- 
-    
+
+
         // 取消按钮
         cancel() {
           this.open = false;
@@ -253,7 +253,7 @@
           this.single = selection.length !== 1
           this.multiple = !selection.length
         },
-  
+
       }
     };
   </script>
@@ -263,4 +263,4 @@
         width: 264px;
       }
     }
-    </style>
+    </style>

src/views/core/safeLevel/index.vue

@@ -141,9 +141,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/core/send/index.vue

@@ -191,9 +191,9 @@ export default {
       userOptions: [],
       //全部角色
       roleOptions: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/core/task/index.vue

@@ -147,9 +147,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/core/weather/index.vue

@@ -86,9 +86,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/question/reform/index.vue

@@ -221,9 +221,9 @@ export default {
       loading: true,
       // // 选中数组
       // ids: [],
-      // // 非单个禁用
+      // // 非单个停用
       // single: true,
-      // // 非多个禁用
+      // // 非多个停用
       // multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/resumption/plan/dialog.edit.vue

@@ -412,8 +412,8 @@ export default {
       else return false;
     },
     handleSelectable(row) {
-      // 在这里根据特定条件判断是否禁用多选框行
-      return this.getshenglianshe(row); // 返回 true 禁用，返回 false 不禁用
+      // 在这里根据特定条件判断是否停用多选框行
+      return this.getshenglianshe(row); // 返回 true 停用，返回 false 不禁用
     },
     // 监听行选中事件，将选中的行数据存入 selectedRows 数组中
     handleSelectionChange(selection) {

src/views/resumption/plan/distribute.vue

@@ -34,7 +34,7 @@
             plain
             size="mini"
             @click="handleAllStatus('0')"
-            >全部禁用</el-button
+            >全部停用</el-button
           >
         </el-col>
       </el-row>
@@ -46,7 +46,7 @@
             <el-switch
               v-model="r.row.status"
               active-text="启用"
-              inactive-text="禁用"
+              inactive-text="停用"
               active-value="1"
               inactive-value="0"
               active-color="#008CD6"
@@ -58,7 +58,7 @@
       </el-table>
     </div>
 
-    <div slot="footer" class="dialog-footer">      
+    <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="onSubmit">确定</el-button>
       <el-button @click="onHide">关闭</el-button>
     </div>

src/views/resumptionEvaluate/evaluate/index.vue

@@ -21,7 +21,7 @@
               size="small"
               :inline="true"
               v-show="showSearch"
-              
+
             >
               <el-form-item label="外包评价名称" prop="evaluateName">
                 <el-input
@@ -83,7 +83,7 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-                
+
               </el-form-item>
             </el-form>
 
@@ -112,7 +112,7 @@
                   v-hasPermi="['system:user:add']"
                   >新增</el-button
                 >
-               
+
               </el-col>
             </el-row>
           </div>
@@ -144,7 +144,7 @@
                   v-model="row.status"
                   active-text="启用"
                   active-value="0"
-                  inactive-text="禁用"
+                  inactive-text="停用"
                   inactive-value="1"
                   active-color="#3bbca9"
                   inactive-color="#d7000f"
@@ -157,7 +157,7 @@
               label="操作"
               width="200"
               fixed="right"
-           
+
               class-name="small-padding fixed-width"
             >
               <template slot-scope="{ row }">
@@ -249,7 +249,7 @@ export default {
     ...mapGetters(["orgId"]),
   },
   methods: {
-    //开关启用禁用
+    //开关启用停用
     swtichChangeHandler(row) {
       swtichHandler({
         id: row.id,

src/views/safetyBook/index.vue

@@ -178,9 +178,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/system/area/index.vue

@@ -107,7 +107,7 @@
       @pagination="getList"
     />
           </div>
-   
+
 
     <!-- 添加或修改【请填写功能名称】对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -155,9 +155,9 @@ export default {
       // 选中数组
       ids: [],
       names:[],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/system/bind/index.vue

@@ -9,7 +9,7 @@
           @click="clickTreeNode" businessTree></org-tree>
       </el-col>
 
-      
+
       <el-col :span="20" :xs="24">
         <div class="main-right-box">
           <div class="main-search-box">
@@ -86,7 +86,7 @@
           @pagination="getList" />
         </div>
 
-   
+
       </el-col>
     </el-row>
 
@@ -157,9 +157,9 @@ export default {
       names: [],
       //搜索tree
       deptName: null,
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/system/check/index.vue

@@ -48,8 +48,8 @@
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-    
-       
+
+
            </div>
            <el-table
           border
@@ -80,7 +80,7 @@
                     @pagination="getList"/>
 
           </div>
-        
+
 
 
     <!-- 添加或修改区域采集点对话框 -->
@@ -146,11 +146,11 @@
         // 选中数组
         ids: [],
         names: [],
-        // 非单个禁用
+        // 非单个停用
         single: true,
         //搜索tree
         deptName: null,
-        // 非多个禁用
+        // 非多个停用
         multiple: true,
         // 显示搜索条件
         showSearch: true,

src/views/system/config/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="main-search-box">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
-      
+
       <el-form-item label="参数名称" prop="configName">
         <el-input
           v-model="queryParams.configName"
@@ -42,7 +42,7 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
-      
+
     </el-form>
 
     <el-row :gutter="10" class="mb8">
@@ -60,7 +60,7 @@
       <el-col :span="1.5">
         <el-button
         type="primary"
-          
+
           icon="el-icon-edit-outline"
           size="mini"
           :disabled="single"
@@ -71,7 +71,7 @@
       <el-col :span="1.5">
         <el-button
         type="primary"
-          
+
           icon="el-icon-delete"
           size="mini"
           :disabled="multiple"
@@ -92,7 +92,7 @@
       <el-col :span="1.5">
         <el-button
         type="primary"
-          
+
           icon="el-icon-refresh"
           size="mini"
           @click="handleRefreshCache"
@@ -102,7 +102,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     </div>
-   
+
 
     <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -191,9 +191,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/system/dept/extend.vue

@@ -614,9 +614,9 @@
         // 选中数组
         Bankids: [],
         Businessids: [],
-        // 非单个禁用
+        // 非单个停用
         single: true,
-        // 非多个禁用
+        // 非多个停用
         multiple: true,
         // 显示搜索条件
         showSearch: true,

src/views/system/dept/index.vue

@@ -713,10 +713,18 @@ export default {
             this.open = false;
             this.getList();
 
-            this.$store.dispatch("getOrgTree");
-            this.$store.dispatch("getDepTree");
-            this.$store.dispatch("getBusinessTree");
-            this.$store.dispatch("getWholeTree");
+            this.$store.dispatch("getOrgTree").then(re=>{
+
+            });
+            this.$store.dispatch("getDepTree").then(re=>{
+
+            });
+            this.$store.dispatch("getBusinessTree").then(re=>{
+
+            });
+            this.$store.dispatch("getWholeTree").then(re=>{
+
+            });
             // this.getDeptTree();
           });
         }
@@ -731,7 +739,7 @@ export default {
             this.open = false;
             this.getList();
             this.getDeptTree();
-            
+
             this.$store.dispatch("getOrgTree");
             this.$store.dispatch("getDepTree");
             this.$store.dispatch("getBusinessTree");

src/views/system/device/index.vue

@@ -416,11 +416,11 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
       //搜索tree
       deptName: null,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,
@@ -464,7 +464,7 @@ export default {
         open: false,
         // 弹出层标题（用户导入）
         title: "",
-        // 是否禁用上传
+        // 是否停用上传
         isUploading: false,
 
         // 设置上传的请求头部

src/views/system/dict/data.vue

@@ -303,9 +303,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,
@@ -523,7 +523,7 @@ export default {
 <style >
 .el-tooltip__popper {
   max-width: 200px;
-  
+
   overflow: hidden;
 }
 </style>

src/views/system/dict/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="main-search-box">
-      
+
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
       <el-form-item label="字典名称" prop="dictName">
         <el-input
@@ -88,7 +88,7 @@
       <el-col :span="1.5">
         <el-button
         type="primary"
-         
+
           icon="el-icon-refresh"
           size="mini"
           @click="handleRefreshCache"
@@ -204,9 +204,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/system/information/index.vue

@@ -306,9 +306,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/system/logininfor/index.vue

@@ -139,9 +139,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 选择用户名
       selectName: "",

src/views/system/notice/index.vue

@@ -180,9 +180,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/system/operlog/index.vue

@@ -205,7 +205,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/system/post/index.vue

@@ -167,9 +167,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/system/role/authUser.vue

@@ -73,7 +73,7 @@ export default {
       loading: true,
       // 选中用户组
       userIds: [],
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/system/role/index.vue

@@ -32,11 +32,11 @@
         <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
           v-hasPermi="['system:role:add']">新增</el-button>
       </el-col>
-  
+
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
            </div>
- 
+
            <el-table
           border
           height="650"
@@ -78,7 +78,7 @@
       @pagination="getList" />
 
           </div>
-   
+
 
     <!-- 添加或修改角色配置对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="750px" append-to-body>
@@ -192,9 +192,9 @@ export default {
       // 选中数组
       ids: [],
       roleNames: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/system/user/extend.vue

@@ -333,9 +333,9 @@ export default {
       orgids: [],
       // 选中数组
       Bankids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

src/views/system/user/index.vue

@@ -594,9 +594,9 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,

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

@@ -1,7 +1,7 @@
 <template>
   <div class="question-infos">
     <DialogCom title="新增作息" @close="handleClose" :visible.sync="isShow" :close-on-click-modal="false"
-      custom-class="gxDialog" width="911px" append-to-body>
+      custom-class="gxDialog" width="1320px" append-to-body>
 <!--      <div class="p-5 work-time">-->
         <el-form label-width="90px" label-suffix="" label-position="right">
 
@@ -53,16 +53,36 @@
                   </el-radio-group>
                 </template>
               </el-table-column>
-<!--              <el-table-column label="上班时间" >-->
-<!--                <template slot-scope="r">-->
-<!--                  <el-time-select-->
-<!--                    style="width: 100%"-->
-<!--                    size="mini"-->
-<!--                    :picker-options="pickerOptions"-->
-<!--                    :disabled="r.row.disabled || !r.row.isEnable"-->
-<!--                    v-model="r.row.workTime"/>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
+              <el-table-column label="是否值班打卡" width="160">
+                <template slot-scope="r">
+                  <el-switch
+                  v-model="r.row.isDuty"
+                  :active-value="1"
+                  :inactive-value="0"
+                  @change="onEnableChange(r.row)"
+                  active-text="是"
+                  inactive-text="否">
+                </el-switch>
+
+<!--                  <el-radio-group-->
+<!--                    :disabled="r.row.disabled"-->
+<!--                    v-model="r.row.isEnable"-->
+<!--                    @change="onEnableChange(r.row)">-->
+<!--                    <el-radio text-color="#48bb78" :label="1">营业</el-radio>-->
+<!--                    <el-radio text-color="#f56565" :label="0">歇业</el-radio>-->
+<!--                  </el-radio-group>-->
+                </template>
+              </el-table-column>
+              <el-table-column label="上班时间" width="120">
+                <template slot-scope="r">
+                  <el-time-select
+                    style="width: 100%"
+                    size="mini"
+                    :picker-options="pickerOptions"
+                    :disabled="r.row.disabled || !r.row.isEnable"
+                    v-model="r.row.workTime"/>
+                </template>
+              </el-table-column>
               <el-table-column label="营业开始" width="120">
                 <template slot-scope="r">
                   <el-time-select
@@ -103,16 +123,16 @@
                     v-model="r.row.closeTime"/>
                 </template>
               </el-table-column>
-<!--              <el-table-column label="下班时间" >-->
-<!--                <template slot-scope="r">-->
-<!--                  <el-time-select-->
-<!--                    style="width: 100%"-->
-<!--                    size="mini"-->
-<!--                    :picker-options="pickerOptions"-->
-<!--                    :disabled="r.row.disabled || !r.row.isEnable"-->
-<!--                    v-model="r.row.workOffTime"/>-->
-<!--                </template>-->
-<!--              </el-table-column>-->
+              <el-table-column label="下班时间" width="120">
+                <template slot-scope="r">
+                  <el-time-select
+                    style="width: 100%"
+                    size="mini"
+                    :picker-options="pickerOptions"
+                    :disabled="r.row.disabled || !r.row.isEnable"
+                    v-model="r.row.workOffTime"/>
+                </template>
+              </el-table-column>
               <el-table-column label="操作列表" width="140">
                 <template slot-scope="r">
                   <btn-tip type="text" @click="deleteData(r.row,r.$index)">删除</btn-tip>
@@ -191,12 +211,13 @@ export default {
       //获取workTimeList最后一条数据
       let workTime = {
         isEnable: 1,
-        // workTime: '08:30',
+        workTime: '08:30',
         openTime: '09:00',
         // noonbreakStart: '12:00',
         // noonbreakEnd: '14:00',
         closeTime: '17:00',
-        // workOffTime: '17:30',
+        workOffTime: '17:30',
+        isDuty:'0',
         ymdDate: new Date(),
         disabled: false,
       };

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

@@ -5,7 +5,7 @@
         <el-form :model="formData" :rules="formData.isEnable?formDataRules:{}" size="small" ref="form" label-position="right"
                  label-width="120px" label-prefix=":">
           <el-row :gutter="20">
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item prop="orgName" label="机构：" >
                 <span>{{formData.orgName}}</span>
               </el-form-item>
@@ -30,26 +30,36 @@
                 </template>
               </el-form-item>
             </el-col>
-<!--            <el-col :span="12">-->
-<!--              <el-form-item prop="workTime" label="上班时间：">-->
-<!--                <template >-->
-<!--                  <el-time-select-->
-<!--                      :picker-options="pickerOptions"-->
-<!--                      v-model="formData.workTime"-->
-<!--                      :disabled="!formData.isEnable || formData.isEnable === false"/>-->
-<!--                </template>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--            <el-col :span="12">-->
-<!--              <el-form-item prop="workOffTime" label="下班时间：">-->
-<!--                <template >-->
-<!--                  <el-time-select-->
-<!--                    :picker-options="pickerOptions"-->
-<!--                    v-model="formData.workOffTime"-->
-<!--                    :disabled="!formData.isEnable || formData.isEnable === false"/>-->
-<!--                </template>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
+            <el-col :span="12">
+              <el-form-item prop="isEnable" label="值班打卡：">
+                <template >
+                  <el-radio-group v-model="formData.isDuty" @change="onEnableChange(formData)">
+                    <el-radio text-color="#48bb78" label="1">是</el-radio>
+                    <el-radio text-color="#f56565" label="0">否</el-radio>
+                  </el-radio-group>
+                </template>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item prop="workTime" label="上班时间：">
+                <template >
+                  <el-time-select
+                      :picker-options="pickerOptions"
+                      v-model="formData.workTime"
+                      :disabled="!formData.isEnable || formData.isEnable === false"/>
+                </template>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item prop="workOffTime" label="下班时间：">
+                <template >
+                  <el-time-select
+                    :picker-options="pickerOptions"
+                    v-model="formData.workOffTime"
+                    :disabled="!formData.isEnable || formData.isEnable === false"/>
+                </template>
+              </el-form-item>
+            </el-col>
 <!--              <el-col :span="12">-->
 
 <!--              <el-form-item prop="noonbreakStart" label="午休开始：">-->
@@ -121,8 +131,8 @@ export default {
       //表单验证
       formDataRules: {
         isEnable: [{ required: true, message: "请选择状态" }],
-        // workTime: [{ required: true, message: "请输入上班时间" }],
-        // workOffTime: [{ required: true, message: "请输入下班时间" }],
+        workTime: [{ required: true, message: "请输入上班时间" }],
+        workOffTime: [{ required: true, message: "请输入下班时间" }],
         // noonbreakStart: [{ required: true, message: "请输入午休开始时间" }],
         // noonbreakEnd: [{ required: true, message: "请输入午休结束时间" }],
         openTime: [{ required: true, message: "请输入营业时间" }],
@@ -158,8 +168,8 @@ export default {
         closeTime: null,
         // noonbreakStart: null,
         // noonbreakEnd: null,
-        // workTime: null,
-        // workOffTime: null,
+        workTime: null,
+        workOffTime: null,
       };
     },
     onEnableChange(workTime) {
@@ -168,8 +178,8 @@ export default {
         workTime.closeTime = null;
         // workTime.noonbreakStart = null;
         // workTime.noonbreakEnd = null;
-        // workTime.workTime = null;
-        // workTime.workOffTime = null;
+        workTime.workTime = null;
+        workTime.workOffTime = null;
       }
     },
     handleClose() {
@@ -191,6 +201,15 @@ export default {
           this.$message.warning(`营业开始时间应在营业结束之前`);
           return false;
         }
+        if (
+          !timeCheck([
+            this.formData.workTime,
+            this.formData.workOffTime,
+          ])
+        ) {
+          this.$message.warning(`上班开始时间应在下班结束之前`);
+          return false;
+        }
         editWorkTime(this.formData).then(res=>{
             this.show = false;
             this.$message.success('操作成功')

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

@@ -1,7 +1,7 @@
 <template>
   <div class="question-infos">
     <DialogCom :title="title" @close="handleClose" :visible.sync="isShow" :close-on-click-modal="false"
-      custom-class="gxDialog" width="800"  append-to-body>
+      custom-class="gxDialog" width="1100px" append-to-body>
 <!--      <div class="p-5 work-time-modify">-->
         <el-form
             :disabled="title === '查看作息模版'"
@@ -31,7 +31,7 @@
               <span style="color: red;"> * </span>作息设置
             </p >
             <div class="box">
-              <el-table class="w-auto" border :data="formData.dayOfWeeks">
+              <el-table  border :data="formData.dayOfWeeks">
                 <el-table-column label="星期" width="100px" prop="dayOfWeekText">
                 </el-table-column>
                 <el-table-column label="营业状态">
@@ -52,16 +52,34 @@
                     </el-radio-group>
                   </template>
                 </el-table-column>
-<!--                <el-table-column label="上班时间">-->
-<!--                  <template slot-scope="r">-->
-<!--                    <el-time-select-->
-<!--                      style="width: 100%"-->
-<!--                      size="mini"-->
-<!--                      :picker-options="pickerOptions"-->
-<!--                      :disabled="!r.row.isWorkday || !r.row.isWorkday"-->
-<!--                      v-model="r.row.workTime"/>-->
-<!--                  </template>-->
-<!--                </el-table-column>-->
+                <el-table-column label="值班打卡">
+                  <template slot-scope="r">
+                    <el-switch
+                      v-model="r.row.isDuty"
+                      active-value="1"
+                      inactive-value="0"
+                      @change="onEnableChange(r.row)"
+                      active-text="是"
+                      inactive-text="否">
+                    </el-switch>
+<!--                    <el-radio-group-->
+<!--                      v-model="r.row.isWorkday"-->
+<!--                      @change="onEnableChange(r.row)">-->
+<!--                      <el-radio text-color="#48bb78" label="1">营业</el-radio>-->
+<!--                      <el-radio text-color="#f56565" label="0">歇业</el-radio>-->
+<!--                    </el-radio-group>-->
+                  </template>
+                </el-table-column>
+                <el-table-column label="上班时间">
+                  <template slot-scope="r">
+                    <el-time-select
+                      style="width: 100%"
+                      size="mini"
+                      :picker-options="pickerOptions"
+                      :disabled="r.row.isWorkday=='0' ||!r.row.isWorkday"
+                      v-model="r.row.workTime"/>
+                  </template>
+                </el-table-column>
                 <el-table-column label="营业开始">
                   <template slot-scope="r">
                     <el-time-select
@@ -102,17 +120,16 @@
                       v-model="r.row.closeTime"/>
                   </template>
                 </el-table-column>
-<!--                <el-table-column label="下班时间">-->
-<!--                  <template slot-scope="r">-->
-<!--                    <el-time-select-->
-<!--                      style="width: 100%"-->
-<!--                      size="small"-->
-<!--                      :picker-options="pickerOptions"-->
-<!--                      :disabled="!r.row.isWorkday || !r.row.isWorkday"-->
-<!--                      v-model="r.row.workOffTime"/>-->
-<!--                  </template>-->
-<!--                </el-table-column>-->
-
+                <el-table-column label="下班时间">
+                  <template slot-scope="r">
+                    <el-time-select
+                      style="width: 100%"
+                      size="small"
+                      :picker-options="pickerOptions"
+                      :disabled="r.row.isWorkday=='0' ||!r.row.isWorkday"
+                      v-model="r.row.workOffTime"/>
+                  </template>
+                </el-table-column>
               </el-table>
 
             </div>
@@ -291,8 +308,8 @@ export default {
         workTime.closeTime = null;
         // workTime.noonbreakStart = null;
         // workTime.noonbreakEnd = null;
-        // workTime.workTime = null;
-        // workTime.workOffTime = null;
+        workTime.workTime = null;
+        workTime.workOffTime = null;
       }
     },
     handleClose() {

src/views/system/workTimeSet/json.js

@@ -1,6 +1,7 @@
 export let json = [
   {
     "id": null,
+    "isDuty": '0',
     "workTimeSetId": null,
     "isWorkday": '1',
     "dayOfWeek": 2,
@@ -14,6 +15,7 @@ export let json = [
   },
   {
     "id": null,
+    "isDuty": '0',
     "workTimeSetId": null,
     "isWorkday": '1',
     "dayOfWeek": 3,
@@ -27,6 +29,7 @@ export let json = [
   },
   {
     "id": null,
+    "isDuty": '0',
     "workTimeSetId": null,
     "isWorkday": '1',
     "dayOfWeek": 4,
@@ -40,6 +43,7 @@ export let json = [
   },
   {
     "id": null,
+    "isDuty": '0',
     "workTimeSetId": null,
     "isWorkday": '1',
     "dayOfWeek": 5,
@@ -53,6 +57,7 @@ export let json = [
   },
   {
     "id": null,
+    "isDuty": '0',
     "workTimeSetId": null,
     "isWorkday": '1',
     "dayOfWeek": 6,
@@ -66,6 +71,7 @@ export let json = [
   },
   {
     "id": null,
+    "isDuty": '1',
     "workTimeSetId": null,
     "isWorkday": '0',
     "dayOfWeek": 7,
@@ -79,6 +85,7 @@ export let json = [
   },
   {
     "id": null,
+    "isDuty": '1',
     "workTimeSetId": null,
     "isWorkday": '0',
     "dayOfWeek": 1,

src/views/system/workTimeSet/workTime.vue

@@ -117,11 +117,16 @@
               r.row.isEnable == "1" ? "营业" : "歇业"
             }}</template>
           </el-table-column>
-          <!--          <el-table-column v-if="columns[3].visible" label="上下班时间段">-->
-          <!--            <template slot-scope="r">-->
-          <!--              <span>{{r.row.workTime}}-{{r.row.workOffTime}}</span>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
+            <el-table-column align="center" label="值班打卡">
+              <template slot-scope="r">{{
+                  r.row.isEnable == "1" ? "是" : "否"
+                }}</template>
+            </el-table-column>
+          <el-table-column v-if="columns[3].visible" label="上下班时间段">
+            <template slot-scope="r">
+              <span>{{r.row.workTime}}-{{r.row.workOffTime}}</span>
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="营业时间段">
             <template slot-scope="r">
               <span>{{ r.row.openTime }}-{{ r.row.closeTime }}</span>

src/views/tool/build/RightPanel.vue

@@ -455,7 +455,7 @@
           <el-form-item v-if="activeData.readonly !== undefined" label="是否只读">
             <el-switch v-model="activeData.readonly" />
           </el-form-item>
-          <el-form-item v-if="activeData.disabled !== undefined" label="是否禁用">
+          <el-form-item v-if="activeData.disabled !== undefined" label="是否停用">
             <el-switch v-model="activeData.disabled" />
           </el-form-item>
           <el-form-item v-if="activeData.tag === 'el-select'" label="是否可搜索">
@@ -553,7 +553,7 @@
           <el-form-item label="栅格间隔">
             <el-input-number v-model="formConf.gutter" :min="0" placeholder="栅格间隔" />
           </el-form-item>
-          <el-form-item label="禁用表单">
+          <el-form-item label="停用表单">
             <el-switch v-model="formConf.disabled" />
           </el-form-item>
           <el-form-item label="表单按钮">

src/views/tool/gen/index.vue

@@ -200,9 +200,9 @@ export default {
       ids: [],
       // 选中表数组
       tableNames: [],
-      // 非单个禁用
+      // 非单个停用
       single: true,
-      // 非多个禁用
+      // 非多个停用
       multiple: true,
       // 显示搜索条件
       showSearch: true,