merge

Reviewed-on: #454

.env.dev

@@ -12,8 +12,10 @@ ENV = 'development'
 VUE_APP_TITLE = 智能监控分析系统
 
 # 芋道管理系统/开发环境
-# VUE_APP_BASE_API = 'http://192.168.8.22:48080'
+
-VUE_APP_BASE_API = 'http://172.16.33.65:48082'
+VUE_APP_BASE_API = 'http://192.168.0.31:48080'
+# VUE_APP_BASE_API = 'http://172.16.32.76:48080'
+# VUE_APP_BASE_API = 'http://line.kszny.picaiba.com'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/api/areavisual/overview.js

@@ -0,0 +1,72 @@
+import request from '@/utils/request'
+
+// 获取区域列表
+export function getAreaList(params) {
+    return request({
+        url: '/wms/region/page',
+        method: 'get',
+        params
+    })
+}
+
+// 获取区域空满数量
+export function postAllAreaInfo(data) {
+    return request({
+        url: '/wms/region/lsit/count',
+        method: 'post',
+        data
+    })
+}
+
+// 获取指定库区库位信息
+export function postAreaInfo(data) {
+    return request({
+        url: '/wms/line-edge-library/list/region',
+        method: 'post',
+        data
+    })
+}
+
+// 获取区域总览
+export function postAllAreaOverview(data) {
+    return request({
+        url: '/wms/line-edge-library/line/count',
+        method: 'post',
+        data
+    })
+}
+
+// 删除能源实时数据库plc相关
+export function deleteEnergyPlc(id) {
+  return request({
+    url: '/base/energy-plc/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获取关联表编码
+export function getCode() {
+  return request({
+    url: '/base/energy-plc/getCode',
+    method: 'get'
+  })
+}
+
+// 获得能源实时数据库plc相关分页
+export function getEnergyPlcPage(data) {
+  return request({
+    url: '/base/energy-plc/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出能源实时数据库plc相关 Excel
+export function exportEnergyPlcExcel(query) {
+  return request({
+    url: '/base/energy-plc/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/areavisual/record.js

@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+// 获取出入库历史任务分页
+export function getRecordPage(params) {
+  return request({
+    url: '/wms/job-main-task-history/page',
+    method: 'get',
+    params
+  })
+}
+
+// 获取巷道列表
+export function getLaneList(params) {
+  return request({
+    url: '/wms/lane/page',
+    method: 'get',
+    params
+  })
+}
+
+// 更新能源实时数据库plc相关
+export function updateEnergyPlc(data) {
+  return request({
+    url: '/base/energy-plc/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除能源实时数据库plc相关
+export function deleteEnergyPlc(id) {
+  return request({
+    url: '/base/energy-plc/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获取关联表编码
+export function getCode() {
+  return request({
+    url: '/base/energy-plc/getCode',
+    method: 'get'
+  })
+}
+
+// 获得能源实时数据库plc相关分页
+export function getEnergyPlcPage(data) {
+  return request({
+    url: '/base/energy-plc/page',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出能源实时数据库plc相关 Excel
+export function exportEnergyPlcExcel(query) {
+  return request({
+    url: '/base/energy-plc/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/group/Schedule.js

@@ -57,7 +57,66 @@ export function listByDeptId(id) {
     method: 'get'
   })
 }
+// 作废计划
+export function disablePlan(id) {
+  return request({
+    url: '/base/group-scheduling-plan/disablePlan?id='+id,
+    method: 'delete',
+  })
+}
+// 同步节假日
+export function updateScheduleLater(data) {
+  return request({
+    url: '/base/group-holiday/updateScheduleLater',
+    method: 'post',
+    data:data
+  })
+}
+// 复制计划
+export function copyPlan(id) {
+  return request({
+    url: '/base/group-scheduling-plan/copyPlan?id='+id,
+    method: 'get'
+  })
+}
 
+// 列表草稿编辑
+export function draftEditing(id) {
+  return request({
+    url: '/base/group-scheduling-plan/draftEditing?id='+id,
+    method: 'get'
+  })
+}
+// 排班计划-详情
+export function getPlan(id) {
+  return request({
+    url: '/base/group-scheduling-plan/get?id='+id,
+    method: 'get'
+  })
+}
+// 弹窗-取消
+export function cancelStepThree(id) {
+  return request({
+    url: '/base/group-scheduling-plan/cancelStepThree?id='+id,
+    method: 'delete',
+  })
+}
+// 第三步确认并执行 检查计划时间是否冲突，如果有，返回冲突的计划列表
+export function checkPlan(data) {
+  return request({
+    url: '/base/group-scheduling-plan/checkPlan',
+    method: 'post',
+    data:data
+  })
+}
+// 第三步确认并执行 执行
+export function createStepFour(id) {
+  return request({
+    url: '/base/group-scheduling-plan/createStepFour',
+    method: 'post',
+    data:id
+  })
+}
 // 班组班次下一步至获取预览
 export function createStepTwo(data) {
   return request({
@@ -73,3 +132,12 @@ export function returnStepTwo(id) {
     method: 'delete',
   })
 }
+
+// 第三步获取预览
+export function getPerView(data) {
+  return request({
+    url: '/base/group-scheduling-plan/getPerView',
+    method: 'post',
+    data:data
+  })
+}

src/api/group/calendar.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 获取部门及下级部门排班list
+export function getDeptSchedulingList(data) {
+  return request({
+    url: '/base/group-team-scheduling/getDeptSchedulingList',
+    method: 'post',
+    data: data
+  })
+}
+// 某个班组的排班list
+export function getClassSchedulingList(data) {
+  return request({
+    url: '/base/group-team-scheduling/getClassSchedulingList',
+    method: 'post',
+    data: data
+  })
+}

src/api/group/holidaySetting.js

@@ -2,19 +2,28 @@
  * @Author: zwq
  * @Date: 2025-10-18 21:24:37
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-18 23:07:37
+ * @LastEditTime: 2025-10-22 14:34:29
  * @Description:
  */
 import request from '@/utils/request'
 
 // 获得节假日基础信息分页
-export function deptHolidayList(query) {
+export function deptHolidayPage(query) {
   return request({
     url: '/base/group-holiday/page',
     method: 'get',
     params: query
   })
 }
+// 获得部门节假日信息
+export function deptHolidayList(data) {
+  return request({
+    url: '/base/group-holiday/deptHolidayList',
+    method: 'post',
+    data: data
+  })
+}
+
 
 // 创建节假日基础信息
 export function createHoliday(data) {
@@ -24,6 +33,14 @@ export function createHoliday(data) {
     data: data
   })
 }
+// 节假日操作后直接更新排班日历
+export function updateSchedule(data) {
+  return request({
+    url: '/base/group-holiday/updateSchedule',
+    method: 'post',
+    data: data
+  })
+}
 
 // 更新节假日基础信息
 export function updateHoliday(data) {
@@ -33,14 +50,30 @@ export function updateHoliday(data) {
     data: data
   })
 }
+// 删除节假日基础信息前校验是否影响排班
+export function checkDeleteHoliday(id) {
+  return request({
+    url: '/base/group-holiday/checkDelete?id=' + id,
+    method: 'delete'
+  })
+}
+
 // 删除
-export function deleteHolidayn(id) {
+export function deleteHoliday(id) {
   return request({
     url: '/base/group-holiday/delete?id=' + id,
     method: 'delete'
   })
 }
 
+// 获得节假日基础信息
+export function getHoliday(id) {
+  return request({
+    url: '/base/group-holiday/get?id=' + id,
+    method: 'get'
+  })
+}
+
 // 获得节假日变动日志分页
 export function deptHolidayLogList(query) {
   return request({
@@ -49,3 +82,11 @@ export function deptHolidayLogList(query) {
     params: query
   })
 }
+
+// 获得用户本人及以下的部门扁平化结构
+export function getEnableData() {
+  return request({
+    url: '/base/group-team-scheduling/getEnableData',
+    method: 'get',
+  })
+}

src/api/ssdl/product&recipe.js

@@ -0,0 +1,154 @@
+/*
+ * @Author: zwq
+ * @Date: 2025-11-17 09:25:12
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-28 09:29:14
+ * @Description:
+ */
+import request from '@/utils/request'
+
+
+// 获得原料分页
+export function getProductPage(query) {
+  return request({
+    url: '/wms/material/page',
+    method: 'get',
+    params: query
+  })
+}
+// 获得原料
+export function getProduct(id) {
+  return request({
+    url: '/wms/material/get?id=' + id,
+    method: 'get'
+  })
+}
+// 删除原料
+export function deleteProduct(id) {
+  return request({
+    url: '/wms/material/delete?id=' + id,
+    method: 'delete'
+  })
+}
+// 更新
+export function updateProduct(data) {
+  return request({
+    url: '/wms/material/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 创建
+export function createProduct(data) {
+  return request({
+    url: '/wms/material/create',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 获得工艺分页
+export function getProcessPage(query) {
+  return request({
+    url: '/wms/process/page/group/by',
+    method: 'get',
+    params: query
+  })
+}
+// 获得工艺点击展开表格
+export function getProcessDetailPage(query) {
+  return request({
+    url: '/wms/process/page/group/by/detail',
+    method: 'get',
+    params: query
+  })
+}
+// 删除工艺
+export function deleteProcess(id) {
+  return request({
+    url: '/wms/process/delete?id=' + id,
+    method: 'delete'
+  })
+}
+// 批量删除工艺
+export function deleteProcessList(ids) {
+  return request({
+    url: '/wms/process/delete-list?ids=' + ids,
+    method: 'delete'
+  })
+}
+// 更新
+export function updateProcess(data) {
+  return request({
+    url: '/wms/process/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 创建
+export function createProcess(data) {
+  return request({
+    url: '/wms/process/create',
+    method: 'post',
+    data: data
+  })
+}
+// 获得工艺
+export function getProcess(id) {
+  return request({
+    url: '/wms/process/get?id=' + id,
+    method: 'get'
+  })
+}
+// 工艺设备原料分页
+export function getProcessMaterialPage(query) {
+  return request({
+    url: '/wms/process-equipment-material/page',
+    method: 'get',
+    params: query
+  })
+}
+// 删除工艺设备原料
+export function deleteProcessMaterial(id) {
+  return request({
+    url: '/wms/process-equipment-material/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 更新
+export function updateProcessMaterial(data) {
+  return request({
+    url: '/wms/process-equipment-material/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 创建
+export function createProcessMaterial(data) {
+  return request({
+    url: '/wms/process-equipment-material/create',
+    method: 'post',
+    data: data
+  })
+}
+// 获得工艺
+export function getProcessMaterial(id) {
+  return request({
+    url: '/wms/process-equipment-material/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得设备分页
+export function getEquipmentPage(query) {
+  return request({
+    url: '/wms/equipment/page',
+    method: 'get',
+    params: query
+  })
+}

src/api/ssdl/taskList.js

@@ -0,0 +1,60 @@
+/*
+ * @Author: zwq
+ * @Date: 2025-11-17 09:25:12
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-18 15:42:19
+ * @Description:
+ */
+import request from '@/utils/request'
+
+
+// 获得任务分页
+export function getTaskPage(query) {
+  return request({
+    url: '/wms/job-main-task/page',
+    method: 'get',
+    params: query
+  })
+}
+// 获得任务
+export function getTask(id) {
+  return request({
+    url: '/wms/job-main-task/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得任务日志分页
+export function getTaskLogPage(query) {
+  return request({
+    url: '/wms/job-main-task-log/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 更新
+export function updateTask(data) {
+  return request({
+    url: '/wms/job-main-task/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 根据区域id获取该区域下的库位信息
+export function getRegion(id) {
+  return request({
+    url: '/wms/line-edge-library/get-by-region-id?regionId=' + id,
+    method: 'get'
+  })
+}
+
+// 创建
+export function createPCTask(data) {
+  return request({
+    url: '/wms/job-main-task/pc-create-task',
+    method: 'post',
+    data: data
+  })
+}

src/api/visualization/visualization.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function getLineEdgeLibraryList(data) {
+  return request({
+		url: '/wms/line-edge-library/list',
+		method: 'get',
+		params: data,
+	});
+}

src/mixins/basic-page.js

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-08-24 11:19:43
  * @LastEditors: zwq
- * @LastEditTime: 2024-04-02 09:33:29
+ * @LastEditTime: 2025-11-28 09:35:03
  * @Description:
  */
 export default {
@@ -16,7 +16,7 @@ export default {
       },
       tableData: [], //table数据
       listQuery: { //分页
-        pageSize: 10,
+        pageSize: 20,
         pageNo: 1,
         total: 1,
       },
@@ -69,7 +69,7 @@ export default {
           this.$refs.addOrUpdate.init(val.data.id);
         });
       } else if (val.type === "delete") {
-        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex)
+        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex,val.data)
       } else {
         this.otherMethods(val)
       }

src/permission.js

@@ -9,7 +9,7 @@ import { isRelogin } from '@/utils/request'
 NProgress.configure({ showSpinner: false })
 
 // 增加三方登陆 update by 芋艿
-const whiteList = ['/login', '/social-login',  '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee']
+const whiteList = ['/login', '/social-login','screenbg',  '/auth-redirect', '/bind', '/register', '/oauthLogin/gitee']
 
 router.beforeEach((to, from, next) => {
   NProgress.start()
@@ -25,9 +25,9 @@ router.beforeEach((to, from, next) => {
         // 获取字典数据 add by 芋艿
         store.dispatch('dict/loadDictDatas')
         // 判断当前用户是否已拉取完 user_info 信息
-        store.dispatch('GetInfo').then(() => {
+        store.dispatch('GetInfo').then(userInfo => {
           isRelogin.show = false
-          store.dispatch('GenerateRoutes').then(accessRoutes => {
+          store.dispatch('GenerateRoutes', userInfo.menus).then(accessRoutes => {
             // 根据 roles 权限生成可访问的路由表
             router.addRoutes(accessRoutes) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成

src/router/index.js

@@ -35,185 +35,236 @@ export const constantRoutes = [
 		children: [
 			{
 				path: '/redirect/:path(.*)',
-        component: (resolve) => require(['@/views/redirect'], resolve)
+				component: (resolve) => require(['@/views/redirect'], resolve),
-      }
+			},
-    ]
+		],
 	},
 	{
 		path: '/login',
 		component: (resolve) => require(['@/views/login'], resolve),
-    hidden: true
+		// hidden: true,
 	},
+
 	{
 		path: '/sso',
 		component: (resolve) => require(['@/views/sso'], resolve),
-    hidden: true
+		hidden: true,
 	},
 	{
 		path: '/social-login',
 		component: (resolve) => require(['@/views/socialLogin'], resolve),
-    hidden: true
+		hidden: true,
 	},
 	{
 		path: '/404',
 		component: (resolve) => require(['@/views/error/404'], resolve),
-    hidden: true
+		hidden: true,
 	},
 	{
 		path: '/401',
 		component: (resolve) => require(['@/views/error/401'], resolve),
-    hidden: true
+		hidden: true,
 	},
 	{
 		path: '/print-design',
 		component: (resolve) => require(['@/views/print/design'], resolve),
-    hidden: true
+		hidden: true,
 	},
 	{
-    path: "",
+		path: '',
 		component: Layout,
-    redirect: "index",
+		redirect: 'index',
 		children: [
 			{
-        path: "index",
+				path: 'index',
-        component: (resolve) => require(["@/views/home/index"], resolve),
+				component: (resolve) => require(['@/views/home/index'], resolve),
-        name: "首页",
+				name: '首页',
-        meta: { title: "首页", icon: "dashboard", affix: true },
+				meta: { title: '首页', icon: 'dashboard', affix: true },
-        hidden: true
+				hidden: true,
 			},
 		],
 	},
+	{
+		path: '/screenbg',
+		component: () =>
+			import(
+				/* webpackChunkName: "about" */ '@/views/productionVisualization/equipmentBoard'
+			),
+		name: 'screenbg',
+		meta: { title: '大屏', icon: 'chart' },
+	},
 	{
 		path: '/user',
 		component: Layout,
 		hidden: true,
 		redirect: 'noredirect',
-    children: [{
+		children: [
+			{
 				path: 'profile',
-      component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
+				component: (resolve) =>
+					require(['@/views/system/user/profile/index'], resolve),
 				name: 'Profile',
-      meta: { title: '个人中心', icon: 'user' }
+				meta: { title: '个人中心', icon: 'user' },
-    }, {
+			},
+			{
 				path: 'notify-message',
-      component: (resolve) => require(['@/views/system/notify/my/index'], resolve),
+				component: (resolve) =>
+					require(['@/views/system/notify/my/index'], resolve),
 				name: 'MyNotifyMessage',
 				meta: { title: '我的站内信', icon: 'message' },
-    }]
+			},
+		],
 	},
 	{
 		path: '/dict',
 		component: Layout,
 		hidden: true,
-    children: [{
+		children: [
+			{
 				path: 'type/data/:dictId(\\d+)',
 				component: (resolve) => require(['@/views/system/dict/data'], resolve),
 				name: 'SystemDictData',
-      meta: { title: '字典数据', icon: '', activeMenu: '/system/dict' }
+				meta: { title: '字典数据', icon: '', activeMenu: '/system/dict' },
-    }
+			},
-    ]
+		],
 	},
 	{
 		path: '/job',
 		component: Layout,
 		hidden: true,
-    children: [{
+		children: [
+			{
 				path: 'log',
 				component: (resolve) => require(['@/views/infra/job/log'], resolve),
 				name: 'InfraJobLog',
-      meta: { title: '调度日志', activeMenu: '/infra/job' }
+				meta: { title: '调度日志', activeMenu: '/infra/job' },
-    }
+			},
-    ]
+		],
-  }, {
+	},
+	{
 		path: '/codegen',
 		component: Layout,
 		hidden: true,
-    children: [{
+		children: [
+			{
 				path: 'edit/:tableId(\\d+)',
-      component: (resolve) => require(['@/views/infra/codegen/editTable'], resolve),
+				component: (resolve) =>
+					require(['@/views/infra/codegen/editTable'], resolve),
 				name: 'InfraCodegenEditTable',
-      meta: { title: '修改生成配置', activeMenu: '/infra/codegen' }
+				meta: { title: '修改生成配置', activeMenu: '/infra/codegen' },
-    }
+			},
-    ]
+		],
 	},
 	{
 		path: '/bpm',
 		component: Layout,
 		hidden: true,
 		redirect: 'noredirect',
-    children: [{
+		children: [
+			{
 				path: 'oa/leave/create',
-      component: (resolve) => require(['@/views/bpm/oa/leave/create'], resolve),
+				component: (resolve) =>
+					require(['@/views/bpm/oa/leave/create'], resolve),
 				name: 'BpmOALeaveCreate',
-      meta: { title: '发起 OA 请假', icon: 'form', activeMenu: '/bpm/oa/leave' }
+				meta: {
-    }, {
+					title: '发起 OA 请假',
+					icon: 'form',
+					activeMenu: '/bpm/oa/leave',
+				},
+			},
+			{
 				path: 'oa/leave/detail',
-      component: (resolve) => require(['@/views/bpm/oa/leave/detail'], resolve),
+				component: (resolve) =>
+					require(['@/views/bpm/oa/leave/detail'], resolve),
 				name: 'BpmOALeaveDetail',
-      meta: { title: '查看 OA 请假', icon: 'view', activeMenu: '/bpm/oa/leave' }
+				meta: {
-    }
+					title: '查看 OA 请假',
-    ]
+					icon: 'view',
+					activeMenu: '/bpm/oa/leave',
+				},
+			},
+		],
 	},
 	{
 		path: '/bpm',
 		component: Layout,
 		hidden: true,
-    children: [{
+		children: [
+			{
 				path: 'manager/form/edit',
-      component: (resolve) => require(['@/views/bpm/form/formEditor'], resolve),
+				component: (resolve) =>
+					require(['@/views/bpm/form/formEditor'], resolve),
 				name: 'BpmFormEditor',
-      meta: { title: '流程表单-编辑', activeMenu: '/bpm/manager/form' }
+				meta: { title: '流程表单-编辑', activeMenu: '/bpm/manager/form' },
-    }, {
+			},
+			{
 				path: 'manager/definition',
-      component: (resolve) => require(['@/views/bpm/definition/index'], resolve),
+				component: (resolve) =>
+					require(['@/views/bpm/definition/index'], resolve),
 				name: 'BpmProcessDefinition',
-      meta: { title: '流程定义', activeMenu: '/bpm/manager/model' }
+				meta: { title: '流程定义', activeMenu: '/bpm/manager/model' },
-    }, {
+			},
+			{
 				path: 'manager/model/design',
-      component: (resolve) => require(['@/views/bpm/model/modelEditor'], resolve),
+				component: (resolve) =>
+					require(['@/views/bpm/model/modelEditor'], resolve),
 				name: 'BpmModelEditor',
-      meta: { title: '设计流程', activeMenu: '/bpm/manager/model' }
+				meta: { title: '设计流程', activeMenu: '/bpm/manager/model' },
-    }, {
+			},
+			{
 				path: 'process-instance/create',
-      component: (resolve) => require(['@/views/bpm/processInstance/create'], resolve),
+				component: (resolve) =>
+					require(['@/views/bpm/processInstance/create'], resolve),
 				name: 'BpmProcessInstanceCreate',
-      meta: { title: '发起流程', activeMenu: '/bpm/task/my' }
+				meta: { title: '发起流程', activeMenu: '/bpm/task/my' },
-    }, {
+			},
+			{
 				path: 'process-instance/detail',
-      component: (resolve) => require(['@/views/bpm/processInstance/detail'], resolve),
+				component: (resolve) =>
+					require(['@/views/bpm/processInstance/detail'], resolve),
 				name: 'BpmProcessInstanceDetail',
-      meta: { title: '流程详情', activeMenu: '/bpm/task/my' }
+				meta: { title: '流程详情', activeMenu: '/bpm/task/my' },
-    }
+			},
-    ]
+		],
 	},
 	{
 		path: '/property',
 		component: Layout,
 		hidden: true,
-    children: [{
+		children: [
+			{
 				path: 'value/:propertyId(\\d+)',
-      component: (resolve) => require(['@/views/mall/product/property/value'], resolve),
+				component: (resolve) =>
+					require(['@/views/mall/product/property/value'], resolve),
 				name: 'ProductPropertyValue',
-      meta: { title: '商品属性值', icon: '', activeMenu: '/product/property' }
+				meta: {
-    }
+					title: '商品属性值',
-    ]
+					icon: '',
+					activeMenu: '/product/property',
+				},
+			},
+		],
 	},
 	{
 		path: '/spu',
 		component: Layout,
 		hidden: true,
-    children: [{
+		children: [
+			{
 				path: 'edit/:spuId(\\d+)',
-      component: (resolve) => require(['@/views/mall/product/spu/save'], resolve),
+				component: (resolve) =>
+					require(['@/views/mall/product/spu/save'], resolve),
 				name: 'ProductSpuUpdate',
-      meta: { title: '修改商品', activeMenu: '/product/spu' }
+				meta: { title: '修改商品', activeMenu: '/product/spu' },
 			},
 			{
 				path: 'add',
-      component: (resolve) => require(['@/views/mall/product/spu/save'], resolve),
+				component: (resolve) =>
+					require(['@/views/mall/product/spu/save'], resolve),
 				name: 'ProductSpuCreate',
-      meta: { title: '添加商品', activeMenu: '/product/spu' }
+				meta: { title: '添加商品', activeMenu: '/product/spu' },
-    }
+			},
-    ]
+		],
 	},
 	{
 		path: '/trade/order',
@@ -225,26 +276,29 @@ export const constantRoutes = [
 				name: 'TradeOrderDetail',
 				hidden: true,
 				meta: { title: '订单详情' },
-        component: (resolve) => require(['@/views/mall/trade/order/detail'], resolve)
+				component: (resolve) =>
-      }
+					require(['@/views/mall/trade/order/detail'], resolve),
-    ]
+			},
+		],
 	},
 	{
 		path: '/pay',
 		component: Layout,
 		hidden: true,
-    children: [{
+		children: [
+			{
 				path: 'order/submit',
 				name: 'PayOrderSubmit',
 				hidden: true,
 				meta: {
 					title: '收银台',
-        noCache: true
+					noCache: true,
 				},
-      component: (resolve) => require(['@/views/pay/order/submit'], resolve)
+				component: (resolve) => require(['@/views/pay/order/submit'], resolve),
-    }]
+			},
-  }
+		],
-]
+	},
+];
 
 // 防止连续点击多次路由报错
 let routerPush = Router.prototype.push;

src/store/modules/permission.js

@@ -1,5 +1,4 @@
 import {constantRoutes} from '@/router'
-import {getRouters} from '@/api/menu'
 import Layout from '@/layout/index'
 import ParentView from '@/components/ParentView';
 import {toCamelCase} from "@/utils";
@@ -27,13 +26,17 @@ const permission = {
     },
   },
   actions: {
-    // 生成路由
+    /**
-    GenerateRoutes({commit}) {
+     * 生成路由
+     *
+     * @param commit commit 函数
+     * @param menus  路由参数
+     */
+    GenerateRoutes({commit}, menus) {
       return new Promise(resolve => {
-        // 向后端请求路由数据（菜单）
+        // 将 menus 菜单，转换为 route 路由数组
-        getRouters().then(res => {
+        const sdata = JSON.parse(JSON.stringify(menus)) // 【重要】用于菜单中的数据
-          const sdata = JSON.parse(JSON.stringify(res.data)) // 【重要】用于菜单中的数据
+        const rdata = JSON.parse(JSON.stringify(menus)) // 用于最后添加到 Router 中的数据
-          const rdata = JSON.parse(JSON.stringify(res.data)) // 用于最后添加到 Router 中的数据
         const sidebarRoutes = filterAsyncRouter(sdata)
         const rewriteRoutes = filterAsyncRouter(rdata, false, true)
         rewriteRoutes.push({path: '*', redirect: '/404', hidden: true})
@@ -43,7 +46,6 @@ const permission = {
         commit('SET_TOPBAR_ROUTES', sidebarRoutes)
         resolve(rewriteRoutes)
       })
-      })
     }
   }
 }

src/views/areavisual/overview/components/ringChart.vue

@@ -0,0 +1,125 @@
+<template>
+	<div
+		:class="className"
+		:style="{ height: height, width: width, marginLeft: '10px' }" />
+</template>
+
+<script>
+import * as echarts from 'echarts';
+require('echarts/theme/macarons'); // echarts theme
+import resize from '@/utils/chartMixins/resize';
+
+const animationDuration = 1000;
+export default {
+	mixins: [resize],
+	props: {
+		className: {
+			type: String,
+			default: 'chart',
+		},
+		title: {
+			type: String,
+			default: '',
+		},
+		width: {
+			type: String,
+			default: '100%',
+		},
+		height: {
+			type: String,
+			default: '300px',
+		},
+		ringData: {
+			type: Object,
+			default: () => {},
+		},
+	},
+	data() {
+		return {
+			chart: null,
+			targetId: '',
+		};
+	},
+	beforeDestroy() {
+		if (!this.chart) {
+			return;
+		}
+		this.chart.dispose();
+		this.chart = null;
+	},
+	methods: {
+		initChart() {
+			this.chart = echarts.init(this.$el, 'macarons');
+			const _this = this;
+			this.chart.setOption({
+				title: {
+					text: this.title
+						? '{space|}{tip|}{space|}{value|' + this.title + '}'
+						: '',
+					textStyle: {
+						rich: {
+							tip: {
+								width: 6,
+								height: 6,
+								borderRadius: 50,
+								backgroundColor: '#288AFF',
+							},
+							space: {
+								width: 8,
+							},
+							value: {
+								fontSize: 14,
+								color: 'black',
+							},
+						},
+					},
+				},
+				color: ['#33B36B', '#3A8DFF', '#F59A23'],
+				tooltip: {
+					trigger: 'axis',
+					axisPointer: {
+						type: 'cross',
+						crossStyle: {
+							color: '#999',
+						},
+					},
+				},
+				legend: {
+					data: ['当前满位', '当前空位', '在途'],
+				},
+				grid: {
+					containLabel: true,
+				},
+				series: [
+					{
+						// name: '投入',
+						type: 'pie',
+						radius: '50%',
+						data: [
+							{
+								name: '当前满位',
+								value: this.ringData.occupiedQuantity
+							},
+							{
+								name: '当前空位',
+								value: this.ringData.idleQuantity
+							},
+							{
+								name: '在途',
+								value: this.ringData.transitQuantity
+							},
+						],
+						emphasis: {
+							itemStyle: {
+								shadowBlur: 10,
+								shadowOffsetX: 0,
+								shadowColor: 'rgba(0, 0, 0, 0.5)'
+							}
+						}
+					}
+				],
+			});
+		},
+	},
+};
+</script>

src/views/areavisual/overview/index.vue

@@ -0,0 +1,262 @@
+<template>
+	<div class="app-container">
+        <el-row class="overview-container">
+            <el-col :span="4" class="overview-container-left">
+                <el-row style="font-size: 18px; font-weight: bold; line-height: 36px">库区选择</el-row>
+                <el-input
+                    v-model="areaSearchForm.regionName"
+                    placeholder="库区名称"
+                    @blur="getArea"
+                    clearable
+                />
+                <el-tree
+                    :data="areaList"
+                    :node-key="'id'"
+                    :props="{label: 'regionName'}"
+                    @node-click="nodeClick"
+                />
+            </el-col>
+            <el-col :span="16" v-if="changeType === 0" class="overview-container-main">
+                <el-row>
+                    <el-col :span="8" class="allarea-box" v-for="item in allAreaList" :key="item.id">
+                        <div class="areainfo-box">
+                            <div class="areainfo-box-header">
+                                {{ item.regionName }}
+                            </div>
+                            <div class="areainfo-box-line">
+                                <div class="areainfo-box-line-item" :style="{width: `${(item.occupiedQuantity / (item.totalInventory + item.transitQuantity) * 100).toFixed(2)}%`, backgroundColor: '#33B36B'}"></div>
+                                <div class="areainfo-box-line-item" :style="{width: `${(item.idleQuantity / (item.totalInventory + item.transitQuantity) * 100).toFixed(2)}%`, backgroundColor: '#3A8DFF'}"></div>
+                                <div class="areainfo-box-line-item" :style="{width: `${(item.transitQuantity / (item.totalInventory + item.transitQuantity) * 100).toFixed(2)}%`, backgroundColor: '#F59A23'}"></div>
+                            </div>
+                            <el-row class="areainfo-box-info">
+                                <el-col class="areainfo-box-info-item" :span="6">
+                                    <p class="areainfo-box-info-item-count">{{item.totalInventory}}</p>
+                                    <p class="areainfo-box-info-item-title">库位总数</p>
+                                </el-col>
+                                <el-col class="areainfo-box-info-item" :span="6">
+                                    <p class="areainfo-box-info-item-count" style="color: #33B36B">{{item.occupiedQuantity}}</p>
+                                    <p class="areainfo-box-info-item-title">占</p>
+                                </el-col>
+                                <el-col class="areainfo-box-info-item" :span="6">
+                                    <p class="areainfo-box-info-item-count" style="color: #3A8DFF">{{item.idleQuantity}}</p>
+                                    <p class="areainfo-box-info-item-title">空</p>
+                                </el-col>
+                                <el-col class="areainfo-box-info-item" :span="6">
+                                    <p class="areainfo-box-info-item-count" style="color: #F59A23">{{item.transitQuantity}}</p>
+                                    <p class="areainfo-box-info-item-title">在途</p>
+                                </el-col>
+                            </el-row>
+                        </div>
+                    </el-col>
+                </el-row>
+            </el-col>
+            <el-col :span="4" v-if="changeType === 0" class="overview-container-right">
+                <el-tabs v-model="activeName" @tab-click="handleClickRight">
+                    <el-tab-pane label="概览" name="first">
+                        <el-row class="overview-container-right-alloverview">
+                            <el-col class="overview-container-right-alloverview-item" :span="8">
+                                <p class="overview-container-right-alloverview-item-count">{{allAreaInfo.totalInventory}}</p>
+                                <p class="overview-container-right-alloverview-item-title">库位总数</p>
+                            </el-col>
+                            <el-col class="overview-container-right-alloverview-item" :span="8">
+                                <p class="overview-container-right-alloverview-item-count">{{allAreaInfo.occupiedQuantity}}</p>
+                                <p class="overview-container-right-alloverview-item-title">当前满位</p>
+                            </el-col>
+                            <el-col class="overview-container-right-alloverview-item" :span="8">
+                                <p class="overview-container-right-alloverview-item-count">{{allAreaInfo.idleQuantity}}</p>
+                                <p class="overview-container-right-alloverview-item-title">当前空位</p>
+                            </el-col>
+                            <el-col class="overview-container-right-alloverview-item" :span="8">
+                                <p class="overview-container-right-alloverview-item-count">{{allAreaInfo.transitQuantity}}</p>
+                                <p class="overview-container-right-alloverview-item-title">在途</p>
+                            </el-col>
+                        </el-row>
+                        <ringChart :ring-data="allAreaInfo" ref="ringChart" />
+                    </el-tab-pane>
+                    <el-tab-pane label="在途任务" name="second">在途任务</el-tab-pane>
+                </el-tabs>
+            </el-col>
+            <el-col :span="20" v-if="changeType === 1" class="overview-container-main"></el-col>
+        </el-row>
+	</div>
+</template>
+
+<script>
+// import basicPage from '@/mixins/basic-page';
+import ringChart from './components/ringChart.vue';
+import { getAreaList, postAllAreaInfo, postAllAreaOverview, postAreaInfo } from '@/api/areavisual/overview';
+
+export default {
+    name: 'overview',
+	// mixins: [basicPage],
+	data() {
+		return {
+			areaList: [
+                {
+                    id: 0,
+                    regionName: "全部库区"
+                }
+            ],
+            areaSearchForm: {
+                pageNo: 1,
+                pageSize: 100,
+                regionName: ''
+            },
+            changeType: 0,
+            allAreaList: [],
+            allAreaInfo: {
+                totalInventory: 0,
+                occupiedQuantity: 0,
+                idleQuantity: 0,
+                transitQuantity: 0
+            },
+            areaInfo: [],
+            activeName: 'first'
+		};
+	},
+	components: {
+		ringChart
+	},
+	async created() {
+        this.getArea()
+        this.getAllAreaInfo()
+        this.getAllAreaOverview()
+    },
+    watch: {
+        activeName: (val) => {
+            if (val === 'first') {
+                this.getAllAreaOverview()
+            } else if (val === 'second') {
+                this.getNowTaskList()
+            }
+        }
+    },
+	methods: {
+        // 获取库区列表
+        async getArea() {
+            const res = await getAreaList(this.areaSearchForm)
+            if (res.code === 0 && res.data) {
+                this.areaList = [
+                    {
+                        id: 0,
+                        regionName: "全部库区"
+                    }
+                ],
+                this.areaList.push(...(res.data.list))
+            }
+        },
+        // 库区选择
+        nodeClick(data, node, components) {
+            if (data.id === 0) {
+                this.changeType = 0
+                this.activeName = 'first'
+                this.getAllAreaInfo()
+            } else {
+                this.changeType = 1
+                this.getAreaInfo(data.id)
+            }
+        },
+        // 获取全部库区概览信息
+        async getAllAreaInfo() {
+            const res = await postAllAreaInfo([])
+            console.log(res)
+            if (res.code === 0 && res.data) {
+                this.allAreaList = res.data
+            }
+        },
+        // 获取库区概览
+        async getAllAreaOverview() {
+            const res = await postAllAreaOverview([])
+            console.log(res)
+            if (res.code === 0 && res.data) {
+                this.allAreaInfo = res.data
+                this.$refs.ringChart.initChart();
+            }
+        },
+        // 获取在途任务
+        async getNowTaskList() {},
+        // 获取单库区信息
+        async getAreaInfo (id) {
+            const res = await postAreaInfo({id})
+            console.log(res)
+            if (res.code === 0 && res.data) {
+                this.areaInfo = res.data
+            }
+        },
+        // 全部库区右侧分页点击
+        handleClickRight (tab, event) {
+            console.log(tab, event)
+        }
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.overview-container {
+    max-height: calc(100vh - 120px - 8px);
+    overflow: scroll;
+    .overview-container-left {
+        padding-right: 12px;
+    }
+    .overview-container-main {
+        .allarea-box {
+            padding: 10px;
+            .areainfo-box {
+                border: 1px solid #bbb;
+                border-radius: 5px;
+                padding: 10px;
+                .areainfo-box-header {
+                    font-size: 16px;
+                    font-weight: bold;
+                    white-space: nowrap; /* 禁止换行 */
+                    overflow: hidden; /* 隐藏溢出内容 */
+                    text-overflow: ellipsis; /* 溢出部分显示省略号 */
+                }
+                .areainfo-box-line {
+                    width: 100%;
+                    .areainfo-box-line-item {
+                        height: 5px;
+                        display: inline-block;
+                    }
+                }
+                .areainfo-box-info {
+                    .areainfo-box-info-item {
+                        text-align: center;
+                        font-size: 12px;
+                        .areainfo-box-info-item-count {
+                            font-weight: bold;
+                            font-size: 14px;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    .overview-container-right {
+        .overview-container-right-alloverview {
+            .overview-container-right-alloverview-item {
+                text-align: center;
+                .overview-container-right-alloverview-item-count {
+                    font-size: 14px;
+                    font-weight: bold;
+                }
+            }
+        }
+    }
+}
+</style>
+
+<style lang="scss">
+.el-tree-node__content {
+    height: 40px;
+    line-height: 40px;
+}
+.el-tree-node__label {
+    display: block;
+    width: calc(100% - 24px);
+    text-align: center;
+    white-space: nowrap; /* 禁止换行 */
+    overflow: hidden; /* 隐藏溢出内容 */
+    text-overflow: ellipsis; /* 溢出部分显示省略号 */
+}
+</style>

src/views/areavisual/record/components/RecordDrawer.vue

@@ -0,0 +1,519 @@
+<!--
+    filename: EquipmentDrawer.vue
+    author: liubin
+    date: 2023-08-22 14:38:56
+    description:
+-->
+
+<template>
+	<el-drawer
+		:visible="visible"
+		:show-close="false"
+		:wrapper-closable="false"
+		class="drawer"
+		custom-class="mes-drawer"
+		size="60%"
+		@closed="$emit('destroy')">
+		<SmallTitle slot="title">
+			{{
+				mode.includes('detail')
+					? '详情'
+					: mode.includes('edit')
+					? '编辑'
+					: '新增'
+			}}
+		</SmallTitle>
+
+		<div class="drawer-body flex">
+			<div class="drawer-body__content">
+				<section v-for="(section, index) in sections" :key="section.key">
+					<SmallTitle v-if="index != 0">{{ section.name }}</SmallTitle>
+
+					<div
+						class="form-part"
+						v-if="section.key == 'base'"
+						style="margin-bottom: 32px">
+						<el-skeleton v-if="!showForm" animated />
+						<!-- <EquipmentInfoForm
+							key="drawer-dialog-form"
+							v-if="showForm"
+							:disabled="mode.includes('detail')"
+							:sync-filelist="syncFileListFlag"
+							v-model="form" /> -->
+					</div>
+
+					<div v-if="section.key == 'attrs'" style="margin-top: 12px">
+						<base-table
+							v-loading="attrListLoading"
+							:table-props="section.props"
+							:page="attrQuery?.params.pageNo || 1"
+							:limit="attrQuery?.params.pageSize || 10"
+							:table-data="list"
+							:add-button-show="mode.includes('detail') ? null : '添加属性'"
+							@emitButtonClick="handleAddAttr"
+							@emitFun="handleEmitFun">
+							<method-btn
+								v-if="section.tableBtn"
+								slot="handleBtn"
+								label="操作"
+								:method-list="tableBtn"
+								@clickBtn="handleTableBtnClick" />
+						</base-table>
+
+						<!-- 分页组件 -->
+						<pagination
+							v-show="total > 0"
+							:total="total"
+							:page.sync="attrQuery.params.pageNo"
+							:limit.sync="attrQuery.params.pageSize"
+							@pagination="getAttrList" />
+					</div>
+				</section>
+			</div>
+
+			<div class="drawer-body__footer">
+				<el-button style="" @click="handleCancel">取消</el-button>
+				<el-button v-if="mode == 'detail'" type="primary" @click="toggleEdit">
+					编辑
+				</el-button>
+				<el-button v-else type="primary" @click="handleConfirm">确定</el-button>
+				<!-- sections的第二项必须是 属性列表  -->
+				<!-- <el-button
+						v-if="sections[1].allowAdd"
+						type="primary"
+						@click="handleAddAttr">
+						添加属性
+					</el-button> -->
+			</div>
+		</div>
+	</el-drawer>
+</template>
+
+<script>
+
+const SmallTitle = {
+	name: 'SmallTitle',
+	props: ['size'],
+	components: {},
+	data() {
+		return {};
+	},
+	methods: {},
+	render: function (h) {
+		return h(
+			'span',
+			{
+				class: 'small-title',
+				style: {
+					fontSize: '18px',
+					lineHeight:
+						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
+					fontWeight: 500,
+					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
+				},
+			},
+			this.$slots.default
+		);
+	},
+};
+
+export default {
+	components: { SmallTitle },
+	props: ['sections', 'mode', 'dataId'], // dataId 作为一个通用的存放id的字段
+	data() {
+		return {
+			visible: false,
+			showForm: false,
+			btnLoading: false,
+			total: 0,
+			form: {},
+			list: [],
+			attrTitle: '',
+			attrForm: {
+				id: null,
+				equipmentId: null,
+				name: '',
+				value: '',
+			},
+			attrFormVisible: false,
+			attrRows: [
+				[
+					{
+						input: true,
+						label: '属性名称',
+						prop: 'name',
+						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+					},
+				],
+				[
+					{
+						input: true,
+						label: '属性值',
+						prop: 'value',
+					},
+				],
+			],
+			attrQuery: {
+				params: {
+					pageNo: 1,
+					pageSize: 10,
+				},
+			}, // 属性列表的请求
+			infoQuery: null, // 基本信息的请求
+			attrFormSubmitting: false,
+			attrListLoading: false,
+			syncFileListFlag: null,
+		};
+	},
+	computed: {
+		formRows() {
+			return this.sections[0].rows.map((row) => {
+				return row.map((col) => {
+					if (col.key == 'eq-pics') {
+						// 重置图片的位置
+						return {
+							...col,
+							bind: {
+								...col.bind,
+							},
+							style: {
+								left: 0,
+								right: 'unset',
+							},
+						};
+					}
+					return {
+						...col,
+						bind: {
+							...col.bind,
+							// 详情 模式下，禁用各种输入
+							disabled: this.mode == 'detail',
+						},
+					};
+				});
+			});
+		},
+		tableBtn() {
+			return this.mode == 'detail' ? [] : this.sections[1].tableBtn;
+		},
+	},
+	mounted() {
+		for (const section of this.sections) {
+			// 请求具体信息
+			if ('url' in section) {
+				const query = {
+					url: section.url,
+					method: section.method || 'get',
+					params: section.queryParams || null,
+					data: section.data || null,
+				};
+				this.$axios(query).then(({ data }) => {
+					if (section.key == 'base') {
+						this.form = data;
+						// this.form = {
+						// 	code: 'gj',
+						// 	name: '下片机',
+						// 	enName: 'unload',
+						// 	abbr: '',
+						// 	equipmentTypeId: 21084,
+						// 	remark: '备注',
+						// 	id: '1712367395052384257',
+						// 	createTime: 1697095176000,
+						// 	enterTime: 0,
+						// 	productionTime: 0,
+						// 	files: [
+						// 		{
+						// 			fileName: '测试.xlsx',
+						// 			fileUrl: 'https://nimg.ws.126.net/?url=http%3A%2F%2Fdingyue.ws.126.net%2F2022%2F0108%2F0f0c6f30j00r5cle9000sc000hs00gtc.jpg&thumbnail=660x2147483647&quality=80&type=jpg',
+						// 			fileType: 1
+						// 		},
+						// 		{
+						// 			fileName: '测试2.xlsx',
+						// 			fileUrl: 'https://nimg.ws.126.net/?url=http%3A%2F%2Fdingyue.ws.126.net%2F2022%2F0415%2F2cd23619j00racb96000kc000hs00hsc.jpg&thumbnail=660x2147483647&quality=80&type=jpg',
+						// 			fileType: 1
+						// 		},
+						// 		{
+						// 			fileName: '测试3.xlsx',
+						// 			fileUrl: 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsafe-img.xhscdn.com%2Fbw1%2F1fea91a0-d088-409e-b145-e0e61254b28b%3FimageView2%2F2%2Fw%2F1080%2Fformat%2Fjpg&refer=http%3A%2F%2Fsafe-img.xhscdn.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1700031689&t=2e0fe7d1de7f54adff3007efe133d67c',
+						// 			fileType: 1
+						// 		},
+						// 		{
+						// 			fileName: '测试4.xlsx',
+						// 			fileUrl: 'https://pics5.baidu.com/feed/b7003af33a87e950cdfb4b4546eed044faf2b40d.jpeg?token=1d7484cfe4b014dd201f8c8725cab945',
+						// 			fileType: 2
+						// 		},
+						// 		{
+						// 			fileName: '测试5.xlsx',
+						// 			fileUrl: 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsafe-img.xhscdn.com%2Fbw1%2Fe3500876-9c46-4b70-8d37-4799520cdd13%3FimageView2%2F2%2Fw%2F1080%2Fformat%2Fjpg&refer=http%3A%2F%2Fsafe-img.xhscdn.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1700031689&t=4abc1df930e62730e5361a7d3765e0f2',
+						// 			fileType: 2
+						// 		},
+						// 	],
+						// 	tvalue: 0,
+						// 	processingTime: 0,
+						// 	manufacturer: '',
+						// 	spec: '',
+						// 	description: '描述',
+						// };
+						this.showForm = true;
+						this.infoQuery = query;
+					} else if (section.key == 'attrs') {
+						this.attrQuery = query;
+						this.list = data.list;
+						this.total = data.total;
+					}
+				});
+			}
+		}
+	},
+	methods: {
+		handleTableBtnClick({ type, data }) {
+			switch (type) {
+				case 'edit':
+					this.handleEditAttr(data.id);
+					break;
+				case 'delete':
+					this.handleDeleteAttr(data.id);
+					break;
+			}
+		},
+		async handleConfirm() {
+			this.btnLoading = true;
+			this.syncFileListFlag = Math.random();
+
+			this.$nextTick(async () => {
+				const { code, data } = await this.$axios({
+					url: this.sections[0].urlUpdate,
+					method: 'put',
+					data: this.form,
+				});
+				if (code == 0) {
+					this.$modal.msgSuccess('更新成功');
+          this.$emit('refreshDataList');
+				}
+
+				this.btnLoading = false;
+				this.handleCancel();
+			});
+		},
+
+		handleEmitFun(val) {
+			console.log('handleEmitFun', val);
+		},
+
+		init() {
+			this.visible = true;
+		},
+
+		async getAttrList() {
+			this.attrListLoading = true;
+			const res = await this.$axios(this.attrQuery);
+			if (res.code == 0) {
+				this.list = res.data.list;
+				this.total = res.data.total;
+			}
+			this.attrListLoading = false;
+		},
+
+		// 保存表单
+		handleSave() {
+			this.$refs['form'][0].validate(async (valid) => {
+				if (valid) {
+					const isEdit = this.mode == 'edit';
+					await this.$axios({
+						url: this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
+						method: isEdit ? 'put' : 'post',
+						data: this.form,
+					});
+					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
+					this.visible = false;
+					this.$emit('refreshDataList');
+				}
+			});
+		},
+
+		handleCancel() {
+			this.visible = false;
+		},
+
+		// 开启编辑
+		toggleEdit() {
+			this.$emit('update-mode', 'edit');
+		},
+
+		// 新增属性
+		handleAddAttr() {
+			if (!this.dataId) return this.$message.warning('请先创建设备信息');
+			this.attrForm = {
+				id: null,
+				equipmentId: this.dataId,
+				name: '',
+				value: '',
+			};
+			this.attrTitle = '添加设备属性';
+			this.attrFormVisible = true;
+		},
+
+		// 编辑属性
+		async handleEditAttr(attrId) {
+			const res = await this.$axios({
+				url: this.sections[1].urlDetail,
+				method: 'get',
+				params: { id: attrId },
+			});
+			if (res.code == 0) {
+				this.attrForm = res.data;
+				this.attrTitle = '编辑设备属性';
+				this.attrFormVisible = true;
+			}
+		},
+
+		// 删除属性
+		handleDeleteAttr(attrId) {
+			this.$confirm('确定删除该属性?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(async () => {
+					const res = await this.$axios({
+						url: this.sections[1].urlDelete,
+						method: 'delete',
+						params: { id: attrId },
+					});
+					if (res.code == 0) {
+						this.$message({
+							message: '删除成功',
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+				})
+				.catch(() => {});
+		},
+
+		// 提交属性表
+		submitAttrForm() {
+			this.$refs['attrForm'].validate(async (valid) => {
+				if (!valid) {
+					return;
+				}
+
+				try {
+					const isEdit = this.attrForm.id != null;
+					this.attrFormSubmitting = true;
+					const res = await this.$axios({
+						url: isEdit
+							? this.sections[1].urlUpdate
+							: this.sections[1].urlCreate,
+						method: isEdit ? 'put' : 'post',
+						data: this.attrForm,
+					});
+
+					if (res.code == 0) {
+						this.closeAttrForm();
+						this.$message({
+							message: `${isEdit ? '更新' : '创建'}成功`,
+							type: 'success',
+							duration: 1500,
+							onClose: () => {
+								this.getAttrList();
+							},
+						});
+					}
+					this.attrFormSubmitting = false;
+				} catch (err) {
+					this.$message({
+						message: err,
+						type: 'error',
+						duration: 1500,
+					});
+					this.attrFormSubmitting = false;
+				}
+			});
+		},
+
+		closeAttrForm() {
+			this.attrFormVisible = false;
+		},
+
+		handleClick(raw) {
+			if (raw.type === 'delete') {
+				this.$confirm(
+					`确定对${
+						raw.data.name
+							? '[名称=' + raw.data.name + ']'
+							: '[序号=' + raw.data._pageIndex + ']'
+					}进行删除操作?`,
+					'提示',
+					{
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					}
+				)
+					.then(() => {
+						deleteProductAttr(raw.data.id).then(({ data }) => {
+							this.$message({
+								message: '操作成功',
+								type: 'success',
+								duration: 1500,
+								onClose: () => {
+									this.getList();
+								},
+							});
+						});
+					})
+					.catch(() => {});
+			} else {
+				this.addNew(raw.data.id);
+			}
+		},
+	},
+};
+</script>
+
+<style scoped>
+.drawer >>> .el-drawer {
+	border-radius: 8px 0 0 8px;
+}
+
+.drawer >>> .el-drawer__header {
+	margin: 0;
+	padding: 32px 32px 24px;
+	border-bottom: 1px solid #dcdfe6;
+	margin-bottom: 0px;
+}
+
+.small-title::before {
+	content: '';
+	display: inline-block;
+	vertical-align: top;
+	width: 4px;
+	height: 22px;
+	border-radius: 1px;
+	margin-right: 8px;
+	background-color: #0b58ff;
+}
+
+.drawer-body {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+}
+
+.drawer-body__content {
+	flex: 1;
+	/* background: #eee; */
+	padding: 20px 30px;
+	overflow-y: auto;
+}
+
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 18px;
+}
+</style>

src/views/areavisual/record/index.vue

@@ -0,0 +1,277 @@
+<template>
+	<div class="app-container">
+		<!-- 搜索工作栏 -->
+		<SearchBar
+			:formConfigs="searchBarFormConfig"
+			ref="search-bar"
+            isFold
+			@headBtnClick="handleSearchBarBtnClick" />
+
+		<!-- 列表 -->
+		<base-table
+			:table-props="tableProps"
+			:page="queryParams.pageNo"
+			:limit="queryParams.pageSize"
+			:table-data="list"
+			@emitFun="handleEmitFun">
+			<method-btn
+				v-if="tableBtn.length"
+				slot="handleBtn"
+				:width="120"
+				label="操作"
+				:method-list="tableBtn"
+				@clickBtn="handleTableBtnClick" />
+		</base-table>
+
+		<!-- 分页组件 -->
+		<pagination
+			v-show="total > 0"
+			:total="total"
+			:page.sync="queryParams.pageNo"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList" />
+
+		<!-- 设备 详情 - 编辑 -->
+		<RecordDrawer
+			v-if="open"
+			ref="drawer"
+			:mode="editMode"
+			@update-mode="editMode = $event"
+			:data-id="form.id"
+			@refreshDataList="getList"
+			@cancel="cancelEdit"
+			@destroy="cancelEdit" />
+	</div>
+</template>
+
+<script>
+import moment from 'moment';
+import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import RecordDrawer from './components/RecordDrawer';
+import { getRecordPage, getLaneList } from '@/api/areavisual/record';
+
+export default {
+	name: 'Equipment',
+	components: {
+		RecordDrawer,
+	},
+	mixins: [basicPageMixin],
+	data() {
+		return {
+			searchBarKeys: ['name', 'code'],
+            // this.$auth.hasPermi(`base:equipment:update`)
+			tableBtn: [
+				{
+                    type: 'detail',
+                    btnName: '详情'
+				}
+			].filter((v) => v),
+			tableProps: [
+				{
+					prop: 'recordCode',
+					label: '出/入库单编号',
+					fixed: true,
+					width: 180,
+					// filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+					// showOverflowtooltip: true,
+				},
+				{
+					prop: 'type',
+					label: '业务类型',
+					filter: (val) => val === 1 ? '出库' : '入库',
+				},
+				{
+                    width: 180,
+                    prop: 'recordTime',
+                    label: '出/入库时间',
+					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss')
+                },
+				{ prop: 'recordArea', label: '出/入库库区' },
+				{ prop: 'recordLane', label: '出/入库巷道' },
+				{ prop: 'recordRegion', label: '出/入库库位号' },
+				{ prop: 'target', label: '搬运对象' },
+				{ prop: 'productName', label: '产品名称' },
+				{ prop: 'specification', label: '型号规格' },
+				{ prop: 'recordMan', label: '出/入库人' },
+				{ prop: 'remark', label: '备注' }
+			],
+			searchBarFormConfig: [
+				{
+					type: 'input',
+					label: '关键字',
+					placeholder: '请输入出/入库编码、产品名称、规格型号、库位号',
+					param: 'query',
+                    width: 350
+				},
+				{
+					type: 'select',
+					label: '业务类型',
+					selectOptions: [
+                        {
+                            id: '1',
+                            name:'出库'
+                        },
+                        {
+                            id: '2',
+                            name:'入库'
+                        },
+                    ],
+					placeholder: '请选择业务类型',
+					param: 'type',
+				},
+				{
+					type: 'select',
+					label: '出/入库巷道',
+					selectOptions: [],
+					placeholder: '请选择出/入库巷道',
+					param: 'recordLane',
+				},
+				{
+					type: 'select',
+					label: '来源',
+					selectOptions: [
+                        {
+                            id: '1',
+                            name:'WMS'
+                        },
+                        {
+                            id: '2',
+                            name:'MES'
+                        },
+                    ],
+					placeholder: '请选择来源',
+					param: 'source',
+				},
+				{
+					type: 'select',
+					label: '出/入库人',
+					selectOptions: [],
+					placeholder: '请选择出/入库人',
+					param: 'recordMan',
+				},
+				{
+					type: 'datePicker',
+					label: '出/入库时间',
+					placeholder: '请选择出/入库时间',
+					param: 'recordTime',
+                    dateType: 'datetimerange',
+                    rangeSeparator: '至'
+				},
+				{
+					type: 'select',
+					label: '载具类型',
+					selectOptions: [
+                        {
+                            id: '1',
+                            name:'AGV'
+                        },
+                        {
+                            id: '2',
+                            name:'人工叉车'
+                        },
+                    ],
+					placeholder: '请选择载具类型',
+					param: 'vehicleType',
+				},
+				{
+					type: 'button',
+					btnName: '查询',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'button',
+					btnName: '重置',
+					name: 'reset',
+					color: 'info',
+				}
+			],
+			editVisible: false,
+			editMode: 'detail', // 'edit', 'detail'
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				pageNo: 1,
+				pageSize: 20,
+                query: '',
+				type: '',
+                source: '',
+				recordLane: '',
+                recordMan: '',
+                recordTime: '',
+                vehicleType: ''
+			},
+            form: {}
+		};
+	},
+	created() {
+        this.getLane()
+		this.getList();
+	},
+	computed: {},
+	methods: {
+		/** 查询列表 */
+		getList() {
+			this.loading = true;
+			// 执行查询
+			getRecordPage(this.queryParams).then((response) => {
+                console.log(response)
+				this.list = response.data.list;
+				this.total = response.data.total;
+				this.loading = false;
+			});
+		},
+        async getLane() {
+            const res = await getLaneList({
+                pageNo: 1,
+                pageSize: 100
+            })
+            if (res.code === 0 && res.data) {
+                console.log(res.data)
+                this.searchBarFormConfig[2].selectOptions = res.data.list.map(item => {
+                    return { id: item.id, name: item.lane }
+                })
+                console.log(this.searchBarFormConfig)
+            }
+        },
+		/** 取消按钮 */
+		cancel() {
+			this.open = false;
+		},
+		// /** 导出按钮操作 */
+		// handleExport() {
+		// 	// 处理查询参数
+		// 	let params = { ...this.queryParams };
+		// 	params.pageNo = undefined;
+		// 	params.pageSize = undefined;
+		// 	this.$modal
+		// 		.confirm('是否确认导出所有设备数据项?')
+		// 		.then(() => {
+		// 			this.exportLoading = true;
+		// 			return exportEquipmentExcel(params);
+		// 		})
+		// 		.then((response) => {
+		// 			this.$download.excel(response, '设备.xls');
+		// 			this.exportLoading = false;
+		// 		})
+		// 		.catch(() => {});
+		// },
+        handleTableBtnClick ({data, type}) {
+            switch (type) {
+                case 'detail':
+                    this.viewDetail(data.id)
+            }
+        },
+		// 查看详情
+		viewDetail(id) {
+			this.editMode = 'detail';
+			this.open = true;
+			this.form.id = id;
+			this.$nextTick(() => {
+				this.$refs['drawer'].init();
+			});
+		},
+	},
+};
+</script>

src/views/cost/components/SmallTitle.vue

@@ -0,0 +1,65 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-08-01 15:27:31
+ * @LastEditors: zwq
+ * @LastEditTime: 2023-08-01 16:25:54
+ * @Description:
+-->
+<template>
+	<div :class="[className, { 'p-0': noPadding }]">
+		<slot />
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		size: {
+			// 取值范围:  xl lg md sm
+			type: String,
+			default: 'de',
+			validator: function (val) {
+				return ['xl', 'lg', 'de', 'md', 'sm'].indexOf(val) !== -1;
+			},
+		},
+		noPadding: {
+			type: Boolean,
+			default: false,
+		},
+	},
+	computed: {
+		className: function () {
+			return `${this.size}-title`;
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+$pxls: (xl, 28px) (lg, 24px) (de, 20px) (md, 18px) (sm, 16px);
+$mgr: 8px;
+@each $size, $height in $pxls {
+	.#{$size}-title {
+		font-size: $height;
+		line-height: $height;
+		color: #000;
+		font-weight: 500;
+		font-family: '微软雅黑', 'Microsoft YaHei', Arial, Helvetica, sans-serif;
+
+		&::before {
+			content: '';
+			display: inline-block;
+			vertical-align: top;
+			width: 4px;
+			height: $height + 2px;
+			border-radius: 1px;
+			margin-right: $mgr;
+			background-color: #0b58ff;
+		}
+	}
+}
+
+.p-0 {
+	padding: 0;
+}
+</style>

src/views/cost/components/add-or-updata.vue

@@ -0,0 +1,442 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-13 15:07:24
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-07 15:35:14
+ * @Description:
+-->
+<template>
+	<div>
+		<div class="circle-container">
+			<div v-for="(item, index) in dotArr" :key="index" class="circle-wrapper">
+				<div
+					class="circle"
+					:style="{
+						background: stepNum == index + 1 ? '#0B58FF' : '',
+					}">
+					{{ index + 1 }}
+				</div>
+				<div
+					class="circle-text"
+					:style="{
+						color: stepNum == index + 1 ? '#0B58FF' : '',
+					}">
+					{{ item.name }}
+				</div>
+				<!-- 圆点后面的虚线 -->
+				<div v-if="index < 2" class="connector" />
+			</div>
+		</div>
+		<div v-if="stepNum == 1">
+			<div class="topTip">
+				1.可选择库区、巷道，同批次创建任务搬运仅支持同一产品型号。
+				<br />
+				2.须在本页下方填写搬运数量，搬运数量仅支持双数，且数量≤当前可用库存总量。
+			</div>
+			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
+				步骤一：选择产品及起点
+			</small-title>
+			<el-form
+				:model="dataForm"
+				:rules="dataRule"
+				ref="dataForm"
+				@keyup.enter.native="dataFormSubmit()"
+				label-position="top"
+				label-width="80px">
+				<el-row :gutter="10">
+					<el-col :span="6">
+						<el-form-item label="搬运对象" prop="val1">
+							<el-select
+								style="width: 100%"
+								v-model="dataForm.val1"
+								placeholder="请选择搬运对象">
+								<el-option
+									v-for="item in options1"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6" v-if="dataForm.val1 == 1">
+						<el-form-item label="产品名称" prop="val1">
+							<el-select
+								style="width: 100%"
+								v-model="dataForm.val2"
+								placeholder="请选择产品名称">
+								<el-option
+									v-for="item in options1"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6" v-if="dataForm.val1 == 1">
+						<el-form-item label="规格型号" prop="val1">
+							<el-select
+								style="width: 100%"
+								v-model="dataForm.val2"
+								placeholder="请选择规格型号">
+								<el-option
+									v-for="item in options1"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
+						<el-form-item label="搬运数量" prop="val4">
+							<el-input
+								v-model="dataForm.val4"
+								oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
+								<template slot="append">盘</template>
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row :gutter="10">
+					<el-col :span="12">
+						<el-form-item label="起点信息" prop="val5">
+							<el-radio-group v-model="dataForm.val5">
+								<el-radio :label="1">按策略自动选择</el-radio>
+								<el-radio :label="2">指定起点</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<div v-if="dataForm.val5 == 2" class="potBG-div">
+				<div>
+					<el-row :gutter="10">
+						<el-col :span="10">
+							起点库区:
+							<el-select
+								style="width: 200px; margin-left: 10px"
+								v-model="startPot"
+								size="small"
+								placeholder="请选择起点库区">
+								<el-option
+									v-for="item in options1"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"></el-option>
+							</el-select>
+						</el-col>
+						<el-col :span="13" style="text-align: right; line-height: 36px">
+							<span
+								class="num1-startPot-status"
+								style="background-color: #5ab45a" />
+							可选
+							<span class="num1-startPot-status" />
+							不可选
+							<span
+								class="num1-startPot-status"
+								style="background-color: #e9b100" />
+							已选
+						</el-col>
+					</el-row>
+					<div class="potTitleBG">
+						<div v-for="item in Object.keys(startPotList)" :key="item">
+							<div class="potTitle">
+								{{ item }}
+							</div>
+							<div class="potList">
+								<div
+									class="pot"
+									v-for="sitem in startPotList[item]"
+									:key="sitem.id"
+									:style="{
+										backgroundColor: potBGcolor[sitem.status],
+										cursor: sitem.status > 0 ? 'pointer' : '',
+									}"
+									@click="sitem.status > 0 && setStartPot(sitem)"
+									:title="sitem.name">
+									{{ sitem.name }}
+								</div>
+							</div>
+						</div>
+					</div>
+						<el-divider></el-divider>
+						<div style="text-align: right">可用库存总量 <span style="color:#409EFF;font-size:16px">12</span> 盘</div>
+				</div>
+			</div>
+		</div>
+		<div v-if="stepNum == 2">
+			<div class="topTip">
+				1.指定终点库位，下发后会锁定所属巷道仅本批次任务进入。
+				<br />
+				2.指定终点库位选位规则：仅可从巷道最里空对位选位。
+				<br />
+				3.只选择库区或巷道时，该方式下当前终点为候选位置，系统将根据策略与现场实际情况自动确定最终终点库位。
+			</div>
+			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
+				步骤二：选择终点
+			</small-title>
+		</div>
+		<div v-if="stepNum == 3">
+			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
+				步骤三：预览与下发
+			</small-title>
+		</div>
+	</div>
+</template>
+
+<script>
+import SmallTitle from './SmallTitle';
+export default {
+	components: {
+		SmallTitle,
+	},
+	data() {
+		return {
+			dotArr: [
+				{
+					name: '选择起点',
+				},
+				{
+					name: '选择终点',
+				},
+				{
+					name: '预览下发',
+				},
+			],
+			potBGcolor: ['', '#dafadc', '#f8f0c4'],
+			stepNum: 1, // 当前第几步
+			//第一步参数
+			dataForm: {
+				id: undefined,
+				val1: undefined,
+				val2: undefined,
+				val3: undefined,
+				val4: undefined,
+				val5: 1,
+			},
+			options1: [
+				{
+					label: '产品',
+					value: 1,
+				},
+				{
+					label: '空盘',
+					value: 2,
+				},
+			],
+			dataRule: {},
+			startPot: undefined, //起点库区选择的类型
+			startPotList: {
+				//起点库区List
+				G01: [
+					{
+						id: '001',
+						name: 'L001',
+						status: 1,
+					},
+					{
+						id: '002',
+						name: 'R002',
+						status: 1,
+					},
+					{
+						id: '003',
+						name: 'L003',
+						status: 0,
+					},
+					{
+						id: '004',
+						name: 'R004',
+						status: 0,
+					},
+				],
+				G02: [
+					{
+						id: '005',
+						name: 'L005',
+					},
+					{
+						id: '006',
+						name: 'R006',
+					},
+					{
+						id: '007',
+						name: 'L007',
+					},
+					{
+						id: '008',
+						name: 'R008',
+					},
+				],
+			},
+		};
+	},
+	methods: {
+		init(id) {
+			this.dataForm.id = id || undefined;
+			this.$nextTick(() => {
+				if (this.dataForm.id) {
+				} else {
+				}
+			});
+		},
+		//上一步
+		upSubmit() {
+			if (this.stepNum == 2) {
+				this.stepNum -= 1;
+				this.$emit('setSN', this.stepNum);
+			} else if (this.stepNum == 3) {
+				this.stepNum -= 1;
+				this.$emit('setSN', this.stepNum);
+			}
+		},
+		//下一步
+		nextSubmit() {
+			if (this.stepNum == 1) {
+				this.stepNum += 1;
+				this.$emit('setSN', this.stepNum);
+				return;
+			}
+			if (this.stepNum == 2) {
+				this.stepNum += 1;
+				this.$emit('setSN', this.stepNum);
+				return;
+			}
+			if (this.stepNum == 3) {
+				this.stepNum = 1;
+				this.$emit('setSN', this.stepNum);
+				return;
+			}
+		},
+		cancelStep() {},
+
+		// 第一步方法
+		setStartPot(data) {
+			data.status = data.status == 1 ? 2 : 1;
+		},
+	},
+};
+</script>
+
+<style scoped>
+.topTip {
+	background-color: #ebebeb;
+	padding: 10px 20px;
+	border-radius: 5px;
+	line-height: 25px;
+}
+</style>
+<!-- //库位点的样式 -->
+<style scoped>
+.potBG-div {
+	width: 100%;
+	margin: 10px;
+	border: 1px solid gainsboro;
+	box-shadow: 2px 2px 2px gainsboro, -1px -1px 3px gainsboro;
+	padding: 15px;
+}
+.num1-startPot-status {
+	margin-left: 5px;
+	display: inline-block;
+	width: 14px;
+	height: 14px;
+	border: 1px solid gainsboro;
+}
+.potTitleBG {
+	margin-top: 10px;
+	overflow-x: auto;
+	display: flex;
+}
+.potTitle {
+	width: 82px;
+	background-color: rgb(169, 235, 249);
+	border-radius: 3px;
+	margin-right: 5px;
+	text-align: center;
+	color: #000000;
+	letter-spacing: 1px;
+	margin-bottom: 10px;
+}
+.potList {
+	width: 82px;
+	display: grid;
+	grid-template-columns: 40px 40px;
+	gap: 2px;
+}
+.pot {
+	width: 40px;
+	text-align: center;
+	border: 1px solid gainsboro;
+	border-radius: 3px;
+	padding: 5px 0;
+	margin-bottom: 5px;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+</style>
+
+<!-- //序号圆点 -->
+<style scoped>
+.circle-container {
+	height: 110px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	padding: 20px;
+	width: 90%;
+	overflow-x: auto;
+	margin: auto;
+}
+
+.circle-wrapper {
+	position: relative;
+	display: flex;
+	align-items: center;
+}
+
+.circle {
+	width: 52px;
+	height: 52px;
+	border-radius: 50%;
+	background: #8db1ff;
+	font-weight: 500;
+	font-size: 31px;
+	color: #ffffff;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	position: relative;
+	z-index: 2;
+	cursor: pointer;
+}
+.circle-text {
+	position: absolute;
+	top: 60px;
+	left: -15px;
+	color: #8db1ff;
+	width: 82px;
+	text-align: center;
+}
+
+/* 下半圆虚线边框 */
+.circle::after {
+	content: '';
+	position: absolute;
+	bottom: -6px; /* 2px边框 + 2px间隙 */
+	left: -4px;
+	right: -4px;
+	height: 30px; /* 半圆高度 */
+	border-radius: 0 0 60px 60px;
+	border: 1px dashed #0b58ff;
+	border-top: none;
+	z-index: 1;
+}
+
+.connector {
+	width: 160px; /* 计算连接线长度 */
+	height: 2px;
+	border-bottom: 1px dashed rgb(11, 88, 255, 1);
+	margin: 0 5px;
+	z-index: 1;
+}
+</style>

src/views/cost/components/detailDrawer.vue

@@ -0,0 +1,273 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-11-07 17:01:51
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-07 22:31:17
+ * @Description:
+-->
+<template>
+	<el-drawer
+		:visible.sync="visible"
+		:with-header="false"
+		size="50%"
+		@close="closeD"
+		:show-close="false">
+		<div class="bgDiv1">
+			<el-row :gutter="20" style="margin-bottom: 15px">
+				<el-col :span="8" style="font-size: 20px; font-weight: 600">
+					TSK202510230001
+				</el-col>
+				<el-col :span="8">满盘搬运（自动）</el-col>
+				<el-col :span="8">
+					上次刷新：{{ parseTime(Date.now()) }}
+					<el-button type="text" @click="refresh">刷新</el-button>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="8">任务状态</el-col>
+				<el-col :span="8">优先级</el-col>
+				<el-col :span="8">执行车辆</el-col>
+			</el-row>
+			<el-row :gutter="20" style="margin-bottom: 15px">
+				<el-col :span="8">
+					<span
+						:style="{ backgroundColor: statusColor[1].color }"
+						class="taskStatus">
+						{{ statusColor[1].label }}
+					</span>
+				</el-col>
+				<el-col :span="8">中</el-col>
+				<el-col :span="8">--</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="8">执行时长</el-col>
+				<el-col :span="8">创建人</el-col>
+				<el-col :span="8">创建时间</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="8">--</el-col>
+				<el-col :span="8">系统/张三</el-col>
+				<el-col :span="8">{{ parseTime(Date.now()) }}</el-col>
+			</el-row>
+		</div>
+		<div class="bgDiv2">
+			<el-steps
+				:active="stepNum"
+				finish-status="success"
+				:process-status="stepStatus"
+				align-center>
+				<el-step title="待下发"></el-step>
+				<el-step title="待执行"></el-step>
+				<el-step title="执行中"></el-step>
+				<el-step title="已完成"></el-step>
+			</el-steps>
+			<div class="abnormal">任务异常：无效路径</div>
+		</div>
+		<div class="bgDiv3">
+			<small-title style="margin: 0 0 8px 0" size="sm" :no-padding="true">
+				搬运对象
+			</small-title>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<div class="pan-info">
+						<div class="pan-title">L盘</div>
+					</div>
+				</el-col>
+				<el-col :span="12">
+					<div class="pan-info">
+						<div class="pan-title">R盘</div>
+					</div>
+				</el-col>
+			</el-row>
+		</div>
+		<div class="bgDiv4">
+			<small-title style="margin: 0 0 8px 0" size="sm" :no-padding="true">
+				回收信息
+			</small-title>
+			<el-descriptions :column="2" size="medium" border>
+				<el-descriptions-item label="回收方式">他车回收</el-descriptions-item>
+				<el-descriptions-item label="回收任务编号">
+					18100000000
+				</el-descriptions-item>
+				<el-descriptions-item label="回收库位">
+					CK-01-A05-L / R
+				</el-descriptions-item>
+				<el-descriptions-item label="执行车辆">AGV-06</el-descriptions-item>
+			</el-descriptions>
+		</div>
+		<div class="bgDiv5">
+			<small-title style="margin: 0 0 8px 0" size="sm" :no-padding="true">
+				任务明细
+			</small-title>
+			<el-descriptions :column="2" size="medium" border>
+				<el-descriptions-item label="起点库位(L/R)">
+					CK-01-A05-L / R
+				</el-descriptions-item>
+				<el-descriptions-item label="终点库位(L/R)">
+					CC-02-B03-L/R (候选 )
+				</el-descriptions-item>
+				<el-descriptions-item label="起点策略">--</el-descriptions-item>
+				<el-descriptions-item label="终点策略">入库策略</el-descriptions-item>
+				<el-descriptions-item label="FMS任务号">--</el-descriptions-item>
+				<el-descriptions-item label="车辆位置">--</el-descriptions-item>
+				<el-descriptions-item label="电量">--</el-descriptions-item>
+				<el-descriptions-item label="是否载货">--</el-descriptions-item>
+				<el-descriptions-item label="创建方式">自动/人工</el-descriptions-item>
+				<el-descriptions-item label="任务来源">
+					PDA/PC/系统
+				</el-descriptions-item>
+				<el-descriptions-item label="关联叫料单">--</el-descriptions-item>
+				<el-descriptions-item label=""></el-descriptions-item>
+			</el-descriptions>
+		</div>
+		<div class="bgDiv6">
+			<small-title style="margin: 0 0 8px 0" size="sm" :no-padding="true">
+				任务日志
+			</small-title>
+			<el-timeline style="padding: 0">
+				<el-timeline-item
+					v-for="(activity, index) in activities"
+					:key="index"
+					:type="activity.type"
+					:color="activity.color"
+					size="large"
+					hide-timestamp>
+					<span>{{ activity.content }}</span>
+					<span style="float: right">{{ activity.timestamp }}</span>
+				</el-timeline-item>
+			</el-timeline>
+		</div>
+						<el-divider></el-divider>
+
+      <!-- 底部按钮 -->
+			<div class="drawer-body__footer">
+        <el-button @click="closeD">返 回</el-button>
+      </div>
+	</el-drawer>
+</template>
+<script>
+import SmallTitle from './SmallTitle';
+
+export default {
+	name: '',
+	data() {
+		return {
+			visible: false,
+			title: '',
+			statusColor: [
+				//bgDiv1的任务状态
+				{ label: '待下发', color: '#fa8c16' },
+				{ label: '待执行', color: '#1890ff' },
+				{ label: '执行中', color: '#1890ff' },
+				{ label: '已完成', color: '#52c41a' },
+				{ label: '暂停中', color: '#8c8c8c' },
+				{ label: '已终止', color: '#faad14' },
+				{ label: '异常', color: '#ff4d4f' },
+				{ label: '禁用', color: '#d9d9d9' },
+			],
+			//bgDiv2的步骤条
+			stepNum: 2,
+			stepStatus: 'finish',
+			//bgDiv6的时间线
+
+			activities: [
+				{
+					content: 'FMS | 卸货完成，任务完成',
+					timestamp: '2018-04-12 20:46',
+					type: 'primary',
+				},
+				{
+					content: 'FMS | 取货完成',
+					timestamp: '2018-04-03 20:46',
+				},
+				{
+					content: 'FMS | 派车AGV-03，前往起点取货',
+					timestamp: '2018-04-03 20:46',
+				},
+				{
+					content: '张三 | 任务扫码配对完成，进入待下发',
+					timestamp: '2018-04-03 20:46',
+				},
+			],
+		};
+	},
+	components: {
+		SmallTitle,
+	},
+	created() {},
+	methods: {
+		init(val) {
+			this.visible = true;
+		},
+		//刷新
+		refresh() {},
+		closeD() {
+      this.visible = false
+			this.$emit('closeDrawer');
+		},
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+.bgDiv1 {
+	background-color: rgba(242, 242, 242, 0.5);
+	padding: 20px;
+	line-height: 25px;
+	font-size: 15px;
+	border-bottom: 1px solid rgba(121, 121, 121, 0.5);
+	.taskStatus {
+		text-align: center;
+		border-radius: 3px;
+		padding: 2px 5px;
+		color: #fff;
+	}
+}
+.bgDiv2 {
+	border-bottom: 1px solid rgba(121, 121, 121, 0.5);
+	padding: 18px 0;
+	.abnormal {
+		width: 80%;
+		margin: auto;
+		border-radius: 5px;
+		height: 40px;
+		font-size: 22px;
+		line-height: 40px;
+		text-align: center;
+		background-color: rgba(217, 0, 27, 0.1);
+		color: rgba(217, 0, 27, 1);
+		border: 1px solid rgba(217, 0, 27, 1);
+	}
+}
+.bgDiv3 {
+	padding: 20px 20px 0;
+	.pan-info {
+		height: 350px;
+		border: 1px solid rgba(121, 121, 121, 0.8);
+		border-radius: 5px;
+		.pan-title {
+			background-color: rgba(242, 242, 242, 0.5);
+			height: 35px;
+			font-size: 20px;
+			line-height: 35px;
+			padding: 0 20px;
+			border-bottom: 1px solid rgba(121, 121, 121, 0.5);
+			letter-spacing: 2px;
+		}
+	}
+}
+.bgDiv4 {
+	padding: 20px 20px 0;
+}
+.bgDiv5 {
+	padding: 20px 20px 0;
+}
+.bgDiv6 {
+	padding: 20px 20px 0;
+}
+.drawer-body__footer {
+	display: flex;
+	justify-content: flex-end;
+	padding: 0 18px 10px;
+}
+</style>

src/views/cost/components/stopInStock.vue

@@ -0,0 +1,65 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-11-08 17:44:05
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-08 18:13:25
+ * @Description:
+-->
+<template>
+	<div>
+		<div>请选择要执行的终止方式，系统会根据选择进行处理</div>
+		<el-radio-group v-model="radio" class="stockRadioDiv">
+			<el-radio :label="1" border style="margin: 10px 0">
+				仅终止，稍后回收
+				<div style="font-weight: 400">
+					任务立即终止，车辆保持暂停，稍后可在任务列表中手动回收
+				</div>
+			</el-radio>
+			<el-radio :label="2" border style="margin: 10px 0">
+				终止，并立即回收
+				<div style="font-weight: 400">
+					任务立即终止立即，选择货物回收方式生成任务或更新卸货点
+				</div>
+			</el-radio>
+		</el-radio-group>
+		<div>
+			终止原因：
+			<el-input
+				type="textarea"
+				:rows="3"
+         style="margin: 10px 0"
+				placeholder="请输入终止原因"
+				v-model="textarea" />
+		</div>
+	</div>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			radio: 1,
+			textarea: '',
+		};
+	},
+	methods: {
+		init(val) {},
+		submit() {
+      if(this.textarea){
+
+      }else{
+        this.$message('请输入终止原因');
+      }
+    },
+	},
+};
+</script>
+
+<style scoped>
+.stockRadioDiv >>> .el-radio--medium.is-bordered {
+	display: flex;
+	align-items: center;
+	height: 70px;
+  line-height: 20px;
+}
+</style>

src/views/cost/components/subSpan1.vue

@@ -0,0 +1,32 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-13 16:18:41
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-06 15:19:24
+ * @Description:
+-->
+<template>
+	<span>
+		{{
+			(injectData.val2
+				? ['满盘搬运', '空盘搬运', '备料搬运', '临时搬运'][injectData.val2]
+				: '-')
+		}}
+	</span>
+</template>
+
+<script>
+export default {
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {};
+	},
+	created() {},
+	methods: {},
+};
+</script>

src/views/cost/components/subSpan2.vue

@@ -0,0 +1,32 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-13 16:18:41
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-06 15:20:43
+ * @Description:
+-->
+<template>
+	<span>
+		{{
+			(injectData.val3
+				? ['待下发', '待执行', '执行中', '已完成', '暂停中', '已终止', '异常'][injectData.val3]
+				: '-')
+		}}
+	</span>
+</template>
+
+<script>
+export default {
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {};
+	},
+	created() {},
+	methods: {},
+};
+</script>

src/views/cost/components/subSpan3.vue

@@ -0,0 +1,57 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-13 16:18:41
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-06 15:37:02
+ * @Description:
+-->
+<template>
+	<div>
+		<div style="display: flex; align-items: center">
+			<div
+				style="
+					width: 16px;
+					height: 16px;
+					border-radius: 5px;
+					background-color: #e89b24;
+					color: #fff;
+          text-align:center;
+          line-height:16px
+				">
+				L
+			</div>
+			产品名称+产品规格
+		</div>
+		<div style="display: flex; align-items: center">
+			<div
+				style="
+					width: 16px;
+					height: 16px;
+					border-radius: 5px;
+					background-color: #6a96ec;
+					color: #fff;
+          text-align:center;
+          line-height:16px
+				">
+				R
+			</div>
+			产品名称+产品规格
+		</div>
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {};
+	},
+	created() {},
+	methods: {},
+};
+</script>

src/views/cost/components/subSpan4.vue

@@ -0,0 +1,32 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-13 16:18:41
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-11-06 15:19:24
+ * @Description:
+-->
+<template>
+	<span>
+		{{
+			(injectData.val2
+				? ['满盘搬运', '空盘搬运', '备料搬运', '临时搬运'][injectData.val2]
+				: '-')
+		}}
+	</span>
+</template>
+
+<script>
+export default {
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {};
+	},
+	created() {},
+	methods: {},
+};
+</script>

src/views/cost/components/typeRule.vue

@@ -0,0 +1,23 @@
+<!--
+ * @Author: zwq
+ * @Date: 2023-12-05 13:45:59
+ * @LastEditors: zwq
+ * @LastEditTime: 2024-04-15 17:12:03
+ * @Description
+-->
+<template>
+	<div>
+		<span>{{ parseTime(injectData.startTime,'{y}年{m}月{d}日') + '-' + (parseTime(injectData.endTime)?parseTime(injectData.endTime,'{y}年{m}月{d}日'):'永久') }}</span>
+	</div>
+</template>
+<script>
+export default {
+	name: '',
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+};
+</script>

src/views/cost/costStatistics/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<div style="background: #f2f4f9; height: 40px; width: 100%">
+		<!-- <div style="background: #f2f4f9; height: 40px; width: 100%">
 			<ButtonNav :menus="['按日期', '按规格']" @change="currentMenu">
 				<template v-slot:tab1>
 					<div>按日期</div>
@@ -9,7 +9,7 @@
 					<div>按规格</div>
 				</template>
 			</ButtonNav>
-		</div>
+		</div> -->
 		<div class="app-container energyOverlimitLog">
 			<div v-show="activeName === 'his'">
 				<!-- 搜索工作栏 -->
@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -86,32 +86,36 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
 	},
 	{
 		prop: 'originArea',
 		label: '原片下片面积',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'deepArea',
 		label: '深加工下片面积',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'originPrice',
 		label: '原片成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'deepPrice',
 		label: '深加工成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'price',
 		label: '总成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 const tableProps2 = [
@@ -244,19 +248,12 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
 			this.formConfig2[0].startPlaceholder = '开始时间';
 			this.formConfig2[0].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
@@ -274,7 +271,7 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
@@ -334,12 +331,19 @@ export default {
 				this.otherMethods(val);
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		/** 导出按钮操作 */
 		handleExport() {
 			let exportURL, title;
 			if (this.activeName === 'his') {
 				exportURL = exportCostSumExcel;
-        title = '总成本统计-按日期';
+        title = '总成本统计';
 			} else {
 				exportURL = exportRawStatisticsRealtimeExcel;
         title = '总成本统计-按规格';

src/views/cost/deep/24hourCostMonitor/index.vue

@@ -77,7 +77,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name||null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
@@ -90,7 +90,7 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name;
 					this.listQuery.recTime = val.searchTime;
 					this.handleExport();

src/views/cost/deep/costDeepEnergy/index.vue

@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -86,24 +86,27 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
 	},
 	{
 		prop: 'energyTypeName',
 		label: '能源类型',
 	},
-	{
+	// {
-		prop: 'bindObjectName',
+	// 	prop: 'bindObjectName',
-		label: '监控对象',
+	// 	label: '监控对象',
-		filter: (val) => (val != null ? val : '--'),
+	// 	filter: (val) => (val != null ? val : '--'),
-	},
+	// },
-	{
+	// {
-		prop: 'meterName',
+	// 	prop: 'meterName',
-		label: '抄表名',
+	// 	label: '抄表名',
-		filter: (val) => (val != null ? val : '--'),
+	// 	filter: (val) => (val != null ? val : '--'),
-	},
+	// },
 	{
 		prop: 'quantity',
 		label: '累计使用量',
@@ -115,20 +118,24 @@ const tableProps = [
 	},
 ];
 const tableProps2 = [
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'energyTypeName',
 		label: '能源类型',
 	},
-	{
+	// {
-		prop: 'bindObjectName',
+	// 	prop: 'bindObjectName',
-		label: '监控对象',
+	// 	label: '监控对象',
-		filter: (val) => (val != null ? val : '--'),
+	// 	filter: (val) => (val != null ? val : '--'),
-	},
+	// },
-	{
+	// {
-		prop: 'meter',
+	// 	prop: 'meter',
-		label: '抄表名',
+	// 	label: '抄表名',
-		filter: (val) => (val != null ? val : '--'),
+	// 	filter: (val) => (val != null ? val : '--'),
-	},
+	// },
 	{
 		prop: 'quantity',
 		label: '累计使用量',
@@ -207,13 +214,16 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'daterange',
+					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd',
+					format: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
+					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
+					width: 350,
+					clearable: false,
 				},
 				{
 					type: 'button',
@@ -262,26 +272,18 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
-			this.formConfig2[1].startPlaceholder = '开始时间';
-			this.formConfig2[1].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.energyTypeId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
+					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
+					if (this.activeName === 'his') {
 						this.listQuery.endTime = val.searchTime
 							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 							: null;
-					if (this.activeName === 'his') {
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -292,13 +294,18 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.energyTypeId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
+					this.listQuery.endTime = val.searchTime
+						? val.searchTime[1]
+						: null;
+					if (this.activeName === 'his') {
 						this.listQuery.endTime = val.searchTime
 							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 							: null;
+					}
 					this.handleExport();
 					break;
 				default:
@@ -320,15 +327,26 @@ export default {
 				const end = new Date();
 				const start = new Date();
 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
+				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
+				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
-				this.formConfig2[1].startPlaceholder = parseTime(start).substr(0, 10);
+				this.$nextTick(() => {
-				this.formConfig2[1].endPlaceholder = parseTime(end).substr(0, 10);
+					this.$refs.searchBarForm2.formInline.searchTime = [
+						this.listQuery.startTime,
+						this.listQuery.endTime,
+					];
+				});
 				this.listQuery.name = null;
 				this.listQuery.pageNo = 1;
 				this.getDataList2();
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {

src/views/cost/deep/costDeepOthercostHis/index.vue

@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -87,9 +87,12 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
 	},
 	{
 		prop: 'otherCostName',
@@ -99,9 +102,14 @@ const tableProps = [
 		prop: 'price',
 		label: '总价（元）',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 const tableProps2 = [
+	// {
+	// 	prop: 'remark',
+	// 	label: '备注',
+	// },
 	{
 		prop: 'otherCostName',
 		label: '成本名称',
@@ -110,6 +118,7 @@ const tableProps2 = [
 		prop: 'price',
 		label: '总价（元）',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 export default {
@@ -182,13 +191,16 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'daterange',
+					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd',
+					format: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
+					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
+					width: 350,
+					clearable: false,
 				},
 				{
 					type: 'button',
@@ -237,26 +249,20 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
-			this.formConfig2[1].startPlaceholder = '开始时间';
-			this.formConfig2[1].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
 					if (this.activeName === 'his') {
+						this.listQuery.endTime = val.searchTime
+							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+							: null;
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -267,13 +273,18 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
+					this.listQuery.endTime = val.searchTime
+						? val.searchTime[1]
+						: null;
+					if (this.activeName === 'his') {
 						this.listQuery.endTime = val.searchTime
 							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 							: null;
+					}
 					this.handleExport();
 					break;
 				default:
@@ -295,15 +306,26 @@ export default {
 				const end = new Date();
 				const start = new Date();
 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
+				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
+				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
-				this.formConfig2[1].startPlaceholder = parseTime(start).substr(0, 10);
+				this.$nextTick(() => {
-				this.formConfig2[1].endPlaceholder = parseTime(end).substr(0, 10);
+					this.$refs.searchBarForm2.formInline.searchTime = [
+						this.listQuery.startTime,
+						this.listQuery.endTime,
+					];
+				});
 				this.listQuery.name = null;
 				this.listQuery.pageNo = 1;
 				this.getDataList2();
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		// 获取数据2列表
 		getDataList2() {
 			getRawOthercostSunPage(this.listQuery).then((response) => {

src/views/cost/deep/costDeepOthercostLog/index.vue

@@ -65,6 +65,7 @@ const tableProps = [
 		prop: 'price',
 		label: '成本金额',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'remark',
@@ -161,7 +162,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name||null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
@@ -174,7 +175,7 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name||null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime

src/views/cost/deep/costDeepOthercostRule/typeRule.vue

@@ -10,9 +10,9 @@
 		<span>
 			{{
 				injectData.type == 1
-					? `每天等价,${injectData.price}元`
+					? `每天等价,${Number(injectData.price)}元`
 					: injectData.type == 2
-					? `总价${injectData.price}元,年折旧率${injectData.ratio}%,折旧年限${injectData.timeLimit}年`
+					? `总价${Number(injectData.price)}元,年折旧率${injectData.ratio}%,折旧年限${injectData.timeLimit}年`
 					: '-'
 			}}
 		</span>

src/views/cost/deep/costDeepRatioHis/index.vue

@@ -52,7 +52,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -85,9 +85,12 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
 	},
 	{
 		prop: 'productionLineName',
@@ -100,22 +103,27 @@ const tableProps = [
 	{
 		prop: 'innum',
 		label: '上片数量',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outnum',
 		label: '下片数量',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? val * 100 + '%' : '-'),
+		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
 	},
 ];
 const tableProps2 = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
 	},
 	{
 		prop: 'productionLineName',
@@ -128,15 +136,17 @@ const tableProps2 = [
 	{
 		prop: 'innum',
 		label: '进片数量',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outnum',
 		label: '出片数量',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? val * 100 + '%' : '-'),
+		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
 	},
 ];
 export default {
@@ -170,13 +180,15 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'daterange',
+					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd',
+					format: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
+					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
+					width: 350,
 				},
 				{
 					type: 'button',
@@ -225,22 +237,15 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.productionLineId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
 					if (this.activeName === 'his') {
 						this.getDataList();
@@ -253,12 +258,12 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.productionLineId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
 					this.handleExport();
 					break;
@@ -309,10 +314,20 @@ export default {
 				this.otherMethods(val);
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		successSubmit() {
 			this.handleCancel();
-			const val = this.activeName === 'his' ? '产线良品率' : 'now';
+			if (this.activeName === 'his') {
-			this.currentMenu(val);
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
 		},
 		/** 导出按钮操作 */
 		handleExport() {

src/views/cost/deep/costStatistics/index.vue

@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -87,9 +87,12 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '时间',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
 	},
 	{
 		prop: 'bindObjectName',
@@ -102,33 +105,42 @@ const tableProps = [
 	{
 		prop: 'inCount',
 		label: '上片数量',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outCount',
 		label: '下片数量',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? val * 100 + '%' : '-'),
+		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
 	},
 	{
 		prop: 'costSum',
 		label: '深加工成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costPiece',
 		label: '单片成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costArea',
 		label: '每平米成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 const tableProps2 = [
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'bindObjectName',
 		label: '产线',
@@ -140,30 +152,35 @@ const tableProps2 = [
 	{
 		prop: 'inCount',
 		label: '上片数量',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outCount',
 		label: '下片数量',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? val * 100 + '%' : '-'),
+		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
 	},
 	{
 		prop: 'costSum',
 		label: '深加工成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costPiece',
 		label: '单片成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costArea',
 		label: '每平米成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 export default {
@@ -225,13 +242,16 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'daterange',
+					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd',
+					format: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
+					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
+					width: 350,
+					clearable: false,
 				},
 				{
 					type: 'select',
@@ -288,26 +308,20 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
-			this.formConfig2[0].startPlaceholder = '开始时间';
-			this.formConfig2[0].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
 					if (this.activeName === 'his') {
+						this.listQuery.endTime = val.searchTime
+							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+							: null;
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -318,13 +332,18 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
+					this.listQuery.endTime = val.searchTime
+						? val.searchTime[1]
+						: null;
+					if (this.activeName === 'his') {
 						this.listQuery.endTime = val.searchTime
 							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 							: null;
+					}
 					this.handleExport();
 					break;
 				default:
@@ -346,15 +365,26 @@ export default {
 				const end = new Date();
 				const start = new Date();
 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
+				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
+				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
-				this.formConfig2[0].startPlaceholder = parseTime(start).substr(0, 10);
+				this.$nextTick(() => {
-				this.formConfig2[0].endPlaceholder = parseTime(end).substr(0, 10);
+					this.$refs.searchBarForm2.formInline.searchTime = [
+						this.listQuery.startTime,
+						this.listQuery.endTime,
+					];
+				});
 				this.listQuery.name = null;
 				this.listQuery.pageNo = 1;
 				this.getDataList2();
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {

src/views/cost/index.vue

@@ -0,0 +1,45 @@
+<template>
+	<div class="home-page">
+		<div
+			class="main-footer"
+			style="
+				color: #c7c7c7;
+				user-select: none;
+				font-size: 14px;
+				letter-spacing: 1px;
+				height: 30px;
+				display: grid;
+				place-content: center;
+			">
+			&copy; 中建材智能自动化研究院有限公司
+		</div>
+	</div>
+</template>
+
+<script>
+
+export default {
+	name: 'Home',
+	mixins: [],
+	components: {},
+	computed: {},
+	data() {
+		return {};
+	},
+	created() {
+	},
+	beforeDestroy() {
+	},
+	methods: {
+		
+		
+		
+	},
+};
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+<style lang="scss">
+</style>

src/views/cost/indexDetail.vue

@@ -0,0 +1,199 @@
+<template>
+	<div class="app-container">
+		<search-bar
+			:formConfigs="formConfig"
+			ref="searchBarForm"
+			@headBtnClick="buttonClick" />
+		<base-table
+			:table-props="tableProps1"
+			:page="1"
+			:limit="100"
+			:table-data="tableData1"></base-table>
+		<base-table
+			:table-props="tableProps2"
+			:page="1"
+			:limit="100"
+			:table-data="tableData2"></base-table>
+	</div>
+</template>
+
+<script>
+import { getDetailData } from '@/api/cost/allCost';
+import moment from 'moment';
+
+const tableProps1 = [
+	{
+		prop: 'name',
+		label: '成本项目-原片',
+	},
+	{
+		prop: 'f1',
+		label: '本期领用',
+		children: [
+			{
+				prop: 'quantity',
+				label: '数量',
+			},
+			{
+				prop: 'price',
+				label: '单价',
+			},
+			{
+				prop: 'sumPrice',
+				label: '金额',
+			},
+		],
+	},
+	{
+		prop: 'sprice',
+		label: '单位成本',
+	},
+];
+
+const tableProps2 = [
+	{
+		prop: 'name',
+		label: '成本项目-加工',
+	},
+	{
+		prop: 'quantity',
+		label: '耗用数量',
+	},
+	{
+		prop: 'price',
+		label: '平均耗用单价',
+	},
+	{
+		prop: 'sumPrice',
+		label: '总成本',
+	},
+	{
+		prop: 'sprice',
+		label: '综合单位成本',
+	},
+];
+export default {
+	data() {
+		return {
+			tableProps1,
+			tableData1: [],
+			tableProps2,
+			tableData2: [],
+			listQuery: {
+				pageSize: 10,
+				pageNo: 1,
+				statisticType: 1,
+			},
+			activeName: '日',
+			startTime:
+				moment(new Date()).subtract(1, 'days').format('YYYY-MM-DD') +
+				' 00:00:00',
+			endTime:
+				moment(new Date()).subtract(-1, 'days').format('YYYY-MM-DD') +
+				' 00:00:00',
+			formConfig: [
+				{
+					type: 'select',
+					label: '维度',
+					selectOptions: [
+						{ id: 1, name: '日' },
+						{ id: 2, name: '周' },
+						{ id: 3, name: '月' },
+						{ id: 4, name: '年' },
+					],
+					param: 'statisticType',
+					defaultSelect: 1, // 默认值,
+					clearable: false,
+				},
+				{
+					// 日期选择
+					type: 'datePicker',
+					// label: '日期',
+					dateType: 'date',
+					placeholder: '选择日期',
+					format: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd',
+					param: 'timeday',
+					clearable: false,
+					pickerOptions: {
+						disabledDate(time) {
+							return (time.getTime()+ 3600 * 1000 * 24) > Date.now();
+						},
+						shortcuts: [
+							{
+								text: '今天',
+								onClick(picker) {
+									picker.$emit('pick', new Date());
+								},
+							},
+							{
+								text: '昨天',
+								onClick(picker) {
+									const date = new Date();
+									date.setTime(date.getTime() - 3600 * 1000 * 24);
+									picker.$emit('pick', date);
+								},
+							},
+							{
+								text: '一周前',
+								onClick(picker) {
+									const date = new Date();
+									date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+									picker.$emit('pick', date);
+								},
+							},
+						],
+					},
+				},
+				{
+					type: 'button',
+					btnName: '搜索',
+					name: 'search',
+					color: 'primary',
+				},
+				{
+					type: 'separate',
+				},
+				{
+					type: 'button',
+					btnName: '返回首页',
+					name: 'back',
+					color: 'warning',
+				},
+			],
+		};
+	},
+	created() {},
+	mounted() {
+		this.listQuery.startTime = this.startTime;
+    this.$refs.searchBarForm.formInline.timeday = this.startTime.substr(0, 10)
+		this.getDataList();
+	},
+	methods: {
+		// 获取数据列表
+		getDataList() {
+			getDetailData(this.listQuery).then((response) => {
+				this.tableData1 = response.data.odata;
+				this.tableData2 = response.data.ddata;
+			});
+		},
+		buttonClick(val) {
+			switch (val.btnName) {
+				case 'search':
+          console.log(val.timeday)
+					this.listQuery.statisticType = val.statisticType || 1;
+					this.listQuery.startTime = val.timeday
+						? val.timeday + ' 00:00:00'
+						: null;
+					this.getDataList();
+					break;
+				case 'back':
+          this.$router.go(-1)
+					break;
+				default:
+					console.log(val);
+			}
+		},
+	},
+};
+</script>

src/views/cost/raw/24hourCostMonitor/index.vue

@@ -77,7 +77,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name||null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
@@ -90,7 +90,7 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name;
 					this.listQuery.recTime = val.searchTime;
 					this.handleExport();

src/views/cost/raw/costEnergy/index.vue

@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -86,24 +86,27 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
 	},
 	{
 		prop: 'energyTypeName',
 		label: '能源类型',
 	},
-	{
+	// {
-		prop: 'bindObjectName',
+	// 	prop: 'bindObjectName',
-		label: '监控对象',
+	// 	label: '监控对象',
-		filter: (val) => (val != null ? val : '--'),
+	// 	filter: (val) => (val != null ? val : '--'),
-	},
+	// },
-	{
+	// {
-		prop: 'meterName',
+	// 	prop: 'meterName',
-		label: '抄表名',
+	// 	label: '抄表名',
-		filter: (val) => (val != null ? val : '--'),
+	// 	filter: (val) => (val != null ? val : '--'),
-	},
+	// },
 	{
 		prop: 'quantity',
 		label: '累计使用量',
@@ -115,20 +118,24 @@ const tableProps = [
 	},
 ];
 const tableProps2 = [
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'energyTypeName',
 		label: '能源类型',
 	},
-	{
+	// {
-		prop: 'bindObjectName',
+	// 	prop: 'bindObjectName',
-		label: '监控对象',
+	// 	label: '监控对象',
-		filter: (val) => (val != null ? val : '--'),
+	// 	filter: (val) => (val != null ? val : '--'),
-	},
+	// },
-	{
+	// {
-		prop: 'meter',
+	// 	prop: 'meter',
-		label: '抄表名',
+	// 	label: '抄表名',
-		filter: (val) => (val != null ? val : '--'),
+	// 	filter: (val) => (val != null ? val : '--'),
-	},
+	// },
 	{
 		prop: 'quantity',
 		label: '累计使用量',
@@ -207,13 +214,16 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'daterange',
+					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd',
+					format: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
+					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
+					width: 350,
+					clearable: false,
 				},
 				{
 					type: 'button',
@@ -237,10 +247,11 @@ export default {
 			activeName: 'his',
 			tableProps,
 			tableProps2,
-			tableBtn: [{
+			tableBtn: [
+				{
 					type: 'edit',
 					btnName: '编辑',
-					  }
+				},
 			].filter((v) => v),
 			tableData: [],
 			tableData2: [],
@@ -262,26 +273,18 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
-			this.formConfig2[1].startPlaceholder = '开始时间';
-			this.formConfig2[1].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.energyTypeId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
+					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
+					if (this.activeName === 'his') {
 						this.listQuery.endTime = val.searchTime
 							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 							: null;
-					if (this.activeName === 'his') {
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -292,13 +295,16 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.energyTypeId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
+					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : null;
+					if (this.activeName === 'his') {
 						this.listQuery.endTime = val.searchTime
 							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 							: null;
+					}
 					this.handleExport();
 					break;
 				default:
@@ -320,15 +326,26 @@ export default {
 				const end = new Date();
 				const start = new Date();
 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
+				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
+				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
-				this.formConfig2[1].startPlaceholder = parseTime(start).substr(0, 10);
+				this.$nextTick(() => {
-				this.formConfig2[1].endPlaceholder = parseTime(end).substr(0, 10);
+					this.$refs.searchBarForm2.formInline.searchTime = [
+						this.listQuery.startTime,
+						this.listQuery.endTime,
+					];
+				});
 				this.listQuery.name = null;
 				this.listQuery.pageNo = 1;
 				this.getDataList2();
 			}
 		},
+		getNavDataList() {
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+		},
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {

src/views/cost/raw/costMaterial/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-09-05 15:34:28
+ * @LastEditTime: 2024-12-27 09:18:43
  * @Description:
 -->
 <template>
@@ -22,7 +22,7 @@
 						placeholder="请输入原料名称" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<!-- <el-col :span="12">
 				<el-form-item label="单价" prop="matPrice">
 					<el-input
 						v-model="dataForm.matPrice"
@@ -31,7 +31,7 @@
 						placeholder="请输入单价" />
 					(元/吨)
 				</el-form-item>
-			</el-col>
+			</el-col> -->
 			<el-col :span="12">
 				<el-form-item label="累计用量" prop="quantity">
 					<el-input-number

src/views/cost/raw/costMaterial/changeStatus.vue

@@ -0,0 +1,35 @@
+<template>
+	<el-switch
+		@change="changeStatus"
+		size="small"
+		v-model="list.enabled"
+		:active-value="1"
+		:inactive-value="0"></el-switch>
+</template>
+
+<script>
+import { updateGroup } from '@/api/group/groupSetting';
+export default {
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {
+			list: this.injectData,
+		};
+	},
+	created() {},
+	methods: {
+		changeStatus(val) {
+			const data = { ...this.injectData, enabled: val };
+			updateGroup(data).then((res) => {
+				this.$modal.msgSuccess('修改成功');
+					this.$emit('emitData');
+			});
+		},
+	},
+};
+</script>

src/views/cost/raw/costMaterial/index.vue

@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -87,9 +87,12 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
 	},
 	{
 		prop: 'materialName',
@@ -97,13 +100,13 @@ const tableProps = [
 	},
 	{
 		prop: 'quantity',
-		label: '累计使用量(吨)',
+		label: '累计使用量(千克)',
-	},
-	{
-		prop: 'matPrice',
-		label: '单价(元/吨)',
-		align: 'right',
 	},
+	// {
+	// 	prop: 'matPrice',
+	// 	label: '单价(元/千克)',
+	// 	align: 'right',
+	// },
 	{
 		prop: 'price',
 		label: '总价(元)',
@@ -111,6 +114,10 @@ const tableProps = [
 	},
 ];
 const tableProps2 = [
+	// {
+	// 	prop: 'remark',
+	// 	label: '备注',
+	// },
 	{
 		prop: 'materialName',
 		label: '原料名称',
@@ -123,13 +130,13 @@ const tableProps2 = [
 	},
 	{
 		prop: 'quantity',
-		label: '累计使用量(吨)',
+		label: '累计使用量(千克)',
-	},
-	{
-		prop: 'materialPrice',
-		label: '单价(元/吨)',
-		align: 'right',
 	},
+	// {
+	// 	prop: 'materialPrice',
+	// 	label: '单价(元/千克)',
+	// 	align: 'right',
+	// },
 	{
 		prop: 'price',
 		label: '总价(元)',
@@ -204,13 +211,16 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'daterange',
+					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd',
+					format: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
+					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
+					width: 350,
+					clearable: false,
 				},
 				{
 					type: 'button',
@@ -234,10 +244,11 @@ export default {
 			activeName: 'his',
 			tableProps,
 			tableProps2,
-			tableBtn: [{
+			tableBtn: [
+				{
 					type: 'edit',
 					btnName: '编辑',
-					  }
+				},
 			].filter((v) => v),
 			tableData: [],
 			tableData2: [],
@@ -259,26 +270,20 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
-			this.formConfig2[1].startPlaceholder = '开始时间';
-			this.formConfig2[1].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.materialId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
 					if (this.activeName === 'his') {
+						this.listQuery.endTime = val.searchTime
+							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+							: null;
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -289,13 +294,18 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.materialId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
+					this.listQuery.endTime = val.searchTime
+						? val.searchTime[1]
+						: null;
+					if (this.activeName === 'his') {
 						this.listQuery.endTime = val.searchTime
 							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 							: null;
+					}
 					this.handleExport();
 					break;
 				default:
@@ -317,15 +327,26 @@ export default {
 				const end = new Date();
 				const start = new Date();
 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
+				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
+				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
-				this.formConfig2[1].startPlaceholder = parseTime(start).substr(0, 10);
+				this.$nextTick(() => {
-				this.formConfig2[1].endPlaceholder = parseTime(end).substr(0, 10);
+					this.$refs.searchBarForm2.formInline.searchTime = [
+						this.listQuery.startTime,
+						this.listQuery.endTime,
+					];
+				});
 				this.listQuery.name = null;
 				this.listQuery.pageNo = 1;
 				this.getDataList2();
 			}
 		},
+		getNavDataList() {
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+		},
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {

src/views/cost/raw/costOriginRatioHis/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2024-09-05 15:33:16
+ * @LastEditTime: 2025-06-13 10:59:54
  * @Description:
 -->
 <template>
@@ -15,7 +15,9 @@
 		label-width="80px">
 		<el-row :gutter="20">
 			<el-col :span="12">
-				<el-form-item label="产线" prop="bindObjectName">
+				<el-form-item
+					:label="activeName === 'his' ? '产线' : '工段'"
+					prop="bindObjectName">
 					<el-input
 						style="width: 100%"
 						v-model="dataForm.bindObjectName"
@@ -33,7 +35,7 @@
 						placeholder="选择所属日期"></el-date-picker>
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<el-col :span="12" v-if="activeName === 'his'">
 				<el-form-item label="厚度" prop="thick">
 					<el-input-number
 						:min="0"
@@ -43,7 +45,7 @@
 						placeholder="请输入厚度" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<el-col :span="12" v-if="activeName === 'his'">
 				<el-form-item label="在线速度" prop="speed">
 					<el-input-number
 						:min="0"
@@ -53,7 +55,7 @@
 						placeholder="请输入在线速度" />
 				</el-form-item>
 			</el-col>
-			<el-col :span="12">
+			<el-col :span="12" v-if="activeName === 'his'">
 				<el-form-item label="掰边宽度" prop="width">
 					<el-input-number
 						:min="0"
@@ -64,25 +66,27 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="拉引量" prop="inArea">
+				<el-form-item
+					:label="activeName === 'his' ? '拉引量' : '进片数'"
+					prop="inArea">
 					<el-input-number
 						:min="0"
 						style="width: 85%"
 						v-model="dataForm.inArea"
-						clearable
+						clearable />
-						placeholder="请输入拉引量" />
+					{{ activeName === 'his' ? '(m²)' : '片' }}
-					(m²)
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="下片面积" prop="outArea">
+				<el-form-item
+					:label="activeName === 'his' ? '下片面积' : '出片数'"
+					prop="outArea">
 					<el-input-number
 						:min="0"
 						style="width: 85%"
 						v-model="dataForm.outArea"
-						clearable
+						clearable />
-						placeholder="请输入下片面积" />
+					{{ activeName === 'his' ? '(m²)' : '片' }}
-					(m²)
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
@@ -129,10 +133,12 @@ export default {
 				recTime: undefined,
 			},
 			dataRule: {},
+			activeName: 'his',
 		};
 	},
 	methods: {
-		init(val, statisticType) {
+		init(val, statisticType, activeName) {
+			this.activeName = activeName;
 			this.visible = true;
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
@@ -148,17 +154,22 @@ export default {
 				if (!valid) {
 					return false;
 				}
-				const udata = {
+				let udata = {
 					id: this.dataForm.id,
 					statisticType: this.dataForm.statisticType,
-					modifyThick: this.dataForm.thick,
-					modifySpeed: this.dataForm.speed,
-					modifyWidth: this.dataForm.width,
 					modifyInArea: this.dataForm.inArea,
 					modifyOutArea: this.dataForm.outArea,
 					modifyRatio:
 						this.dataForm.ratio >= 0 ? this.dataForm.ratio / 100 : '',
 				};
+				if (this.activeName === 'his') {
+					udata = {
+						...udata,
+						modifyThick: this.dataForm.thick,
+						modifySpeed: this.dataForm.speed,
+						modifyWidth: this.dataForm.width,
+					};
+				}
 				// 修改的提交
 				this.urlOptions.updateURL(udata).then((response) => {
 					this.$modal.msgSuccess('修改成功');

src/views/cost/raw/costOriginRatioHis/index.vue

@@ -1,11 +1,22 @@
 <template>
+	<div>
+		<div style="background: #f2f4f9; height: 40px; width: 100%">
+			<ButtonNav :menus="['产线良品率', '工段良品率']" @change="currentMenu">
+				<template v-slot:tab1>
+					<div>产线良品率</div>
+				</template>
+				<template v-slot:tab2>
+					<div>工段良品率</div>
+				</template>
+			</ButtonNav>
+		</div>
 		<div class="app-container energyOverlimitLog">
-		<!-- 搜索工作栏 -->
 			<search-bar
 				:formConfigs="formConfig"
 				ref="searchBarForm"
 				@headBtnClick="buttonClick" />
 			<!-- 列表 -->
+			<div v-if="activeName === 'his'">
 				<base-table
 					:page="listQuery.pageNo"
 					:limit="listQuery.pageSize"
@@ -20,11 +31,28 @@
 						:method-list="tableBtn"
 						@clickBtn="handleClick" />
 				</base-table>
+			</div>
+			<div v-if="activeName === 'now'">
+				<base-table
+					:page="listQuery.pageNo"
+					:limit="listQuery.pageSize"
+					:table-props="tableProps2"
+					:table-data="tableData2"
+					:max-height="tableH">
+					<method-btn
+						v-if="tableBtn.length"
+						slot="handleBtn"
+						:width="80"
+						label="操作"
+						:method-list="tableBtn"
+						@clickBtn="handleClick" />
+				</base-table>
+			</div>
 			<pagination
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-			@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -38,22 +66,34 @@
 					@refreshDataList="successSubmit"></add-or-update>
 			</base-dialog>
 		</div>
+	</div>
 </template>
 
 <script>
 import AddOrUpdate from './add-or-updata';
 import basicPage from '@/mixins/basic-page';
 import { getLinePage } from '@/api/base/productionLine';
-import { getcostOriginRatioHisPage,exportcostOriginRatioHisExcel } from '@/api/cost/costOriginRatioHis';
+import {
+	getcostOriginRatioHisPage,
+	getcostOriginWSRatioHisPage,
+	exportcostOriginWSRatioHisExcel,
+	exportcostOriginRatioHisExcel,
+} from '@/api/cost/costOriginRatioHis';
 import { parseTime } from '@/filter/code-filter';
 import tableHeightMixin from '@/mixins/lb/tableHeightMixin';
+import ButtonNav from '@/components/ButtonNav';
+
+
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
     width:130,
 	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'bindObjectName',
 		label: '产线',
@@ -62,27 +102,67 @@ const tableProps = [
 	{
 		prop: 'thick',
 		label: '厚度',
+    filter: (val) => (val != null ? Number(val).toFixed(1) : '-'),
 	},
 	{
 		prop: 'speed',
 		label: '在线速度',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'width',
 		label: '掰边宽度',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'inArea',
 		label: '拉引量/m²',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outArea',
 		label: '下片面积/m²',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? val * 100 + '%' : '-'),
+		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
+	},
+];
+const tableProps2  = [
+	{
+		prop: 'time',
+		label: '日期',
+    width:130,
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
+	{
+		prop: 'bindObjectName',
+		label: '工段',
+    width:145,
+	},
+	{
+		prop: 'spec',
+		label: '规格',
+	},
+	{
+		prop: 'inArea',
+		label: '进片数',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
+	},
+	{
+		prop: 'outArea',
+		label: '出片数',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
+	},
+	{
+		prop: 'ratio',
+		label: '良品率',
+		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
 	},
 ];
 export default {
@@ -116,13 +196,15 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'daterange',
+					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd',
+					format: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
+					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
+					width: 350,
 				},
 				{
 					type: 'button',
@@ -143,23 +225,27 @@ export default {
 			listQuery: {
 				statisticType: 1,
 			},
+			activeName: 'his',
 			tableProps,
+			tableProps2,
 			tableBtn: [{
 							type: 'edit',
 							btnName: '编辑',
 					  }
 			].filter((v) => v),
 			tableData: [],
+			tableData2: [],
 		};
 	},
 	components: {
 		AddOrUpdate,
+		ButtonNav,
 	},
 	created() {
     const params ={
       pageNo: 1,
       pageSize: 100,
-      pdType: 1
+      pdType: 0
     }
 		getLinePage(params).then((response) => {
 			this.formConfig[1].selectOptions = response.data.list;
@@ -167,36 +253,33 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
+					if (this.activeName === 'his') {
 						this.getDataList();
+					} else {
+						this.getDataList2();
+					}
 					break;
 				case 'add':
 					this.addOrUpdateHandle();
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
 					this.handleExport();
 					break;
@@ -204,23 +287,74 @@ export default {
 					console.log(val);
 			}
 		},
+		currentMenu(val) {
+			this.activeName = val === '产线良品率' ? 'his' : 'now';
+			if (this.activeName === 'his') {
+				this.$refs.searchBarForm.resetForm();
+				this.listQuery.bindObjectId = null;
+				this.listQuery.startTime = null;
+				this.listQuery.endTime = null;
+				this.listQuery.statisticType = 1;
+				this.listQuery.pageNo = 1;
+				this.getDataList();
+			} else {
+				this.$refs.searchBarForm.resetForm();
+				this.listQuery.bindObjectId = null;
+				this.listQuery.startTime = null;
+				this.listQuery.endTime = null;
+				this.listQuery.statisticType = 1;
+				this.listQuery.pageNo = 1;
+				this.getDataList2();
+			}
+		},
+		// 获取数据2列表
+		getDataList2() {
+			getcostOriginWSRatioHisPage(this.listQuery).then((response) => {
+				this.tableData2 = response.data.list;
+				this.listQuery.total = response.data.total;
+			});
+		},
 		//tableBtn点击
 		handleClick(val) {
 			if (val.type === 'edit') {
 				this.addOrUpdateVisible = true;
 				this.addOrEditTitle = '编辑';
 				this.$nextTick(() => {
-					this.$refs.addOrUpdate.init(val.data, this.listQuery.statisticType);
+					this.$refs.addOrUpdate.init(
+						val.data,
+						this.listQuery.statisticType,
+						this.activeName
+					);
 				});
 			} else {
 				this.otherMethods(val);
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
+		successSubmit() {
+			this.handleCancel();
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+		},
 		/** 导出按钮操作 */
 		handleExport() {
 			let exportURL, title;
+			if (this.activeName === 'his') {
 				exportURL = exportcostOriginRatioHisExcel;
-        title = '原片成本-原片良品率';
+				title = '原片-产线良品率';
+			} else {
+				exportURL = exportcostOriginWSRatioHisExcel;
+				title = '原片-工段良品率';
+			}
 			// 处理查询参数
 			let params = { ...this.listQuery };
 			params.pageNo = undefined;

src/views/cost/raw/costOthercostHis/index.vue

@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -87,9 +87,12 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '日期',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
 	},
 	{
 		prop: 'otherCostName',
@@ -102,6 +105,10 @@ const tableProps = [
 	},
 ];
 const tableProps2 = [
+	// {
+	// 	prop: 'remark',
+	// 	label: '备注',
+	// },
 	{
 		prop: 'otherCostName',
 		label: '成本名称',
@@ -182,13 +189,16 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'daterange',
+					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd',
+					format: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
+					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
+					width: 350,
+					clearable: false,
 				},
 				{
 					type: 'button',
@@ -237,24 +247,20 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
 					if (this.activeName === 'his') {
+						this.listQuery.endTime = val.searchTime
+							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+							: null;
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -265,13 +271,18 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
+					this.listQuery.endTime = val.searchTime
+						? val.searchTime[1]
+						: null;
+					if (this.activeName === 'his') {
 						this.listQuery.endTime = val.searchTime
 							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 							: null;
+					}
 					this.handleExport();
 					break;
 				default:
@@ -297,6 +308,13 @@ export default {
 				this.getDataList2();
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		// 获取数据2列表
 		getDataList2() {
 			getRawOthercostSunPage(this.listQuery).then((response) => {

src/views/cost/raw/costOthercostLog/index.vue

@@ -65,6 +65,7 @@ const tableProps = [
 		prop: 'price',
 		label: '成本金额',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'remark',
@@ -161,7 +162,7 @@ export default {
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name||null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
@@ -174,7 +175,7 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.name = val.name||null;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime

src/views/cost/raw/costOthercostRule/typeRule.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-12-05 13:45:59
  * @LastEditors: zwq
- * @LastEditTime: 2024-04-15 17:12:03
+ * @LastEditTime: 2024-12-25 16:20:38
  * @Description
 -->
 <template>
@@ -10,9 +10,9 @@
 		<span>
 			{{
 				injectData.type == 1
-					? `每天等价,${injectData.price}元`
+					? `每天等价,${Number(injectData.price)}元`
 					: injectData.type == 2
-					? `总价${injectData.price}元,年折旧率${injectData.ratio}%,折旧年限${injectData.timeLimit}年`
+					? `总价${Number(injectData.price)}元,年折旧率${injectData.ratio}%,折旧年限${injectData.timeLimit}年`
 					: '-'
 			}}
 		</span>

src/views/cost/raw/costStatistics/index.vue

@@ -54,7 +54,7 @@
 				:page.sync="listQuery.pageNo"
 				:limit.sync="listQuery.pageSize"
 				:total="listQuery.total"
-				@pagination="getDataList" />
+				@pagination="getNavDataList" />
 			<base-dialog
 				:dialogTitle="addOrEditTitle"
 				:dialogVisible="addOrUpdateVisible"
@@ -87,9 +87,12 @@ import ButtonNav from '@/components/ButtonNav';
 
 const tableProps = [
 	{
-		prop: 'recTime',
+		prop: 'time',
 		label: '时间',
-		filter: (val) => parseTime(val, '{y}年{m}月{d}日'),
+	},
+	{
+		prop: 'remark',
+		label: '备注',
 	},
 	{
 		prop: 'bindObjectName',
@@ -98,32 +101,41 @@ const tableProps = [
 	{
 		prop: 'thick',
 		label: '厚度',
+    filter: (val) => (val != null ? Number(val).toFixed(1) : '-'),
 	},
 	{
 		prop: 'inArea',
 		label: '拉引量/m²',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outArea',
 		label: '下片面积/m²',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? val * 100 + '%' : '-'),
+		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
 	},
 	{
 		prop: 'costSum',
 		label: '原片成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costArea',
 		label: '每平米成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 const tableProps2 = [
+	{
+		prop: 'remark',
+		label: '备注',
+	},
 	{
 		prop: 'bindObjectName',
 		label: '产线',
@@ -135,34 +147,40 @@ const tableProps2 = [
 	{
 		prop: 'inArea',
 		label: '拉引量/m²',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outArea',
 		label: '下片面积/m²',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'outCount',
 		label: '下片数量',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'ratio',
 		label: '良品率',
-		filter: (val) => (val ? val * 100 + '%' : '-'),
+		filter: (val) => (val ? Number(val * 100).toFixed(2) + '%' : '-'),
 	},
 	{
 		prop: 'costSum',
 		label: '原片成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costPiece',
 		label: '单片成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 	{
 		prop: 'costArea',
 		label: '每平米成本/元',
 		align: 'right',
+    filter: (val) => (val != null ? Number(val).toFixed(2) : '-'),
 	},
 ];
 export default {
@@ -224,13 +242,16 @@ export default {
 				{
 					type: 'datePicker',
 					label: '时间范围',
-					dateType: 'daterange',
+					dateType: 'datetimerange',
-					format: 'yyyy-MM-dd',
+					format: 'yyyy-MM-dd HH:mm:ss',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
+					defaultTime: ['08:30:00', '08:30:00'],
 					param: 'searchTime',
+					width: 350,
+					clearable: false,
 				},
 				{
 					type: 'select',
@@ -287,26 +308,20 @@ export default {
 	},
 	methods: {
 		buttonClick(val) {
-			if (val.statisticType === 2) {
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年第{w}周');
-			}else{
-				this.tableProps[0].filter = (val) =>
-					parseTime(val, '{y}年{m}月{d}日');
-      }
-			this.formConfig2[0].startPlaceholder = '开始时间';
-			this.formConfig2[0].endPlaceholder = '结束时间';
 			switch (val.btnName) {
 				case 'search':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
 					this.listQuery.endTime = val.searchTime
-						? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+						? val.searchTime[1]
 						: null;
 					if (this.activeName === 'his') {
+						this.listQuery.endTime = val.searchTime
+							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
+							: null;
 						this.getDataList();
 					} else {
 						this.getDataList2();
@@ -317,13 +332,18 @@ export default {
 					break;
 				case 'export':
 					this.listQuery.pageNo = 1;
-					this.listQuery.pageSize = 10;
+					this.listQuery.pageSize = 20;
 					this.listQuery.bindObjectId = val.name || null;
 					this.listQuery.statisticType = val.statisticType || 1;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : null;
+					this.listQuery.endTime = val.searchTime
+						? val.searchTime[1]
+						: null;
+					if (this.activeName === 'his') {
 						this.listQuery.endTime = val.searchTime
 							? val.searchTime[1].substr(0, 10) + ' 23:59:59'
 							: null;
+					}
 					this.handleExport();
 					break;
 				default:
@@ -345,15 +365,26 @@ export default {
 				const end = new Date();
 				const start = new Date();
 				start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 00:00:00';
+				this.listQuery.startTime = parseTime(start).substr(0, 10) + ' 08:30:00';
-				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 23:59:59';
+				this.listQuery.endTime = parseTime(end).substr(0, 10) + ' 08:30:00';
-				this.formConfig2[0].startPlaceholder = parseTime(start).substr(0, 10);
+				this.$nextTick(() => {
-				this.formConfig2[0].endPlaceholder = parseTime(end).substr(0, 10);
+					this.$refs.searchBarForm2.formInline.searchTime = [
+						this.listQuery.startTime,
+						this.listQuery.endTime,
+					];
+				});
 				this.listQuery.name = null;
 				this.listQuery.pageNo = 1;
 				this.getDataList2();
 			}
 		},
+    getNavDataList(){
+			if (this.activeName === 'his') {
+				this.getDataList();
+			} else {
+				this.getDataList2();
+			}
+    },
 		// 获取数据2列表
 		getDataList2() {
 			if (this.listQuery.startTime) {

src/views/group/Calendar/holidayLog.vue

@@ -0,0 +1,83 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-23 13:43:55
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-10-23 16:50:43
+ * @Description:
+-->
+<template>
+	<div class="app-container">
+		<div v-for="item in groupClassArr" :key="item.planId">
+			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
+				{{item.planName}}
+			</small-title>
+			<base-table
+				:table-props="tableProps"
+				:table-data="
+					tableData.filter((titem) => titem.schedulingPlanId == item.planId)
+				"></base-table>
+		</div>
+	</div>
+</template>
+
+<script>
+import SmallTitle from '../Schedule/SmallTitle';
+
+const tableProps = [
+	{
+		prop: 'classesName',
+		label: '班次名称',
+	},
+	{
+		prop: 'workTime',
+		label: '班次时间',
+	},
+	{
+		prop: 'teamName',
+		label: '班组名称',
+	},
+	{
+		prop: 'teamLeader',
+		label: '组长',
+	},
+	{
+		prop: 'teamLeaderPhone',
+		label: '组长电话',
+	},
+];
+
+export default {
+	components: {
+		SmallTitle,
+	},
+	data() {
+		return {
+			tableProps,
+			tableData: [],
+			groupClassArr: [],
+		};
+	},
+	created() {},
+	methods: {
+		init(det) {
+			this.tableData = det;
+			//返回计划名和id
+			const arr = det.map((item) => {
+				const obj = {
+					planName: item.schedulingPlanName,
+					planId: item.schedulingPlanId,
+				};
+				return obj;
+			});
+			//去重
+			const map = new Map();
+			arr.forEach((item) => {
+				if (!map.has(item.planId)) {
+					map.set(item.planId, item);
+				}
+			});
+			this.groupClassArr = Array.from(map.values());
+		},
+	},
+};
+</script>

src/views/group/Calendar/index.vue

@@ -0,0 +1,567 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-23 13:43:55
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-10-24 11:14:55
+ * @Description:
+-->
+<template>
+	<el-row :gutter="10" style="background-color: #f2f4f9">
+		<!--部门数据-->
+		<el-col :span="4">
+			<div class="head-container">
+				<el-tabs v-model="activeName" stretch @tab-click="tabsClick">
+					<el-tab-pane label="部门" name="first"></el-tab-pane>
+					<el-tab-pane label="班组" name="second"></el-tab-pane>
+				</el-tabs>
+				<div v-if="activeName == 'first'">
+					<el-input
+						v-model="deptName"
+						placeholder="请输入部门名称"
+						clearable
+						size="small"
+						prefix-icon="el-icon-search"
+						style="margin-bottom: 20px" />
+					<el-tree
+						:data="deptOptions"
+						:props="defaultProps"
+						:expand-on-click-node="false"
+						:filter-node-method="filterNode"
+						ref="tree"
+						default-expand-all
+						highlight-current
+						@node-click="handleNodeClick" />
+				</div>
+				<div v-else>
+					<el-input
+						v-model="groupName"
+						placeholder="请输入班组名称"
+						clearable
+						size="small"
+						prefix-icon="el-icon-search"
+						style="margin-bottom: 20px" />
+					<el-tree
+						:data="groupOptions"
+						:props="defaultProps"
+						:expand-on-click-node="false"
+						:filter-node-method="filterNode"
+						ref="tree1"
+						default-expand-all
+						highlight-current
+						@node-click="handleNodeClick1" />
+				</div>
+			</div>
+		</el-col>
+		<el-col :span="20">
+			<div class="groupTeamScheduling">
+				<div class="operationArea">
+					<el-form :inline="true" class="demo-form-inline">
+						<span class="blue-block"></span>
+						<el-form-item label="月份选择">
+							<el-date-picker
+								v-model="startDay"
+								type="month"
+								placeholder="选择月"
+								size="small"
+								@change="selectMonth"
+								:clearable="false"
+								style="width: 120px"></el-date-picker>
+							<span
+								style="color: #909399; font-size: 12px"
+								v-if="activeName == 'first'">
+								提示：排班日历仅展示当前选中部门的节假日设置，若休假日中仍有排班，则表示下级组织已通过自定义假期进行排班。
+							</span>
+							<span v-else>
+								组长:{{ showTeamName?.leaderName || '-' }} 组长电话:{{
+									showTeamName?.leaderPhone || '-'
+								}}
+							</span>
+						</el-form-item>
+						<el-form-item style="float: right">
+							<el-button
+								size="small"
+								type="primary"
+								@click="(startDay = new Date()), getHolidayPage()">
+								跳转到今天
+							</el-button>
+						</el-form-item>
+					</el-form>
+				</div>
+				<!-- 日历区域 -->
+				<div class="calenderArea">
+					<el-calendar v-model="startDay">
+						<template slot="dateCell" slot-scope="{ data }">
+							<div v-if="data.type === 'current-month'">
+								<!-- 日期 -->
+								<div class="dateStyle">
+									<el-row :gutter="20">
+										<!-- 公历和农历 -->
+										<el-col :span="18">
+											{{ Number(data.day.split('-')[2]) }}
+											<div class="lunar-date">{{ getLunarDate(data.day) }}</div>
+										</el-col>
+										<!-- 显示假或班 -->
+										<el-col :span="6">
+											<div
+												class="work-tip"
+												:style="{
+													backgroundColor: HolidayList[
+														Number(data.day.split('-')[2]) - 1
+													]?.isHoliday
+														? '#67C23A'
+														: '#409EFF',
+												}">
+												{{
+													HolidayList[Number(data.day.split('-')[2]) - 1]
+														?.isHoliday
+														? '假'
+														: '班'
+												}}
+                        <!-- //变更节假日未更新排班计划的角标 -->
+												<div
+													class="subIcon"
+													v-if="
+														HolidayList[Number(data.day.split('-')[2]) - 1]
+															?.isUpdate
+													">
+													<el-tooltip
+														effect="dark"
+														content="本日节假日变更已影响当前排班计划，但尚未同步，请及时处理。"
+														placement="top">
+														<i
+															class="el-icon-warning"
+															style="color: #f56c6c"></i>
+													</el-tooltip>
+												</div>
+											</div>
+										</el-col>
+										<!-- 显示排班 -->
+										<div
+											v-if="
+												HolidayList[Number(data.day.split('-')[2]) - 1]?.det
+													.length > 0
+											">
+											<el-col
+												:span="24"
+												v-for="(item, index) in HolidayList[
+													Number(data.day.split('-')[2]) - 1
+												]?.det.filter(
+													(item) =>
+														item.schedulingPlanId ==
+														HolidayList[Number(data.day.split('-')[2]) - 1]
+															?.schedulingPlanId
+												)"
+												:key="index">
+												<el-tooltip
+													effect="dark"
+													content="点击展示全部排班计划"
+													placement="top-start">
+													<div
+														class="holiday-div"
+														:style="{
+															backgroundColor:
+																holidayDivColor[item?.classesCode],
+														}"
+														@click="
+															holidayLog(
+																HolidayList[Number(data.day.split('-')[2]) - 1]
+																	?.det,
+																HolidayList[Number(data.day.split('-')[2]) - 1]
+																	?.date
+															)
+														"
+														:title="
+															item.classesName +
+															' | ' +
+															item.teamName +
+															' | ' +
+															item.workTime
+														">
+														{{
+															item.classesName +
+															' | ' +
+															item.teamName +
+															' | ' +
+															item.workTime
+														}}
+													</div>
+												</el-tooltip>
+											</el-col>
+										</div>
+									</el-row>
+								</div>
+							</div>
+							<div
+								v-else
+								style="font-size: 20px; font-weight: 500; text-align: left">
+								<el-row :gutter="20">
+									<el-col :span="24">
+										{{ Number(data.day.split('-')[2]) }}
+										<span style="font-size: 12px">
+											{{ getLunarDate(data.day) }}
+										</span>
+									</el-col>
+								</el-row>
+							</div>
+						</template>
+					</el-calendar>
+				</div>
+			</div>
+		</el-col>
+		<base-dialog
+			:dialogTitle="dialogTitle"
+			:dialogVisible="logVisible"
+			@cancel="cancelLog"
+			:before-close="cancelLog"
+			:destroy-on-close="true"
+			width="70%">
+			<holiday-log ref="holidayLogRef"></holiday-log>
+			<template #footer>
+				<slot name="footer">
+					<el-row slot="footer" type="flex" justify="end">
+						<el-col :span="24">
+							<el-button size="small" class="btnTextStyle" @click="cancelLog">
+								取消
+							</el-button>
+						</el-col>
+					</el-row>
+				</slot>
+			</template>
+		</base-dialog>
+	</el-row>
+</template>
+
+<script>
+import moment from 'moment';
+import { solarToLunar } from 'chinese-lunar';
+
+import { getUserProfile } from '@/api/system/user';
+import { listByDeptId } from '@/api/group/Schedule';
+import { getEnableData } from '@/api/group/holidaySetting';
+import {
+	getDeptSchedulingList,
+	getClassSchedulingList,
+} from '@/api/group/calendar';
+import holidayLog from './holidayLog';
+
+export default {
+	name: '',
+	components: {
+		holidayLog,
+	},
+	data() {
+		return {
+			activeName: 'first',
+			startDay: '', // 查询参数
+			HolidayList: [],
+			// 选择的部门名称
+			showDeptName: undefined,
+			showTeamName: {},
+			// 部门树选项
+			deptOptions: undefined,
+			groupOptions: undefined,
+			// 查询的部门名称
+			deptName: undefined,
+			groupName: undefined,
+
+			topDept: {}, // 保存当前用户的部门id为最高级部门id
+			deptId: undefined,
+			teamId: undefined,
+
+			defaultProps: {
+				children: 'children',
+				label: 'name',
+			},
+			logVisible: false,
+			dialogTitle: '',
+			holidayDivColor: ['#67c23a', '#69d983', '#f5c931', '#4fa6f0'],
+		};
+	},
+	watch: {
+		// 根据名称筛选部门树
+		deptName(val) {
+			this.$refs.tree.filter(val);
+		},
+		groupName(val) {
+			this.$refs.tree1.filter(val);
+		},
+	},
+	created() {
+		this.startDay = new Date();
+		// 查询用户个人信息
+		getUserProfile().then((response) => {
+			this.showDeptName = response.data.dept.name || '';
+			this.topDept = {
+				name: response.data.dept.name || '',
+				id: response.data.dept.id || '',
+			}; // 保存当前用户的部门为最高级部门id
+			this.deptId = response.data.dept.id || '';
+			this.getHolidayPage();
+			this.getTreeselect();
+		});
+	},
+	methods: {
+		getHolidayPage() {
+			const now = new Date(this.startDay);
+			const year = now.getFullYear();
+			const month = now.getMonth();
+			const startTime = `${year}-${String(month + 1).padStart(2, '0')}-01`;
+			const lastDate = new Date(year, month + 1, 0).getDate();
+			const endTime = `${year}-${String(month + 1).padStart(2, '0')}-${String(
+				lastDate
+			).padStart(2, '0')}`;
+
+			this.HolidayList = [];
+			if (this.activeName == 'first') {
+				getDeptSchedulingList({
+					deptId: this.deptId,
+					startTime: Date.parse(startTime),
+					endTime: Date.parse(endTime),
+				}).then((res) => {
+					this.HolidayList = res.data;
+				});
+			} else {
+				getClassSchedulingList({
+					teamId: this.teamId,
+					startTime: Date.parse(startTime),
+					endTime: Date.parse(endTime),
+				}).then((res) => {
+					this.HolidayList = res.data;
+				});
+			}
+		},
+		// 切换月份
+		selectMonth() {
+			this.getHolidayPage();
+		},
+		/** 查询部门下拉树结构 */
+		getTreeselect() {
+			getEnableData().then((response) => {
+				// 处理 deptOptions 参数
+				this.deptOptions = [];
+				this.deptOptions.push(...this.handleTree(response.data, 'id'));
+			});
+			listByDeptId(this.topDept.id).then((response) => {
+				this.groupOptions = [];
+				this.groupOptions.push(...response.data);
+			});
+		},
+		// 筛选节点
+		filterNode(value, data) {
+			if (!value) return true;
+			return data.name.indexOf(value) !== -1;
+		},
+		tabsClick() {
+			if (this.activeName == 'second' && this.groupOptions.length > 0) {
+				this.teamId = this.groupOptions[0].id;
+				this.showTeamName = {
+					leaderName: this.groupOptions[0].leaderName || '-',
+					leaderPhone: this.groupOptions[0].leaderPhone || '-',
+				};
+			} else if (this.activeName == 'first') {
+				this.deptId = this.topDept.id;
+			}
+			this.getHolidayPage();
+		},
+		// 节点单击事件
+		handleNodeClick(data) {
+			this.deptId = data.id;
+			this.showDeptName = data.name;
+			this.getHolidayPage();
+		},
+		handleNodeClick1(data) {
+			this.teamId = data.id;
+			this.showTeamName = {
+				leaderName: data.leaderName || '-',
+				leaderPhone: data.leaderPhone || '-',
+			};
+			this.getHolidayPage();
+		},
+		//获取农历
+		getLunarDate(solarDate) {
+			try {
+				const [year, month, day] = solarDate.split('-').map(Number);
+
+				const date = new Date(year, month - 1, day);
+				const lunar = solarToLunar(date);
+
+				// 将数字月份和日期转换为中文
+				const monthMap = {
+					1: '正',
+					2: '二',
+					3: '三',
+					4: '四',
+					5: '五',
+					6: '六',
+					7: '七',
+					8: '八',
+					9: '九',
+					10: '十',
+					11: '冬',
+					12: '腊',
+				};
+
+				const dayMap = {
+					1: '初一',
+					2: '初二',
+					3: '初三',
+					4: '初四',
+					5: '初五',
+					6: '初六',
+					7: '初七',
+					8: '初八',
+					9: '初九',
+					10: '初十',
+					11: '十一',
+					12: '十二',
+					13: '十三',
+					14: '十四',
+					15: '十五',
+					16: '十六',
+					17: '十七',
+					18: '十八',
+					19: '十九',
+					20: '二十',
+					21: '廿一',
+					22: '廿二',
+					23: '廿三',
+					24: '廿四',
+					25: '廿五',
+					26: '廿六',
+					27: '廿七',
+					28: '廿八',
+					29: '廿九',
+					30: '三十',
+				};
+
+				// 返回 "三月初四" 格式
+				return `${monthMap[lunar.month]}月${dayMap[lunar.day]}`;
+			} catch (error) {
+				console.log(error);
+				return '';
+			}
+		},
+		holidayLog(det, date) {
+			this.dialogTitle = this.showDeptName + '-' + date + '-排班详情';
+			this.logVisible = true;
+			this.$nextTick(() => {
+				this.$refs.holidayLogRef.init(det);
+			});
+		},
+		cancelLog() {
+			this.dialogTitle = '';
+			this.logVisible = false;
+		},
+	},
+};
+</script>
+<style lang="scss">
+.head-container {
+	padding: 20px 10px 0;
+	background-color: #fff;
+	min-height: calc(100vh - 120px - 8px);
+	border-radius: 8px;
+}
+.groupTeamScheduling {
+	.operationArea {
+		padding: 14px 10px 0 16px;
+		margin-bottom: 8px;
+		background-color: #fff;
+		border-radius: 8px;
+		.blue-block {
+			display: inline-block;
+			width: 4px;
+			height: 16px;
+			background-color: #0b58ff;
+			border-radius: 1px;
+			margin-right: 8px;
+			margin-top: 10px;
+		}
+		.el-form-item {
+			margin-bottom: 10px;
+		}
+	}
+	// 日历
+	.calenderArea {
+		padding: 14px 10px 0 20px;
+		background-color: #fff;
+		border-radius: 8px;
+		min-height: calc(100vh - 120px - 8px - 168px);
+		.el-calendar__body {
+			padding: 10px 16px 16px 0;
+		}
+		.el-calendar__header {
+			display: none;
+		}
+		.el-calendar-table > thead {
+			height: 48px;
+			font-size: 20px;
+			font-weight: 500;
+			color: #000000;
+			background-color: rgba(242, 244, 249, 1);
+		}
+		.el-calendar-table__row {
+			height: 133px;
+			.prev,
+			.next {
+				pointer-events: none;
+			}
+			.is-selected,
+			.is-today {
+				background-color: #e4f0fd;
+			}
+			.el-calendar-day {
+				padding: 0;
+				height: 100%;
+				:hover {
+					background-color: #e4f0fd;
+				}
+				.dateStyle {
+					font-size: 20px;
+					font-weight: 500;
+					color: #000000;
+					text-align: left;
+					height: 133px;
+					line-height: 28px;
+					padding: 10px;
+					overflow: hidden;
+
+					.lunar-date {
+						display: inline-block;
+						font-size: 12px;
+						color: #909399;
+					}
+					.work-tip {
+						background: #87c1ff;
+						color: white;
+						font-size: 18px;
+						width: 30px;
+						text-align: center;
+						float: right;
+						position: relative;
+						.subIcon {
+							position: absolute;
+							top: -18px;
+							right: -10px;
+							font-size: 10px;
+						}
+					}
+					.holiday-div {
+						background-color: #67c23a;
+						border-radius: 3px;
+						height: 25px;
+						text-align: center;
+						font-size: 12px;
+						line-height: 24px;
+						color: #fff;
+						margin-bottom: 2px;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+					}
+				}
+			}
+		}
+	}
+}
+</style>

src/views/group/Schedule/add-group.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-10-11 14:27:37
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-15 16:47:28
+ * @LastEditTime: 2025-10-29 17:12:04
  * @Description:
 -->
 <template>
@@ -12,6 +12,9 @@
 			ref="searchBarForm"
 			@headBtnClick="buttonClick" />
 		<base-table
+			ref="groupTableRef"
+			:id="'groupTableSelectRef'"
+			row-key="id"
 			:selectWidth="55"
 			@selection-change="selectChange"
 			:table-props="tableProps"
@@ -46,6 +49,7 @@ const tableProps = [
 	{
 		prop: 'remark',
 		label: '备注',
+		showOverflowtooltip: true,
 	},
 ];
 
@@ -84,21 +88,51 @@ export default {
 				name: '',
 			},
 			selectedList: [],
-      deptId: undefined
+			selectedArr: [], //已选的班组，从父组件传过来的
+			deptId: undefined,
 		};
 	},
 	created() {},
 	methods: {
-    init(id){
+		init(id, tableData) {
-      this.deptId = id
+			this.deptId = id;
-      this.getDataList()
+			this.selectedArr = tableData || [];
+			this.$nextTick(() => {
+				this.getDataList();
+			});
 		},
 		// 获取数据列表
 		getDataList() {
-			this.urlOptions
+			this.urlOptions.getDataListURL(this.deptId).then((response) => {
-				.getDataListURL(this.deptId)
-				.then((response) => {
 				this.tableData = response.data;
+				this.$nextTick(() => {
+					if (this.selectedArr.length > 0) {
+						this.setSelectedRows();
+					}
+				});
+			});
+		},
+		setSelectedRows() {
+			const table = this.$refs.groupTableRef.$children[0];
+
+			// 先清空选择
+			table.clearSelection();
+
+			this.selectedArr.forEach((item) => {
+				const rowInTable = this.tableData.find((i) => i.id === item.id);
+				if (rowInTable) {
+					//这里一定要用table.tableData，这样才是指向同一个数组
+					this.$set(table.store.states, 'selection', [
+						...table.store.states.selection,
+						table.tableData.find((i) => i.id === item.id),
+					]);
+				}
+			});
+
+			// 强制更新视图
+			this.$nextTick(() => {
+				table.$forceUpdate();
+				this.$forceUpdate();
 			});
 		},
 		buttonClick(val) {
@@ -115,9 +149,25 @@ export default {
 		selectChange(val) {
 			this.selectedList = val;
 		},
+		// 判断两个数组是否有重复的 id
+		hasDuplicateIds(arr1, arr2) {
+			const idSet = new Set(arr1.map((item) => item.id));
+			return arr2.some((item) => idSet.has(item.id));
+		},
+
 		dataFormSubmit() {
 			if (this.selectedList && this.selectedList.length > 0) {
+				const haveData = this.hasDuplicateIds(
+					this.selectedArr,
+					this.selectedList
+				);
+				if (haveData) {
+					this.$message('请不要重复添加数组');
+					return;
+				}
 				this.$emit('refreshTableData', this.selectedList);
+			} else if (this.selectedArr.length > 0) {
+				this.$message('请不要重复添加数组');
 			}
 		},
 	},

src/views/group/Schedule/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-10-13 15:07:24
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-17 17:01:35
+ * @LastEditTime: 2025-10-29 15:28:52
  * @Description:
 -->
 <template>
@@ -111,20 +111,12 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">
+					<el-col :span="6" v-if="dataForm.shiftType>1">
 						<el-form-item label="同班次连排" prop="shiftSustainedNum">
 							<el-input
 								v-model="dataForm.shiftSustainedNum"
 								oninput="value=value.replace(/^(0+)|[^\d]+/g,'')">
-								<el-select
+								<span slot="append">日</span>
-									style="width: 80px"
-									v-model="dataForm.shiftSustainedType"
-									slot="append">
-									<el-option label="日" :value="1"></el-option>
-									<el-option label="周" :value="2"></el-option>
-									<el-option label="月" :value="3"></el-option>
-									<el-option label="季" :value="4"></el-option>
-								</el-select>
 							</el-input>
 						</el-form-item>
 					</el-col>
@@ -176,7 +168,10 @@
 			</base-table>
 		</div>
 		<div v-if="stepNum == 3">
-			<small-title style="margin: 16px 0" size="sm" :no-padding="true">
+			<small-title
+				style="margin: 16px 0; font-size: 16px"
+				size="de"
+				:no-padding="true">
 				排班计划预览
 				<span style="font-size: 14px; color: #ff1c15">
 					系统将根据以下设置，按班组轮班顺序依次循环每日班次，生成正式排班计划，请确认。
@@ -263,12 +258,38 @@
 					</div>
 				</div>
 			</div>
+			<small-title
+				style="margin: 16px 0; font-size: 16px"
+				size="de"
+				:no-padding="true">
+				预览周期
+				<span>
+					<el-select
+						style="height: 20px"
+						v-model="period"
+						size="mini"
+						@change="setPeriod"
+						placeholder="请选择">
+						<el-option
+							v-for="item in periodArr"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"></el-option>
+					</el-select>
+				</span>
+			</small-title>
+
+			<base-table
+				v-if="tableProps3.length > 0"
+				:table-props="tableProps3"
+				:table-data="tableData3"></base-table>
 		</div>
 		<base-dialog
 			:dialogTitle="'修改班次'"
 			:dialogVisible="addOrUpdateVisible1"
 			@cancel="cancel1"
 			@confirm="handleConfirm1"
+			:before-close="cancel1"
 			:destroy-on-close="true"
 			append-to-body
 			width="40%">
@@ -281,6 +302,7 @@
 			:dialogVisible="addOrUpdateVisible2"
 			@cancel="cancel2"
 			@confirm="handleConfirm2"
+			:before-close="cancel2"
 			:destroy-on-close="true"
 			append-to-body
 			width="40%">
@@ -293,6 +315,7 @@
 			:dialogVisible="addOrUpdateVisible3"
 			@cancel="cancel3"
 			@confirm="handleConfirm3"
+			:before-close="cancel3"
 			:destroy-on-close="true"
 			append-to-body
 			width="50%">
@@ -306,11 +329,24 @@
 <script>
 import deptSelect from './../deptSelect.vue';
 import SmallTitle from './SmallTitle';
+import propfirstSpan from './propfirstSpan.vue';
+import propSpan from './propSpan.vue';
 import { parseTime } from '@/filter/code-filter';
 import editClass from './edit-class.vue';
 import addGroup from './add-group.vue';
 import bindLine from './bind-line.vue';
-import { getCode, createStepOne, returnStepOne } from '@/api/group/Schedule';
+import {
+	getCode,
+	createStepOne,
+	returnStepOne,
+	createStepTwo,
+	returnStepTwo,
+	getPerView,
+	draftEditing,
+	cancelStepThree,
+	checkPlan,
+	createStepFour,
+} from '@/api/group/Schedule';
 
 const tableProps1 = [
 	{
@@ -318,18 +354,18 @@ const tableProps1 = [
 		label: '班次名称',
 	},
 	{
-		prop: 'startDay',
+		prop: 'startTime',
 		label: '开始时间',
-		// filter: (val) => {
+		filter: (val) => {
-		// 	parseTime(val, '{H}:{mm}');
+			return val ? val.slice(0, -3) : '-';
-		// },
+		},
 	},
 	{
-		prop: 'endDay',
+		prop: 'endTime',
 		label: '结束时间',
-		// filter: (val) => {
+		filter: (val) => {
-		// 	parseTime(val, '{H}:{mm}');
+			return val ? val.slice(0, -3) : '-';
-		// },
+		},
 	},
 	{
 		prop: 'remark',
@@ -356,8 +392,9 @@ const tableProps2 = [
 		width: 110,
 	},
 	{
-		prop: 'code1',
+		prop: 'lineName',
 		label: '产线及工段',
+		showOverflowtooltip: true,
 	},
 ];
 
@@ -368,6 +405,8 @@ export default {
 		editClass,
 		addGroup,
 		bindLine,
+		propfirstSpan,
+		propSpan,
 	},
 	data() {
 		return {
@@ -383,6 +422,7 @@ export default {
 				},
 			],
 			stepNum: 1, // 当前第几步
+			shiftTypeEdit: undefined, //该值为编辑时获取的shiftType，到第二步，判断dataForm.shiftType是否改变，同时改变班次信息
 			//第一步参数
 			dataForm: {
 				id: undefined,
@@ -474,6 +514,16 @@ export default {
 				{
 					type: 'bind',
 					btnName: '绑定产线',
+					showParam: {
+						type: '&',
+						data: [
+							{
+								type: 'equal',
+								name: 'isProduction',
+								value: true,
+							},
+						],
+					},
 				},
 				{
 					type: 'delete',
@@ -527,41 +577,55 @@ export default {
 					class2: 'B',
 				},
 			],
+			period: 7, //预览周期
+			periodArr: [
+				{
+					value: 7,
+					label: '7天',
+				},
+				{
+					value: 14,
+					label: '14天',
+				},
+				{
+					value: 30,
+					label: '30天',
+				},
+			],
+			tableProps3: [],
+			tableData3: [],
 		};
 	},
 	methods: {
-		//子组件获取的部门id
+		init(id) {
-		setDeptId(val) {
+			this.dataForm.id = id || undefined;
-			this.dataForm.deptId = val;
-		},
-		//详情时传给子组件的部门id
-		setDataForm() {
-			this.$refs.deptSelect.setID(this.dataForm.deptId);
-		},
-		init() {
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
+				if (this.dataForm.id) {
+					draftEditing(this.dataForm.id).then((res) => {
+						this.dataForm = res.data?.stepOne;
+						this.shiftTypeEdit = res.data?.stepOne.shiftType;
+						this.setDataForm();
+						this.tableData1 = res.data?.stepTwo.groupPlanClassesBaseVOList;
+						this.tableData2 = res.data?.stepTwo.groupPlanTeamBaseVOList;
+						this.tableData2.forEach((item, index) => {
+							let lineName = '';
+							lineName = this.setLineName(item.bindLineTree, lineName);
+							this.$set(
+								this.tableData2[index],
+								'lineName',
+								lineName.slice(0, -1)
+							);
+						});
+					});
+				} else {
 					getCode().then((res) => {
 						this.dataForm.code = res.data;
 					});
-			});
-		},
-		handleClick1(val) {
-			this.addOrUpdateVisible1 = true;
-			this.$nextTick(() => {
-				this.$refs.editClassRef.init(val.data);
-			});
-		},
-		handleClick2(val) {
-			if (val.type === 'bind') {
-				this.addOrUpdateVisible3 = true;
-				this.$nextTick(() => {
-					this.$refs.bindLineRef.init(val.data.id);
-				});
-			} else if (val.type === 'delete') {
-				this.tableData2.splice(val.data._pageIndex - 1, 1);
 				}
+			});
 		},
+		//上一步
 		upSubmit() {
 			if (this.stepNum == 2) {
 				returnStepOne(this.dataForm.id).then((res) => {
@@ -571,8 +635,14 @@ export default {
 						this.setDataForm();
 					});
 				});
+			} else if (this.stepNum == 3) {
+				returnStepTwo(this.dataForm.id).then((res) => {
+					this.stepNum -= 1;
+					this.$emit('setSN', this.stepNum);
+				});
 			}
 		},
+		//下一步
 		nextSubmit() {
 			if (this.stepNum == 1) {
 				this.$refs['dataForm'].validate((valid) => {
@@ -584,99 +654,216 @@ export default {
 						this.$message('部门不能为空');
 						return;
 					}
+          const compareDate = this.compareDates(this.dataForm.startDay,this.dataForm.endDay)
+
+					if (compareDate > 0 ) {
+						this.$message('开始时间不能大于结束时间');
+						return;
+					}
 					createStepOne(this.dataForm).then((res) => {
+						if (!this.dataForm.id) {
 							this.dataForm.id = res.data;
+						}
 						this.stepNum += 1;
 						this.$emit('setSN', this.stepNum);
-						this.setTWOclass(); // 第一步提交后，根据倒班方式设置第二部班次
+						if (
+							!this.dataForm.id ||
+							this.dataForm.shiftType !== this.shiftTypeEdit
+						) {
+							this.setTWOclass(); // (新增时或者编辑时倒班方式变了)第一步提交后，根据倒班方式设置第二部班次
+						}
 					});
 				});
 				return;
 			}
 			if (this.stepNum == 2) {
-        let data = {}
+				if (!this.tableData2 || this.tableData2.length == 0) {
-        data.planId = this.dataForm.id
+					this.$message('班组不能为空');
-        data.groupPlanClassesBaseVOList = [] //排班-班次信息list
+					return;
+				}
+
+				let isbindLine = false;
+				this.tableData2.forEach((item) => {
+					if (!item.bindLineTree || item.bindLineTree.length == 0) {
+						isbindLine = true;
+					}
+				});
+				if (isbindLine) {
+					this.$message('生产班组必须绑定产线或工段');
+					return;
+				}
+
+				const ids = this.tableData2.map((item) => item.id);
+				const uniqueIds = [...new Set(ids)];
+				if (ids.length !== uniqueIds.length) {
+					this.$message('存在重复的班组,请检查！');
+					return;
+				}
+
+				if (this.dataForm.shiftType == 1 && this.tableData2.length > 1) {
+					this.$message('白班，班组数量仅支持 1个 班组');
+					return;
+				} else if (this.dataForm.shiftType == 2 && this.tableData2.length < 2) {
+					this.$message('两班倒，班组数量至少 2个 班组');
+					return;
+				} else if (this.dataForm.shiftType == 3 && this.tableData2.length < 3) {
+					this.$message('三班倒，班组数量至少 3个 班组');
+					return;
+				}
+
+				let data = {};
+				data.planId = this.dataForm.id;
+				data.groupPlanClassesBaseVOList = []; //排班-班次信息list
 				this.tableData1.forEach((item, index) => {
 					const obj = {
 						sort: index + 1,
 						name: item.name,
 						remark: item.remark,
-            startTime: {
+						startTime: item.startTime,
-              hour:item.startDay.split(':')[0],
+						endTime: item.endTime,
-              minute:item.startDay.split(':')[1],
+						daySpan: item.daySpan,
-            },
+					};
-            endTime: {
+					data.groupPlanClassesBaseVOList.push(obj);
-              hour:item.endDay.split(':')[0],
+				});
-              minute:item.endDay.split(':')[1],
+				data.groupPlanTeamBaseVOList = []; //排班-班组信息list
-            }
+				this.tableData2.forEach((item) => {
-          }
-          data.groupPlanClassesBaseVOList.push(obj)
-        })
-        data.groupPlanTeamBaseVOList = [] //排班-班组信息list
-        this.tableData2.forEach(item=>{
 					const obj = {
 						teamId: item.id,
-            bindData: ''
+						name: item.name,
-          }
+            leaderName: item.leaderName,
-          data.groupPlanTeamBaseVOList.push(obj)
+            leaderPhone:item.leaderPhone,
-        })
+						bindData: JSON.stringify(item.bindLineTree),
+					};
+					data.groupPlanTeamBaseVOList.push(obj);
+				});
+				createStepTwo(data).then((res) => {
 					this.stepNum += 1;
 					this.$emit('setSN', this.stepNum);
+					this.getThreeGroup(7); // 第三步，进来加载预览排班,默认7天预览周期
+				});
 				return;
 			}
 			if (this.stepNum == 3) {
+				let data = { planId: this.dataForm.id };
+				data.groupPlanTeamBaseVOList = []; //排班-班组信息list
+				this.tableData2.forEach((item) => {
+					const obj = {
+						teamId: item.id,
+						name: item.name,
+						bindData: JSON.stringify(item.bindLineTree),
+					};
+					data.groupPlanTeamBaseVOList.push(obj);
+				});
+				checkPlan(data).then((RES) => {
+					createStepFour(this.dataForm.id).then((res) => {
+						this.$modal.msgSuccess('创建计划成功');
 						this.stepNum = 1;
 						this.$emit('setSN', this.stepNum);
+						this.$emit('refreshDataList');
+					});
+				});
 				return;
 			}
 		},
+		//第一步
+		//子组件获取的部门id
+		setDeptId(val) {
+			this.dataForm.deptId = val;
+		},
+		//详情时传给子组件的部门id
+		setDataForm() {
+			this.$refs.deptSelect.setID(this.dataForm.deptId);
+		},
+    //比较时间，开始时间在结束时间前
+		compareDates(date1, date2) {
+			const d1 = date1;
+			const d2 = date2;
+
+			if (d1 === d2) {
+				return 0; // 日期相等
+			} else if (d1 < d2) {
+				return -1; // date1 在 date2 之前
+			} else {
+				return 1; // date1 在 date2 之后
+			}
+		},
+		//第二步
 		//设置第二部班次
 		setTWOclass() {
 			this.tableData1 = [];
 			if (this.dataForm.shiftType == 1) {
 				const obj = {
 					name: '长白班',
-					startDay: '8:00',
+					startTime: '08:00:00',
-					endDay: '17:00',
+					endTime: '17:00:00',
+					daySpan: 0, //是否跨天
+          code: 1, //排版日历页面，根据这个字段显示颜色
 				};
 				this.tableData1.push(obj);
 			} else if (this.dataForm.shiftType == 2) {
 				const obj1 = {
 					name: '白班',
-					startDay: '8:00',
+					startTime: '08:00:00',
-					endDay: '20:00',
+					endTime: '20:00:00',
+					daySpan: 0,
+          code: 1,
 				};
 				const obj2 = {
 					name: '夜班',
-					startDay: '20:00',
+					startTime: '20:00:00',
-					endDay: '8:00',
+					endTime: '08:00:00',
+					daySpan: 1,
+          code: 3,
 				};
 				this.tableData1.push(obj1, obj2);
 			} else if (this.dataForm.shiftType == 3) {
 				const obj1 = {
 					name: '早班',
-					startDay: '8:00',
+					startTime: '08:00:00',
-					endDay: '16:00',
+					endTime: '16:00:00',
+					daySpan: 0,
+          code: 1,
 				};
 				const obj2 = {
 					name: '中班',
-					startDay: '16:00',
+					startTime: '16:00:00',
-					endDay: '00:00',
+					endTime: '00:00:00',
+					daySpan: 1,
+          code: 2,
 				};
 				const obj3 = {
 					name: '夜班',
-					startDay: '00:00',
+					startTime: '00:00:00',
-					endDay: '8:00',
+					endTime: '08:00:00',
+					daySpan: 0,
+          code: 3,
 				};
 				this.tableData1.push(obj1, obj2, obj3);
 			}
 		},
+		//编辑班次
+		handleClick1(val) {
+			this.addOrUpdateVisible1 = true;
+			this.$nextTick(() => {
+				this.$refs.editClassRef.init(val.data);
+			});
+		},
+		//班组操作
+		handleClick2(val) {
+			if (val.type === 'bind') {
+				this.addOrUpdateVisible3 = true;
+				this.$nextTick(() => {
+					this.$refs.bindLineRef.init(val.data);
+				});
+			} else if (val.type === 'delete') {
+				this.tableData2.splice(val.data._pageIndex - 1, 1);
+			}
+		},
 		// 新增班组
 		addNewGroup() {
 			this.addOrUpdateVisible2 = true;
 			this.$nextTick(() => {
-				this.$refs.addGroupRef.init(this.dataForm.deptId);
+				this.$refs.addGroupRef.init(this.dataForm.deptId,this.tableData2);
 			});
 		},
 		cancel1() {
@@ -705,10 +892,93 @@ export default {
 			this.tableData2.push(...val);
 			this.cancel2();
 		},
-		refreshTableData3(val) {
+		refreshTableData3(index, val) {
-			console.log(val);
+			this.tableData2[index].bindLineTree = val;
+			let lineName = '';
+			lineName = this.setLineName(val, lineName);
+			if (lineName) {
+				this.$set(this.tableData2[index], 'lineName', lineName.slice(0, -1));
+			}
 			this.cancel3();
 		},
+		//提取绑定的产线工段名展示出来
+		setLineName(val, lineName) {
+			val.forEach((item) => {
+				lineName += item.name + '：';
+				if (item.children && item.children.length > 0) {
+					const childName = this.setLineName(item.children, lineName);
+					lineName = childName;
+				}
+			});
+			return lineName;
+		},
+		//第三步
+		// 进来加载预览排班
+		getThreeGroup(day) {
+			const data = {
+				id: this.dataForm.id,
+				count: day,
+			};
+			this.tableProps3 = [];
+			this.tableData3 = [];
+			getPerView(data).then((res) => {
+				this.setThreeData(res.data);
+			});
+		},
+		setPeriod(val) {
+			this.getThreeGroup(val);
+		},
+
+		setThreeData(data) {
+			//表头第一个为班次名称
+			const propfirst = {
+				prop: 'name',
+				label: '',
+				align: 'center',
+				fixed: true,
+				subcomponent: propfirstSpan,
+			};
+			this.tableProps3.push(propfirst);
+			data.forEach((item, index) => {
+				//设置所有日期为表头
+				const obj = {
+					prop: 'daydata' + index,
+					label: item.day,
+					work: item.work,
+					subcomponent: propSpan,
+				};
+				this.tableProps3.push(obj);
+				item.det.forEach((sItem, sIndex) => {
+					if (index === 0) {
+						let sObj = {
+							name: sItem.classesName + '/' + sItem.time,
+							sort: sItem.sort,
+						};
+						sObj['daydata' + index] = item.work
+							? sItem.teamName
+							: item.holidayName;
+						this.tableData3.push(sObj);
+					} else {
+						this.$set(
+							this.tableData3[sIndex],
+							'daydata' + index,
+							item.work ? sItem.teamName : item.holidayName
+						);
+						this.$set(this.tableData3[sIndex], 'sort', sItem.sort);
+					}
+				});
+			});
+		},
+		cancelStep() {
+			if (this.stepNum > 1) {
+				cancelStepThree(this.dataForm.id).then((res) => {
+					this.$message('已取消计划');
+					this.$emit('refreshDataList');
+				});
+			} else {
+				this.$emit('refreshDataList');
+			}
+		},
 	},
 };
 </script>

src/views/group/Schedule/bind-line.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-16 16:37:40
+ * @LastEditTime: 2025-10-30 10:47:09
  * @Description:
 -->
 <template>
@@ -31,7 +31,6 @@ export default {
 	components: { treeTransfer },
 	data() {
 		return {
-			groupId: undefined,
 			title: ['待选', '已选'],
 			mode: 'transfer',
 			fromData: [], //左边内容
@@ -39,15 +38,19 @@ export default {
 		};
 	},
 	methods: {
-		init(id) {
+		init(val) {
+			this._pageIndex = val._pageIndex - 1;
 			this.fromData = [];
 			this.toData = [];
-			this.groupId = id;
 			getGroupPlanTree().then((res) => {
 				this.fromData = res.data;
 				this.fromData.forEach((item) => {
 					item.productionLineId = 0;
 				});
+				this.$nextTick(() => {
+					this.toData = val.bindLineTree || [];
+					this.getFilterLeftData(this.fromData, this.toData); //编辑时组件有bug，左边相同数据不消失
+				});
 			});
 		},
 		// 监听穿梭框组件添加
@@ -60,9 +63,25 @@ export default {
 			console.log('fromData:', fromData);
 			console.log('toData:', toData);
 		},
+		/** 消除组件左边与右边选中数据相同项 */
+		// 处理过滤数据
+		getFilterLeftData(data, selData) {
+			for (let i = data.length - 1; i >= 0; i--) {
+				for (let j = selData.length - 1; j >= 0; j--) {
+					if (data[i] && data[i].id === selData[j].id) {
+						// 当id相等可以删除的情况 即：没有子级可以删除；
+						if (!data[i].children || data[i].children.length == 0) {
+							data.splice(i, 1);
+						} else {
+							this.getFilterLeftData(data[i].children, selData[j].children);
+						}
+					}
+				}
+			}
+		},
 		// 表单提交
 		dataFormSubmit() {
-			this.$emit('refreshTableData',this.toData);
+			this.$emit('refreshTableData', this._pageIndex, this.toData);
 		},
 	},
 };

src/views/group/Schedule/detail.vue

@@ -0,0 +1,187 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-21 14:27:23
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-10-21 15:02:27
+ * @Description:
+-->
+<template>
+	<div>
+		<div class="info-div">
+			<div>
+				<span class="title">计划编号:</span>
+				{{ infoData.code }}
+			</div>
+			<div>
+				<span class="title">计划状态:</span>
+				{{ ['', '草稿', '已确认', '已作废'][infoData.status] }}
+			</div>
+			<div>
+				<span class="title">计划名称:</span>
+				{{ infoData.name }}
+			</div>
+			<div>
+				<span class="title">部门:</span>
+				{{ infoData.deptName }}
+			</div>
+			<div>
+				<span class="title">开始时间:</span>
+				{{ parseTime(infoData.startDay) }}
+			</div>
+			<div>
+				<span class="title">结束时间:</span>
+				{{ parseTime(infoData.endDay) }}
+			</div>
+			<div>
+				<span class="title">周末休假方式:</span>
+				{{ ['', '双休', '周六休', '周日休', '不休'][infoData.weekType] }}
+			</div>
+			<div>
+				<span class="title">倒班方式:</span>
+				{{ ['', '长白班', '两班倒', '三班倒'][infoData.shiftType] }}
+			</div>
+			<div>
+				<span class="title">同班次连排:</span>
+				{{ infoData.shiftSustainedNum }}日
+			</div>
+			<div>
+				<span class="title">创建人:</span>
+				{{ infoData.creator }}
+			</div>
+			<div>
+				<span class="title">创建时间:</span>
+				{{ parseTime(infoData.createTime) }}
+			</div>
+			<div v-if="infoData.status == 3">
+				<span class="title">作废时间:</span>
+				{{ parseTime(infoData.disableTime) }}
+			</div>
+			<div>
+				<span class="title">备注:</span>
+				{{ infoData.remark }}
+			</div>
+		</div>
+		<div>
+			<el-tabs v-model="activeName" stretch>
+				<el-tab-pane label="班次" name="first"></el-tab-pane>
+				<el-tab-pane label="班组" name="second"></el-tab-pane>
+			</el-tabs>
+			<base-table
+				v-if="activeName == 'first'"
+				:table-props="tableProps1"
+				:page="1"
+				:limit="10"
+				:table-data="tableData1"></base-table>
+			<base-table
+      v-else
+				:table-props="tableProps2"
+				:page="1"
+				:limit="10"
+				:table-data="tableData2"></base-table>
+		</div>
+	</div>
+</template>
+
+<script>
+import { parseTime } from '@/filter/code-filter';
+import { getPlan } from '@/api/group/Schedule';
+
+const tableProps1 = [
+	{
+		prop: 'name',
+		label: '班次名称',
+	},
+	{
+		prop: 'startTime',
+		label: '开始时间',
+		filter: (val) => {
+			return val ? val.slice(0, -3) : '-';
+		},
+	},
+	{
+		prop: 'endTime',
+		label: '结束时间',
+		filter: (val) => {
+			return val ? val.slice(0, -3) : '-';
+		},
+	},
+	{
+		prop: 'remark',
+		label: '备注',
+	},
+];
+
+const tableProps2 = [
+	{
+		prop: 'code',
+		label: '班组编号',
+		width: 140,
+	},
+	{
+		prop: 'name',
+		label: '班组名称',
+	},
+	{
+		prop: 'isProduction',
+		label: '是否生产班组',
+		filter: (val) => {
+			return val ? '是' : '否';
+		},
+		width: 110,
+	},
+	{
+		prop: 'lineName',
+		label: '产线及工段',
+	},
+];
+export default {
+	data() {
+		return {
+			infoData: {},
+			activeName: 'first',
+			tableProps1,
+			tableData1: [],
+			tableProps2,
+			tableData2: [],
+		};
+	},
+	methods: {
+		init(id) {
+			this.infoData = {};
+			getPlan(id).then((res) => {
+				this.infoData = res.data || {};
+				console.log(res);
+				this.tableData1 = res.data?.groupPlanClassesBaseVOList;
+				this.tableData2 = res.data?.groupPlanTeamBaseVOList;
+				this.tableData2.forEach((item, index) => {
+					let lineName = '';
+					lineName = this.setLineName(item.bindLineTree, lineName);
+					this.$set(this.tableData2[index], 'lineName', lineName.slice(0, -1));
+				});
+			});
+		},
+		//提取绑定的产线工段名展示出来
+		setLineName(val, lineName) {
+			val.forEach((item) => {
+				lineName += item.name + '：';
+				if (item.children && item.children.length > 0) {
+					const childName = this.setLineName(item.children, lineName);
+					lineName = childName;
+				}
+			});
+			return lineName;
+		},
+	},
+};
+</script>
+
+<style scoped>
+.info-div {
+	display: grid;
+	grid-template-columns: 1fr 1fr 1fr;
+	gap: 10px;
+}
+.title {
+	font-weight: bold;
+}
+</style>

src/views/group/Schedule/edit-class.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-15 16:31:11
+ * @LastEditTime: 2025-10-20 10:23:52
  * @Description:
 -->
 <template>
@@ -32,22 +32,22 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="开始时间" prop="startDay">
+				<el-form-item label="开始时间" prop="startTime">
 					<el-time-picker
 						style="width: 100%"
 						format="H:mm"
-						value-format="H:mm"
+						value-format="HH:mm:ss"
-						v-model="dataForm.startDay"
+						v-model="dataForm.startTime"
 						placeholder="选择日期时间"></el-time-picker>
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="结束时间" prop="endDay">
+				<el-form-item label="结束时间" prop="endTime">
 					<el-time-picker
 						style="width: 100%"
 						format="H:mm"
-						value-format="H:mm"
+						value-format="HH:mm:ss"
-						v-model="dataForm.endDay"
+						v-model="dataForm.endTime"
 						placeholder="选择日期时间"></el-time-picker>
 				</el-form-item>
 			</el-col>
@@ -72,8 +72,8 @@ export default {
 				id: undefined,
 				index: undefined,
 				name: undefined,
-				startDay: undefined,
+				startTime: undefined,
-				endDay: undefined,
+				endTime: undefined,
 				remark: undefined,
 			},
 			_pageIndex: 1,
@@ -82,10 +82,10 @@ export default {
 				name: [
 					{ required: true, message: '班次名称不能为空', trigger: 'blur' },
 				],
-				startDay: [
+				startTime: [
 					{ required: true, message: '开始时间不能为空', trigger: 'change' },
 				],
-				endDay: [
+				endTime: [
 					{ required: true, message: '结束时间不能为空', trigger: 'change' },
 				],
 			},
@@ -96,8 +96,8 @@ export default {
 			this._pageIndex = val._pageIndex-1;
 			this.dataForm.index = val._pageIndex || 1;
 			this.dataForm.name = val.name || undefined;
-			this.dataForm.startDay = val.startDay || undefined;
+			this.dataForm.startTime = val.startTime || undefined;
-			this.dataForm.endDay = val.endDay || undefined;
+			this.dataForm.endTime = val.endTime || undefined;
 			this.dataForm.remark = val.remark || undefined;
 		},
 		// 表单提交

src/views/group/Schedule/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2025-10-11 14:27:37
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-15 16:42:28
+ * @LastEditTime: 2025-10-29 14:50:16
  * @Description:
 -->
 <template>
@@ -59,12 +59,14 @@
 					<el-button
 						type="primary"
 						size="small"
+						v-hasPermi="['base:group-scheduling-plan:query']"
 						@click="buttonClick({ btnName: 'search' })">
 						查询
 					</el-button>
 				</el-form-item>
 				<el-form-item>
-					<span class="separateStyle"></span>
+					<span class="separateStyle"
+						v-hasPermi="['base:group-scheduling-plan:query']"></span>
 				</el-form-item>
 				<el-form-item>
 					<el-button size="small" @click="buttonClick({ btnName: 'reset' })">
@@ -72,13 +74,15 @@
 					</el-button>
 				</el-form-item>
 				<el-form-item>
-					<span class="separateStyle"></span>
+					<span class="separateStyle"
+						v-hasPermi="['base:group-scheduling-plan:create']"></span>
 				</el-form-item>
 				<el-form-item>
 					<el-button
 						type="success"
 						size="small"
 						:plain="true"
+						v-hasPermi="['base:group-scheduling-plan:create']"
 						@click="buttonClick({ btnName: 'add' })">
 						新增
 					</el-button>
@@ -95,7 +99,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="80"
+				:width="270"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -141,7 +145,7 @@
 								class="btnTextStyle"
 								size="small"
 								plain
-								@click="handleConfirm">
+								@click="successSubmit">
 								保存草稿
 							</el-button>
 							<el-button
@@ -156,6 +160,30 @@
 				</slot>
 			</template>
 		</base-dialog>
+		<base-dialog
+			:dialogTitle="'排班计划详情'"
+			:dialogVisible="detailVisible"
+			@cancel="detailCancel"
+			:before-close="detailCancel"
+			:destroy-on-close="true"
+			append-to-body
+			width="50%">
+			<detail ref="detailRef"></detail>
+			<template #footer>
+				<slot name="footer">
+					<el-row slot="footer" type="flex" justify="end">
+						<el-col :span="24">
+							<el-button
+								size="small"
+								class="btnTextStyle"
+								@click="detailCancel">
+								取消
+							</el-button>
+						</el-col>
+					</el-row>
+				</slot>
+			</template>
+		</base-dialog>
 	</div>
 </template>
 
@@ -165,8 +193,15 @@ import deptSelect from './../deptSelect.vue';
 import basicPage from '@/mixins/basic-page';
 import subSpan from './subSpan.vue';
 import subStatus from './subStatus.vue';
+import detail from './detail.vue';
 import { parseTime } from '@/filter/code-filter';
-import { getGroupPlanPage, deleteGroupPlan } from '@/api/group/Schedule';
+import {
+	getGroupPlanPage,
+	deleteGroupPlan,
+	copyPlan,
+	disablePlan,
+	updateScheduleLater,
+} from '@/api/group/Schedule';
 
 const tableProps = [
 	{
@@ -206,7 +241,7 @@ const tableProps = [
 		subcomponent: subSpan,
 	},
 	{
-		prop: 'deptId',
+		prop: 'deptName',
 		label: '部门',
 	},
 	{
@@ -233,6 +268,7 @@ export default {
 			},
 			tableProps,
 			tableBtn: [
+				this.$auth.hasPermi('base:group-scheduling-plan:update')?
 				{
 					type: 'edit',
 					btnName: '编辑',
@@ -246,7 +282,8 @@ export default {
 							},
 						],
 					},
-				},
+				}:undefined,
+				this.$auth.hasPermi('base:group-scheduling-plan:delete')?
 				{
 					type: 'delete',
 					btnName: '删除',
@@ -260,7 +297,8 @@ export default {
 							},
 						],
 					},
-				},
+				}:undefined,
+				this.$auth.hasPermi('base:group-scheduling-plan:query')?
 				{
 					type: 'detail',
 					btnName: '查看',
@@ -274,7 +312,8 @@ export default {
 							},
 						],
 					},
-				},
+				}:undefined,
+				this.$auth.hasPermi('base:group-scheduling-plan:delete')?
 				{
 					type: 'cancel',
 					btnName: '作废',
@@ -288,7 +327,8 @@ export default {
 							},
 						],
 					},
-				},
+				}:undefined,
+				this.$auth.hasPermi('base:group-holiday:update')?
 				{
 					type: 'sync',
 					btnName: '同步节假日',
@@ -301,17 +341,18 @@ export default {
 								value: 2,
 							},
 							{
-								type: 'updateFlag',
+								type: 'equal',
-								name: 'status',
+								name: 'updateFlag',
 								value: true,
 							},
 						],
 					},
-				},
+				}:undefined,
+				this.$auth.hasPermi('base:group-scheduling-plan:create')?
 				{
 					type: 'copy',
 					btnName: '复制',
-				},
+				}:undefined,
 			].filter((v) => v),
 			tableData: [],
 			options: [
@@ -337,11 +378,13 @@ export default {
 				status: '',
 			},
 			stepNum: 1, // 新增编辑时当前第几步
+			detailVisible: false,
 		};
 	},
 	components: {
 		AddOrUpdate,
 		deptSelect,
+    detail
 	},
 	created() {},
 	methods: {
@@ -396,10 +439,15 @@ export default {
 		setStepNum(val) {
 			this.stepNum = val;
 		},
-		// dialog取消
+		successSubmit() {
-		handleCancel() {
 			this.addOrUpdateVisible = false;
 			this.addOrEditTitle = '';
+			this.stepNum = 1;
+			this.getDataList();
+		},
+		// dialog取消
+		handleCancel() {
+			this.$refs.addOrUpdate.cancelStep();
 		},
 		handleConfirm(val) {
 			if (val == 'up') {
@@ -408,6 +456,41 @@ export default {
 				this.$refs.addOrUpdate.nextSubmit();
 			}
 		},
+		//tableBtn点击
+		handleClick(val) {
+			if (val.type === 'edit') {
+				this.addOrUpdateVisible = true;
+				this.addOrEditTitle = '编辑';
+				this.$nextTick(() => {
+					this.$refs.addOrUpdate.init(val.data.id);
+				});
+			} else if (val.type === 'delete') {
+				this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex);
+			} else if (val.type === 'detail') {
+				this.detailVisible = true;
+				this.$nextTick(() => {
+					this.$refs.detailRef.init(val.data.id);
+				});
+			} else if (val.type === 'cancel') {
+				disablePlan(val.data.id).then((res) => {
+					this.$modal.msgSuccess('作废成功');
+          this.getDataList()
+				});
+			} else if (val.type === 'sync') {
+				updateScheduleLater({ planId: val.data.id }).then((res) => {
+					this.$modal.msgSuccess('同步节假日成功');
+          this.getDataList()
+				});
+			} else if (val.type === 'copy') {
+				copyPlan(val.data.id).then((res) => {
+					this.$modal.msgSuccess('复制成功');
+          this.getDataList()
+				});
+			}
+		},
+		detailCancel() {
+			this.detailVisible = false;
+		},
 	},
 };
 </script>
@@ -460,7 +543,7 @@ body .el-dialog__header .titleStyle::before{
 	display: inline-block;
 	width: 4px;
 	height: 16px;
-  background-color: #0B58FF;
+	background-color: #0b58ff;
 	border-radius: 1px;
 	margin-right: 8px;
 	position: relative;

src/views/group/Schedule/propSpan.vue

@@ -0,0 +1,36 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-13 16:18:41
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-10-21 13:54:52
+ * @Description:
+-->
+<template>
+	<span>
+		<el-tag
+			v-if="injectData.work"
+			size="small"
+			:type="['', 'success', 'warning'][injectData.sort]">
+			{{ injectData[injectData.prop] }}
+		</el-tag>
+		<el-tag v-else effect="dark" size="small" type="info">
+			{{ injectData[injectData.prop] }}
+		</el-tag>
+	</span>
+</template>
+
+<script>
+export default {
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {};
+	},
+	created() {},
+	methods: {},
+};
+</script>

src/views/group/Schedule/propfirstSpan.vue

@@ -0,0 +1,33 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-13 16:18:41
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-10-20 10:13:26
+ * @Description:
+-->
+<template>
+	<div>
+		<div>
+			{{ injectData.name.split('/')[0] }}
+		</div>
+		<div>
+			{{ injectData.name.split('/')[1] }}
+		</div>
+	</div>
+</template>
+
+<script>
+export default {
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {};
+	},
+	created() {},
+	methods: {},
+};
+</script>

src/views/group/Schedule/subSpan.vue

@@ -1,9 +1,16 @@
+<!--
+ * @Author: zwq
+ * @Date: 2025-10-13 16:18:41
+ * @LastEditors: zwq
+ * @LastEditTime: 2025-10-20 10:13:26
+ * @Description:
+-->
 <template>
 	<span>
 		{{
 			injectData.shiftSustainedNum +
-			(injectDatashiftSustainedType
+			(injectData.shiftSustainedType
-				? ['', '日', '周', '月', '季'][injectDatashiftSustainedType]
+				? ['', '日', '周', '月', '季'][injectData.shiftSustainedType]
 				: '')
 		}}
 	</span>

src/views/group/groupSetting/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: zwq
- * @LastEditTime: 2025-10-13 15:44:18
+ * @LastEditTime: 2025-10-29 14:47:33
  * @Description:
 -->
 <template>
@@ -33,7 +33,7 @@
 			<el-col :span="8">
 				<el-form-item label="部门">
 					<dept-select
-						style="width: 200px"
+						style="width: 100%"
 						ref="deptSelect"
 						@DeptId="setDeptId"></dept-select>
 				</el-form-item>
@@ -41,8 +41,10 @@
 			<el-col :span="8">
 				<el-form-item label="组长" prop="leaderId">
 					<el-select
+						style="width: 100%"
 						v-model="dataForm.leaderId"
 						@change="setLeaderName"
+            filterable
 						placeholder="请选择组长">
 						<el-option
 							v-for="item in leaderArr"
@@ -57,12 +59,14 @@
 					<el-input
 						v-model="dataForm.leaderPhone"
 						clearable
+             maxlength="11"
 						placeholder="请输入组长电话" />
 				</el-form-item>
 			</el-col>
 			<el-col :span="8">
 				<el-form-item label="班组人数" prop="num">
 					<el-input-number
+						style="width: 100%"
 						v-model="dataForm.num"
 						:step="1"
 						:min="0"
@@ -72,6 +76,7 @@
 			<el-col :span="8">
 				<el-form-item label="生产班组" prop="isProduction">
 					<el-select
+						style="width: 100%"
 						v-model="dataForm.isProduction"
 						placeholder="请选择是否为生产班组">
 						<el-option
@@ -157,6 +162,13 @@ export default {
 				isProduction: [
 					{ required: true, message: '生产班组不能为空', trigger: 'change' },
 				],
+        leaderPhone: [
+          {
+            pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ]
 			},
 		};
 	},