Merge branch 'dev' of http://192.168.0.56:3000/zzyuan/gz-att-web into dev

src/views/setting/rules/index.vue

@@ -115,7 +115,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="参与考勤人员：" prop="checkList">
-                  <treeselect v-model="form.checkList" :multiple="true" :flat="false" :options="personOptions" :normalizer="normalizer" placeholder="选择部门和人员" @input="handleSelect"/>
+                  <treeselect v-model="form.checkList" :multiple="true" :flat="true" :options="personOptions" :normalizer="normalizer" placeholder="选择部门和人员" @input="handleSelect"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -351,11 +351,6 @@
       //数据操作
       changeData(data)  { // 存在子集就不让禁止，父级让禁止
         data.map(item => {
-          // if(item.children.length == 0&&item.disabled&&!item.isChecked){
-          //   item.isDisabled = true
-          // }else{
-          //       item.isDisabled = false
-          // }
           if (item.disabled) {
             if (item.isChecked) {
               item.isDisabled = false
@@ -371,17 +366,8 @@
       },
       handleSelect(value, instanceId) { 
         console.log('Selected:', value);
-        // value.forEach(item=>{
-        //   if(item.indexOf("|")<0){
-        //     console.log(item) 
-        //     this.checkChild(item)
-        //   }
-        // }) 
       },
       
-
-
-
       /** 转换部门数据结构 */
       normalizer(node) {
         if (node.children && !node.children.length) {

src/views/system/role/index.vue

@@ -599,7 +599,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const roleIds = row.roleId || this.ids;
-      this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除角色？').then(function() {
         return delRole(roleIds);
       }).then(() => {
         this.getList();