Explorar el Código

Merge branch 'fyh' of yinet2020/YinetOASystemWeb into master

付宇航 hace 4 años
padre
commit
6f006aa2aa

+ 6 - 4
package.json

@@ -67,17 +67,17 @@
   },
   "devDependencies": {
     "@babel/core": "7.0.0",
-    "@babel/register": "7.0.0",
     "@babel/parser": "^7.7.4",
+    "@babel/register": "7.0.0",
     "@vue/cli-plugin-babel": "3.5.3",
     "@vue/cli-plugin-eslint": "^3.9.1",
-    "@vue/cli-plugin-unit-jest": "3.5.3",
-    "@vue/cli-service": "3.5.3",
+    "@vue/cli-plugin-unit-jest": "^4.4.6",
+    "@vue/cli-service": "^4.4.6",
     "@vue/test-utils": "1.0.0-beta.29",
     "autoprefixer": "^9.5.1",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "10.0.1",
-    "babel-jest": "23.6.0",
+    "babel-jest": "^26.1.0",
     "chalk": "2.4.2",
     "chokidar": "2.1.5",
     "connect": "3.6.6",
@@ -86,6 +86,8 @@
     "html-webpack-plugin": "3.2.0",
     "http-proxy-middleware": "^0.19.1",
     "husky": "1.3.1",
+    "less": "^3.11.3",
+    "less-loader": "^6.2.0",
     "lint-staged": "8.1.5",
     "mockjs": "1.0.1-beta3",
     "node-sass": "^4.9.0",

+ 12 - 0
src/api/activiti/process/index.js

@@ -0,0 +1,12 @@
+import request from '@/utils/request'
+import { praseStrEmpty } from "@/utils/ruoyi";
+
+// 查询用户列表
+export function processType(query) {
+
+  return request({
+    url: '/activiti/group/processType',
+    method: 'get',
+    params: query
+  })
+}

+ 201 - 0
src/views/system/process/index.vue

@@ -0,0 +1,201 @@
+<template>
+  <div class="hello">
+    <div class="box">
+      <el-container>
+        <el-aside width="250px">
+          <div class="title">流程分类</div>
+          <div class="left">
+            <ul>
+              <li><router-link to="/">用户管理类</router-link></li>
+              <li><router-link to="/about">权限管理合同类</router-link></li>
+              <li><router-link to="/goods">商品管理类</router-link></li>
+              <li><router-link to="/orders">订单管理类</router-link></li>
+              <li><router-link to="/settings">项目类</router-link></li>
+            </ul>
+          </div>
+        </el-aside>
+        <el-main class="right">
+          <div class="title">模板数据-分类</div>
+          <div class="dad">
+            <el-form :inline="true"  class="demo-form-inline" style="float: left;margin-left: 50px;margin-top: 18px">
+              <el-form-item label="">
+                <el-input v-model="msg"  placeholder="请输入要查询的关键字"></el-input>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="onSubmit">查询</el-button>
+                <el-button  @click="onSubmit">重置</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+          <div class="dead">
+            <el-row class="der">
+              <el-button>刷新</el-button>
+              <el-button type="primary">添加</el-button>
+              <el-button >预览流程</el-button>
+              <el-button >启用流程</el-button>
+              <el-button >停用流程</el-button>
+              <el-button >查看历史记录</el-button>
+              <el-button >导出流程(XML)</el-button>
+              <el-button >导入流程(XML)</el-button>
+              <el-button >导出流程(JSON)</el-button>
+              <el-button >导出流程(JSON)</el-button>
+              <el-button >分类管理</el-button>
+            </el-row>
+            <div class="ddt">
+              <router-vie8w></router-vie8w>
+            </div>
+          </div>
+        </el-main>
+      </el-container>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { processType} from "@/api/activiti/process";
+export default {
+
+  name: 'HelloWorld',
+  props: {
+    msg: String
+  },
+  data () {
+    return {
+      tableData: [{
+        date: '2016-05-02',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333,
+        cdate: '2016-05-02'
+      }, {
+        date: '2016-05-04',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1517 弄',
+        zip: 200333,
+        cdate: '2016-05-02'
+      }, {
+        date: '2016-05-01',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1519 弄',
+        zip: 200333,
+        cdate: '2016-05-02'
+      }, {
+        date: '2016-05-03',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1516 弄',
+        zip: 200333,
+        cdate: '2016-05-02'
+      }]
+    }
+  },
+  methods: {
+    handleClick (row) {
+      console.log(row)
+    },
+    getprocessType() {
+      processType().then(response => {
+        this.deptOptions = response.data;
+      });
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+  h3 {
+    margin: 40px 0 0;
+  }
+  ul {
+    list-style-type: none;
+    padding: 0;
+  }
+  li {
+    display: inline-block;
+    margin: 0 10px;
+  }
+  a {
+    color: inherit;
+    text-decoration: none;
+  }
+
+  body{
+    background: #ffffff;
+    padding: 10px;
+  }
+
+  .box{
+    margin: 10px;
+  }
+  .el-aside {
+    /*background-color: #D3DCE6;*/
+    color: #333;
+    border: 1px solid #e9e9e9;
+    border-radius: 10px;
+  }
+  .title{
+    line-height: 40px;
+    border-bottom: 2px solid #e9e9e9;
+    text-align: left;
+    padding-left: 30px;
+  }
+  .left{
+    width: 100%;
+    /*height: 100%;*/
+  }
+  .left ul{
+    min-height:800px;
+    height: 100%;
+  }
+  .left ul li{
+    width: 80%;
+    height: 50px;
+    line-height: 50px;
+    color: #2f4050;
+    text-align: left;
+    padding-left: 30px;
+  }
+  .left ul li:hover{
+    color: #02a7f0;
+  }
+  .right{
+    border: 1px solid #e9e9e9;
+    margin-left: 20px;
+    padding-top: 0;
+    padding-left: 0;
+    border-radius: 10px;
+    padding-right: 0;
+  }
+  .dad{
+    height: 75px;
+    border-top: 1px solid #e9e9e9;
+    border-bottom: 1px solid #e9e9e9;
+    border-top: none;
+  }
+  .dead{
+    width: 100%;
+    height: 500px;
+    margin-top: 20px;
+    border-top: 1px solid #e9e9e9;
+    border-bottom: 1px solid #e9e9e9;
+  }
+  .der{
+    float: left;
+    margin: 20px;
+  }
+  .der .el-button{
+    margin-bottom: 10px;
+  }
+
+  .ddt{
+    margin: 0 20px;
+  }
+</style>

+ 1 - 1
src/views/system/user/index.vue

@@ -656,4 +656,4 @@ export default {
     }
   }
 };
-</script>
+</script>