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

src/components/orgTree/orgDropDown.vue

@@ -1,14 +1,6 @@
 <template>
-  <treeselect
-    v-model="val"
-    :options="deptOptions"
-    :normalizer="normalizer"
-    v-bind="$attrs"
-    @select="select"
-    ref="tree"
-    noResultsText="暂无符合条件的数据"
-    clearValueText="清除"
-  />
+  <treeselect v-model="val" :options="deptOptions" :normalizer="normalizer" v-bind="$attrs" @select="select" ref="tree"
+    noResultsText="暂无符合条件的数据" clearValueText="清除" />
 </template>
 <script>
 import Treeselect from "@riophae/vue-treeselect";
@@ -20,6 +12,7 @@ export default {
   data() {
     return {
       deptOptions: [],
+      currentNode: null,
     };
   },
   props: {
@@ -32,10 +25,19 @@ export default {
     },
   },
   watch: {
-    // value(v){
-    //   // debugger
-    //   // console.info("watch",v);
-    // }
+    value(v) {
+      if(!v){
+        return;
+      }
+      if (!this.currentNode || this.currentNode.id != v) {        
+        this.currentNode = this.findNodeInOptions(v);
+      }
+      
+      if (this.currentNode) {
+        console.info(this.currentNode)
+        this.$emit("select", this.currentNode);
+      }
+    }
   },
   computed: {
     val: sync("value"),
@@ -45,20 +47,40 @@ export default {
   methods: {
     /** 查询机构下拉树结构 */
     getDeptTree() {
-      deptTreeSelect().then((response) => {
-        this.deptOptions = response.data;
-        // console.log(this.deptOptions, " this.deptOptions");
-        if (response.data && response.data.length > 0) {
-          // this.val = response.data[0].id;
-          // this.value = response.data[0].id;
-          // let t=this.$refs.tree;
-          // debugger;
-          // this.$emit("input", response.data[0].id);
-          if(this.val){
-            this.$emit("select", response.data[0]);
+      this.deptOptions = this.$store.getters.wholeTree;
+      if (this.deptOptions && this.deptOptions.length > 0) {
+        if (this.val) {
+          this.currentNode = this.findNodeInOptions(this.val);
+          if (this.currentNode) {
+            this.$emit("select", this.currentNode);
           }
         }
-      });
+      }
+    },
+    findNodeInOptions(id) {
+      if (!id) {
+        return;
+      }
+
+      let func = (nodes) => {
+        if (!nodes || nodes.length == 0) {
+          return null;
+        }
+
+        let n = nodes.find(n => n.id == id);
+        if (n) {
+          return n;
+        }
+        for (let index in nodes) {
+          let node = nodes[index]
+          n = func(node.children);
+          if (n) {
+            return n;
+          }
+        }
+      }
+
+      return func(this.deptOptions)
     },
     /** 转换机构数据结构 */
     normalizer(node) {
@@ -72,7 +94,7 @@ export default {
       };
     },
     select(node) {
-      this.$emit("select", node);
+      this.currentNode = node;
     },
   },
   mounted() {
@@ -88,7 +110,7 @@ export default {
     max-height: 300px !important;
   }
 
-  
+
   .vue-treeselect__label {
     overflow: unset;
 

src/utils/generator/html.js

@@ -5,13 +5,13 @@ let confGlobal
 let someSpanIsNot24
 
 export function dialogWrapper(str) {
-  return `<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="Dialog Title">
+  return `<DialogCom v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="Dialog Title">
     ${str}
     <div slot="footer">
       <el-button @click="close">取消</el-button>
       <el-button type="primary" @click="handleConfirm">确定</el-button>
     </div>
-  </el-dialog>`
+  </DialogCom>`
 }
 
 export function vueTemplate(str) {

src/views/check/dialog.edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="rule-type">
-    <el-dialog
+    <DialogCom
       :title="id ? '编辑检查计划' : '新增检查计划'"
       :visible.sync="isShow"
       width="1500px"
@@ -30,6 +30,7 @@
             <el-col :span="6">
               <el-form-item prop="checkType" label="检查类型:">
                 <el-select
+                  :disabled="isChildren()"
                   label="检查类型"
                   v-model="formData.checkType"
                   placeholder="请选择检查类型"
@@ -48,6 +49,7 @@
             <el-col :span="6">
               <el-form-item prop="planCycle" label="检查周期:">
                 <el-select
+                  :disabled="isChildren()"
                   prop="planCycle"
                   label="检查周期"
                   v-model="formData.planCycle"
@@ -71,10 +73,11 @@
                 v-if="NowBuild()"
               >
                 <el-checkbox
+                  :disabled="isChildren()"
                   v-model="formData.buildTaskNow"
                   size="medium"
                   @change="handleCheckboxChange"
-                  >默认从下个周期生成任务，<br>勾选后从当前周期立即生成任务</el-checkbox
+                  >默认从下个周期生成任务，<br />勾选后从当前周期立即生成任务</el-checkbox
                 >
               </el-form-item>
             </el-col>
@@ -85,6 +88,7 @@
                 v-if="formData.planCycle == 6"
               >
                 <el-date-picker
+                  :disabled="isChildren()"
                   v-model="formData.startDate"
                   style="width: 240px"
                   value-format="yyyy-MM-dd hh:mm:ss"
@@ -102,6 +106,7 @@
                 v-if="formData.planCycle == 6"
               >
                 <el-date-picker
+                  :disabled="isChildren()"
                   v-model="formData.endDate"
                   style="width: 240px"
                   value-format="yyyy-MM-dd hh:mm:ss"
@@ -115,6 +120,7 @@
             <el-col :span="6">
               <el-form-item prop="execOrgType" label="检查机构类型:">
                 <el-select
+                  :disabled="isChildren()"
                   @change="cleanExecOrgList"
                   prop="execOrgType"
                   label="检查机构类型"
@@ -137,6 +143,7 @@
             <el-col :span="6">
               <el-form-item prop="roleIds" label="检查角色:">
                 <el-select
+                  :disabled="isChildren()"
                   label="检查角色"
                   v-model="formData.roleIds"
                   placeholder="请选择检查角色"
@@ -157,6 +164,7 @@
             <el-col :span="6">
               <el-form-item prop="checkOrgType" label="受检机构类型:">
                 <el-select
+                  :disabled="isChildren()"
                   @change="cleanCheckOrgList"
                   prop="checkOrgType"
                   label="受检机构类型"
@@ -177,6 +185,7 @@
             <el-col :span="6">
               <el-form-item prop="count" label="检查次数:">
                 <el-input-number
+                  :disabled="isChildren()"
                   style="margin-left: 10px"
                   v-model="formData.count"
                   controls-position="right"
@@ -186,12 +195,12 @@
                 ></el-input-number>
               </el-form-item>
             </el-col>
-           
           </el-row>
           <el-row>
             <el-col :span="6">
               <el-form-item :span="6" prop="execOrgIds" label="检查机构">
                 <org-tree-select
+                  :disabled="isChildren()"
                   v-model="formData.execOrgIds"
                   :queryData="parseInt(formData.execOrgType)"
                   ref="execorgTreeSelect"
@@ -204,6 +213,7 @@
             <el-col :span="6">
               <el-form-item :span="6" prop="checkOrgIds" label="受检机构">
                 <org-tree-select
+                  :disabled="isChildren()"
                   v-model="formData.checkOrgIds"
                   :queryData="parseInt(formData.checkOrgType)"
                   ref="checkorgTreeSelect"
@@ -239,6 +249,7 @@
           </el-row>
           <el-form-item :span="6" prop="description" label="备注">
             <el-input
+              :disabled="isChildren()"
               v-model="formData.description"
               :maxlength="255"
               clearable
@@ -250,7 +261,7 @@
         <el-table :data="tableData" style="width: 100%" height="400px">
           <el-table-column label="是否扫描">
             <template v-slot="{ row }">
-              <el-switch
+              <el-switch :disabled="!getshenglianshe(row)"
                 v-model="row.pointScan"
                 active-text="是"
                 inactive-text="否"
@@ -261,7 +272,7 @@
 
           <el-table-column label="必完成项">
             <template v-slot="{ row }">
-              <el-switch
+              <el-switch :disabled="!getshenglianshe(row)"
                 v-model="row.required"
                 active-text="是"
                 inactive-text="否"
@@ -272,6 +283,7 @@
           <el-table-column prop="ruleName" label="检查手册"> </el-table-column>
           <el-table-column prop="itemName" label="检查项"> </el-table-column>
           <el-table-column prop="pointName" label="检查内容"> </el-table-column>
+          <el-table-column v-if="false" prop="ofOrgId" label="所属机构id"> </el-table-column>
           <el-table-column prop="areaName" label="检查区域"> </el-table-column>
           <el-table-column prop="businessType" label="数据来源">
             <template slot-scope="r">
@@ -282,7 +294,12 @@
           </el-table-column>
           <el-table-column prop="areaName" label="操作">
             <template v-slot="{ row }">
-              <el-button type="text" @click="removeRow(row)">删除</el-button>
+              <el-button
+                v-if="getshenglianshe(row)"
+                type="text"
+                @click="removeRow(row)"
+                >删除</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -292,7 +309,7 @@
         <el-button @click="onHide">取消</el-button>
         <el-button type="primary" @click="onSubmit">确定</el-button>
       </div>
-    </el-dialog>
+   </DialogCom>
     <DialogSelect
       ref="DialogSelect"
       :defaultSelect="defaultSelect"
@@ -310,7 +327,7 @@ import OrgTree from "@/components/orgTree";
 import korgTree from "@/components/k-orgTree";
 import * as api from "@/api/safetycheck/plan";
 import { statusOptions } from "@/views/commonOption";
-import { findAllRole,findRoleByType } from "@/api/system/role";
+import { findAllRole, findRoleByType } from "@/api/system/role";
 import { getLabel } from "@/views/commonOption";
 import DialogSelect from "@/views/safetycheck/ruleManager/dialog.select.point.vue";
 export default {
@@ -369,6 +386,22 @@ export default {
     ...mapGetters(["orgId", "orgName"]),
   },
   methods: {
+    //省联社内容不能删除
+    getshenglianshe(row) {
+      if (row.ofOrgId == this.orgId) {
+        return true;
+      } else return false;
+    },
+    //编辑内容判断
+    isChildren() {
+      // console.log(this.formData.distributePlanStatus,"distributePlanStatus")
+      if (
+        this.formData.distributePlanStatus != 1 &&
+        (this.formData.hasEdit != 1 || this.id == null)
+      ) {
+        return false;
+      } else return true;
+    },
     NowBuild() {
       if (this.formData.planCycle == 6) return false;
       else return true;
@@ -379,14 +412,14 @@ export default {
     cleanExecOrgList() {
       this.execOrgIds = null;
       this.formData.execOrgList = [];
-      this.formData.roleIds=[];
-      this.formData.execOrgIds=[];
+      this.formData.roleIds = [];
+      this.formData.execOrgIds = [];
       this.getRolesByOrg();
     },
     cleanCheckOrgList() {
       this.checkOrgIds = null;
       this.formData.checkOrgList = [];
-      this.formData.checkOrgIds=[];
+      this.formData.checkOrgIds = [];
     },
     tenantIdnormalizer(node, instanceId) {
       if (node.children && !node.children.length) {
@@ -438,7 +471,7 @@ export default {
       //   orgType: null,
       // };
       findRoleByType(this.formData.execOrgType).then((res) => {
-        console.log(res,"res")
+        console.log(res, "res");
         this.planRoles = res;
       });
     },
@@ -494,12 +527,14 @@ export default {
         this.formData.checkOrgIds = null;
         this.formData.execOrgIds = null;
         this.formData.rulePointIds = null;
+        this.formData.distributePlanStatus = null;
       }
     },
     onSelect(selectList) {
       // console.log(selectList,"selectList");
       for (let i = 0; i < selectList.length; i++) {
         let tem = {
+          ofOrgId:this.orgId,
           pointScan: selectList[i].pointScan,
           required: !selectList[i].required,
           ruleName: selectList[i].ruleName,

src/views/check/distribute.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog
+  <DialogCom
     title="选择下发机构状态"
     :visible.sync="isShow"
     class="g-dialog-select-safe-check"
@@ -62,7 +62,7 @@
       <el-button @click="onHide">关闭</el-button>
       <el-button type="primary" @click="onSubmit">确定</el-button>
     </div>
-  </el-dialog>
+ </DialogCom>
 </template>
 <script>
 import { listByTypes } from "@/api/system/org.js";
@@ -147,4 +147,7 @@ export default {
 .el-dialog-div {
   overflow: auto;
 }
+.dialog-footer{
+  margin-top:20px;
+}
 </style>

src/views/check/index.vue

@@ -283,6 +283,7 @@
           <el-table-column label="操作">
             <template slot-scope="r">
               <el-button
+              v-if="eqOrg(r.row)"
                 size="mini"
                 type="text"
                 icon="el-icon-edit-outline"
@@ -291,6 +292,7 @@
                 >修改</el-button
               >
               <el-button
+              v-if="eqOrg2(r.row)"
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
@@ -310,6 +312,14 @@
                 size="mini"
                 type="text"
                 icon="el-icon-arrow-down"
+                v-if="newcheckCanPublish(r.row)"
+                @click="newshowDialogDistribute(r.row)"
+                v-hasPermi="['core:checkplan:distribute']"
+                >下发</el-button>
+                <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-arrow-down"
                 v-if="chehui(r.row)"
                 @click="chhuile(r.row)"
                 v-hasPermi="['core:checkplan:distribute']"
@@ -340,7 +350,7 @@
 <script>
 import DialogDistribute from "./distribute.vue";
 import OrgTree from "@/components/orgTree";
-import { mapState, mapMutations } from "vuex";
+import { mapState, mapMutations,mapGetters } from "vuex";
 import DialogEdit from "./dialog.edit";
 import * as api from "@/api/safetycheck/plan";
 import { statusOptions, getLabel } from "@/views/commonOption";
@@ -410,9 +420,64 @@ export default {
   watch: {},
   computed: {
     ...mapState([]),
+    ...mapGetters(["orgId", "orgName"]),
   },
   methods: {
     ...mapMutations([]),
+    
+    //判断是否跟当前用户同机构
+    eqOrg(row) {
+      // console.log(row.planCreateOrgId,"row.planCreateOrgId");
+      // console.log(this.orgId,"this.orgId");
+      if (row != null && row != undefined && row.planOfOrgId == this.orgId) {
+        return true;
+      }
+      return true;
+    },
+    eqOrg2(row) {
+      // console.log(row.planCreateOrgId,"row.planCreateOrgId");
+      // console.log(this.orgId,"this.orgId");
+      if (row != null && row != undefined && row.planCreateOrgId == this.orgId&& row.planOfOrgId == this.orgId) {
+        return true;
+      }
+      return false;
+    },
+    newcheckCanPublish(row){
+      if (row.planStatus==2&& row.parentId != -1&& row.planOfOrgType ==1) {
+        return true;
+      }
+      return false;
+    },
+    newshowDialogDistribute(row){
+      this.$modal
+        .confirm("是否下发!", "提示")
+        .then(() => {
+          // 用户点击了确认按钮
+          console.log("执行操作...");
+          this.loading = true;
+      api
+        .distributeCheHui(row.id)
+        .then((response) => {
+          // console.log(response, "then");
+          if (response.data == 0) {
+            this.loading = false;
+          } else {
+            this.getList();
+            this.loading = false;
+          }
+        })
+        .catch((response) => {
+          // console.log(response, "catch");
+          this.getList();
+          this.loading = false;
+        });
+        })
+        .catch(() => {
+          // 用户点击了取消按钮
+          console.log("取消操作...");
+        });
+
+    },
         //已完成下发的计划不显示下发按钮
     checkCanPublish(row) {
       // console.log(row.planOfOrgType == "1","row.planOfOrgType")
@@ -491,39 +556,30 @@ export default {
       return false;
     },
     showDialogDistribute(row){
-      this.loading = true;
-      api
-        .distributeCheHui(row.id)
-        .then((response) => {
-          // console.log(response, "then");
-          if (response.data == 0) {
-            this.loading = false;
-            this.$refs.dialogDistribute.show(row);
-          } else {
-            this.getList();
-            this.loading = false;
-          }
-        })
-        .catch((response) => {
-          // console.log(response, "catch");
-          this.getList();
-          this.loading = false;
-          this.$refs.dialogDistribute.show(row);
-        });
+      console.log(row,"qqq")
+      this.$refs.dialogDistribute.show(row);
     },
     async onDel(id, name) {
+
       this.$modal
         .confirm('是否确认删除名称为"' + name + '"的数据项？')
-        .then(function () {
-          return api.delelte(id);
-        })
         .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
+          // 用户点击了确认按钮
+          console.log("执行操作...");
+          this.loading = true;
+          api.delelte(id).then(() => {
+            this.getList();
+            this.loading = false;
+            this.$modal.msgSuccess("删除成功");
+            
+          }).catch(()=>{
+            this.loading = false;
+          });
         })
-        .catch(() => {});
-      // await api.delelte(id);
-      // this.getList();
+        .catch(() => {
+          // 用户点击了取消按钮
+          console.log("取消操作...");
+        });
     },
     // 多选框选中数据
     handleSelectionChange(selection) {

src/views/core/accessPlan/index.vue

@@ -4,7 +4,7 @@
       <!--机构数据-->
       <el-col :span="4" :xs="24">
                   <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @defaultOrg="getDefaultOrg" @checkChange="checkChange"
-                    @click="clickTreeNode"></org-tree>
+                    @click="clickTreeNode" :defaultCheckSub="false"></org-tree>
       </el-col>
       <!--搜索栏-->
 
@@ -256,7 +256,7 @@
           description: null,
           isDeleted: null,
           isDistribute: null,
-          checkSub: true
+          checkSub: false
         },
         // 表单参数
         form: {},

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

@@ -81,7 +81,7 @@
                 v-if="canEdit(scope.row)"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['core:drillDictionary:edit']"
-              >修改
+              >编辑
               </el-button>
               <BtnTip
                 size="mini"
@@ -263,7 +263,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加参考预案演练库";
+      this.title = "新增参考预案演练库";
     },
     canEdit(row)
     {
@@ -276,7 +276,7 @@ export default {
       getDrillDictionary(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改参考预案演练库";
+        this.title = "编辑参考预案演练库";
       });
     },
     /** 提交按钮 */

src/views/core/drill/plan/dialog.select.file.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog
+  <DialogCom
     title="选择学习附件"
     :visible.sync="isShow"
     class="g-dialog-select-safe-check"
@@ -62,7 +62,7 @@
       <el-button @click="onHide">关闭</el-button>
       <el-button type="primary" @click="onSubmit">确定</el-button>
     </div>
-  </el-dialog>
+ </DialogCom>
 </template>
 <script>
 import GSearchTable from "@/components/table/gx.search.table.vue";

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

@@ -99,6 +99,9 @@
               <el-button v-if="checkCanPublish(scope.row)" size="mini" type="text" icon="el-icon-edit-outline"
                          @click="handlePublish(scope.row)" v-hasPermi="['core:drillPlan:publish']">下发
               </el-button>
+              <el-button v-if="checkCanRevocation(scope.row)" size="mini" type="text" icon="el-icon-down"
+                         @click="handleRevocation(scope.row)" v-hasPermi="['core:plan:edit']">撤回
+              </el-button>
               <el-button v-if="checkCanEdit(scope.row)" size="mini" type="text" icon="el-icon-edit-outline"
                          @click="handleUpdate(scope.row)" v-hasPermi="['core:drillPlan:edit']">修改
               </el-button>
@@ -115,7 +118,7 @@
       </el-col>
     </el-row>
     <!-- 添加或修改教育培训计划对话框 -->
-    <el-dialog :title="title" :visible.sync="open" :before-close="closeDialog"  :close="cancel" width="850px" height="800px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" :before-close="closeDialog"  :close="cancel" width="850px" height="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="24">
@@ -238,7 +241,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+   </DialogCom>
     <DialogSelectFile
       ref="DialogSelectFile"
       :defaultSelect=defaultSelect
@@ -422,6 +425,7 @@ export default {
       return row.createByTopOrg !== 1
     },
     execOrgTypeChanged(row) {
+      this.$refs['orgTreeSelect'].clear();
       this.initRoleList(this.form.execOrgType);
       // this.form.planExecOrgIdList = [];
     },

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

@@ -1,6 +1,6 @@
 <template>
   <div class="edu-training-edit">
-    <el-dialog title="教育培训详情" :visible.sync="isShow" width="960px">
+    <DialogCom title="教育培训详情" :visible.sync="isShow" width="960px">
       <div class="page-body">
         <el-form :model="formData" size="small" ref="form" label-position="right" label-width="120px"
                  label-suffix=":">
@@ -109,7 +109,7 @@
       <div slot="footer" class="dialog-footer">
         <el-button @click="onHide">关闭</el-button>
       </div>
-    </el-dialog>
+   </DialogCom>
   </div>
 </template>
 

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

@@ -1,6 +1,6 @@
 <template>
   <div class="edu-training-edit">
-    <el-dialog :title="'演练登记'" :close="onHide" :visible.sync="isShow" width="960px">
+    <DialogCom :title="'演练登记'" :close="onHide" :visible.sync="isShow" width="960px">
       <div class="page-body">
         <el-form :model="formData" :rules="formDataRules" size="small" ref="form" label-position="right"
           label-width="120px" label-prefix=":">
@@ -78,7 +78,7 @@
         <el-button type="primary" @click="onSave">暂存</el-button>
         <el-button type="primary" @click="onSubmit">提交</el-button>
       </div>
-    </el-dialog>
+   </DialogCom>
   </div>
 </template>
 

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

@@ -94,14 +94,14 @@
                 @click="handleDetail(scope.row.id)"
                 v-hasPermi="['core:drillTask:query']"
               >详情</el-button>
-              <el-button
+<!--              <el-button
                 size="mini"
                 type="text"
                 icon="el-icon-document-add"
                 v-if="canEvaluate(scope.row)"
                 @click="handleRecorded(scope.row.id)"
                 v-hasPermi="['core:drillTask:evaluate']"
-              >评价</el-button>
+              >评价</el-button>-->
               <el-button
                 size="mini"
                 type="text"

src/views/core/message/index.vue

@@ -142,7 +142,7 @@
       />
     </el-col>
     <!-- 添加或修改公告通知对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @close="handleClose">
+    <DialogCom :title="title" :visible.sync="open" width="800px" append-to-body @close="handleClose">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
         <el-form-item label="标题" prop="title">
@@ -196,7 +196,7 @@
         <el-button type="primary" v-if="isSubmit" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+   </DialogCom>
     </el-row>
   </div>
 </template>

src/views/core/send/index.vue

@@ -52,7 +52,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" v-if="scope.row.sendStatus == 2" icon="el-icon-edit-outline"
-            @click="handleUpdate(scope.row)" v-hasPermi="['core:send:edit']">修改</el-button>
+            @click="handleUpdate(scope.row)" v-hasPermi="['core:send:edit']">编辑</el-button>
 
           <el-button size="mini" type="text" v-if="scope.row.sendStatus == 2" icon="el-icon-delete"
             @click="handleDelete(scope.row)" v-hasPermi="['core:send:remove']">删除</el-button>
@@ -67,7 +67,7 @@
       @pagination="getList" />
 
     <!-- 添加或修改【请填写功能名称】对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="标题" prop="title">
           <el-input v-model="form.title" maxlength="50" placeholder="请输入标题" />
@@ -100,7 +100,7 @@
         </el-form-item>
         <el-form-item prop="sendTime" v-if="form.sendTimeType == 2" label="指定时间">
           <el-date-picker style="width: 100%;" v-model="form.sendTime" @change="startDateChanged"
-            :picker-options="startDatepickerOptions" align="right" type="date" placeholder="选择指定时间">
+            :picker-options="startDatepickerOptions" align="right" type="datetime" placeholder="选择指定时间">
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -108,18 +108,18 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+   </DialogCom>
 
     <!-- 详情 -->
-    <el-dialog :title="title" :visible.sync="yes" width="500px" append-to-body>
+    <DialogCom :title="title" :visible.sync="yes" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="标题" prop="title">
           <el-input readonly v-model="form.title" maxlength="50" placeholder="请输入标题" />
         </el-form-item>
         <el-form-item label="类型" prop="type">
-          <el-select v-model="form.type" style="width: 100%" placeholder="请选择类型">
+          <el-select v-model="form.type" style="width: 100%" placeholder="请选择类型" :disabled="true">
             <el-option v-for="dict in dict.type.message_type" :key="dict.value" :label="dict.label"
-              :value="`${dict.value}`" :disabled="true"></el-option>
+              :value="`${dict.value}`" ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="内容" prop="content">
@@ -127,12 +127,12 @@
         </el-form-item>
 
         <el-form-item label="发送目标" prop="sendUser">
-          <el-select mode="multiple" style="width: 100%;" v-model="form.sendUser" placeholder="按用户选择">
+          <el-select mode="multiple" style="width: 100%;" v-model="form.sendUser" placeholder="按用户选择" :disabled="true">
             <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id"
               :disabled="true"></el-option>
           </el-select>
 
-          <el-select mode="multiple" style="width: 100%;" v-model="form.sendRole" placeholder="按角色选择">
+          <el-select mode="multiple" style="width: 100%;" v-model="form.sendRole" placeholder="按角色选择" :disabled="true">
             <el-option v-for="item in roleOptions" :key="item.id" :label="item.roleName" :value="item.id"
               :disabled="true"></el-option>
           </el-select>
@@ -144,16 +144,16 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item prop="sendTime" v-if="form.sendTimeType == 2" label="指定时间">
+        <el-form-item prop="sendTime" v-if="form.sendTimeType == 2" label="指定时间" :disabled="true">
           <el-date-picker readonly style="width: 100%;" v-model="form.sendTime" @change="startDateChanged"
-            :picker-options="startDatepickerOptions" align="right" type="date" placeholder="选择指定时间">
+            :picker-options="startDatepickerOptions" align="right" type="datetime" placeholder="选择指定时间">
           </el-date-picker>
         </el-form-item>
       </el-form>
       <!-- <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
       </div> -->
-    </el-dialog>
+   </DialogCom>
   </div>
 </template>
 
@@ -316,7 +316,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加";
+      this.title = "新增消息";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -325,7 +325,7 @@ export default {
       getSend(id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改";
+        this.title = "编辑消息";
       });
     },
     /**

src/views/question/list/dialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @close="cancel">
+  <DialogCom :title="title" :visible.sync="open" width="800px" append-to-body @close="cancel">
     <div class="question-dialog-body">
       <el-descriptions :column="2" class="contentArea">
       <el-descriptions-item label="隐患所属机构">{{
@@ -175,7 +175,7 @@
       <el-button type="primary" @click="submitForm" v-if="type!='detail'">确 定</el-button>
       <el-button @click="cancel">取 消</el-button>
     </div>
-  </el-dialog>
+ </DialogCom>
 </template>
 <script>
 import {

src/views/resumption/plan/distribute.vue

@@ -138,4 +138,7 @@ export default {
 .el-dialog-div {
   overflow: auto;
 }
+.dialog-footer{
+  margin-top:20px;
+}
 </style>

src/views/resumption/plan/index.vue

@@ -453,7 +453,7 @@ export default {
       return false;
     },
     newcheckCanPublish(row){
-      if (row.planStatus==2&& row.parentId != -1) {
+      if ((row.planOfOrgType==3&&row.planStatus!=1)||(row.planStatus==2&& row.parentId != -1&& row.planOfOrgType ==1)) {
         return true;
       }
       return false;

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

@@ -104,7 +104,7 @@ export default {
     reset() {
       return {
         id: null,
-        orgId: null,
+        orgId:null,
         orgPath: null,
         orgName: null,
         name: null,
@@ -135,6 +135,7 @@ export default {
       });
     },
     onOrgSelect(node) {
+      // console.info(node)
       this.formData.orgPath = node.path;
       this.formData.orgName = node.shortName;
       listIdName({ orgId: node.id, deviceType: 1, assetType: 2 }).then((d) => {

src/views/resumption/ruleManager/dialog.editPoint.vue

@@ -179,10 +179,10 @@ export default {
 </script>
 
 <style lang="scss">
-.brand_info {
-  .el-form {
-    width: 600px;
-    padding-top: 40px;
-  }
-}
+// .brand_info {
+//   .el-form {
+//     width: 600px;
+//     padding-top: 40px;
+//   }
+// }
 </style>

src/views/resumption/ruleManager/dialog.select.point.vue

@@ -140,4 +140,7 @@ export default {
 .DialogCom-div {
   overflow: auto;
 }
+.dialog-footer{
+  margin-top:20px;
+}
 </style>

src/views/safetyBook/dialog.edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="rule-type">
-    <el-dialog
+    <DialogCom
       :title="id ? '编辑安全责任书' : '新增安全责任书'"
       :visible.sync="isShow"
       @close="onHide"
@@ -67,7 +67,7 @@
         <el-button @click="isShow = false">取消</el-button>
         <el-button type="primary" @click="onSubmit">确定</el-button>
       </div>
-    </el-dialog>
+   </DialogCom>
     <DialogSelect ref="DialogSelect" @success="getSign"></DialogSelect>
   </div>
 </template>

src/views/safetyBook/dialog.sign.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="rule-type">
-    <el-dialog
+    <DialogCom
       :title="id ? '编辑' : '新增'"
       :visible.sync="isShow"
       @close="onHide"
@@ -52,7 +52,7 @@
         <el-button @click="isShow = false">取消</el-button>
         <el-button type="primary" @click="onSubmit">确定</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
     <UserSelector ref="UserSelector" @select="onUserSelect"></UserSelector>
   </div>
 </template>

src/views/safetycheck/rule/dialog.edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="rule-type">
-    <el-dialog
+    <DialogCom
       :title="id ? '编辑检查内容库' : '新增检查内容库'"
       :visible.sync="isShow"
       @close="onHide"
@@ -72,7 +72,7 @@
         <el-button @click="isShow=false">取消</el-button>
         <el-button type="primary" @click="onSubmit">确定</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/safetycheck/ruleManager/dialog.editItem.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="rule-type">
-    <el-dialog
+    <DialogCom
       :title="!formData.id ? '新增检查项' : '编辑检查项'"
       :visible.sync="dialogVisible"
       width="50%"
@@ -58,7 +58,7 @@
         <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="onSubmit()">保 存</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
     <EditPoint
       ref="editDialog"
       @submit="onPointSubmit"

src/views/safetycheck/ruleManager/dialog.editPoint.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="rule-type">
-    <el-dialog
+    <DialogCom
       width="600px"
       :title="index >= 0 ? '编辑检查内容' : '新增检查内容'"
       :visible.sync="dataVisible"
@@ -82,7 +82,7 @@
           index >= 0 ? "保 存" : "添 加"
         }}</el-button>
       </div>
-    </el-dialog>
+    </DialogCom>
   </div>
 </template>
 

src/views/safetycheck/ruleManager/dialog.select.point.vue

@@ -139,4 +139,7 @@ export default {
   overflow: auto;
   margin-bottom:20px;
 }
+.dialog-footer{
+  margin-top:20px;
+}
 </style>

src/views/system/device/index.vue

@@ -10,12 +10,12 @@
           <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
             label-width="68px">
             <el-form-item label="设备名称" prop="deviceName">
-              <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable
+              <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" maxlength="50"
                 @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item label="资产类别" prop="assetType">
 
-              <el-select style="width: 100%;" clearable v-model="queryParams.assetType" placeholder="请选择"
+              <el-select style="width: 100%;"  v-model="queryParams.assetType" placeholder="请选择"
                 @change="changeSelectDevice">
                 <el-option v-for="dict in dict.type.sys_asset_type" :key="dict.value" :label="dict.label"
                   :value="`${dict.value}`"></el-option>
@@ -24,7 +24,7 @@
 
             <el-form-item label="设备分类" prop="deviceType">
 
-              <el-select style="width: 100%;" clearable v-model="queryParams.deviceType" placeholder="请选择">
+              <el-select style="width: 100%;"  v-model="queryParams.deviceType" placeholder="请选择">
                 <el-option v-for="item in devices" :key="item.dictValue" :label="item.dictLabel"
                   :value="item.dictValue"></el-option>
               </el-select>
@@ -97,14 +97,15 @@
 
     </el-row>
 
-
-
-
-
-
     <!-- 添加或修改【请填写功能名称】对话框 -->
-    <el-dialog :title="title" :visible="open" width="800px" append-to-body @close="cancel">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <DialogCom
+      :title="title"
+      :visible.sync="open"
+      width="700px"
+      @close="closeHandler"
+      append-to-body
+    >
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="20">
             <el-form-item label="所属机构" prop="orgId">
@@ -121,8 +122,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
-
         <el-row>
           <el-col :span="12">
             <el-form-item label="资产类别" prop="assetType">
@@ -149,7 +148,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="设备品牌" prop="deviceBrand">
-              <el-input v-model="form.deviceBrand" placeholder="请输入" maxlength="30" />
+              <el-input v-model="form.deviceBrand" placeholder="请输入" maxlength="50" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -189,7 +188,7 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-dialog>
+  </DialogCom>
 
         <!-- 设备导入对话框 -->
         <DialogCom :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
@@ -205,6 +204,7 @@
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </DialogCom>
+   
   </div>
 </template>
 
@@ -243,7 +243,7 @@ export default {
           { required: true, message: '请选择所属机构', trigger: 'blur' },
         ],
         assetType: [
-          { required: true, message: '请选择资产类别', trigger: 'blur' },
+          { required: true, message: '请选择资产类别', trigger: 'change' },
         ],
         hostId: [{ required: true, message: '请选择主机', trigger: 'blur' }],
         channel: [{ required: true, message: '请输入通道号', trigger: 'change' }],
@@ -314,7 +314,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/device/importData",
+        url:  process.env.NODE_ENV === "development"?process.env.VUE_APP_BASE_API + "/system/device/importData":window.origin+"/system/device/importData",
       },
       // 表单参数
       form: {
@@ -471,6 +471,9 @@ export default {
       this.open = false;
       this.reset();
     },
+    closeHandler() {
+      this.reset();
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -518,6 +521,7 @@ export default {
       this.form.orgId = this.selectOrgId;
       this.dept.id=this.selectOrgId;
       this.changeSelect(this.dept);
+      this.devices=null;
     },
     changeSelectDevice(val) {
       if (val) {

src/views/system/dict/data.vue

@@ -152,13 +152,6 @@
         prop="remark"
         :show-overflow-tooltip="true"
       >
-        <template slot-scope="scope">
-          <el-tooltip  placement="top">
-            <div slot="content" class="tooltipClass">
-              {{ scope.row.remark }}
-            </div>
-          </el-tooltip>
-        </template>
       </el-table-column>
 
       <el-table-column
@@ -523,7 +516,14 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-  .tooltipClass{
-    width: 300px;
-  }
+.tooltipClass {
+  width: 300px;
+}
+</style>
+<style >
+.el-tooltip__popper {
+  max-width: 200px;
+  
+  overflow: hidden;
+}
 </style>

src/views/system/user/extend.vue

@@ -181,7 +181,7 @@ import { extendUserInformation } from "@/api/system/information";
 export default {
   props: [],
   components: { TreeSelect ,ImgsUpload},
-  dicts: ['sys_highest_education', "sys_work_type", "sys_duties", "sys_education_type", 'sys_department_type', 'post_no_pass', 'current_position'],
+  dicts: ['sys_highest_education', "sys_work_type", "sys_duties", "sys_education_type", 'sys_department_type', 'post_no_pass', 'current_position','department_name'],
   data() {
     return {
       startDatepickerOptions: {

src/views/system/user/index.vue

@@ -34,7 +34,7 @@
           </el-form-item>
           <el-form-item label="姓名" prop="name">
             <el-input
-              :maxlength="20"
+              :maxlength="50"
               v-model="queryParams.name"
               placeholder="请输入姓名"
               clearable