改bug

src/layout/header/BredCum.vue

@@ -12,12 +12,12 @@ const route = useRoute();
 const getBredcurm = () => {
   //获取所有有meta和title
   let mached = route.matched.filter(item => item.meta && item.meta.title);
-  //判断第一个是否是首页,如果不是，构造一个
-  // const first = mached[0];
-  // if(first && first.path !== '/menu'){
-  //     //构造一个
-  //     mached = [{path: '/menu',meta:{title:'首页'}} as any].concat(mached);
-  // }
+  // 判断第一个是否是首页,如果不是，构造一个
+  const first = mached[0];
+  if(first && first.path !== '/dashboard'){
+      //构造一个
+      mached = [{path: '/dashboard',meta:{title:'首页'}} as any].concat(mached);
+  }
   //设置面包屑导航数据
   tabs.value = mached;
 

src/layout/header/UserInfo.vue

@@ -5,7 +5,7 @@
         </span>
         <template #dropdown>
             <el-dropdown-menu>
-                <el-dropdown-item @click="userInfo">个人信息</el-dropdown-item>
+                <!-- <el-dropdown-item @click="userInfo">个人信息</el-dropdown-item> -->
                 <el-dropdown-item @click="loginOut">退出登录</el-dropdown-item>
             </el-dropdown-menu>
         </template>

src/layout/tabs/Tabs.vue

@@ -23,7 +23,7 @@ const setActiveTab = () => {
 }
 //删除选项卡
 const removeTab = (targetName: string) => {
-    if (targetName === '/menu') return;
+    if (targetName === '/dashboard') return;
     //选项卡数据列表
     const tabs = tabsList.value;
     //当前激活的选项卡

src/router/index.ts

 import { createRouter, createWebHashHistory, RouteRecordRaw } from "vue-router";
-import Layout from '@/layout/index.vue'
+import Layout from "@/layout/index.vue";
 const routes: Array<RouteRecordRaw> = [
-    {
-        path: '/',
-        component: Layout,
-        redirect: '/menu',
-    },
-    {
-        path: '/login',
-        name: 'login',
-        component: () => import("@/views/login/login.vue"),
-    },
-    {
-        path: '/404',
-        name: '404',
-        component: () => import("@/views/exception/404.vue")
-    },
-    // {
-    //     path: '/:catchAll(.*)',
-    //     redirect: '/404'
-    // }
-]
-
-export const asyncRoutes: Array<RouteRecordRaw> = []
+  {
+    path: "/",
+    component: Layout,
+    redirect: "/dashboard",
+    children: [
+      {
+        path: "/dashboard",
+        component: () => import("@/views/dashboard/index.vue"),
+        name: "dashboard",
+        meta: {
+          title: "首页",
+          icon: "#icondashboard",
+        },
+      },
+    ],
+  },
+  {
+    path: "/login",
+    name: "login",
+    component: () => import("@/views/login/login.vue"),
+  },
+  {
+    path: "/404",
+    name: "404",
+    component: () => import("@/views/exception/404.vue"),
+  },
+  // {
+  //     path: '/:catchAll(.*)',
+  //     redirect: '/404'
+  // }
+];
 
+export const asyncRoutes: Array<RouteRecordRaw> = [];
 
 const router = createRouter({
-    history: createWebHashHistory(),
-    // routes = routes:routes
-    routes
-})
+  history: createWebHashHistory(),
+  // routes = routes:routes
+  routes,
+});
 
-export function addRoutes(routes:any){
-    router.addRoute(routes)
+export function addRoutes(routes: any) {
+  router.addRoute(routes);
 }
 
 export default router;

src/table/index.vue

 <template>
   <!-- 顶部搜索 -->
   <div class="search-content">
-    <el-form :model="formData">
+    <!-- <el-form :model="formData">
       <el-form-item label="搜索">
         <el-row :gutter="10">
           <el-col :span="18"><el-input v-model="formData.keyword" :placeholder="`请输入${tableConfigData.title}`" @change="searchList" /></el-col>
           <el-col :span="6"><el-button type="primary" size="small" @click="searchList">搜索</el-button></el-col>
         </el-row>
       </el-form-item>
-    </el-form>
+    </el-form> -->
     <div class="button-content margin-bottom-10">
       <el-button v-if="tableConfigData.btnObj.isAdd" type="primary" size="small" @click="drawerData.handleShow('新增')">
         <el-icon><Plus /></el-icon>
@@ -54,7 +54,7 @@
     :before-close="drawerData.handleClose"
   >
     <el-card v-if="drawerData.drawerShow">
-      <el-form ref="ruleFormRef" :model="tableConfigData.drawerformData" :rules="tableConfigData.rules" label-width="80px">   
+      <el-form ref="ruleFormRef" :model="tableConfigData.drawerformData" :rules="tableConfigData.rules" label-width="100px">   
         <slot name="drawer" />
         <el-form-item>
           <el-button type="primary" @click="drawerData.onSubmit(ruleFormRef)">保存</el-button>

src/views/dashboard/index.vue

-<template>
+<!-- <template>
     <div class="router">
         <el-row :gutter="5" style="margin-bottom:5px;">
             <el-col :span="10">
@@ -41,4 +41,10 @@ const missions = reactive<Array<any>>([
     }
 ])
 </script>
-<style></style>
+<style></style> -->
\ No newline at end of file
+
+<template>
+    <div class="app-container">
+        <h1>Welcome ！！！</h1>
+    </div>
+</template>
\ No newline at end of file

src/views/manage/components/fieldConfiguration/newField.vue

@@ -33,11 +33,6 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="8" v-show="fieidForm.flag === '1' || fieidForm.flag === 'MES->ERP'">
-                    <el-form-item label="目标单分录主键">
-                        <el-input v-model="fieidForm.entryIdName" placeholder="请输入目标单分录主键" />
-                    </el-form-item>
-                </el-col>
-                <el-col :span="8" v-show="fieidForm.flag === '1' || fieidForm.flag === 'MES->ERP'">
                     <el-form-item label="源单唯一标识">
                         <el-input v-model="fieidForm.fathersFormId" placeholder="请输入源单唯一标识" />
                     </el-form-item>
@@ -48,8 +43,16 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="8" v-show="fieidForm.flag === '1' || fieidForm.flag === 'MES->ERP'">
-                    <el-form-item label="源单分录主键">
-                        <el-input v-model="fieidForm.linkFsIdName" placeholder="请输入子源单行内码" />
+                    <el-form-item label="行内码标识">
+                        <el-input v-model="fieidForm.linkFsIdName" placeholder="请输入行内码标识" />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8" v-show="fieidForm.flag === '1' || fieidForm.flag === 'MES->ERP'">
+                    <el-form-item label="在事务中">
+                        <el-select v-model="fieidForm.isInTransaction" placeholder="请选择在事务中">
+                            <el-option label="true" value="1"></el-option>
+                            <el-option label="false" value="0"></el-option>
+                        </el-select>
                     </el-form-item>
                 </el-col>
                 <el-col>
@@ -106,7 +109,7 @@ const fieidForm = ref({
     linkFsIdName: '',
     pushRule: '',
     fathersFormId: '',
-    entryIdName: '',
+    isInTransaction: true,
     entryName: '',
     plugInUrl: '',
     customSql: '',
@@ -162,7 +165,7 @@ const clear = () => {
         linkFsIdName: '',
         pushRule: '',
         fathersFormId: '',
-        entryIdName: '',
+        isInTransaction: true,
         entryName: '',
         plugInUrl: '',
         customSql: '',

src/views/manage/kingdeeLog.vue

@@ -3,28 +3,28 @@
     <el-card>
       <!-- <el-space direction="vertical" alignment="align-items: left" style="margin-top: 30px"> -->
       <!-- 过滤条件框 -->
-      <el-form :model="filterForm" style="width: 100%" label-width="125px">
+      <el-form :model="filterForm" style="width: 100%" label-width="135px">
         <el-row :gutter="24">
           <el-col :span="8">
-            <el-form-item label="选择时间：">
+            <el-form-item label="选择时间">
               <el-date-picker v-model="dateTime" type="datetimerange" range-separator="至" start-placeholder="开始时间"
                 end-placeholder="结束时间" @change="dateChange" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="名称：" width="60px">
+            <el-form-item label="名称" width="60px">
               <el-input v-model="filterForm.name" placeholder="请输入名称" clearable />
             </el-form-item>
           </el-col>
           <el-col></el-col>
           <el-col :span="8">
-            <el-form-item label="同步时长 / 毫秒：">
+            <el-form-item label="同步时长/ms">
               <el-row justify="start">
                 <el-col :span="10">
                   <el-input v-model="filterForm.costTimeFrom" controls-position="right" @change="handleNumberChangeFrom"
                     placeholder="开始同长时间" />
                 </el-col>
-                <span style="margin: 0 20px;">至</span>
+                <span style="margin: 0 25px;">至</span>
                 <el-col :span="10">
                   <el-input v-model="filterForm.costTimeTo" controls-position="right" placeholder="结束同步时长"
                     @change="handleNumberChangeTo" />
@@ -33,7 +33,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="唯一标识：" width="60px">
+            <el-form-item label="唯一标识" width="60px">
               <el-input v-model="filterForm.queueId" placeholder="请输入唯一标识" clearable />
             </el-form-item>
           </el-col>
@@ -62,7 +62,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="name" label="单据名称" align="center" />
-        <el-table-column prop="costTime" label="同步时长 / 毫秒" align="center" />
+        <el-table-column prop="costTime" label="同步时长/ms" align="center" />
         <el-table-column prop="queueId" label="唯一标识" align="center" />
         <el-table-column prop="message" label="错误信息" align="center">
           <template #default="scope">
@@ -97,7 +97,7 @@
               "失败"
           }}</el-tag>
         </el-form-item>
-        <el-form-item label="同步时长 / 毫秒：">
+        <el-form-item label="同步时长/ms：">
           <el-input v-model="detailForm.costTime" placeholder="同步时长为" />
         </el-form-item>
         <el-form-item label="唯一标识：">
@@ -190,6 +190,8 @@ const filterChange = (value: any) => {
 const dateChange = (value: any) => {
   filterForm.value.dateFrom = moment(value[0]).format("YYYY-MM-DD HH:mm:ss");
   filterForm.value.dateTo = moment(value[1]).format("YYYY-MM-DD HH:mm:ss");
+  console.log(value);
+  console.log(filterForm.value.dateFrom, filterForm.value.dateTo);
 };
 // 选择多选框的数据
 const handleSelectionChange = (val: List[]) => {

src/views/system/department/AddAndEdit.vue

@@ -19,7 +19,7 @@
                 :model="dialogModel"
                 ref="addDeptForm"
                 :rules="rules"
-                label-width="80px"
+                label-width="100px"
                 size="small"
             >
                 <el-row>

src/views/system/department/department.vue

 <template>
     <el-main height>
         <!-- 搜索栏 -->
-        <el-form :model="searchParm" label-width="80px" :inline="true">
+        <el-form :model="searchParm" label-width="100px" :inline="true">
             <el-form-item>
                 <el-input v-model="searchParm.searchName"></el-input>
             </el-form-item>

src/views/system/modules/menuManageFormModules.vue

 <template>
     <el-drawer v-model="props.show" :title="title" @close="handleClose" @open="radioChange(radio)">
         <el-card>
-            <el-form ref="form" :model="formData" :rules="rules" size="large" label-position="right" label-width="80px">
+            <el-form ref="form" :model="formData" :rules="rules" size="large" label-width="100px">
                 <el-radio-group v-model="radio" @change="radioChange">
                     <el-radio :label="0">一级菜单</el-radio>
                     <el-radio :label="1">子菜单</el-radio>

src/views/system/userManage.vue

 <template>
     <div class="router" style="padding: 20px;">
-        <el-form :inline="true">
+        <!-- <el-form :inline="true">
             <el-form-item label="账号">
                 <el-input placeholder="账号模糊查询"></el-input>
             </el-form-item>
             <el-form-item>
                 <el-button type="primary">查询</el-button>
             </el-form-item>
-        </el-form>
+        </el-form> -->
         <el-form :inline="true">
             <el-form-item>
-                <el-button type="primary" @click="handleAdd">添加用户</el-button>
+                <el-button type="primary" size="small" @click="handleAdd">添加用户</el-button>
             </el-form-item>
         </el-form>
         <el-table :data="tableData" border scrollbar-always-on>
@@ -19,6 +19,9 @@
                 <template #default="scope" v-if="i.prop == 'avatar'">
                     <el-avatar :src="scope.row.avatar"></el-avatar>
                 </template>
+                <template #default="scope" v-if="i.prop == 'fdate'">
+                    {{ moment(scope.row.fdate).format("YYYY-MM-DD hh:mm:ss") }}
+                </template>
             </el-table-column>
             <el-table-column label="操作" width="135" align="center">
                 <template #default="scope">
@@ -32,9 +35,9 @@
                 </template>
             </el-table-column>
         </el-table>
-        <el-drawer v-model="showDrawer" :title="drawerTitle" size="35%">
+        <el-drawer v-model="showDrawer" :title="drawerTitle" size="40%" style="padding-right: 20px;">
             <el-form class="form" ref="form" :rules="rules" :model="formData" size="large" label-position="right"
-                label-width="80px">
+                label-width="110px">
                 <el-form-item v-for="item in formColumn" :prop="item.prop" :label="item.label">
                     <el-input v-if="item.type == 'input'" v-model="formData[item.prop]" :placeholder="item.placeholder">
                     </el-input>
@@ -58,6 +61,7 @@
 <script setup lang="ts">
 import { reactive, ref } from 'vue'
 import { addUser, getUserInfo, editUser, deleteUser, getAllRole, findRoleByUser } from '@/services/api/user/userAPI'
+import moment from 'moment';
 const tableColumn = reactive([
     {
         label: '用户账号',