前端-后台

ruoyi-ui/package.json

@@ -36,18 +36,23 @@
     "url": "https://gitee.com/y_project/RuoYi-Vue.git"
   },
   "dependencies": {
+    "@fortawesome/fontawesome-svg-core": "^1.2.36",
+    "@fortawesome/free-brands-svg-icons": "^6.4.2",
+    "@fortawesome/free-regular-svg-icons": "^6.4.2",
+    "@fortawesome/free-solid-svg-icons": "^5.15.4",
+    "@fortawesome/vue-fontawesome": "^0.1.10",
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "0.24.0",
     "bpmn-js": "^11.1.0",
-    "bpmnlint": "^6.4.0",
     "bpmn-js-bpmnlint": "^0.15.0",
+    "bpmnlint": "^6.4.0",
     "bpmnlint-loader": "^0.1.4",
-    "file-drops": "^0.4.0",
     "clipboard": "2.0.8",
-    "core-js": "3.25.3",
+    "core-js": "^3.33.2",
     "diagram-js": "^11.4.1",
     "echarts": "5.4.0",
     "element-ui": "2.15.13",
+    "file-drops": "^0.4.0",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
     "highlight.js": "9.18.5",

ruoyi-ui/src/api/crmSystem/index.js

@@ -0,0 +1,81 @@
+import request from '@/utils/request'
+const crmSystem = "/crmSystem"
+
+// 查询已办任务列表
+export function finishedList(query) {
+    return request({
+        url: crmSystem + '/myTaskList',
+        method: 'get',
+        params: query
+    })
+}
+//发起流程-提交表单
+export function crmStart(procDefId,data) {
+    return request({
+        url: crmSystem +'/start/'+procDefId,
+        method: 'post',
+        data: data
+    })
+}
+// 获取最新的crm-流程id flowKey=dgt-crm-workflow
+export function selectByFlowKey(query) {
+    return request({
+        url: '/flowable/definition/selectByFlowKey',
+        method: 'get',
+        params: query
+    })
+}
+
+// 任务流转记录
+export function flowRecord(query) {
+    return request({
+        url: crmSystem + '/flowRecord',
+        method: 'get',
+        params: query
+    })
+}
+
+// 撤回任务
+export function revokeProcess(data) {
+    return request({
+        url: crmSystem +'/revokeProcess',
+        method: 'post',
+        data: data
+    })
+}
+
+
+// 查询流程定义详细
+export function getDeployment(id) {
+    return request({
+        url: crmSystem +'/deployment/' + id,
+        method: 'get'
+    })
+}
+
+// 新增流程定义
+export function addDeployment(data) {
+    return request({
+        url: crmSystem +'/deployment',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改流程定义
+// export function updateDeployment(data) {
+//     return request({
+//         url: '/system/deployment',
+//         method: 'put',
+//         data: data
+//     })
+// }
+
+// 删除流程定义
+// export function delDeployment(id) {
+//     return request({
+//         url: '/flowable/instance/delete/' + id,
+//         method: 'delete'
+//     })
+// }
+

ruoyi-ui/src/api/public/index.js

@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+// 多文件上传
+export function uploads(data) {
+  return request({
+    url: '/common/uploads',
+    method: 'post',
+    data: data
+  })
+}
+

ruoyi-ui/src/assets/styles/element-ui.scss

@@ -35,6 +35,7 @@
   }
 }
 
+
 .status-col {
   .cell {
     padding: 0 10px;
@@ -83,10 +84,28 @@
   box-sizing: content-box;
 }
 
-.el-menu--collapse
-  > div
-  > .el-submenu
-  > .el-submenu__title
-  .el-submenu__icon-arrow {
+.el-menu--collapse>div>.el-submenu>.el-submenu__title .el-submenu__icon-arrow {
   display: none;
+}
+
+// 新增颜色
+.el-button--blue,
+.el-button--blue.is-plain:focus,
+.el-button--blue.is-plain:hover {
+  color: #FFFFFF !important;
+  background-color: #3498fb !important;
+  border-color: #3498fb !important;
+}
+
+.el-button--blue:focus,
+.el-button--blue:hover {
+  background: #66b1ff !important;
+  border-color: #66b1ff !important;
+  color: #FFFFFF !important;
+}
+
+.el-button--blue.is-plain {
+  color: #3498fb !important;
+  background: #ecf5ff !important;
+  border-color: #b3d8ff !important;
 }

ruoyi-ui/src/assets/styles/element-variables.scss

@@ -9,6 +9,7 @@ $--color-success: #13ce66;
 $--color-warning: #ffba00;
 $--color-danger: #ff4949;
 // $--color-info: #1E1E1E;
+$--color-save: #1890ff;
 
 $--button-font-weight: 400;
 

ruoyi-ui/src/main.js

@@ -46,8 +46,16 @@ import Tinymce from '@/components/tinymce/index.vue'
 import SearchFilter from '@/components/SearchFilter/index.vue'
 // 节点表格组件
 import nodeTableList from '@/components/nodeTableList/index.vue'
-
-
+// font-Awesome icon
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { fas } from '@fortawesome/free-solid-svg-icons'
+import { far } from '@fortawesome/free-regular-svg-icons'
+import { fab } from '@fortawesome/free-brands-svg-icons'
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
+library.add(fas,)
+library.add(far)
+library.add(fab)
+Vue.component('font-awesome-icon', FontAwesomeIcon)
 
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts

ruoyi-ui/src/store/getters.js

@@ -11,6 +11,9 @@ const getters = {
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
   permissions: state => state.user.permissions,
+  user: state => state.user.user,
+  dept: state => state.user.dept,
+  dhrmCompany: state => state.user.dhrmCompany,
   permission_routes: state => state.permission.routes,
   topbarRouters:state => state.permission.topbarRouters,
   defaultRoutes:state => state.permission.defaultRoutes,

ruoyi-ui/src/store/modules/user.js

@@ -7,7 +7,10 @@ const user = {
     name: '',
     avatar: '',
     roles: [],
-    permissions: []
+    permissions: [],
+    user: {},
+    dept: {},
+    dhrmCompany: {}
   },
 
   mutations: {
@@ -25,6 +28,16 @@ const user = {
     },
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
+    },
+    SET_USER: (state, user) => {
+      state.user = user
+    },
+    SET_DEPT: (state, dept) => {
+      state.dept = dept
+    },
+    SET_DHRMCOMPANY: (state, dhrmCompany) => {
+      state.dhrmCompany = dhrmCompany
+
     }
   },
 
@@ -60,6 +73,9 @@ const user = {
           }
           commit('SET_NAME', user.userName)
           commit('SET_AVATAR', avatar)
+          commit('SET_USER', user)
+          commit('SET_DEPT', user.dept)
+          commit('SET_DHRMCOMPANY', res.dhrmCompany)
           resolve(res)
         }).catch(error => {
           reject(error)
@@ -74,6 +90,9 @@ const user = {
           commit('SET_TOKEN', '')
           commit('SET_ROLES', [])
           commit('SET_PERMISSIONS', [])
+          commit('SET_USER', {})
+          commit('SET_DEPT', {})
+          commit('SET_DHRMCOMPANY', {})
           removeToken()
           resolve()
         }).catch(error => {

ruoyi-ui/src/utils/preventReClick.js

@@ -8,7 +8,7 @@ export default {
                         el.disabled = true
                         setTimeout(() => {
                             el.disabled = false
-                        }, binding.value || 2000)
+                        }, binding.value || 1000)
                     }
                 })
             }

ruoyi-ui/src/utils/request.js

@@ -56,7 +56,8 @@ service.interceptors.request.use(config => {
       const s_data = sessionObj.data;                // 请求数据
       const s_time = sessionObj.time;                // 请求时间
       const interval = 1000;                         // 间隔时间(ms)，小于此时间视为重复提交
-      if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
+      // console.log("s_url=",s_url)
+      if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url && s_url !== "/common/uploads") {
         const message = '数据正在处理，请勿重复提交';
         console.warn(`[${s_url}]: ` + message)
         return Promise.reject(new Error(message))
@@ -67,46 +68,46 @@ service.interceptors.request.use(config => {
   }
   return config
 }, error => {
-    console.log(error)
-    Promise.reject(error)
+  console.log(error)
+  Promise.reject(error)
 })
 
 // 响应拦截器
 service.interceptors.response.use(res => {
-    // 未设置状态码则默认成功状态
-    const code = res.data.code || 200;
-    // 获取错误信息
-    const msg = errorCode[code] || res.data.msg || errorCode['default']
-    // 二进制数据则直接返回
-    if (res.request.responseType ===  'blob' || res.request.responseType ===  'arraybuffer') {
-      return res.data
-    }
-    if (code === 401) {
-      if (!isRelogin.show) {
-        isRelogin.show = true;
-        MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
-          isRelogin.show = false;
-          store.dispatch('LogOut').then(() => {
-            location.href = '/index';
-          })
+  // 未设置状态码则默认成功状态
+  const code = res.data.code || 200;
+  // 获取错误信息
+  const msg = errorCode[code] || res.data.msg || errorCode['default']
+  // 二进制数据则直接返回
+  if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
+    return res.data
+  }
+  if (code === 401) {
+    if (!isRelogin.show) {
+      isRelogin.show = true;
+      MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
+        isRelogin.show = false;
+        store.dispatch('LogOut').then(() => {
+          location.href = '/index';
+        })
       }).catch(() => {
         isRelogin.show = false;
       });
     }
-      return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
-    } else if (code === 500) {
-      Message({ message: msg, type: 'error' })
-      return Promise.reject(new Error(msg))
-    } else if (code === 601) {
-      Message({ message: msg, type: 'warning' })
-      return Promise.reject('error')
-    } else if (code !== 200) {
-      Notification.error({ title: msg })
-      return Promise.reject('error')
-    } else {
-      return res.data
-    }
-  },
+    return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
+  } else if (code === 500) {
+    Message({ message: msg, type: 'error' })
+    return Promise.reject(new Error(msg))
+  } else if (code === 601) {
+    Message({ message: msg, type: 'warning' })
+    return Promise.reject('error')
+  } else if (code !== 200) {
+    Notification.error({ title: msg })
+    return Promise.reject('error')
+  } else {
+    return res.data
+  }
+},
   error => {
     console.log('err' + error)
     let { message } = error;

ruoyi-ui/src/views/crmSystem/myTask/index.vue

@@ -234,7 +234,7 @@
       </el-tab-pane>
     </el-tabs>
     <!--流程图-->
-    <flow :flowData="flowData" />
+    <!-- <flow :flowData="flowData" /> -->
   </div>
 </template>