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

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

@@ -447,7 +447,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注"  :disabled="tableDisable()"/>
+              <el-input v-model="form.remark" placeholder="请输入备注" :disabled="tableDisable()"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -615,6 +615,11 @@ export default {
         this.loading = false;
       });
     },
+    delayFlush(time) {
+      setTimeout(() => {
+        this.getList()
+      }, time)
+    },
     //初始化与计划相关的角色信息
     initPlanRoleList() {
       listPlanRole({}).then((response) => {
@@ -663,7 +668,7 @@ export default {
     },
     //所属机构为当前用户登录机构时才显示 “编辑、删除”按钮
     checkCanEdit(row) {
-       console.log("checkCanEdit",this.$store.getters.orgId,row.belongOrgId)
+      console.log("checkCanEdit", this.$store.getters.orgId, row.belongOrgId)
       return (
         row.belongOrgId == this.$store.getters.orgId
       );
@@ -913,9 +918,7 @@ export default {
           })
           .then(() => {
             publishPlan(row.id, 1);
-            setTimeout(() => {
-              this.getList()
-            }, 100)
+            this.delayFlush(200);
           });
       } else {
         if (row.planStatus == 0) {
@@ -925,9 +928,7 @@ export default {
             (state) => {
               if (state == 0 || state == 1) {
                 publishPlan(row.id, state);
-                setTimeout(() => {
-                  this.getList()
-                }, 100)
+                this.delayFlush(200);
               }
             },
             {
@@ -944,9 +945,7 @@ export default {
             })
             .then(() => {
               publishPlan(row.id, 0);
-              setTimeout(() => {
-                this.getList()
-              }, 100)
+              this.delayFlush(200);
             });
         }
       }
@@ -960,12 +959,12 @@ export default {
         if (row.planCycle == 0) {
           if (row.done == 1) {
             msg = '因存在已完成任务,无周期任务不允许撤回,如需删除下发任务请点击"删除"';
-            this.$alert(msg,'系统提示',{
-              confirmButtonText:"确认"
+            this.$alert(msg, '系统提示', {
+              confirmButtonText: "确认"
             })
             return
           } else {
-            msg = "因存在不已完成任务,撤回后将删除所有生成任务";
+            msg = "因不存在已完成任务,撤回后将删除所有生成任务";
           }
         } else {
           //有周期
@@ -973,7 +972,7 @@ export default {
             msg =
               "因存在已完成任务,撤回后下周期起将不再生成任务";
           } else {
-            msg = "因存在不已完成任务,撤回后将删除所有生成任务";
+            msg = "因不存在已完成任务,撤回后将删除所有生成任务";
           }
         }
         this.$modal
@@ -999,8 +998,8 @@ export default {
         `plan_${new Date().getTime()}.xlsx`
       );
     },
-    tableDisable(){
-      return this.form.planStatus==1;
+    tableDisable() {
+      return this.form.planStatus == 1;
     },
     // showSelectFile() {
     //   this.$refs["DialogSelectFile"].show();

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

@@ -993,9 +993,7 @@ export default {
           })
           .then(() => {
             publishPlan(row.id, 1);
-            setTimeout(() => {
-              this.getList()
-            }, 100)
+            this.delayFlush(200)
           });
       } else {
         if (row.planStatus == 0) {
@@ -1005,9 +1003,7 @@ export default {
             (state) => {
               if (state == 0 || state == 1) {
                 publishPlan(row.id, state);
-                setTimeout(() => {
-                  this.getList()
-                }, 100)
+                this.delayFlush(200)
               }
             },
             {
@@ -1024,13 +1020,17 @@ export default {
             })
             .then(() => {
               publishPlan(row.id, 0);
-              setTimeout(() => {
-                this.getList()
-              }, 100)
+              this.delayFlush(200)
             });
         }
       }
     },
+
+    delayFlush(time) {
+      setTimeout(() => {
+        this.getList()
+      }, time)
+    },
     getMsgStr(row, type) {
       let str = "是否确认" + type + "该计划？";
       if (row.standard == 1) {
@@ -1045,12 +1045,12 @@ export default {
       if (row.planCycle == 0) {
         if (row.done == 1) {
           msg = '因存在已完成任务,无周期任务不允许撤回,如需删除下发任务请点击"删除"';
-          this.$alert(msg,'系统提示',{
-            confirmButtonText:"确认"
+          this.$alert(msg, '系统提示', {
+            confirmButtonText: "确认"
           })
           return
         } else {
-          msg = "因存在不已完成任务,撤回后将删除所有生成任务";
+          msg = "因不存在已完成任务,撤回后将删除所有生成任务";
         }
       } else {
         //有周期
@@ -1058,7 +1058,7 @@ export default {
           msg =
             "因存在已完成任务,撤回后下周期起将不再生成任务";
         } else {
-          msg = "因存在不已完成任务,撤回后将删除所有生成任务";
+          msg = "因不存在已完成任务,撤回后将删除所有生成任务";
         }
       }
 

src/views/login.vue

@@ -220,13 +220,14 @@ export default {
 }
 
 .login-form {
-  margin-right: 15%;
   border-radius: 6px;
   background: #ffffff;
   width: 544px;
   height: 488px;
   padding: 25px 60px 50px 60px;
   z-index:2;
+  position: absolute;
+  right: 12%;
   .el-input {
     height: 38px;
     input {

src/views/question/list/index.vue

@@ -141,12 +141,14 @@
               align="center"
               label="机构名称"
               prop="orgName"
+              show-overflow-tooltip
               v-if="columns[1].visible"
             />
             <el-table-column
               align="center"
               label="隐患来源"
               prop="srcTaskName"
+              show-overflow-tooltip
               v-if="columns[2].visible"
             />
             <el-table-column
@@ -163,14 +165,15 @@
               align="center"
               label="隐患描述"
               prop="questionDesc"
-              :show-overflow-tooltip="true"
+              show-overflow-tooltip
               v-if="columns[4].visible"
             />
             <el-table-column
               align="center"
               label="提出人"
               prop="submitorName"
-              width="100px"
+              width="120px"
+              show-overflow-tooltip
               v-if="columns[5].visible"
             />
             <el-table-column
@@ -189,7 +192,7 @@
             <el-table-column
               align="center"
               label="隐患状态"
-              width="100px"
+              width="120px"
               prop="confirmStatus"
               v-if="columns[7].visible"
             >

src/views/question/reform/index.vue

@@ -125,6 +125,7 @@
               align="center"
               label="机构名称"
               prop="orgName"
+              show-overflow-tooltip
               v-if="columns[1].visible"
             />
             <el-table-column
@@ -140,8 +141,8 @@
             <el-table-column
               align="center"
               label="隐患描述"
-              prop="questionDesc"
-              :show-overflow-tooltip="true"
+              prop="questionDesc"            
+              show-overflow-tooltip
               v-if="columns[3].visible"
             />
 
@@ -149,7 +150,7 @@
               align="center"
               label="整改期限"
               prop="submitTime"
-              width="120"
+              width="140"
               v-if="columns[4].visible"
             >
               <template slot-scope="scope">
@@ -162,7 +163,7 @@
               align="center"
               label="整改状态"
               prop="reformStatus"
-              width="100px"
+              width="120px"
               v-if="columns[5].visible"
             >
               <template slot-scope="scope">

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

@@ -215,25 +215,22 @@
           :data="tableData"
           style="width: 100%"
           height="400px"
+          border
           @selection-change="handleSelectionChange"
         >
           <el-table-column
             type="selection"
             :selectable="handleSelectable"
           ></el-table-column>
-          <el-table-column prop="ruleName" label="履职手册"> </el-table-column>
-          <el-table-column prop="itemName" label="履职项"> </el-table-column>
-          <el-table-column prop="pointName" label="履职内容" width="300px">
+          <el-table-column prop="ruleName" label="履职手册" align="center" show-overflow-tooltip> </el-table-column>
+          <el-table-column prop="itemName" label="履职项" align="center" show-overflow-tooltip> </el-table-column>
+          <el-table-column prop="pointName" label="履职内容" width="300px" align="center">
             <template slot-scope="scope">
               <pre>{{ scope.row.pointName }}</pre>
             </template>
-          </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="checkName" label="履职点位" v-if="false">
-          </el-table-column>
-          <el-table-column label="是否扫描">
+          </el-table-column>         
+          <el-table-column prop="areaName" label="履职区域" align="center"> </el-table-column>        
+          <el-table-column label="是否扫描" align="center">
             <template v-slot="{ row }">
               <el-switch
                 :disabled="!getshenglianshe(row)"
@@ -245,7 +242,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="必完成项">
+          <el-table-column label="必完成项" align="center">
             <template v-slot="{ row }">
               <el-switch
                 :disabled="!getshenglianshe(row)"
@@ -256,7 +253,7 @@
               </el-switch>
             </template>
           </el-table-column>
-          <el-table-column label="操作">
+          <el-table-column label="操作" align="center">
             <template v-slot="{ row }">
               <el-button
                 v-if="getshenglianshe(row) && (formData.Id==null || formData.planOfOrgId == orgId)"

src/views/resumption/plan/index.vue

@@ -169,9 +169,10 @@
             ></el-table-column>
             <el-table-column
               prop="planName"
+              align="center"
               label="任务名称"
               width="250px"
-              :show-overflow-tooltip="true"
+              show-overflow-tooltip
               v-if="columns[1].visible"
             ></el-table-column>
             <el-table-column

src/views/resumption/protection/index.vue

@@ -142,6 +142,7 @@
               align="center"
               prop="name"
               label="报警控制器名称"
+              show-overflow-tooltip
               v-if="columns[2].visible"
             >
             </el-table-column>
@@ -149,6 +150,7 @@
               align="center"
               prop="status"
               label="报警控制器状态"
+              width="150"
               v-if="columns[3].visible"
             >
               <template slot-scope="r"
@@ -161,6 +163,8 @@
               align="center"
               prop="statusUpdatorName"
               label="登记人"
+              show-overflow-tooltip
+              width="150"
               v-if="columns[4].visible"
             >
             </el-table-column>
@@ -168,6 +172,7 @@
               align="center"
               prop="statusUpdateTime"
               label="最近登记时间"
+              width="150"
               v-if="columns[5].visible"
             >
             </el-table-column>

src/views/resumption/rule/index.vue

@@ -122,11 +122,13 @@
               align="center"
               prop="name"
               label="履职手册名称"
+              show-overflow-tooltip
               v-if="columns[1].visible"
             ></el-table-column>
             <el-table-column
               align="center"
               prop="orgType"
+              width="150"
               label="履职机构类型"
               v-if="columns[2].visible"
             >
@@ -138,12 +140,14 @@
               align="center"
               prop="orgName"
               label="发布机构"
+              width="200"
               v-if="columns[3].visible"
             ></el-table-column>
             <el-table-column
               align="center"
               prop="status"
               label="状态"
+              width="100"
               v-if="columns[4].visible"
             >
               <template slot-scope="r">
@@ -154,6 +158,7 @@
               align="center"
               prop="remark"
               label="备注"
+              show-overflow-tooltip
               v-if="columns[5].visible"
             ></el-table-column>
             <el-table-column

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

@@ -78,11 +78,12 @@
                 <el-date-picker
                   :disabled="cannotEdit()"
                   v-model="formData.startDate"
-                  style="width: 240px"
+                  style="width: 217px"
                   value-format="yyyy-MM-dd 00:00:00"
                   placeholder="请选择开始时间"
                   type="date"
                   :clearable="false"
+                  :picker-options="datepickerOptions"
                 ></el-date-picker>
               </el-form-item>
             </el-col>
@@ -96,11 +97,12 @@
                 <el-date-picker
                   :disabled="cannotEdit()"
                   v-model="formData.endDate"
-                  style="width: 240px"
+                  style="width: 217px"
                   value-format="yyyy-MM-dd 23:59:59"
                   placeholder="请选择结束时间"
                   type="date"
                   :clearable="false"
+                  :picker-options="datepickerOptions"
                 ></el-date-picker>
               </el-form-item>
             </el-col>
@@ -175,7 +177,6 @@
               <el-form-item prop="count" label="任务次数:">
                 <el-input-number
                   :disabled="cannotEdit()"
-                  style="margin-left: 10px"
                   v-model="formData.count"
                   controls-position="right"
                   @change="handleChange"
@@ -189,6 +190,7 @@
                 <org-tree-select
                   :disabled="cannotEdit()"
                   v-model="formData.execOrgIds"
+                  class="org-selector"
                   :queryData="parseInt(formData.execOrgType)"
                   ref="execorgTreeSelect"
                   :enabledCheckOrgTypes="parseInt(formData.execOrgType)"
@@ -202,9 +204,11 @@
                 <org-tree-select
                   :disabled="cannotEdit()"
                   v-model="formData.checkOrgIds"
+                  class="org-selector"
                   ref="checkorgTreeSelect"
                   :queryData="
-                    (formData.checkOrgTypes==null || formData.checkOrgTypes.length > 1)
+                    formData.checkOrgTypes == null ||
+                    formData.checkOrgTypes.length > 1
                       ? null
                       : parseInt(formData.checkOrgTypes[0])
                   "
@@ -263,13 +267,15 @@
           :data="tableData"
           style="width: 100%; margin-top: 15px"
           height="400px"
+          border
           @selection-change="handleSelectionChange"
         >
           <el-table-column
             type="selection"
+            align="center"
             :selectable="handleSelectable"
           ></el-table-column>
-          <el-table-column label="是否扫描">
+          <el-table-column label="是否扫描" align="center">
             <template v-slot="{ row }">
               <el-switch
                 :disabled="!getshenglianshe(row)"
@@ -281,7 +287,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="必完成项">
+          <el-table-column label="必完成项" align="center">
             <template v-slot="{ row }">
               <el-switch
                 :disabled="!getshenglianshe(row)"
@@ -294,27 +300,26 @@
           </el-table-column>
           <el-table-column
             prop="ruleName"
-            label="检查手册
-          "
+            label="检查手册"
+            align="center"
+            show-overflow-tooltip
           >
           </el-table-column>
-          <el-table-column prop="itemName" label="检查项"> </el-table-column>
-          <el-table-column prop="pointName" label="检查内容" width="300px">
+          <el-table-column prop="itemName" label="检查项" align="center">
+          </el-table-column>
+          <el-table-column
+            prop="pointName"
+            label="检查内容"
+            width="300px"
+            align="center"
+          >
             <template slot-scope="scope">
               <pre>{{ scope.row.pointName }}</pre>
             </template>
           </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="数据来源" v-if="false">
-            <template slot-scope="r">
-              {{
-                getLabel(dict.type.point_data_source, `${r.row.businessType}`)
-              }}
-            </template>
+          <el-table-column prop="areaName" label="检查区域" align="center">
           </el-table-column>
-          <el-table-column prop="areaName" label="操作">
+          <el-table-column prop="areaName" label="操作" align="center">
             <template v-slot="{ row }">
               <el-button
                 v-if="
@@ -329,11 +334,15 @@
           </el-table-column>
         </el-table>
       </div>
-      <div v-if="formData.planCycle==6 && formData.taskHasCompleted==1" slot="footer" class="dialog-footer">    
+      <div
+        v-if="formData.planCycle == 6 && formData.taskHasCompleted == 1"
+        slot="footer"
+        class="dialog-footer"
+      >
         <span>存在已完成任务，无周期任务如需修改，请删除后重新下发。</span>
         <el-button @click="onHide">关闭</el-button>
       </div>
-      <div v-else slot="footer" class="dialog-footer">        
+      <div v-else slot="footer" class="dialog-footer">
         <el-button type="primary" @click="onSubmit">确定</el-button>
         <el-button @click="onHide">取消</el-button>
       </div>
@@ -358,6 +367,7 @@ import { statusOptions } from "@/views/commonOption";
 import { findAllRole, findRoleByType } from "@/api/system/role";
 import { getLabel } from "@/views/commonOption";
 import DialogSelect from "@/views/safetycheck/ruleManager/dialog.select.point.vue";
+import dayjs from "dayjs";
 export default {
   dicts: [
     "sys_org_type",
@@ -405,6 +415,13 @@ export default {
         endDate: [{ required: true, message: "请选择结束时间" }],
       },
       statusOptions: statusOptions,
+      datepickerOptions: {
+        disabledDate(time) {
+          const date = new Date();
+          date.setTime(date.getTime() - 3600 * 1000 * 24);
+          return time.getTime() < date;
+        },
+      },
     };
   },
   props: {
@@ -573,7 +590,7 @@ export default {
         return false;
       }
 
-      if(this.formData.planCycle==6 && this.formData.taskHasCompleted==1){
+      if (this.formData.planCycle == 6 && this.formData.taskHasCompleted == 1) {
         return true;
       }
 
@@ -591,7 +608,7 @@ export default {
         return false;
       }
 
-      if(this.formData.planCycle==6 && this.formData.taskHasCompleted==1){
+      if (this.formData.planCycle == 6 && this.formData.taskHasCompleted == 1) {
         return true;
       }
 
@@ -835,23 +852,27 @@ export default {
     onSubmit() {
       this.$refs.form.validate(async (isValidate) => {
         if (!isValidate) return;
-        this.loading = true;
+
         // console.log(this.formData.hasEdit,"this.formData.hasEdit")
         this.formData.planCreateOrgId = this.orgId;
         this.formData.planCreateOrgName = this.orgName;
 
         this.formData.rulePointList =
           this.tableData == null ? [] : this.tableData;
-        // let rols = this.formData.roleList;
-        // let rolis = this.formData.roleIds;
-        // this.formData.roleList = null;
-        // this.formData.roleIds =
-        //   this.selectedValues.length == 0 ? null : this.selectedValues;
+        if (
+          this.formData.planCycle == "6" &&
+          dayjs(this.formData.endDate).isBefore(this.formData.startDate)
+        ) {
+          this.$message.info("开始时间不能晚于结束时间");
+          return;
+        }
 
-        // if (this.formData.planCycle == 6) {
-        //   this.formData.buildTaskNow = true;
-        // }
+        if(this.formData.rulePointList.length==0){
+          this.$message.info("请选择检查内容");
+          return;
+        }
 
+        this.loading = true;
         if (this.formData.planStatus == 1) {
           let msg;
           let imme;
@@ -914,4 +935,9 @@ export default {
   display: flex;
   align-items: center;
 }
+.org-selector {
+  ::v-deep .tags-box {
+    width: calc(100% - 13px) !important;
+  }
+}
 </style>

src/views/safetycheck/plan/index.vue

@@ -215,8 +215,9 @@
             <el-table-column
               prop="planName"
               label="任务名称"
+              align="center"
               width="250px"
-              :show-overflow-tooltip="true"
+              show-overflow-tooltip
               v-if="columns[1].visible"
             ></el-table-column>
 
@@ -224,7 +225,7 @@
               prop="checkType"
               label="任务类型"
               align="center"
-              width="180px"
+              width="300px"
               v-if="columns[2].visible"
             >
               <template slot-scope="r"
@@ -235,7 +236,8 @@
               prop="planCreateOrgName"
               label="创建机构"
               align="center"
-              width="180px"
+              width="150px"
+              show-overflow-tooltip
               v-if="columns[3].visible"
             >
             </el-table-column>
@@ -243,7 +245,8 @@
               prop="planOfOrgName"
               label="行社名称"
               align="center"
-              width="180px"
+              width="150px"
+              show-overflow-tooltip
               v-if="columns[4].visible"
             >
             </el-table-column>
@@ -251,7 +254,7 @@
             <el-table-column
               prop="execOrgType"
               align="center"
-              width="180px"
+              width="150px"
               label="检查主体"
               v-if="columns[5].visible"
             >
@@ -263,7 +266,7 @@
             <el-table-column
               prop="typeNames"
               align="center"
-              width="180px"
+              width="150px"
               label="受检机构"
               v-if="columns[6].visible"
             >
@@ -275,21 +278,21 @@
             <el-table-column
               prop="roleNames"
               align="center"
-              width="180px"
+              width="200px"
               label="检查人员"
+              show-overflow-tooltip
               v-if="columns[7].visible"
             >
               <template slot-scope="scope">
                 <template v-for="item in splitRoleNames(scope.row.roleNames)">
                   {{ item }}
-                  <br />
                 </template> </template
             ></el-table-column>
             <el-table-column
               prop="planCycle"
               label="任务周期"
               align="center"
-              width="180px"
+              width="120px"
               v-if="columns[8].visible"
             >
               <template slot-scope="r"
@@ -301,7 +304,7 @@
               prop="count"
               label="任务次数"
               align="center"
-              width="180px"
+              width="120px"
               v-if="columns[9].visible"
             ></el-table-column>
 
@@ -309,7 +312,7 @@
               prop="planStatus"
               label="任务状态"
               align="center"
-              width="180px"
+              width="120px"
               v-if="columns[10].visible"
             >
               <template slot-scope="r"

src/views/safetycheck/rule/index.vue

@@ -122,12 +122,14 @@
               align="center"
               prop="name"
               label="检查手册名称"
+              show-overflow-tooltip
               v-if="columns[1].visible"
             ></el-table-column>
             <el-table-column
               align="center"
               prop="orgType"
               label="受检机构类型"
+              width="200"
               v-if="columns[2].visible"
             >
               <template slot-scope="r"
@@ -144,6 +146,7 @@
               align="center"
               prop="status"
               label="状态"
+              width="150"
               v-if="columns[4].visible"
             >
               <template slot-scope="r">
@@ -154,6 +157,7 @@
               align="center"
               prop="remark"
               label="备注"
+              show-overflow-tooltip
               v-if="columns[5].visible"
             ></el-table-column>
             <el-table-column align="center" label="操作" width="300">

src/views/safetycheck/task/index.vue

@@ -216,7 +216,7 @@
               prop="title"
               label="任务名称"
               width="250px"
-              :show-overflow-tooltip="true"
+              show-overflow-tooltip
               v-if="columns[1].visible"
             >
             </el-table-column>
@@ -225,6 +225,7 @@
               prop="checkOrgName"
               label="检查主体"
               width="180px"
+              show-overflow-tooltip
               v-if="columns[2].visible"
             >
             </el-table-column>
@@ -232,7 +233,8 @@
               prop="roleName"
               label="检查人员"
               align="center"
-              width="180px"
+              width="200px"
+              show-overflow-tooltip
               v-if="columns[3].visible"
             >
               <template slot-scope="r">
@@ -266,7 +268,8 @@
               prop="orgName"
               label="受检机构"
               align="center"
-              width="180px"
+              width="250px"
+              show-overflow-tooltip
               v-if="columns[5].visible"
             >
             </el-table-column>

src/views/system/user/index.vue

@@ -324,7 +324,7 @@
                     type="text"
                     icon="el-icon-key"
                     v-if="scope.row.source == 0"
-                    @click="handleResetPwd(scope.row)"
+                    @click="handleRestPassword(scope.row)"
                     v-hasPermi="['system:user:resetPwd']"
                     >重置密码</el-button
                   >
@@ -341,6 +341,32 @@
         </div>
       </el-col>
     </el-row>
+  <!-- 重置密码对话框 -->
+    <DialogCom :title="title" :visible.sync="close" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+       
+          <el-col :span="10">
+            <el-form-item  label="密码" prop="password" >
+              <el-input
+              style="width: 317px;"
+                v-model="form.password"
+                placeholder="请输入密码"
+                autocomplete="off"
+                type="password"
+                maxlength="20"
+                show-password
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitRest">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </DialogCom>
+
 
     <!-- 添加或编辑配置对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="800px" append-to-body>
@@ -588,6 +614,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      close:false,
       // 机构名称
       deptName: null,
       isRoleIdsChanged: false,
@@ -691,13 +718,6 @@ export default {
         orgId: [
           { required: true, message: "所属机构不能为空", trigger: "blur" },
         ],
-        // email: [
-        //   {
-        //     type: "email",
-        //     message: "请输入正确的邮箱地址",
-        //     trigger: ["blur", "change"]
-        //   }
-        // ],
         phone: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
@@ -872,6 +892,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.close=false;
       this.reset();
     },
     // 表单重置
@@ -928,6 +949,15 @@ export default {
         this.form.password = this.initPassword;
       });
     },
+    handleRestPassword(row) {
+      this.reset();
+      const userId = row.id || this.ids;
+      getUser(userId).then((response) => {
+        this.form.id = response.data.id;
+        this.close = true;
+        this.title = "重置密码";
+      });
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.isRoleIdsChanged = false;
@@ -952,31 +982,63 @@ export default {
 
     /** 重置密码按钮操作 */
     handleResetPwd(row) {
-      console.log(row, "row");
-      this.$prompt('请输入"' + row.name + '"的新密码', "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        closeOnClickModal: false,
-        inputPattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z0-9_]{8,16}$/,
-        inputErrorMessage:
-          "用户密码长度介于8和16之间，只能输入字母、数字及_，必须包含大小写字母和数字",
-      })
-        .then(({ value }) => {
-          let data = {
-            id: row.userId,
-            password: value,
-          };
-          resetUserPwd(data).then((response) => {
-            this.$modal.msgSuccess("修改成功，新密码是：" + value);
+      // console.log(row, "row");
+      // this.$prompt('请输入"' + row.name + '"的新密码', "提示", {
+      //   confirmButtonText: "确定",
+      //   cancelButtonText: "取消",
+      //   closeOnClickModal: false,
+      //   inputPattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z0-9_]{8,16}$/,
+      //   inputErrorMessage:
+      //     "用户密码长度介于8和16之间，只能输入字母、数字及_，必须包含大小写字母和数字",
+      // })
+      //   .then(({ value }) => {
+      //     let data = {
+      //       id: row.userId,
+      //       password: value,
+      //     };
+      //     resetUserPwd(data).then((response) => {
+      //       this.$modal.msgSuccess("修改成功，新密码是：" + value);
+      //     });
+      //   })
+      //   .catch(() => {});
+      console.log(this.form.id, "row");
+      let data = {
+             id: this.form.id,
+             password: this.form.password,
+           };
+      resetUserPwd(data).then((response) => {
+             this.$modal.msgSuccess("修改成功，新密码是：" + value);
           });
-        })
-        .catch(() => {});
     },
     /** 分配角色操作 */
     handleAuthRole: function (row) {
       const userId = row.id;
       this.$router.push("/system/user-auth/role/" + userId);
     },
+    submitRest:function (){
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          console.log(this.form, "this.form");
+          if (this.form.id != undefined) {
+            // console.log(this.form, "this.form");
+            // updateUser(this.form).then((response) => {
+            //   this.$modal.msgSuccess("修改成功");
+            //   this.close = false;
+            //   this.getList();
+            // });
+         
+            let data = {
+             id: this.form.id,
+             password: this.form.password,
+           };
+            resetUserPwd(data).then((response) => {
+             this.$modal.msgSuccess("修改成功，新密码是：" + this.form.password);
+             this.close = false;
+          });
+          } 
+        }
+      });
+    },
     /** 提交按钮 */
     submitForm: function () {
       this.$refs["form"].validate((valid) => {

src/views/system/workTimeSet/workTime.vue

@@ -134,25 +134,25 @@
               label="机构"
               :show-overflow-tooltip="true"
             ></el-table-column>
-            <el-table-column align="center" label="日期">
+            <el-table-column align="center" label="日期"  width="150">
               <span slot-scope="scope">{{ scope.row.ymdDate }}</span>
             </el-table-column>
-            <el-table-column align="center" label="营业状态">
+            <el-table-column align="center" label="营业状态" width="120">
               <template slot-scope="r">{{
                 r.row.isEnable == "1" ? "营业" : "歇业"
               }}</template>
             </el-table-column>
-            <el-table-column align="center" label="值班打卡">
+            <el-table-column align="center" label="值班打卡"  width="120">
               <template slot-scope="r">{{
                 r.row.isDuty == "1" ? "是" : "否"
               }}</template>
             </el-table-column>
-            <el-table-column v-if="columns[3].visible" label="上下班时间">
+            <el-table-column v-if="columns[3].visible" label="上下班时间"  width="150"  align="center">
               <template slot-scope="r">
                 <span>{{ r.row.workTime }}-{{ r.row.workOffTime }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="营业时间">
+            <el-table-column align="center" label="营业时间"  width="150">
               <template slot-scope="r">
                 <span>{{ r.row.openTime }}-{{ r.row.closeTime }}</span>
               </template>
@@ -166,6 +166,8 @@
               align="center"
               prop="modifiedName"
               label="更新人"
+              width="150"
+              show-overflow-tooltip
             ></el-table-column>
             <el-table-column align="center" label="更新时间" width="180">
               <span slot-scope="scope">{{ scope.row.updateTime }}</span>

src/views/system/workTimeSet/workTimeWeek.vue

@@ -84,8 +84,8 @@
             <el-table-column label="序号" type="index" align="center" width="70"></el-table-column>
             <el-table-column prop="orgName" align="center" label="机构" :show-overflow-tooltip="true"></el-table-column>
             <el-table-column prop="effectiveDate" align="center" label="生效日期" width="160"></el-table-column>
-            <el-table-column prop="workDay" align="center" label="工作日" width="240"></el-table-column>
-            <el-table-column prop="modifiedName" align="center" label="更新人" width="160"></el-table-column>
+            <el-table-column prop="workDay" align="center" label="工作日" width="300"></el-table-column>
+            <el-table-column prop="modifiedName" align="center" label="更新人" width="160" show-overflow-tooltip></el-table-column>
             <el-table-column prop="updateTime" align="center" label="更新时间" width="180"></el-table-column>
             <el-table-column label="操作" align="center"  width="140" >
               <template slot-scope="r">