Browse Source

对接 角色管理。删除多余文件

chenrui 4 years ago
parent
commit
de41008960

+ 35 - 0
src/api/customerBundle.js

@@ -0,0 +1,35 @@
+import { axios } from '@/utils/request'
+
+export const listCustomerBundle = params => {
+  const url = `customerBundle/queryLike/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+
+  return axios.request({
+    url: url,
+    data: params,
+    method: 'post'
+  }).then(res => res.data)
+}
+
+export const customerBundleDetail = (params) => {
+  return axios.request({
+    url: `customerBundle/detail/${params.id}`,
+    method: 'get'
+  }).then(res => res.data)
+}
+
+export const customerBundleHistory = (params) => {
+  return axios.request({
+    url: `customerBundle/useHistory/${params.id}`,
+    method: 'get'
+  }).then(res => res.data)
+}
+
+// 取消购买套餐
+export const cancelBuy = (params) => {
+  return axios.request({
+    url: `customerBundle/cancel/${params.id}`,
+    method: 'get'
+  }).then(res => res.data)
+}

+ 0 - 45
src/api/job.js

@@ -1,45 +0,0 @@
-import { axios } from '@/utils/request'
-
-export const listJob = (params) => {
-  let url = `/job/queryJob/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-export const pauseJob = (params) => {
-  return axios({
-    url: '/job/pauseJob',
-    data: params,
-    method: 'post'
-  })
-}
-export const resumeJob = (params) => {
-  return axios({
-    url: '/job/resumeJob',
-    data: params,
-    method: 'post'
-  })
-}
-export const delJob = (params) => {
-  return axios({
-    url: `job/delJob/${params.id}`,
-    method: 'get'
-  })
-}
-export const addJob = (params) => {
-  return axios({
-    url: '/job/addJob',
-    data: params,
-    method: 'post'
-  })
-}
-export const callJob = (params) => {
-  return axios({
-    url: `job/callJob/${params.id}`,
-    method: 'get'
-  })
-}

+ 6 - 6
src/api/power-role.js

@@ -2,7 +2,7 @@ import { axios } from '@/utils/request'
 
 // 分页查询角色
 export const getPowerRoleList = params => {
-  const url = `role/queryLike/${params.pageNo}/${params.pageSize}`
+  const url = `scrole/queryLike/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -14,7 +14,7 @@ export const getPowerRoleList = params => {
 // 保存角色
 export const saveRolePower = params => {
   return axios({
-    url: 'role/save',
+    url: 'scrole/save',
     data: params,
     method: 'POST'
   })
@@ -22,7 +22,7 @@ export const saveRolePower = params => {
 // flag 0:禁用 1:启用  启禁用角色
 export const updateEnableStatus = params => {
   return axios({
-    url: `role/enable/${params.id}/${params.flag}`,
+    url: `scrole/enable/${params.id}/${params.flag}`,
     data: {},
     method: 'get'
   })
@@ -30,14 +30,14 @@ export const updateEnableStatus = params => {
 // 删除角色
 export const delectRolePower = params => {
   return axios({
-    url: `role/delete/${params.id}`,
+    url: `scrole/delete/${params.id}`,
     data: {},
     method: 'get'
   })
 }
 // 查询可用所有菜单
 export const getMenuList = params => {
-  const url = `role/findAllMenu/${params.id}`
+  const url = `scrole/findAllMenu/${params.id}`
   return axios({
     url: url,
     method: 'get'
@@ -45,7 +45,7 @@ export const getMenuList = params => {
 }
 // 保存角色菜单关系
 export const addMenuPower = params => {
-  const url = `role/saveRoleMenu`
+  const url = `scrole/saveRoleMenu`
   return axios({
     url: url,
     data: params,

+ 6 - 6
src/api/power-user.js

@@ -3,7 +3,7 @@ import { axios } from '@/utils/request'
 // 重置密码
 export const resetPSD = params => {
   return axios({
-    url: 'user/resetPwd',
+    url: 'scuser/resetPwd',
     data: params,
     method: 'POST'
   })
@@ -11,14 +11,14 @@ export const resetPSD = params => {
 // 启用禁用
 export const updateEnableStatus = params => {
   return axios({
-    url: `user/enable/${params.id}/${params.flag}`,
+    url: `scuser/enable/${params.id}/${params.flag}`,
     data: {},
     method: 'get'
   })
 }
 // 分页查询用户
 export const getPowerUserList = params => {
-  const url = `user/queryLike/${params.pageNo}/${params.pageSize}`
+  const url = `scuser/queryLike/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -30,7 +30,7 @@ export const getPowerUserList = params => {
 // 删除用户接口
 export const delectUserPower = params => {
   return axios({
-    url: `user/delete/${params.id}`,
+    url: `scuser/delete/${params.id}`,
     data: {},
     method: 'get'
   })
@@ -38,7 +38,7 @@ export const delectUserPower = params => {
 // 查询所有角色
 export const getRoleList = params => {
   return axios({
-    url: 'role/findAll',
+    url: 'scrole/findAll',
     data: params,
     method: 'POST'
   })
@@ -46,7 +46,7 @@ export const getRoleList = params => {
 // 保存用户
 export const saveUserPower = params => {
   return axios({
-    url: 'user/save',
+    url: 'scuser/save',
     data: params,
     method: 'POST'
   })

+ 0 - 22
src/api/register.js

@@ -1,22 +0,0 @@
-import { axios } from '@/utils/request'
-
-export const listRegister = () => {
-  return axios({
-    url: 'register/findAll',
-    method: 'get'
-  })
-}
-
-export const saveRegister = params => {
-  return axios({
-    url: 'register/save',
-    data: params,
-    method: 'post'
-  })
-}
-export const delRegisterNode = params => {
-  return axios({
-    url: `register/del/${params.id}`,
-    method: 'get'
-  })
-}

+ 0 - 58
src/api/send-coupon-role.js

@@ -1,58 +0,0 @@
-import { axios } from '@/utils/request'
-
-// 获取角色列表数据
-export const getRoleList = params => {
-  const url = `mdrole/queryLike/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-
-// 启用禁用角色   flag 0:禁用 1:启用
-export const changeRoleStatus = params => {
-  return axios({
-    url: `mdrole/enable/${params.id}/${params.flag}`,
-    params: params,
-    method: 'get'
-  })
-}
-
-// 查询发券可用所有菜单
-export const getAllUsedMenu = params => {
-  return axios({
-    url: `mdrole/findAllMenu/${params.id}`,
-    data: {},
-    method: 'get'
-  })
-}
-
-// 保存新修改的可用菜单
-export const getAllNewMenu = params => {
-  return axios({
-    url: `mdrole/saveRoleMenu`,
-    data: params,
-    method: 'post'
-  })
-}
-
-// 新增-编辑角色
-export const getEnableRole = params => {
-  return axios({
-    url: 'mdrole/save',
-    data: params,
-    method: 'post'
-  })
-}
-
-// 删除角色
-export const getDelRole = params => {
-  return axios({
-    url: `mdrole/delete/${params.id}`,
-    data: params,
-    method: 'get'
-  })
-}

+ 0 - 61
src/api/send-coupon-user.js

@@ -1,61 +0,0 @@
-import { axios } from '@/utils/request'
-
-// 重置密码
-export const resetPSD = params => {
-  return axios({
-    url: 'employee/restPWD',
-    data: params,
-    method: 'POST'
-  })
-}
-
-// 获取列表数据
-export const getUserList = params => {
-  const url = `employee/queryLike/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'POST'
-  })
-}
-
-// 获取网点名称列表
-export const storeList = params => {
-  const url = `store/query/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-
-// 删除用户接口
-export const delectUser = params => {
-  return axios({
-    url: `employee/del/${params.id}`,
-    data: {},
-    method: 'get'
-  })
-}
-
-// 新增/编辑保存接口
-export const saveUser = params => {
-  return axios({
-    url: 'employee/save',
-    data: params,
-    method: 'POST'
-  })
-}
-
-// 获取角色列表数据
-export const getRoleList = params => {
-  return axios.request({
-    url: '/mdrole/findAll',
-    data: params,
-    method: 'POST'
-  })
-}

+ 0 - 44
src/config/router.config.js

@@ -131,50 +131,6 @@ export const asyncRouterMap = [{
         }
       }
     ]
-  },
-  {
-    path: '/setting',
-    redirect: '/setting/userList',
-    component: PageView,
-    meta: {
-      title: '系统设置',
-      icon: 'setting'
-      // permission: 'M_setting_0'
-    },
-    children: [{
-      path: '/setting/dataDictionary',
-      name: 'powerDD',
-      component: () => import(/* webpackChunkName: "setting" */
-        '@/views/power/dataDictionary/dataDictionary.vue'),
-      meta: {
-        title: '数据字典管理',
-        icon: 'database'
-        // permission: 'M_sys_dataDictionary'
-      }
-    }
-      // 暂时屏蔽,后期可能需要
-      // {
-      //   path: '/setting/register',
-      //   name: 'powerRegister',
-      //   component: () => import( /* webpackChunkName: "setting" */ '@/views/power/register/register.vue'),
-      //   meta: {
-      //     title: '参数管理',
-      //     icon: 'key'
-      //     // permission: 'M_sys_register'
-      //   }
-      // },
-      // 暂时屏蔽,后期可能需要
-      // {
-      //   path: '/setting/jobs',
-      //   name: 'powerJobs',
-      //   component: () => import( /* webpackChunkName: "setting" */ '@/views/power/job/jobs.vue'),
-      //   meta: {
-      //     title: '定时器',
-      //     icon: 'alert'
-      //     // permission: 'M_sys_job'
-      //   }
-      // }
-    ]
   }
   ]
 },

+ 19 - 27
src/views/SetmealSales/PurchasedSetmeal.vue

@@ -17,26 +17,26 @@
           </a-col>
           <a-col :span="6">
             <a-form-item label="订单号" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-input v-model.trim="searchForm.orderNo" id="purchasedSetmeal-orderNo" placeholder="请输入" allowClear />
+              <a-input v-model.trim="searchForm.number" id="purchasedSetmeal-number" placeholder="请输入" allowClear />
             </a-form-item>
           </a-col>
           <a-col :span="6">
             <a-form-item label="客户信息" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-input v-model.trim="searchForm.customerMobile" id="purchasedSetmeal-info" placeholder="手机号/车牌号" allowClear />
+              <a-input v-model.trim="searchForm.queryWord" id="purchasedSetmeal-queryWord" placeholder="手机号/车牌号" allowClear />
             </a-form-item>
           </a-col>
           <a-col :span="6">
             <a-form-item label="套餐名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <a-input v-model.trim="searchForm.customerMobile" id="purchasedSetmeal-name" placeholder="请输入" allowClear />
+              <a-input v-model.trim="searchForm.bundleName" id="purchasedSetmeal-bundleName" placeholder="请输入" allowClear />
             </a-form-item>
           </a-col>
           <a-col :span="6">
             <a-form-item label="状态" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
               <v-select
-                v-model="searchForm.orderStatus"
-                ref="orderStatus"
+                v-model="searchForm.refundStatus"
+                ref="refundStatus"
                 id="purchasedSetmeal-status"
-                code="ORDER_STATUS"
+                code="REFUND_STATUS"
                 placeholder="请选择"
                 allowClear></v-select>
             </a-form-item>
@@ -85,14 +85,9 @@
 import { STable, VSelect } from '@/components'
 import getDate from '@/libs/getDate.js'
 import { completeDate } from '@/libs/tools.js'
-import {
-  itemList,
-  storeList,
-  orderTotal,
-  exportOrder
-} from '@/api/order.js'
-import SetmealDetailModal from './SetmealDetailModal.vue'
 import moment from 'moment'
+import SetmealDetailModal from './SetmealDetailModal.vue'
+import { listCustomerBundle } from '@/api/customerBundle.js'
 export default {
   name: 'PurchasedSetmeal',
   components: { STable, VSelect, SetmealDetailModal },
@@ -101,13 +96,12 @@ export default {
       storeId: [], // 网点名称
       // 查询参数
       searchForm: {
-        beginDate: null, // 创建的开始时间
-        endDate: null, // 创建的结束时间
-        storeIdList: [], // 网点名称
-        orderNo: '', // 单号
-        itemId: undefined, // 服务项目
-        customerMobile: '', // 手机号码
-        orderStatus: '' // 状态
+        beginDate: null, // 开始时间
+        endDate: null, // 结束时间
+        bundleName: '', // 套餐名称
+        number: '', // 订单号
+        queryWord: '', // 客户信息
+        refundStatus: '' // 状态
       },
       loading: false, // 导出loading
       orderTotal: '', // 合计开单数量
@@ -136,7 +130,7 @@ export default {
       loadData: parameter => {
         this.searchForm.beginDate == null ? this.searchForm.beginDate = getDate.getToday().starttime : null
         this.searchForm.endDate == null ? this.searchForm.endDate = getDate.getToday().endtime : null
-        return storeList(Object.assign(parameter, this.searchForm)).then(res => {
+        return listCustomerBundle(Object.assign(parameter, this.searchForm)).then(res => {
           if (res.status == 200) {
             const no = (res.data.pageNo - 1) * res.data.pageSize
             for (let i = 0; i < res.data.list.length; i++) {
@@ -198,15 +192,13 @@ export default {
       const params = {
         beginDate: this.searchForm.beginDate,
         endDate: this.searchForm.endDate,
-        storeIdList: this.searchForm.storeIdList,
-        orderNo: this.searchForm.orderNo,
-        itemId: this.searchForm.itemId,
-        customerMobile: this.searchForm.customerMobile,
-        orderStatus: this.searchForm.orderStatus
+        bundleName: this.searchForm.bundleName,
+        number: this.searchForm.number,
+        queryWord: this.searchForm.queryWord,
+        refundStatus: this.searchForm.refundStatus
       }
       params.beginDate == null ? params.beginDate = getDate.getToday().starttime : null
       params.endDate == null ? params.endDate = getDate.getToday().endtime : null
-      params.storeIdList = this.storeId
       orderTotal(params).then(res => {
         console.log(res, '--------')
         if (res.status == 200) {

+ 0 - 315
src/views/power/dataDictionary/codeItemModal.vue

@@ -1,315 +0,0 @@
-<template>
-  <div>
-    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancle="cancel">
-      <a-form :form="form" @submit="handleSubmit">
-        <a-row :gutter="24">
-          <a-col :span="24">
-            <!-- code -->
-            <a-form-item label="字典码" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
-              <a-input
-                disabled
-                placeholder=""
-                v-decorator="['formData.lookupCode', {
-                  initialValue: formData.lookupCode,
-                  rules: [] }]"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-row :gutter="24">
-          <a-col :span="12" style="padding-right: 0px;">
-            <!-- 名称 -->
-            <a-form-item label="名称" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
-              <a-input
-                placeholder="请输入名称"
-                v-decorator="['formData.dispName', {
-                  initialValue: formData.dispName,
-                  rules: [{ required: true, message: '请输入名称!' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <!-- 项编码 -->
-            <a-form-item label="项编码" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
-              <a-input
-                placeholder="请输入项编码"
-                v-decorator="['formData.code', {
-                  initialValue: formData.code,
-                  rules: [{ required: true, message: '请输入项编码!' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12" style="padding-right: 0px;">
-            <a-form-item label="启用" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
-              <a-radio-group
-                name="radioGroup"
-                v-decorator="[
-                  'formData.isEnable',
-                  {
-                    initialValue: formData.isEnable,
-                    rules: [] },
-                ]"
-              >
-                <a-radio :value="1">是</a-radio>
-                <a-radio :value="0">否</a-radio>
-              </a-radio-group>
-            </a-form-item>
-          </a-col>
-          <!-- 排序值 -->
-          <a-col :span="12">
-            <a-form-item label="排序值" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
-              <a-input
-                type="number"
-                placeholder="请输入排序值"
-                v-decorator="['formData.sort', {
-                  initialValue: formData.sort,
-                  rules: [{ required: true, message: '请输入排序值!' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <!-- 扩展参数 -->
-        <a-row :gutter="24">
-          <a-col :span="12" style="padding-right: 0px;">
-            <!-- 扩展一 -->
-            <a-form-item label="扩展一" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
-              <a-input
-                placeholder=""
-                v-decorator="['formData.attr1', {
-                  initialValue: formData.attr1,
-                  rules: [] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <!-- 扩展二 -->
-            <a-form-item label="扩展二" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
-              <a-input
-                placeholder=""
-                v-decorator="['formData.attr2', {
-                  initialValue: formData.attr2,
-                  rules: [] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12" style="padding-right: 0px;">
-            <!-- 扩展三 -->
-            <a-form-item label="扩展三" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
-              <a-input
-                placeholder=""
-                v-decorator="['formData.attr3', {
-                  initialValue: formData.attr3,
-                  rules: [] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <!-- 扩展四 -->
-            <a-form-item label="扩展四" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
-              <a-input
-                placeholder=""
-                v-decorator="['formData.attr4', {
-                  initialValue: formData.attr4,
-                  rules: [] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12" style="padding-right: 0px;">
-            <!-- 扩展五 -->
-            <a-form-item label="扩展五" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
-              <a-input
-                placeholder=""
-                v-decorator="['formData.attr5', {
-                  initialValue: formData.attr5,
-                  rules: [] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <!-- 扩展六 -->
-            <a-form-item label="扩展六" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
-              <a-input
-                placeholder=""
-                v-decorator="['formData.attr6', {
-                  initialValue: formData.attr6,
-                  rules: [] }]"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-row :gutter="24">
-          <a-col :span="24">
-            <a-form-item label="备注" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
-              <a-textarea
-                v-decorator="[
-                  'formData.remarks',
-                  {
-                    initialValue: formData.remarks,
-                    rules: [] },
-                ]"
-                style="min-height: 50px;"
-                placeholder=""
-                autosize />
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
-          <a-button type="primary" @click="handleSubmit()">
-            保存
-          </a-button>
-          <a-button :style="{ marginLeft: '8px' }" @click="handleCancel()">
-            取消
-          </a-button>
-        </a-form-item>
-      </a-form>
-
-    </a-modal>
-  </div>
-</template>
-
-<script>
-import { STable, VSelect } from '@/components'
-import { saveLookUpItem } from '@/api/lookup.js'
-export default {
-  name: 'CodeItemModal',
-  components: {
-    STable, VSelect
-  },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    },
-    data: {
-      type: Object,
-      default: function () {
-        return {}
-      }
-    }
-  },
-  data () {
-    return {
-      titleText: '添加字典项',
-      isshow: this.visible,
-      formLayout: 'horizontal',
-      form: this.$form.createForm(this, { name: 'miniForm' }),
-      roleList: [],
-      formData: {
-        lookupCode: '',
-        code: '', // code
-        dispName: '',
-        isEnable: 1, // 活动状态
-        sort: '',
-        attr1: '',
-        attr2: '',
-        attr3: '',
-        attr4: '',
-        attr5: '',
-        attr6: '',
-        remarks: ''
-      }
-
-    }
-  },
-  methods: {
-    cancel (e) {
-      this.clear()
-      this.$emit('close')
-    },
-
-    // 保存提交
-    handleSubmit () {
-      const _this = this
-      this.form.validateFields((err, values) => {
-        console.log(values, 'values222')
-        if (!err) {
-          saveLookUpItem(Object.assign(this.formData, values.formData)).then(res => {
-            console.log(res, 'res--save')
-            if (res.status + '' === '200') {
-              this.$message.success(res.message)
-              this.$emit('refresh')
-              setTimeout(function () {
-                _this.cancel()
-              }, 300)
-            } else {
-              this.$message.error(res.message)
-            }
-          })
-        }
-      })
-    },
-    // 取消
-    handleCancel () {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          _this.clear()
-          _this.cancel()
-        }
-      })
-    },
-    clear () {
-      this.form.resetFields()
-      delete this.formData.id
-      this.formData.lookupCode = ''
-      this.formData.code = ''
-      this.formData.dispName = ''
-      this.formData.isEnable = 1
-      this.formData.sort = ''
-      this.formData.attr1 = ''
-      this.formData.attr2 = ''
-      this.formData.attr3 = ''
-      this.formData.attr4 = ''
-      this.formData.attr5 = ''
-      this.formData.attr6 = ''
-      this.formData.remarks = ''
-    }
-
-  },
-  mounted () {
-  },
-  beforeCreate () {
-    this.form = this.$form.createForm(this, { name: 'miniForm' })
-  },
-  watch: {
-    visible (newValue, oldValue) {
-      this.isshow = newValue
-    },
-    isshow (newValue, oldValue) {
-      if (newValue) {
-        if (this.data.id) { // 编辑
-          this.titleText = '编辑字典项'
-          this.formData = Object.assign({}, this.data)
-
-          delete this.formData.no
-          this.formData.isEnable = Number(this.formData.isEnable)
-          console.log(this.formData, 'this.formData')
-        } else {
-          this.formData.lookupCode = this.data.lookupCode
-          this.titleText = '添加字典项'
-        }
-      } else {
-        this.cancel()
-      }
-    }
-  }
-}
-</script>
-
-<style >
-  .modalBox{
-    width: 650px !important;
-  }
-  .ant-modal-footer {
-    display: none;
-  }
-</style>

+ 0 - 199
src/views/power/dataDictionary/codeModal.vue

@@ -1,199 +0,0 @@
-<template>
-  <div>
-    <a-modal class="modalBox" :title="titleText" v-model="isshow" @cancle="cancel">
-      <a-form :form="form" @submit="handleSubmit">
-        <!-- 类别编码 -->
-        <a-form-item label="类别编码" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-input
-            placeholder="请输入类别编码"
-            :disabled="true"
-            v-decorator="['formData.code', {
-              initialValue: formData.code,
-              rules: [{ required: true, message: '请输入类别编码!' }] }]"
-          />
-        </a-form-item>
-
-        <!-- 名称 -->
-        <a-form-item label="名称" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-input
-            placeholder="请输入名称"
-            v-decorator="['formData.name', {
-              initialValue: formData.name,
-              rules: [{ required: true, message: '请输入名称!' }] }]"
-          />
-        </a-form-item>
-
-        <!-- 排序值 -->
-        <a-form-item label="排序值" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-input
-            type="number"
-            placeholder="请输入排序值"
-            v-decorator="['formData.sort', {
-              initialValue: formData.sort,
-              rules: [{ required: true, message: '请输入排序值!' }] }]"
-          />
-        </a-form-item>
-        <!-- 状态 -->
-        <a-form-item label="启用" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-radio-group
-            name="radioGroup"
-            v-decorator="[
-              'formData.isEnable',
-              {
-                initialValue: formData.isEnable,
-                rules: [{ required: true, message: '请选择状态!' }] },
-            ]"
-          >
-            <a-radio :value="1">是</a-radio>
-            <a-radio :value="0">否</a-radio>
-          </a-radio-group>
-        </a-form-item>
-
-        <a-form-item label="备注" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-          <a-textarea
-            v-decorator="[
-              'formData.remarks',
-              { initialValue: formData.remarks,
-                rules: [] },
-            ]"
-            style="min-height: 60px;"
-            placeholder=""
-            autosize />
-        </a-form-item>
-
-        <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
-          <a-button type="primary" @click="handleSubmit()">
-            保存
-          </a-button>
-          <a-button :style="{ marginLeft: '8px' }" @click="handleCancel()">
-            取消
-          </a-button>
-        </a-form-item>
-      </a-form>
-
-    </a-modal>
-  </div>
-</template>
-
-<script>
-import { STable, VSelect } from '@/components'
-import { saveLookUp } from '@/api/lookup.js'
-export default {
-  name: 'CodeModal',
-  components: {
-    STable, VSelect
-  },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false
-    },
-    data: {
-      type: Object,
-      default: function () {
-        return {}
-      }
-    }
-  },
-  data () {
-    return {
-      titleText: '添加字典',
-      isshow: this.visible,
-      formLayout: 'horizontal',
-      form: this.$form.createForm(this, { name: 'miniForm' }),
-      formData: {
-        name: '',
-        code: '',
-        sort: '',
-        isEnable: '', // 活动状态
-        remarks: ''
-      }
-
-    }
-  },
-  methods: {
-    cancel (e) {
-      this.clear()
-      this.$emit('close')
-    },
-
-    // 保存提交
-    handleSubmit () {
-      const _this = this
-      this.form.validateFields((err, values) => {
-        if (!err) {
-          saveLookUp(Object.assign(this.formData, values.formData)).then(res => {
-            if (res.status + '' === '200') {
-              this.$message.success(res.message ? res.message : '保存成功')
-              this.$emit('refresh')
-              setTimeout(function () {
-                _this.cancel()
-              }, 300)
-            } else {
-              this.$message.error(res.message)
-            }
-          })
-        }
-      })
-    },
-    // 取消
-    handleCancel () {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '确定取消吗?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          _this.clear()
-          _this.cancel()
-        }
-      })
-    },
-    clear () {
-      this.form.resetFields()
-      delete this.formData.id
-      this.formData.name = ''
-      this.formData.code = ''
-      this.formData.sort = ''
-      this.formData.isEnable = ''
-      this.formData.remarks = ''
-    }
-
-  },
-  mounted () {
-  },
-  beforeCreate () {
-    this.form = this.$form.createForm(this, { name: 'miniForm' })
-  },
-  watch: {
-    visible (newValue, oldValue) {
-      this.isshow = newValue
-    },
-    isshow (newValue, oldValue) {
-      if (newValue) {
-        if (this.data.id) { // 编辑
-          this.formData.titleText = '编辑字典'
-          this.formData = Object.assign({}, this.data)
-
-          delete this.formData.no
-          this.formData.isEnable = Number(this.formData.isEnable)
-          console.log(this.formData, 'this.formData')
-        } else {
-          this.formData.titleText = '添加字典'
-        }
-      } else {
-        this.cancel()
-      }
-    }
-  }
-}
-</script>
-
-<style >
-  .modalBox{
-  }
-  .ant-modal-footer {
-    display: none;
-  }
-</style>

+ 0 - 398
src/views/power/dataDictionary/dataDictionary.vue

@@ -1,398 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <a-row :gutter="24">
-      <!-- 左侧字典列表 -->
-      <a-col :span="6">
-        <a-row :gutter="24">
-          <!-- <a-button style="margin-right: 10px;" type="primary" icon="plus" @click="addCode">添加字典</a-button> -->
-          <a-button style="margin-right: 10px;" type="primary" icon="plus" @click="editCode">编辑字典</a-button>
-          <!-- <a-select style="width: 110px" placeholder="更多操作" allowClear >
-               <a-select-option @click="editCode" value="编辑字典">编辑字典</a-select-option>
-               <a-select-option @click="delectCode" value="删除字典">删除字典</a-select-option>
-             </a-select> -->
-        </a-row>
-        <a-row :gutter="24" class="textCount">
-          <a-icon type="info-circle" style="color: #1890FF;margin-right: 10px;" />
-          <span>当前选择:<span style="color: #40a9ff;font-weight: 600;">{{ selectedMenu }}</span><span v-if="selectedKey.length" class="imgSize" @click="cancelSel">取消选择</span></span>
-        </a-row>
-        <a-row :gutter="24" >
-          <a-input-search v-model="code" placeholder="输入编码类别/名称 搜索字典" style="width: 100%" @search="getCodeList" />
-        </a-row>
-        <a-row :gutter="24" >
-          <a-menu class="menu-box" style="border-right: 0;max-height: 650px;overflow: auto;" v-model="selectedKey" >
-            <a-menu-item style="margin-bottom: 0px;height: 30px; line-height: 30px;" v-for="(item,index) in codeList" :key="index" :value="item">{{ item.name }}</a-menu-item>
-          </a-menu>
-          <span v-if="noData" style="line-height: 50px; font-weight: 600;">暂无数据</span>
-        </a-row>
-      </a-col>
-      <!-- 右侧数据列表 -->
-      <a-col :span="18" >
-        <div style="padding-left: 20px;">
-          <div class="table-page-search-wrapper">
-            <a-form layout="inline">
-              <a-row :gutter="48">
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="数据名称">
-                    <a-input allowClear v-model="queryParam.dispName" placeholder="请输入数据名称"/>
-                  </a-form-item>
-                </a-col>
-
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="状态">
-                    <a-select
-                      allowClear
-                      v-model="queryParam.isEnable"
-                      placeholder="请选择"
-                    >
-                      <a-select-option :value="1">
-                        是
-                      </a-select-option>
-                      <a-select-option :value="0">
-                        否
-                      </a-select-option>
-                    </a-select>
-                    <!-- <v-select code="FLAG" v-model="queryParam.enableFlag" allowClear placeholder="是否启用"></v-select> -->
-                  </a-form-item>
-                </a-col>
-                <a-col :md="2" :sm="24">
-                  <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-                </a-col>
-                <!-- <a-col :md="2" :sm="24">
-                  <a-button type="primary" @click="queryParam=''">重置</a-button>
-                </a-col> -->
-              </a-row>
-            </a-form>
-          </div>
-          <!-- <a-divider/> -->
-          <div class="table-operator">
-            <a-button type="primary" icon="plus" @click="openCodeItemModal">添加数据</a-button>
-            <!-- <a-button type="" icon="delete" @click="delectAll">批量删除</a-button> -->
-            <a-button type="" icon="reload" @click="$refs.table.refresh(true)">刷新数据</a-button>
-          </div>
-          <!-- <div  class="textCount">
-            <a-icon type="info-circle" style="color: #1890FF;margin-right: 10px;" />
-            <span>已选择<span style="color: #40a9ff;font-weight: 600;margin-left: 10px;">{{selectedNum}}项</span><span class="imgSize">清空</span></span>
-          </div> -->
-          <s-table
-            ref="table"
-            size="default"
-            rowKey="id"
-            :columns="columns"
-            :data="loadData"
-            bordered
-          >
-            <span slot="action" slot-scope="text, record">
-              <template>
-                <a class="action-button" @click="handleEdit(record)">修改</a>
-                <a v-if="!record.isEnable" class="action-button red-text" @click="delect(record)">删除</a>
-              </template>
-            </span>
-          </s-table>
-        </div>
-
-      </a-col>
-    </a-row>
-    <codeModal :visible="showCodeModal" :data="codeData" @refresh="getCodeList" @close="showCodeModal = false"></codeModal>
-    <codeItemModal :visible="showItemCodeModal" :data="itemCodeData" @refresh="$refs.table.refresh(true)" @close="showItemCodeModal = false"></codeItemModal>
-  </a-card>
-</template>
-
-<script>
-import { STable, VSelect } from '@/components'
-import codeModal from './codeModal.vue'
-import codeItemModal from './codeItemModal.vue'
-import { listLookUp, delLookUp, getLookUpItem, delLookUpItem } from '@/api/lookup.js'
-export default {
-  name: 'DataDictionary',
-  components: {
-    STable, VSelect, codeModal, codeItemModal
-  },
-  props: {},
-  data () {
-    // const rowSelection = {
-    //    onChange: (selectedRowKeys, selectedRows) => {
-    //      console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows)
-    //    },
-    //    onSelect: (record, selected, selectedRows) => {
-    //      this.selectedNum = selectedRows.length
-    //      console.log(record,'record')
-    //      console.log(selectedRows,'selectedRows')
-    //    },
-    //    onSelectAll: (selected, selectedRows, changeRows) => {
-    //      this.selectedNum = selectedRows.length
-    //      console.log(selected, selectedRows, changeRows)
-    //    }
-    //  }
-    return {
-      // 查询参数
-      queryParam: {
-        dispName: '',
-        isEnable: undefined,
-        lookupCode: ''
-      },
-      noData: false,
-      code: '', // 根据输入编码类别/名称搜索字典
-      selectedNum: '',
-      selectedKey: [], // 选中的字典编码项
-      selectedMenu: '',
-      formLayout: 'horizontal',
-      form: this.$form.createForm(this, { name: 'miniForm' }),
-      codeList: [],
-      showCodeModal: false,
-      showItemCodeModal: false,
-      codeData: {}, // 编辑字典行数据
-      itemCodeData: {},
-      // 表头
-      columns: [
-        {
-          title: '序号',
-          dataIndex: 'no',
-          width: '40',
-          align: 'center'
-        },
-        {
-          title: '名称',
-          dataIndex: 'dispName',
-          width: '100',
-          align: 'center'
-        },
-        {
-          title: '项编码',
-          dataIndex: 'code',
-          width: '100',
-          align: 'center'
-        },
-        {
-          title: '排序值',
-          dataIndex: 'sort',
-          width: '100',
-          align: 'center'
-        },
-        {
-          title: '是否启用',
-          width: '100',
-          align: 'center',
-          dataIndex: 'isEnable',
-          customRender: function (text) {
-            if (text == 1) {
-              return '启用'
-            } else {
-              return '禁用'
-            }
-          }
-        },
-        {
-          title: '创建时间',
-          dataIndex: 'createDate',
-          width: '120',
-          align: 'center'
-        },
-        {
-          title: '备注',
-          dataIndex: 'remarks',
-          width: '100',
-          align: 'center'
-        },
-        {
-          title: '操作',
-          width: '100',
-          align: 'center',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        return getLookUpItem(Object.assign(parameter, this.queryParam)).then(res => {
-          const no = (res.data.pageNo - 1) * res.data.pageSize
-          for (let i = 0; i < res.data.list.length; i++) {
-            const _item = res.data.list[i]
-            _item.no = no + i + 1
-            _item.isEnable = _item.isEnable + '' === '1'
-          }
-          return res.data
-        })
-      },
-      optionAlertShow: false
-    }
-  },
-  methods: {
-    // 获取字典列表
-    getCodeList () {
-      listLookUp({ code: this.code }).then(res => {
-        if (res.status == 200) {
-          this.codeList = res.data
-          this.noData = false
-          if (!res.data.length) {
-            this.noData = true
-          }
-        }
-      })
-    },
-    // 添加字典
-    addCode () {
-      this.showCodeModal = true
-      this.codeData = {}
-    },
-    // 编辑字典
-    editCode () {
-      if (!this.selectedKey.length) {
-        return this.$message.warning('您还未选择要编辑的字典')
-      }
-      this.showCodeModal = true
-      this.codeData = this.codeList[this.selectedKey]
-    },
-    // 删除字典
-    delectCode () {
-      if (!this.selectedKey.length) {
-        return this.$message.warning('您还未选择要删除的字典')
-      }
-      const _this = this
-      const id = this.codeList[this.selectedKey].id
-      this.$confirm({
-        title: '警告',
-        content: `确定要删除 ${this.codeList[this.selectedKey].name} 吗?`,
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          delLookUp({
-            id: id
-          }).then(res => {
-            if (res.status == 200) {
-              _this.$message.success('删除成功')
-              _this.getCodeList()
-            } else {
-              _this.$message.error(res.message)
-            }
-          }).catch(() => {
-            _this.$message.success('删除失败, 请稍后重试')
-          })
-        }
-      })
-    },
-    // 字典 取消选择
-    cancelSel () {
-      this.selectedKey = []
-      this.selectedMenu = ''
-    },
-    // 新增数据
-    openCodeItemModal () {
-      if (!this.selectedKey.length) {
-        return this.$message.warning('请先选择一个字典类别')
-      }
-      this.showItemCodeModal = true
-      this.itemCodeData = { lookupCode: this.codeList[this.selectedKey].code }
-    },
-    // 批量删除数据
-    delectAll () {
-      if (!this.selectedNum) {
-        return this.$message.warning('您还未选择要删除的数据')
-      }
-      const _this = this
-      this.$confirm({
-        title: '警告',
-        content: `确定要删除您选择的这${this.selectedNum}条数据吗?`,
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          // delectUserPower({
-          //   id: row.id
-          // }).then(res => {
-          //   if (res.status == 200) {
-          //     _this.$message.success('删除成功')
-          //     _this.$refs.table.refresh()
-          //   }
-          // }).catch(() => {
-          //   _this.$message.success('删除失败, 请稍后重试')
-          // })
-        }
-      })
-    },
-    // 删除
-    delect (row) {
-      const _this = this
-      this.$confirm({
-        title: '警告',
-        content: '确定要删除吗?',
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          delLookUpItem({
-            id: row.id
-          }).then(res => {
-            if (res.status == 200) {
-              _this.$message.success('删除成功')
-              _this.$refs.table.refresh()
-            } else {
-              _this.$message.error(res.message)
-            }
-          }).catch(() => {
-            _this.$message.success('删除失败, 请稍后重试')
-          })
-        }
-      })
-    },
-    handleEdit (row) {
-      this.showItemCodeModal = true
-      this.itemCodeData = row
-    }
-  },
-  beforeCreate () {
-    this.form = this.$form.createForm(this, { name: 'miniForm' })
-  },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getCodeList()
-    })
-  },
-  watch: {
-    selectedKey (newValue, oldValue) {
-      if (newValue.length) {
-        this.selectedMenu = this.codeList[this.selectedKey].name + ' ' + '(' + this.codeList[this.selectedKey].code + ')'
-        this.queryParam.lookupCode = this.codeList[this.selectedKey].code
-        this.$refs.table.refresh(true)
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-  .menu-box::-webkit-scrollbar{
-    width: 6px;
-    height: 6px ;
-  }
-
-  .menu-box::-webkit-scrollbar-thumb{
-    width: 6px;
-    height: 6px ;
-    border-radius: 4px;
-    -webkit-box-shadow: inset 0 0 2px #d1d1d1;
-    background: #e4e4e4;
-  }
-
-  .textCount{
-    border: 1px solid #91d5ff;
-    background-color: #e6f7ff;
-    border-radius: 5px;
-    padding: 5px 10px 5px 20px;
-    margin: 10px 0;
-    color: rgba(0, 0, 0, 0.85);
-  }
-  .imgSize{
-    color: #2d8cf0;
-    margin-left: 10px;
-    font-size: 14px;
-  }
-  .action-button{
-    line-height: 40px;
-    white-space: nowrap;
-    padding: 5px 10px;
-    background-color: #1890ff;
-    border-radius: 4px;
-    color: #fff;
-    margin-right: 5px;
-  }
-  .red-text{
-    background-color: red;
-  }
-</style>

+ 0 - 423
src/views/power/job/jobs.vue

@@ -1,423 +0,0 @@
-<template>
-  <a-card class="settlement" :bordered="false">
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="20">
-          <a-col :md="6" :sm="24">
-            <a-form-item style="margin-bottom: 0;">
-              <a-input v-model.trim="queryParam.name" placeholder="定时器名称" allowClear/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="4" :sm="24">
-            <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <a-divider />
-    <div class="btns">
-      <a-button @click="addJob()" type="primary" icon="plus-circle">添加JOB</a-button>
-      <a-button @click="startJob()" type="default" icon="play-circle">启动</a-button>
-      <a-button @click="stopJob()" type="default" icon="stop">停止</a-button>
-    </div>
-
-    <s-table
-      ref="table"
-      size="default"
-      :rowKey="(record) => record.id"
-      :columns="columns"
-      :data="loadData"
-      :bordered="true"
-      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-    >
-      <span slot="action" slot-scope="text, record">
-        <template>
-          <a @click="editJob(record)">编辑</a>
-          <a-divider type="vertical" />
-          <a @click="deleteRow(record)">删除</a>
-          <a-divider type="vertical" />
-          <a @click="syncJob(record)">立即运行一次</a>
-        </template>
-      </span>
-      <span slot="isEnable" slot-scope="text, record">
-        {{ record.isEnable ? '启用' : '禁用' }}
-      </span>
-      <div slot="status" slot-scope="text, record">
-        <span v-if="record.status === 'STAT'" style="color:green">运行中</span>
-        <span v-if="record.status !== 'STAT'" style="color:red">已停止</span>
-      </div>
-    </s-table>
-
-    <a-modal
-      title="添加JOB"
-      v-model="visible"
-      :footer="null"
-      :maskClosable="false"
-      @cancel="handleCancel"
-    >
-      <a-form
-        @submit="handleSubmit"
-        :form="form"
-      >
-        <a-form-item
-          label="JOB名称"
-          :label-col="{ span: 6 }"
-          :wrapper-col="{ span: 17 }"
-        >
-          <a-input v-decorator="['formData.name',{initialValue: formData.name,rules:[{ required: true, message: '请输入JOB名称' }]}]"/>
-        </a-form-item>
-        <a-form-item
-          label="JOB分组"
-          :label-col="{ span: 6 }"
-          :wrapper-col="{ span: 17 }"
-        >
-          <a-input v-decorator="['formData.group',{initialValue: formData.group,rules:[{ required: true, message: '请输入JOB分组称' }]}]"/>
-        </a-form-item>
-        <a-form-item
-          label="JOB业务类名"
-          :label-col="{ span: 6 }"
-          :wrapper-col="{ span: 17 }"
-        >
-          <a-input v-decorator="['formData.className',{initialValue: formData.className,rules:[{ required: true, message: '请输入JOB业务类名' }]}]"/>
-        </a-form-item>
-        <a-form-item
-          label="CRON表达式"
-          :label-col="{ span: 6 }"
-          :wrapper-col="{ span: 17 }"
-        >
-          <a-input @click="openCronModal" v-model="formData.cron" @change="setCorn">
-            <a-icon slot="prefix" type="schedule" title="corn控件"/>
-            <a-icon v-if="formData.cron" slot="suffix" type="close-circle" @click="formData.cron=''" title="清空"/>
-          </a-input>
-          <JCronModal ref="innerVueCron" :data="formData.cron" @ok="setCorn"></JCronModal>
-        </a-form-item>
-        <a-form-item
-          label="是否启用"
-          :label-col="{ span: 6 }"
-          :wrapper-col="{ span: 17 }"
-        >
-          <a-switch checkedChildren="启用" unCheckedChildren="禁用" v-decorator="['formData.isEnable', { initialValue: formData.isEnable, valuePropName: 'checked' }]" />
-          <!-- <a-switch checkedChildren="启用" unCheckedChildren="禁用" :checked="formData.isEnable" @change="changeStatus"/> -->
-        </a-form-item>
-
-        <div class="jobBtns">
-          <a-button key="back" @click="handleCancel">取消</a-button>
-          <a-button htmlType="submit" :loading="loading" type="primary">
-            确定
-          </a-button>
-        </div>
-
-      </a-form>
-    </a-modal>
-
-  </a-card>
-</template>
-
-<script>
-import { STable } from '@/components'
-import { listJob, pauseJob, resumeJob, delJob, callJob, addJob } from '@/api/job.js'
-import JCronModal from '@/components/Cron/JCronModal'
-
-export default {
-  name: 'Jobs',
-  components: {
-    STable,
-    JCronModal
-  },
-  data () {
-    return {
-      showCron: false,
-      // 查询参数
-      queryParam: {
-        name: ''
-      },
-      selectedRowKeys: [],
-      visible: false,
-      loading: false,
-      formLayout: 'horizontal',
-      formData: {},
-      formBackData: {
-        name: '',
-        group: '',
-        className: '',
-        cron: '',
-        isEnable: false
-      },
-      form: this.$form.createForm(this),
-      // 表头
-      columns: [
-        {
-          title: '序号',
-          dataIndex: 'no',
-          width: '70px',
-          align: 'center'
-        },
-        {
-          title: 'JOB名称',
-          dataIndex: 'name',
-          width: '150px',
-          align: 'center'
-        },
-        {
-          title: 'JOB状态',
-          dataIndex: 'status',
-          width: '100px',
-          align: 'center',
-          scopedSlots: { customRender: 'status' }
-        },
-        {
-          title: 'JOB分组',
-          dataIndex: 'group',
-          width: '150px',
-          align: 'center'
-        },
-        {
-          title: 'JOB业务类名',
-          dataIndex: 'className',
-          width: '200px',
-          align: 'center'
-        },
-        {
-          title: 'CRON表达式',
-          dataIndex: 'cron',
-          width: '150px',
-          align: 'center'
-        },
-        {
-          title: '是否启用',
-          dataIndex: 'isEnable',
-          align: 'center',
-          width: '100px',
-          scopedSlots: { customRender: 'isEnable' }
-        },
-        {
-          title: '操作',
-          dataIndex: 'action',
-          width: '250px',
-          align: 'center',
-          scopedSlots: { customRender: 'action' }
-        }
-      ],
-      // 加载数据方法 必须为 Promise 对象
-      loadData: parameter => {
-        return listJob(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            data.list[i].isEnable = data.list[i].isEnable + '' === '1'
-          }
-          return data
-        })
-      }
-    }
-  },
-  created () {
-
-  },
-  methods: {
-    // 打开cron 表达式弹框
-    openCronModal () {
-      this.$refs.innerVueCron.show()
-    },
-    setCorn (data) {
-      console.log('cron data', data)
-      // this.formData.cron = data
-      this.$set(this.formData, 'cron', data)
-    },
-    handleSubmit (e) {
-      e.preventDefault()
-      this.form.validateFields((err, values) => {
-        if (!err) {
-          // 保存数据
-          let params = Object.assign(this.formData, values.formData)
-          params = Object.assign({}, params)
-          params.isEnable = params.isEnable ? 1 : 0
-          params.id = this.formData.id
-
-          if (params.cron == '' || params.cron.length == 0) {
-            this.$message.warning('请输入CRON表达式')
-            return
-          }
-
-          this.loading = true
-          addJob(params).then(res => {
-            console.log(res)
-            if (res.status + '' === '200') {
-              this.$message.success(params.id ? '修改成功' : '保存成功')
-              this.visible = false
-              this.$refs.table.refresh(true)
-            } else {
-              // this.$message.warning(res.message)
-            }
-            this.loading = false
-          })
-        }
-      })
-    },
-    // 编辑
-    editJob (record) {
-      this.visible = true
-      this.formData = Object.assign({}, {
-        id: record.id,
-        name: record.name,
-        group: record.group,
-        className: record.className,
-        cron: record.cron,
-        isEnable: record.isEnable
-      })
-    },
-    /**
-     * 删除选中的job
-     * @param params
-     */
-    deleteRow (record) {
-      const that = this
-      const h = this.$createElement
-      this.$confirm({
-        title: '提示',
-        content: h('div', {
-          style: {
-            textAlign: 'center'
-          }
-        }, [
-          h('div', '删除后,数据将无法恢复。'),
-          h('div', '确认删除吗?')
-        ]),
-        onOk () {
-          delJob({ id: record.id }).then(res => {
-            if (res.status === '200') {
-              that.$message.success('删除成功')
-              that.$refs.table.refresh()
-            }
-          })
-        }
-      })
-    },
-    /**
-     * 立即执行一次
-     * @param params
-     */
-    syncJob (record) {
-      const that = this
-      const h = this.$createElement
-      this.$confirm({
-        title: '提示',
-        content: h('div', {
-          style: {
-            textAlign: 'center'
-          }
-        }, [
-          h('div', '是否立即执行一次定时器。')
-        ]),
-        onOk () {
-          callJob({ id: record.id }).then(res => {
-            if (res.status === '200') {
-              that.$message.success('执行成功')
-              that.$refs.table.refresh()
-            }
-          })
-        }
-      })
-    },
-    handleCancel (e) {
-      this.visible = false
-      this.loading = false
-      this.formData = Object.assign({}, this.formBackData)
-      this.form.resetFields()
-    },
-    addJob () {
-      this.formData = Object.assign({}, this.formBackData)
-      this.form.resetFields()
-      this.visible = true
-    },
-    /**
-     * 批量启动
-     */
-    startJob () {
-      const _this = this
-      const checkIds = this.selectedRowKeys
-      if (checkIds.length) {
-        // 调用后台启动方法
-        resumeJob({
-          ids: checkIds
-        }).then(res => {
-          if (res.status === '200') {
-            _this.$message.success('操作成功')
-          } else {
-            _this.$message.info(res.message)
-          }
-          _this.$refs.table.refresh()
-        })
-      } else {
-        this.$message.info('请选择需要启动的服务')
-      }
-    },
-    /**
-     * 批量停止
-     */
-    stopJob () {
-      const _this = this
-      const h = this.$createElement
-      const checkIds = this.selectedRowKeys
-      if (checkIds.length) {
-        this.$confirm({
-          title: '提示',
-          content: h('div', {
-            style: {
-              textAlign: 'center'
-            }
-          }, [
-            h('div', '您确定停止所选的服务吗?')
-          ]),
-          onOk () {
-            pauseJob({
-              'ids': checkIds
-            }).then(res => {
-              if (res.status === '200') {
-                _this.$message.success('操作成功')
-              } else {
-                _this.$message.info(res.message)
-              }
-              _this.$refs.table.refresh()
-            })
-          }
-        })
-      } else {
-        this.$message.info('请选择需要停止的服务')
-      }
-    },
-    /**
-     * 获取选中的列表
-     * @returns {Array}
-     */
-    onSelectChange (selectedRowKeys) {
-      this.selectedRowKeys = selectedRowKeys
-    }
-  }
-}
-</script>
-<style>
-  .jobBtns{
-    text-align: center;
-    padding-top: 20px;
-  }
-  .jobBtns button{
-    margin: 0 10px;
-  }
-  .ant-modal-footer{
-    text-align: center;
-  }
-  .ant-modal-body .ant-form-item{
-    margin-bottom: 10px;
-  }
-  .btns{
-    padding-bottom: 15px;
-  }
-  .btns button{
-    margin-right: 15px;
-  }
-  .ant-table-thead > tr > th, .ant-table-tbody > tr > td{
-    word-break: break-all;
-  }
-</style>

+ 0 - 430
src/views/power/register/register.vue

@@ -1,430 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <a-row :gutter="24">
-      <!-- 左侧菜单树列表 -->
-      <a-col :span="8">
-        <a-row :gutter="24" class="textCount">
-          <a-icon type="info-circle" style="color: #1890FF;margin-right: 10px;" />
-          <span>当前选择:<span style="color: #40a9ff;font-weight: 600;">{{ selectedMenu }}</span><span v-if="selectedKeys.length" class="imgSize" @click="cancelSel">取消选择</span></span>
-        </a-row>
-
-        <a-row :gutter="24" >
-          <a-row :gutter="24" >
-            <a-input-search placeholder="搜索" style="width: 100%" @change="onChange" />
-          </a-row>
-          <a-tree
-            @expand="onExpand"
-            :treeData="getMenus"
-            :expandedKeys="expandedKeys"
-            :autoExpandParent="autoExpandParent"
-            @select="onSelect"
-            :selectedKeys="selectedKeys"
-          >
-            <template slot="title" slot-scope="{title}">
-              <span v-if="title.indexOf(searchValue) > -1">
-                {{ title.substr(0, title.indexOf(searchValue)) }}
-                <span style="color: #f50">{{ searchValue }}</span>
-                {{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
-              </span>
-              <span v-else>{{ title }}</span>
-            </template>
-          </a-tree>
-        </a-row>
-      </a-col>
-      <!-- 右侧 -->
-      <a-col :span="16" >
-
-        <a-form :form="form" @submit="handleSubmit">
-          <a-form-item label=" " :colon="false" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-button style="margin-right: 10px;" type="primary" icon="plus" @click="addChild">添加子分类</a-button>
-            <a-button style="margin-right: 10px;background-color: #19be6b;color: #fff;" type="" icon="plus" @click="addTop">添加根节点</a-button>
-            <a-button style="margin-right: 10px;background-color: red;color: #fff;" type="" icon="delete" @click="remove()">删除</a-button>
-          </a-form-item>
-          <!-- 父路径 -->
-          <a-form-item label="父路径" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              disabled
-              placeholder=""
-              v-decorator="['formData.parentPath', {
-                initialValue: formData.parentPath,
-                rules: [] }]"
-            />
-          </a-form-item>
-          <!-- 显示名称-->
-          <a-form-item label="显示名称" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              placeholder="请输入节点显示名称"
-              v-decorator="['formData.dispname', {
-                initialValue: formData.dispname,
-                rules: [{ required: true, message: '请输入节点显示名称!' }] }]"
-            />
-          </a-form-item>
-          <!-- 名称 -->
-          <a-form-item label="编码" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              placeholder="请输入节点code"
-              v-decorator="['formData.name', {
-                initialValue: formData.name,
-                rules: [{ required: true, message: '请输入节点code!' }] }]"
-            />
-          </a-form-item>
-
-          <!-- 值 -->
-          <a-form-item label="值" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              :maxlength="20"
-              placeholder="请输入节点值"
-              v-decorator="['formData.value', {
-                initialValue: formData.value,
-                rules: [{ required: true, message: '请输入节点值!' }] }]"
-            />
-          </a-form-item>
-
-          <!-- 排序值 -->
-          <a-form-item label="排序" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-input
-              type="number"
-              :maxlength="20"
-              placeholder="请输入正确的序号"
-              v-decorator="['formData.index', {
-                initialValue: formData.index,
-                rules: [{ required: true, message: '请输入正确的序号!' }] }]"
-            />
-          </a-form-item>
-
-          <!-- 状态 -->
-          <a-form-item label="是否启用" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-radio-group
-              name="radioGroup"
-              v-decorator="[
-                'formData.isEnable',
-                {
-                  initialValue: formData.isEnable,
-                  rules: [{ required: true, message: '请选择状态!' }] },
-              ]"
-            >
-              <a-radio :value="1">是</a-radio>
-              <a-radio :value="0">否</a-radio>
-            </a-radio-group>
-          </a-form-item>
-          <a-form-item label="备注" :label-col="{ span: 5 }" :wrapper-col="{ span: 14 }">
-            <a-textarea
-              v-decorator="[
-                'formData.desc',
-                { initialValue: formData.desc,
-                  rules: [] },
-              ]"
-              style="min-height: 60px;"
-              placeholder=""
-              autosize />
-          </a-form-item>
-
-          <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
-            <a-button type="primary" @click="handleSubmit()">
-              保存
-            </a-button>
-            <a-button :style="{ marginLeft: '8px' }" @click="reset">
-              重置
-            </a-button>
-          </a-form-item>
-        </a-form>
-
-      </a-col>
-    </a-row>
-  </a-card>
-</template>
-
-<script>
-import { STable, VSelect } from '@/components'
-import { listRegister, saveRegister, delRegisterNode } from '@/api/register'
-import _ from 'lodash'
-
-export default {
-  name: 'Menu',
-  components: {
-    STable, VSelect
-  },
-  props: {},
-  data () {
-    return {
-      treeData: [],
-      dataList: [],
-      searchValue: '',
-      actions: 'addTop', // addTop:添加一级分类,addChild:添加子分类,edit
-      expandedKeys: [],
-      autoExpandParent: true,
-      selectedKeys: [],
-      selectedData: {}, // 被选中的节点数据
-      selectedMenu: '', // 选择的树节点名
-      formLayout: 'horizontal',
-      form: this.$form.createForm(this, { name: 'register' }),
-      parentData: {}, // 父级菜单
-      formData: {},
-      formDataBack: {
-        id: '',
-        dispname: '',
-        name: '',
-        value: '',
-        index: '',
-        parentPath: '',
-        isEnable: '',
-        desc: '',
-        parentId: '0'
-      }
-
-    }
-  },
-  computed: {
-    getMenus () {
-      this.generateList(this.treeData)
-      return this.treeData
-    }
-  },
-  methods: {
-    initPage () {
-      this.addTop()
-      this.initTree()
-    },
-    onExpand (expandedKeys) {
-      console.log('onExpand', expandedKeys)
-      this.expandedKeys = expandedKeys
-      this.autoExpandParent = false
-    },
-
-    onSelect (selectedKeys, info) {
-      console.log('onSelect', info)
-      this.selectedKeys = selectedKeys
-      if (info.selected) {
-        this.selectedData = info
-        const data = info.selectedNodes[0].data.props
-        this.selectedMenu = data.dispname
-        this.formData = {
-          id: data.id,
-          dispname: data.dispname,
-          name: data.name,
-          value: data.value,
-          index: data.index,
-          parentPath: data.parentPath,
-          isEnable: data.isEnable,
-          desc: data.desc,
-          parentId: data.parentId
-        }
-        this.formData.isEnable = Number(this.formData.isEnable)
-        this.actions = 'edit'
-      } else {
-        this.selectedMenu = ''
-        this.clear()
-      }
-    },
-    generateList (data) {
-      for (let i = 0; i < data.length; i++) {
-        const node = data[i]
-        node.key = node.id
-        node.title = node.dispname
-        const key = node.title
-        this.dataList.push({ key, title: key })
-        node.scopedSlots = { title: 'title' }
-        // node.slots = { icon: node.type == '0' ? 'file' : 'pushpin' }
-
-        if (node.children) {
-          this.generateList(node.children)
-        }
-      }
-    },
-    getParentKey (key, tree) {
-      let parentKey
-      for (let i = 0; i < tree.length; i++) {
-        const node = tree[i]
-        if (node.children) {
-          if (node.children.some(item => item.title == key)) {
-            parentKey = node.key
-          } else if (this.getParentKey(key, node.children)) {
-            parentKey = this.getParentKey(key, node.children)
-          }
-        }
-      }
-      return parentKey
-    },
-    onChange (e) {
-      const value = e.target.value
-      const expandedKeys = this.dataList
-        .map(item => {
-          if (item.title.indexOf(value) > -1) {
-            return this.getParentKey(item.title, this.treeData)
-          }
-          return null
-        })
-        .filter((item, i, self) => item && self.indexOf(item) === i)
-      Object.assign(this, {
-        expandedKeys,
-        searchValue: value,
-        autoExpandParent: true
-      })
-    },
-    // 初始化 查询Tree 数据
-    initTree () {
-      const _this = this
-      listRegister().then(res => {
-        if (res.status === '200') {
-          const treeData = res.data
-          if (treeData) {
-            _this.treeData = treeData
-          }
-        } else {
-          this.$Message.warning(res.message)
-        }
-      })
-    },
-    // 添加根节点
-    addTop () {
-      this.clear()
-      this.actions = 'addTop'
-      this.formData = _.cloneDeep(this.formDataBack)
-    },
-    // 添加子节点
-    addChild () {
-      if (!this.selectedKeys.length) {
-        this.$message.warning('请先选择一个根节点')
-      }
-
-      this.actions = 'addChild'
-      const currentNode = this.selectedData.selectedNodes[0].data.props
-      this.formData = _.cloneDeep(this.formDataBack)
-      this.formData.parentId = currentNode.id
-      if (currentNode.parentId === 0) {
-        this.formData.parentPath = currentNode.dispname
-      } else {
-        this.formData.parentPath = currentNode.parentPath + ' > ' + currentNode.dispname
-      }
-    },
-
-    //  取消选择
-    cancelSel () {
-      this.selectedKeys = []
-      this.selectedMenu = ''
-      this.clear()
-    },
-    reset () {
-      if (this.actions != 'addTop') {
-        const data = {
-          id: this.formData.id,
-          parentId: this.formData.parentId,
-          parentPath: this.formData.parentPath
-        }
-        console.log(data, 'data')
-        this.formData = _.cloneDeep(this.formDataBack)
-        this.formData.id = data.id
-        this.formData.parentId = data.parentId
-        this.formData.parentPath = data.parentPath
-      }
-      this.cancelSel()
-    },
-    // 清空列表
-    clear () {
-      this.form.resetFields()
-      this.formData = _.cloneDeep(this.formDataBack)
-    },
-
-    // 删除数据
-    remove () {
-      if (!this.selectedKeys.length) {
-        return this.$message.warning('您还未选择要删除的数据')
-      }
-      if (this.selectedData.node.$children.length) {
-        return this.$message.warning('请先删除子节点')
-      }
-      const _this = this
-      console.log(_this.formData.id, '_this.formData.id')
-      this.$confirm({
-        title: '警告',
-        content: `确定要删除您选择的 ${_this.formData.dispname} 的数据吗?`,
-        okText: '确定',
-        cancelText: '取消',
-        onOk () {
-          delRegisterNode({
-            id: _this.formData.id
-          }).then(res => {
-            if (res.status == 200) {
-              _this.$message.success('删除成功')
-              _this.cancelSel()
-              _this.initTree()
-            }
-          }).catch(() => {
-            _this.$message.success('删除失败, 请稍后重试')
-          })
-        }
-      })
-    },
-
-    // 保存提交
-    handleSubmit () {
-      const _this = this
-      this.form.validateFields((err, values) => {
-        if (!err) {
-          console.log(values.formData, ' formData.type222222222')
-          let params = {}
-          if (this.actions === 'addTop') {
-            params = Object.assign({}, values.formData)
-          } else {
-            params = Object.assign(_this.formData, values.formData)
-          }
-          saveRegister(params).then(res => {
-            if (res.status + '' === '200') {
-              _this.initTree()
-              _this.cancelSel()
-              this.$message.success(res.message ? res.message : '保存成功')
-            } else {
-              // this.$message.error(res.message ? res.message : '保存失败')
-            }
-          })
-        }
-      })
-    }
-
-  },
-  mounted () {
-    // this.initTree()
-  },
-  beforeCreate () {
-    this.form = this.$form.createForm(this, { name: 'register' })
-  },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.initPage()
-    })
-  },
-  watch: {
-
-  }
-}
-</script>
-
-<style>
-  .menu-box::-webkit-scrollbar{
-    width: 6px;
-    height: 6px ;
-  }
-
-  .menu-box::-webkit-scrollbar-thumb{
-    width: 6px;
-    height: 6px ;
-    border-radius: 4px;
-    -webkit-box-shadow: inset 0 0 2px #d1d1d1;
-    background: #e4e4e4;
-  }
-
-  .textCount{
-    border: 1px solid #91d5ff;
-    background-color: #e6f7ff;
-    border-radius: 5px;
-    padding: 5px 10px 5px 20px;
-    margin: 10px 0;
-    color: rgba(0, 0, 0, 0.85);
-  }
-  .imgSize{
-    color: #2d8cf0;
-    margin-left: 10px;
-    font-size: 14px;
-  }
-
-</style>

+ 1 - 0
src/views/power/user/userList.vue

@@ -126,6 +126,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         return getPowerUserList(Object.assign(parameter, this.queryParam)).then(res => {
+          console.log(res, '-------------------列表')
           const no = (res.data.pageNo - 1) * res.data.pageSize
           for (let i = 0; i < res.data.list.length; i++) {
             const _item = res.data.list[i]

+ 1 - 1
src/views/power/user/userModal.vue

@@ -203,7 +203,7 @@ export default {
     // 获取角色列表接口
     getRoleList () {
       getRoleList().then(res => {
-        if (res.status + '' === '200') {
+        if (res.status == 200) {
           this.roleList = res.data
         } else {
           this.$message.warning(res.message)