diff --git a/src/api/production/dailyPlan.js b/src/api/production/dailyPlan.js
new file mode 100644
index 0000000..9f86a82
--- /dev/null
+++ b/src/api/production/dailyPlan.js
@@ -0,0 +1,25 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+//获得接下来一周内的日历班次信息
+export const getWeekCalendarExceptionShiftData= data => createAPI(`/dailyPlan/getWeekCalendarExceptionShiftData`,'post',data)
+
+export const getWeekShiftData= data => createAPI(`/dailyPlan/getWeekShiftData`,'post',data)
+
+//获得可排产的清单
+export const getShopOrderOutData= data => createAPI(`/dailyPlan/getShopOrderOutData`,'post',data)
+//获得已排产的派工单
+export const getOrderScheduleList= data => createAPI(`/dailyPlan/getOrderScheduleList`,'post',data)
+//获得已排产的派工单
+export const getWorkCenterNoWithSiteResourceId= data => createAPI(`/dailyPlan/getWorkCenterNoWithSiteResourceId`,'post',data)
+//获得当日班次清单
+export const getTodayShiftNoList= data => createAPI(`/dailyPlan/getTodayShiftNoList`,'post',data)
+//获得可用机台清单
+export const getSORoutingAvailableResourceList= data => createAPI(`/dailyPlan/getSORoutingAvailableResourceList`,'post',data)
+//获得当日负荷
+export const getHasScheduledData= data => createAPI(`/dailyPlan/getHasScheduledData`,'post',data)
+//获得当日负荷
+export const scheduleOne=data => createAPI(`/dailyPlan/scheduleOne`,'post',data)
+//获得当日负荷
+export const scheduleDatas=data => createAPI(`/dailyPlan/scheduleDatas`,'post',data)
+//获得当日负荷
+export const cancelScheduleData=data => createAPI(`/dailyPlan/cancelScheduleData`,'post',data)
diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss
index 2097949..847575d 100644
--- a/src/assets/scss/global.scss
+++ b/src/assets/scss/global.scss
@@ -336,7 +336,35 @@ input.el-input__inner{
font-size: 16px;
}
+/*全局 el-table 下 el-input的样式 LR 2022-01-12*/
+.customer-number-cell .cell{
+ height: 25px !important;
+ padding: 0px;
+}
+/*a标签全局无下划线 2022-01-18 LR*/
+a:hover{
+ text-decoration: none;
+}
+.el-radio+.el-radio {
+ margin-left: 0px;
+}
+.bigTable1 .el-table .cell {
+ height: 24px;
+}
+.mainTable .el-table .customer-row-gray{
+ background: #7e819e;
+}
+/*去掉悬浮的样式*/
+.mainTable tr:hover > td{
+ background-color: transparent !important;
+}
+
+
+
+.mainTable .hover-row > td{
+ background-color: transparent !important;
+}
diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue
index afdc594..9ff6ee8 100644
--- a/src/views/modules/production/dailyPlan.vue
+++ b/src/views/modules/production/dailyPlan.vue
@@ -1,750 +1,1186 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
-
-
-
-
-
-
-
-
-
-
+ style="width: 100%">
+
+
+ 多日排产
+
+
+ label="工序号">
+ label="工序名称">
+ min-width="100"
+ label="要求完成日期">
+ min-width="100"
+ label="产品编码">
+ min-width="100"
+ label="客户名称">
+
+
+
+
+ min-width="80"
+ label="订单量">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ label="效率">
+
+
+
+ min-width="100"
+ label="计划开工时间">
-
- 排产
-
+ align="left"
+ min-width="100"
+ label="计划完工时间">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
-
-
+
+
+ 添加
+ 保存
+ 关闭
- 新增
+
-
-
+ min-width="100"
+ label="排产日期">
+
+
+
+
+
+
+
-
-
+ min-width="80"
+ label="排产机台">
+
+
+
+
+
+
+
+ min-width="80"
+ label="排产班次">
+
+
+
+
+
+
+
- 编辑
- 删除
+ 删除
+ 当日负荷
-
- 关闭
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 保存并继续
- 保存
- 关闭
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 保存
- 关闭
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+ ➞
+
+
+
+
+
+
+
+
+
+
+ ➞
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ➞
+
+
+
+
+
+
+
+
+
+ 查询
+ 批量排产
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 排产
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存并继续
+ 保存
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 关闭
+
+
+
+