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

src/directive/permission/hasPermi.js

@@ -18,10 +18,9 @@ export default {
       const hasPermissions = permissions.some(permission => {
         return all_permission === permission || permissionFlag.includes(permission)
       })
-
       if (!hasPermissions) {
+        //console.log(el.parentNode,'el')
         el.parentNode && el.parentNode.removeChild(el);
-        //console.log(el,'el.parentNode')
       }
     } else {
       throw new Error(`请设置操作权限标签值`)

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

@@ -545,7 +545,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除教育培训计划"' + row.planName).then(function () {
+      this.$modal.confirm('是否确认删除教育培训计划:' + row.planName).then(function () {
         return delPlan(ids);
       }).then(() => {
         this.getList();

src/views/system/user/index.vue

@@ -801,8 +801,8 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         closeOnClickModal: false,
-        inputPattern: /^.{5,20}$/,
-        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+        inputPattern: /^(?=.[a-z])(?=.[A-Z])(?=.*\d)[\s\S]{8,16}$/,
+        inputErrorMessage: "用户密码长度介于8和16之间，必须包含大小写字母和数字",
       })
         .then(({ value }) => {
           let data = {

src/views/system/workTimeSet/index.vue

@@ -5,7 +5,7 @@
       <el-tab-pane label="作息配置" name="作息配置">
         <work-time></work-time>
       </el-tab-pane>
-      <el-tab-pane v-hasPermi="['system:time:query']" label="按周配置作息" name="按周配置作息">
+      <el-tab-pane v-hasPermi="['system:time:week']" label="按周配置作息" name="按周配置作息">
         <work-time-week ></work-time-week>
       </el-tab-pane>
     </el-tabs>

src/views/system/workTimeSet/workTime.vue

@@ -78,7 +78,7 @@
               size="mini"
               icon="el-icon-thumb"
               @click="clickAdd"
-              v-hasPermi="['system:user:add']"
+              v-hasPermi="['system:time:add']"
             >指定日期配置</el-button>
           </el-col>
           <el-col :span="1.5">
@@ -122,7 +122,7 @@
           </el-table-column>
           <el-table-column v-if="columns[8].visible" label="操作列表" width="100" >
             <template slot-scope="r">
-              <el-button type="text"  v-hasPermi="['system:user:edit']" @click="onEditTime(r.row)">编辑</el-button>
+              <el-button type="text"  v-hasPermi="['system:time:edit']" @click="onEditTime(r.row)">编辑</el-button>
             </template>
           </el-table-column>
         </el-table>