:bug: Fixing a bug.工作流 几个bug 修改

src/api/route.js

@@ -19,22 +19,15 @@ import request from '@/router/axios'
 
 export function fetchList(query) {
   return request({
-    url: '/route',
+    url: '/admin/route',
     method: 'get',
     params: query
   })
 }
 export function putObj(obj) {
     return request({
-        url: '/route',
+        url: '/admin/route',
         method: 'put',
         data: obj
     })
 }
-export function fallback(obj) {
-    return request({
-        url: '/route/fallback',
-        method: 'get',
-        data: obj
-    })
-}

src/const/crud/leavebill.js

@@ -41,14 +41,24 @@ export const tableOption = {
     },
 	  {
       label: '天数',
-      prop: 'days'
+      prop: 'days',
+      type: 'number'
     },
 	  {
       label: '请假时间',
-      prop: 'createTime',
+      prop: 'leaveTime',
       type: 'datetime',
-      format: 'yyyy-MM-dd HH:mm'
-    },
+      format: 'yyyy-MM-dd HH:mm',
+      valueFormat: "yyyy-MM-dd hh:mm:ss"
+      },
+      {
+          label: '提交时间',
+          prop: 'createTime',
+          type: 'datetime',
+          format: 'yyyy-MM-dd HH:mm',
+          editDisabled: true,
+          addVisdiplay: false
+      },
     {
         label: '备注',
         prop: 'content',

src/const/crud/task.js

@@ -125,7 +125,7 @@ export const taskOption = {
         },
         {
             label:'用户',
-            prop:'username'
+            prop:'userId'
         },
         {
             label:'批注',

src/views/admin/activiti/leave.vue

@@ -23,6 +23,7 @@
                  :data="tableData"
                  :table-loading="tableLoading"
                  :option="tableOption"
+                 @search-change="searchChange"
                  @current-change="currentChange"
                  @refresh-change="refreshChange"
                  @size-change="sizeChange"
@@ -192,6 +193,13 @@
       this.getList()
     })
     },
+    /**
+     * 搜索回调
+     */
+    searchChange(form) {
+        this.listQuery.state = form.state
+        this.getList()
+    },
     /**
      * 刷新回调
      */

src/views/admin/route/index.vue

@@ -18,63 +18,66 @@
 <template>
     <div class="app-container pull-auto">
         <basic-container>
+            <el-alert
+                    title="路由配置是非常专业的事情，不建议非工程师操作"
+                    type="warning">
+            </el-alert>
             <vue-json-editor v-model="json" :show-btns="false"></vue-json-editor>
             <div align="center">
                 <el-button @click="edit()">更新</el-button>
-                <el-button type="warning" @click="fallback()">回滚</el-button>
             </div>
         </basic-container>
     </div>
 </template>
 <script>
-import vueJsonEditor from 'vue-json-editor'
-import  {fetchList, putObj,fallback} from '@/api/route'
-export default {
-    data () {
-        return {
-            json: null
-        }
-    },
-
-    // 注入vueJsonEditor组件
-    components: {
-        vueJsonEditor
-    },
+    import vueJsonEditor from 'vue-json-editor'
+    import {fetchList, putObj, fallback} from '@/api/route'
 
-    created () {
-        this.getList()
-    },
+    export default {
+        data() {
+            return {
+                json: null
+            }
+        },
 
-    methods: {
-        getList () {
-            fetchList().then(response => {
-                this.json = response.data
-                console.log(this.json)
-            })
+        // 注入vueJsonEditor组件
+        components: {
+            vueJsonEditor
         },
 
-        fallback (){
-            fallback(this.json).then(response => {
-                this.$notify({
-                    title: '成功',
-                    message: '回滚成功',
-                    type: 'success',
-                    duration: 2000
-                })
-            })
+        created() {
+            this.getList()
         },
 
-        edit (){
-            putObj(this.json).then(response => {
-                this.$notify({
-                    title: '成功',
-                    message: '更新成功',
-                    type: 'success',
-                    duration: 2000
+        methods: {
+            getList() {
+                fetchList().then(response => {
+                    let result = response.data.data;
+                    for (var i = 0; i < result.length; i++) {
+                        let route = result[i]
+                        if(route.predicates){
+                            let predicates = route.predicates
+                            route.predicates = JSON.parse(predicates)
+                        }
+                        if(route.filters){
+                            let filters = route.filters
+                            route.filters = JSON.parse(filters)
+                        }
+                    }
+                    this.json = result
                 })
-            })
-        },
+            },
 
+            edit() {
+                putObj(this.json).then(response => {
+                    this.$notify({
+                        title: '成功',
+                        message: '更新成功',
+                        type: 'success',
+                        duration: 2000
+                    })
+                })
+            }
+        }
     }
-}
 </script>

vue.config.js

@@ -36,13 +36,6 @@ module.exports = {
                     '^/code': '/code'
                 }
             },
-            '/route': {
-                target: url,
-                ws: true,
-                pathRewrite: {
-                    '^/route': '/route'
-                }
-            },
             '/gen': {
                 target: url,
                 ws: true,