岗位，字典类型状态bug更改，字典管理时间选择范围查询bug更改

src/views/system/dict/data.vue

@@ -203,7 +203,7 @@
 
 <script>
 import { listData, getData, delData, addData, updateData, exportData, checkDictLabelUnique } from '@/api/system/dict/data'
-import { listType, getType } from '@/api/system/dict/type'
+import {listType, getType, updateType} from '@/api/system/dict/type'
 import dictCons from '@/utils/dictCons'
 
 export default {
@@ -258,20 +258,7 @@ export default {
       // 是否显示弹出层
       open: false,
       // 状态数据字典
-      statusOptions: [
-        {
-          dictLabel: '全部',
-          dictValue: ''
-        },
-        {
-          dictLabel: '启用',
-          dictValue: '0'
-        },
-        {
-          dictLabel: '停用',
-          dictValue: '1'
-        }
-      ],
+      statusOptions: [],
       // 类型数据字典
       typeOptions: [],
       // 查询参数
@@ -313,23 +300,20 @@ export default {
     // 状态
     changeStatus(row) {
       const text = row.flag === '1' ? '启用' : '停用'
-      const title = `“${row.dictLabel}”参数即将被${row.status === '0' ? '停用' : '启用'},是否继续？`
-      this.$confirm(title, '提示', {
+      this.$confirm('确认要"' + text + '""' + row.dictLabel + '"吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {
-        const row2 = Object.assign({}, row)
-        row2.status = row2.status === '0' ? '1' : '0'
-        updateData(row2).then(res => {
-          row.status = row.status === '0' ? '1' : '0'
-        }).catch()
+      }).then(function() {
+        return updateData(row)
       }).then(() => {
         this.$message({
           message: text + '成功',
           type: 'success'
         })
-      }).catch()
+      }).catch(function() {
+        row.flag = row.flag === '0' ? '1' : '0'
+      })
     },
     /** 查询字典类型详细 */
     getType(dictId) {

src/views/system/dict/index.vue

@@ -124,7 +124,7 @@
             <div v-else>-</div>
           </template>
         </el-table-column>
-        <el-table-column label="状态" align="center" prop="flag" :formatter="statusFormat" >
+        <el-table-column label="状态" align="center" prop="flag" :formatter="statusFormat">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.flag"
@@ -132,8 +132,7 @@
               inactive-value="0"
               active-value="1"
               @click.native="handleStatusChange(scope.row)"
-            >
-            </el-switch>
+            />
           </template>
         </el-table-column>
         <el-table-column label="备注" prop="remarks" :show-overflow-tooltip="true">
@@ -242,11 +241,11 @@ import { listType,
   selectDictType
 } from '@/api/system/dict/type'
 import dictCons from '@/utils/dictCons'
-import Template from "@/views/instance/Template";
+import Template from '@/views/instance/Template'
 
 export default {
   name: 'Dict',
-  components: {Template},
+  components: { Template },
   data() {
     const verifyTypeProp = (rule, value, callback) => {
       if (value === '' || value === undefined || value === null) {
@@ -325,7 +324,7 @@ export default {
       // 状态数据字典
       statusOptions: [],
       // 日期范围
-      // dateRange: ['', ''],
+      dateRange: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -368,7 +367,7 @@ export default {
   methods: {
     /** 查询字典类型列表 */
     getList() {
-      listType(this.queryParams).then(response => {
+      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         console.log(response)
         this.options = response.rows
         this.typeList = response.rows

src/views/system/post/index.vue

@@ -227,6 +227,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import dictCons from '@/utils/dictCons'
 import { listDept } from '@/api/system/dept'
 import { listRole } from '@/api/system/role'
+import {updateType} from "@/api/system/dict/type";
 export default {
   name: 'Post',
   components: { Treeselect },
@@ -307,20 +308,7 @@ export default {
       // 部门树选项
       deptOptions: [],
       // 状态数据字典
-      statusOptions: [
-        {
-          dictLabel: '全部',
-          dictValue: ''
-        },
-        {
-          dictLabel: '启用',
-          dictValue: '0'
-        },
-        {
-          dictLabel: '停用',
-          dictValue: '1'
-        }
-      ],
+      statusOptions: [],
       // 查询参数
       queryParams: {
         page: 1,
@@ -411,21 +399,20 @@ export default {
       })
     },
     handleStatusChange(row) {
-      const text = row.status === '0' ? '停用' : '启用'
-      const temp = JSON.parse(JSON.stringify(row))
-      this.$confirm(`“${row.postName}”职务即将被${text}，是否继续？`, '提示', {
+      const text = row.flag === '1' ? '启用' : '停用'
+      this.$confirm('确认要"' + text + '""' + row.postName + '"吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
+      }).then(function() {
+        return updatePost(row)
       }).then(() => {
-        temp.status = temp.status === '0' ? '1' : '0'
-        updatePost(temp).then(() => {
-          this.$message({
-            type: 'success',
-            message: temp.status === '0' ? '启用成功' : '停用成功'
-          })
-          row.status = temp.status
+        this.$message({
+          message: text + '成功',
+          type: 'success'
         })
+      }).catch(function() {
+        row.flag = row.flag === '0' ? '1' : '0'
       })
     },
     // 岗位状态字典翻译

src/views/system/role/index.vue

@@ -50,8 +50,8 @@
             @click="handleAdd"
           >新增</el-button>
           <el-button
-            style="padding: 8px 7px;"
             v-hasPermi="['sys:role:export']"
+            style="padding: 8px 7px;"
             type="success"
             size="small"
             icon="el-icon-download"
@@ -81,10 +81,10 @@
           </template>
         </el-table-column>
         <el-table-column label="显示顺序" prop="roleSort">
-        <template slot-scope="scope">
-          {{ scope.row.roleSort || '-' }}
-        </template>
-      </el-table-column>
+          <template slot-scope="scope">
+            {{ scope.row.roleSort || '-' }}
+          </template>
+        </el-table-column>
         <el-table-column label="状态" align="center" width="100">
           <template slot-scope="scope">
             <el-switch
@@ -92,7 +92,7 @@
               active-value="1"
               inactive-value="0"
               @change="handleStatusChange(scope.row)"
-            ></el-switch>
+            />
           </template>
         </el-table-column>
         <el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime">
@@ -110,11 +110,11 @@
               @click="handleUpdate(scope.row)"
             >修改</el-button>
             <el-button
+              v-hasPermi="['sys:role:update']"
               size="mini"
               type="text"
               icon="el-icon-circle-check"
               @click="handleMenu(scope.row)"
-              v-hasPermi="['sys:role:update']"
             >数据权限</el-button>
             <el-button
               size="mini"
@@ -160,15 +160,15 @@
           <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
           <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
           <el-tree
+            ref="menu"
             class="tree-border"
             :data="menuOptions"
             show-checkbox
-            ref="menu"
             node-key="id"
             :check-strictly="!form.menuCheckStrictly"
             empty-text="加载中，请稍后"
             :props="defaultProps"
-          ></el-tree>
+          />
         </el-form-item>
         <el-form-item label="备注">
           <el-input v-model.trim="form.remark" maxlength="200" show-word-limit type="textarea" placeholder="请输入内容" />
@@ -184,71 +184,71 @@
     <el-dialog class="roleDialog" title="数据权限信息" :visible.sync="openDataScope" width="900px" append-to-body>
       <el-row>
         <el-col style="width: 49%">
-          <el-form  ref="form" :model="form" :rules="rules" label-width="70px">
-        <el-form-item label="角色名称">
-          <el-input v-model.trim="form.roleName" placeholder="请输入角色名称" show-word-limit :maxlength="30" :disabled="true" />
-        </el-form-item>
-        <el-table
-          v-loading="loading"
-          :data="menuList"
-          row-key="businessId"
-          :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-          max-height="400px"
-        >
-<!--        <el-form-item label="权限字符">-->
-<!--          <el-input v-model.trim="form.roleKey" placeholder="请输入角色名称" show-word-limit :maxlength="30" :disabled="true" />-->
-<!--        </el-form-item>-->
-        <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-circle-check"
-              @click="handleDataScope(scope.row)"
-            >修改</el-button>
-          </template>
-        </el-table-column>
-        </el-table>
-      </el-form>
+          <el-form ref="form" :model="form" :rules="rules" label-width="70px">
+            <el-form-item label="角色名称">
+              <el-input v-model.trim="form.roleName" placeholder="请输入角色名称" show-word-limit :maxlength="30" :disabled="true" />
+            </el-form-item>
+            <el-table
+              v-loading="loading"
+              :data="menuList"
+              row-key="businessId"
+              :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+              max-height="400px"
+            >
+              <!--        <el-form-item label="权限字符">-->
+              <!--          <el-input v-model.trim="form.roleKey" placeholder="请输入角色名称" show-word-limit :maxlength="30" :disabled="true" />-->
+              <!--        </el-form-item>-->
+              <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160" />
+              <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-circle-check"
+                    @click="handleDataScope(scope.row)"
+                  >修改</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form>
         </el-col>
         <el-col style="width: 1%">
-        <div class="dividerStyle">
-        <el-divider direction="vertical"/>
-      </div>
+          <div class="dividerStyle">
+            <el-divider direction="vertical" />
+          </div>
         </el-col>
         <el-col style="width: 49%">
-        <el-form :model="form" label-width="80px">
-        <el-form-item label="菜单名称" prop="roleName">
-          <el-input v-model="form.menuName" placeholder="未选择菜单名称" disabled/>
-        </el-form-item>
-        <el-form-item label="权限范围">
-          <el-select v-model="form.dataScope">
-            <el-option
-              v-for="item in dataScopeOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="数据权限" v-show="form.dataScope == 2">
-          <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
-          <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
-          <el-tree
-            class="tree-border"
-            :data="deptOptions"
-            show-checkbox
-            default-expand-all
-            ref="dept"
-            node-key="id"
-            :check-strictly="!form.deptCheckStrictly"
-            empty-text="加载中，请稍后"
-            :props="defaultProps"
-          ></el-tree>
-        </el-form-item>
-      </el-form>
+          <el-form :model="form" label-width="80px">
+            <el-form-item label="菜单名称" prop="roleName">
+              <el-input v-model="form.menuName" placeholder="未选择菜单名称" disabled />
+            </el-form-item>
+            <el-form-item label="权限范围">
+              <el-select v-model="form.dataScope">
+                <el-option
+                  v-for="item in dataScopeOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-show="form.dataScope == 2" label="数据权限">
+              <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
+              <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
+              <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
+              <el-tree
+                ref="dept"
+                class="tree-border"
+                :data="deptOptions"
+                show-checkbox
+                default-expand-all
+                node-key="id"
+                :check-strictly="!form.deptCheckStrictly"
+                empty-text="加载中，请稍后"
+                :props="defaultProps"
+              />
+            </el-form-item>
+          </el-form>
         </el-col>
       </el-row>
       <div slot="footer" class="dialog-footer">
@@ -418,9 +418,9 @@ export default {
     },
     /** 根据角色ID查询菜单树结构 */
     getRoleMenuTreeselect(roleId) {
-      roleMenuTreeselect(roleId).then(response => {
-        this.menuOptions = response.menus
-        this.$refs.menu.setCheckedKeys(response.checkedKeys)
+      return roleMenuTreeselect(roleId).then(response => {
+        this.menuOptions = response.data.menus
+        return response
       })
     },
     /** 根据角色ID和菜单ID查询部门树结构 */
@@ -505,9 +505,9 @@ export default {
     // 树权限（父子联动）
     handleCheckedTreeConnect(value, type) {
       if (type === 'menu') {
-        this.form.menuCheckStrictly = value ? true : false
+        this.form.menuCheckStrictly = !!value
       } else if (type === 'dept') {
-        this.form.deptCheckStrictly = value ? true : false
+        this.form.deptCheckStrictly = !!value
       }
     },
     // 树权限（全选/全不选）

src/views/system/user/index.vue

@@ -2,16 +2,16 @@
   <div class="user-manage">
     <div class="search" style="border-bottom: 14px solid #f4f4f4">
       <el-form ref="queryForm" style="padding: 0 0 0 10px" class="formClass" :model="queryParams" v-show="showSearch" :inline="true" label-width="auto">
-        <el-form-item label="用户类型" prop="name" class="noMargin">
-          <el-input
-            v-model="queryParams.name"
-            placeholder="请输入用户类型"
-            clearable
-            :maxlength="30"
-            size="small"
-            style="width: 150px"
-          />
-        </el-form-item>
+<!--        <el-form-item label="用户类型" prop="name" class="noMargin">-->
+<!--          <el-input-->
+<!--            v-model="queryParams.name"-->
+<!--            placeholder="请输入用户类型"-->
+<!--            clearable-->
+<!--            :maxlength="30"-->
+<!--            size="small"-->
+<!--            style="width: 150px"-->
+<!--          />-->
+<!--        </el-form-item>-->
         <el-form-item label="登录名" prop="username">
           <el-input
             v-model="queryParams.username"