zhengnaiwen_citu 5 mesi fa
parent
commit
52fdddba3d

+ 8 - 0
src/views/salary/solution/salarySolution/salarySolutionRules.vue

@@ -4,6 +4,14 @@
       <el-form-item label="名称">
         <el-tag color="primary">{{ itemData.title }}</el-tag>
       </el-form-item>
+      <el-form-item label="类型">
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="用户管理" name="first">用户管理</el-tab-pane>
+          <el-tab-pane label="配置管理" name="second">配置管理</el-tab-pane>
+          <el-tab-pane label="角色管理" name="third">角色管理</el-tab-pane>
+          <el-tab-pane label="定时任务补偿" name="fourth">定时任务补偿</el-tab-pane>
+        </el-tabs>
+      </el-form-item>
       <el-form-item label="参数配置">
         <m-table
           shadow="naver"

+ 1 - 1
src/views/system/role/roleMenu.vue

@@ -62,7 +62,7 @@ export default {
       }
     },
     async handleSaveMenu () {
-      const menuIds = this.$refs.menuTree.getCheckedKeys(true)
+      const menuIds = this.$refs.menuTree.getCheckedKeys(false, true)
       if (!menuIds.length) {
         this.$message.warning('请选择菜单')
         return

+ 0 - 6
src/views/workOrder/components/IndexPage.vue

@@ -41,11 +41,6 @@ export default {
   },
   data () {
     return {
-      // statusList: [
-      //   { text: '我发起的 ', color: 'default' },
-      //   { text: '待我审批 ', color: 'warning' },
-      //   { text: '我已审批 ', color: 'success' }
-      // ],
       searchItems: [
         {
           label: '名称',
@@ -62,7 +57,6 @@ export default {
       headers: [
         { label: '名称', prop: 'title' },
         { label: '发起人', prop: 'createUserName' },
-        // { label: '状态', prop: 'opType', align: 'center' },
         { label: '发起时间', prop: 'createDate' },
         { label: '版本号', prop: 'version' },
         { label: '操作', prop: 'actions', fixed: 'right', width: 300 }