通用流程设置页面

src/api/process/generalProcess.js

@@ -2,54 +2,63 @@ import request from '@/router/axios'
 
 // 通用流程-分页
 export function page(data = {}) {
-    return request({
-        url: '/api/service-flow/processInfo/page',
-        method: 'post',
-        data: data,
-    })
+  return request({
+    url: '/api/service-flow/processInfo/page',
+    method: 'post',
+    data: data,
+  })
 }
 
 // 通用流程-添加
 export function add(data = {}) {
-    return request({
-        url: '/api/service-flow/processInfo/add',
-        method: 'post',
-        data: data,
-    })
+  return request({
+    url: '/api/service-flow/processInfo/add',
+    method: 'post',
+    data: data,
+  })
 }
 
-// 通用流程-修改
-export function edit(data = {}) {
-    return request({
-        url: '/api/service-flow/processInfo/edit',
-        method: 'post',
-        data: data,
-    })
+// 通用流程-列表
+export function processInfoList(data = {}) {
+  return request({
+    url: '/api/service-flow/processInfo/list',
+    method: 'post',
+    data: data,
+  })
 }
 
-// 通用流程-删除
-export function dlt(data = {}) {
-    return request({
-        url: '/api/service-flow/processInfo/delete',
-        method: 'post',
-        data: data,
-    })
-}
+// // 通用流程-修改
+// export function edit(data = {}) {
+//   return request({
+//     url: '/api/service-flow/processInfo/edit',
+//     method: 'post',
+//     data: data,
+//   })
+// }
 
-// 通用流程-详情
-export function dtl(data = {}) {
-    return request({
-        url: '/api/service-flow/processInfo/details',
-        method: 'post',
-        data: data,
-    })
-}
+// // 通用流程-删除
+// export function dlt(data = {}) {
+//   return request({
+//     url: '/api/service-flow/processInfo/delete',
+//     method: 'post',
+//     data: data,
+//   })
+// }
+
+// // 通用流程-详情
+// export function dtl(data = {}) {
+//   return request({
+//     url: '/api/service-flow/processInfo/details',
+//     method: 'post',
+//     data: data,
+//   })
+// }
 
 // 业务服务下拉
 export function getServiceNameList(data = {}) {
-    return request({
-        url: '/api/service-flow/processInfo/serviceNameList',
-        method: 'post',
-        data: data,
-    })
+  return request({
+    url: '/api/service-flow/processInfo/serviceNameList',
+    method: 'post',
+    data: data,
+  })
 }

src/router/page/index.js

@@ -69,13 +69,13 @@ export default [
       },
       {
         path: '/generalProcess',
-        name: '通用流程',
+        name: '通用流程设置',
         component: () => import(/* webpackChunkName: "page" */ '@/views/process/generalProcess/index'),
         props: true,
       },
       {
         path: '/processNode',
-        name: '节点列表',
+        name: '流程设置',
         component: () => import(/* webpackChunkName: "page" */ '@/views/process/processNode/index'),
         props: true,
       },
@@ -91,8 +91,6 @@ export default [
         component: () => import(/* webpackChunkName: "page" */ '@/components/iframe/main'),
         props: true,
       },
-      
-      
     ],
   },
   {
@@ -100,7 +98,7 @@ export default [
     name: '测试',
     component: () => import('@/views/test'),
   },
-  
+
   {
     path: '/warehouse-maintenance',
     name: '仓库维护',

src/router/router.js

@@ -6,42 +6,42 @@
  * isTab是否加入到tag导航
  * isAuth是否需要授权
  */
-import Vue from "vue";
-import VueRouter from "vue-router";
-import PageRouter from "./page/"; // 页面路由
-import ViewsRouter from "./views/"; // 页面路由
-import AvueRouter from "./avue-router"; //封装的路由控制方法
-import i18n from "@/lang"; // Internationalization 国际化 多语言
-import Store from "../store/"; // vuex
-Vue.use(VueRouter);
+import Vue from 'vue'
+import VueRouter from 'vue-router'
+import PageRouter from './page/' // 页面路由
+import ViewsRouter from './views/' // 页面路由
+import AvueRouter from './avue-router' //封装的路由控制方法
+import i18n from '@/lang' // Internationalization 国际化 多语言
+import Store from '../store/' // vuex
+Vue.use(VueRouter)
 //创建路由
 export const createRouter = () =>
   new VueRouter({
-    mode: "hash", // 去掉url中的#
+    mode: 'history', // 去掉url中的#
     scrollBehavior: () => ({
       y: 0,
     }),
     routes: [...PageRouter, ...ViewsRouter],
-  });
-const Router = createRouter(); // 获得 route 实例
+  })
+const Router = createRouter() // 获得 route 实例
 // 初始化和注册 AvueRouter
 AvueRouter.install(Vue, {
   router: Router,
   store: Store,
   i18n: i18n,
   keepAlive: false,
-});
-Router.$avueRouter.formatRoutes(Store.state.user.menuAll, true); // 动态路由核心方法
-Router.addRoutes([...PageRouter, ...ViewsRouter]);
+})
+Router.$avueRouter.formatRoutes(Store.state.user.menuAll, true) // 动态路由核心方法
+Router.addRoutes([...PageRouter, ...ViewsRouter])
 export function resetRouter() {
   // 重置路由 比如用于身份验证失败，需要重新登录时 先清空当前的路有权限
-  const newRouter = createRouter();
-  Router.matcher = newRouter.matcher; // reset router
+  const newRouter = createRouter()
+  Router.matcher = newRouter.matcher // reset router
   AvueRouter.install(Vue, {
     router: Router,
     store: Store,
     i18n: i18n,
     keepAlive: false,
-  });
+  })
 }
-export default Router;
+export default Router

src/styles/media.scss

@@ -2,10 +2,9 @@
 .avue-header,
 .avue-top,
 .avue-logo,
-.avue-layout
-.login-logo,
+.avue-layout .login-logo,
 .avue-main {
-  transition: all .3s;
+  transition: all 0.3s;
 }
 
 .avue-contail {
@@ -16,7 +15,6 @@
   background-repeat: no-repeat;
 }
 
-
 .avue-left {
   position: fixed;
   left: 0;
@@ -53,9 +51,8 @@
   position: absolute;
   left: 240px;
   padding: 0;
-  padding-bottom: 20px;
   width: calc(100% - 240px);
-  height: calc(100% - 64px);
+  height: 100%;
   box-sizing: border-box;
   overflow: hidden;
   transition: all 0.5s;
@@ -102,7 +99,7 @@
   right: 0;
   top: 0;
   bottom: 0;
-  background-color: rgba(0, 0, 0, .3);
+  background-color: rgba(0, 0, 0, 0.3);
   z-index: 1024;
 
   &--show {

src/views/process/generalProcess/index.vue

@@ -4,19 +4,14 @@
       <el-col :span="24">
         <el-card class="box-card">
           <div slot="header">
-              <span>{{$t('process.processList')}}</span>
+            <span>{{ $t('process.processList') }}</span>
           </div>
-          <test ref="req" v-model="req" :form-config="queryForm"></test>
-      
+          <from-render ref="req" v-model="req" :form-config="queryForm"></from-render>
+
           <el-table :data="tableList" v-loading="loading">
             <el-table-column :label="$t('process.generalProcess.serviceName')" align="center" prop="serviceName" />
             <el-table-column :label="$t('process.generalProcess.moduleName')" align="center" prop="moduleName" />
             <el-table-column :label="$t('process.generalProcess.codeName')" align="center" prop="code" />
-            <!-- <el-table-column :label="$t('operation')" align="center" width="80">
-              <template slot-scope="scope">
-                <el-button type="text" @click="handleDelete(scope.row)">{{ $t('delete') }} </el-button>
-              </template>
-            </el-table-column> -->
           </el-table>
           <pagination v-show="total > 0" :total="total" :page.sync="req.pageNum" :limit.sync="req.pageSize" @pagination="getList" />
           <el-dialog :title="$t('process.generalProcess.add')" :visible.sync="open" width="30%">
@@ -27,6 +22,7 @@
     </el-row>
   </div>
 </template>
+
 <script>
 import * as API from '@/api/process/generalProcess.js'
 import fromRender from '@/components/form-test/index.vue'
@@ -36,14 +32,13 @@ export default {
   components: { fromRender },
   data() {
     return {
-      
       req: {
         pageNum: 1,
         pageSize: 10,
         keyword: '',
         serviceName: '',
       },
-      
+
       queryForm: {
         keyword: {
           label: this.$t('keyword'),
@@ -97,7 +92,7 @@ export default {
         loadingStatus: false,
         serviceName: {
           label: this.$t('process.generalProcess.serviceName'),
-          type: 'select',
+          type: 'input',
           data: [],
           keyName: 'id',
           labelName: 'name',
@@ -106,14 +101,14 @@ export default {
           label: this.$t('process.generalProcess.moduleName'),
           type: 'input',
         },
+        code: {
+          label: this.$t('process.generalProcess.code'),
+          type: 'input',
+        },
         flowName: {
           label: this.$t('process.generalProcess.flowName'),
           type: 'input',
         },
-        code: {
-          label: this.$t('process.generalProcess.code'),
-          span: 2,
-        },
         otherButton: {
           align: 'center',
           list: [
@@ -145,38 +140,26 @@ export default {
     }
   },
   created() {
-    //this.getSelectList()
+    this.getServiceNameList()
   },
   mounted() {
     this.getList()
-    this.getServiceNameList()
-  },
-  watch: {
-    
   },
+  watch: {},
   methods: {
-    getServiceNameList(){
-      API.getServiceNameList({}).then(
-        (res) => {
-          const listData = []
-          for (let i = 0; i < res.data.data.length; i++) {
-            const element = res.data.data[i];
-            listData.push({
-              name:element,
-              id:element
-            })
-          }
-          this.dialogForm.serviceName.data = listData
-          this.queryForm.serviceName.data = listData
-        },
-        
-      )
-    },
-    reload(row){
-      console.log(row)
-      this.req.pageNum = 1
-      this.req.classifyId = row.id
-      this.getList()
+    getServiceNameList() {
+      API.getServiceNameList({}).then((res) => {
+        const listData = []
+        for (let i = 0; i < res.data.data.length; i++) {
+          const element = res.data.data[i]
+          listData.push({
+            name: element,
+            id: element,
+          })
+        }
+        // this.dialogForm.serviceName.data = listData
+        this.queryForm.serviceName.data = listData
+      })
     },
     getList() {
       this.loading = true
@@ -187,7 +170,7 @@ export default {
           this.loading = false
         },
         (err) => {
-          console.log('tdaDevicePage: ' + err)
+          console.log('page: ' + err)
           this.loading = false
         },
       )
@@ -203,40 +186,23 @@ export default {
               this.open = false
               this.dialogForm.loadingStatus = false
               this.getList()
+              this.getServiceNameList()
             },
             (err) => {
               console.log('tdaDeviceAdd: ' + err)
               this.dialogForm.loadingStatus = false
             },
           )
-          // } else {
-          //   setTimeout(() => {
-          //     const errorDiv = document.getElementsByClassName('is-error')
-          //     errorDiv[0].scrollIntoView()
-          //   }, 0)
         }
       })
     },
-    handleDelete(row) {
-      this.$confirm(this.$t('askDeleteData'), {
-        confirmButtonText: this.$t('submitText'),
-        cancelButtonText: this.$t('cancelText'),
-        type: 'warning',
-      }).then(() => {
-        API.dlt({ id: row.id }).then(() => {
-          this.msgSuccess(this.$t('deleteSuccess'))
-          this.getList()
-        })
-      })
-    },
   },
 }
 </script>
-
-<style lang="scss" scoped>
-
+  
+  <style lang="scss" scoped>
 .box-card {
-  height: calc(100vh - 110px);
+  height: calc(100vh - 60px);
   overflow-y: auto;
 }
-</style>
+</style>