diff --git a/src/api/yieldReport/produce_order.js b/src/api/yieldReport/produce_order.js index a2b782d..40aa583 100644 --- a/src/api/yieldReport/produce_order.js +++ b/src/api/yieldReport/produce_order.js @@ -4,7 +4,7 @@ import { createAPI } from '@/utils/httpRequest.js' export const getProduceScheduleList = data => createAPI('schedule/getProduceScheduleData', 'POST', data) // 获取信息 -export const getShopOrderList = data => createAPI('schedule/getShopOrderList', 'POST', data) +export const getOperatorData = data => createAPI('schedule/getOperatorData', 'POST', data) // 获取信息 export const getOrderScheduleList = data => createAPI('schedule/getOrderScheduleList', 'POST', data) diff --git a/src/api/yieldReport/produce_report_normal.js b/src/api/yieldReport/produce_report_normal.js new file mode 100644 index 0000000..f1451cc --- /dev/null +++ b/src/api/yieldReport/produce_report_normal.js @@ -0,0 +1,39 @@ +import { createAPI } from '@/utils/httpRequest.js' + +// 获取派工单信息 +export const getScheduleDataBySeqNo = data => createAPI('schedule/getScheduleDataBySeqNo', 'POST', data) + +// 获取当前上机卷信息 +export const getCurrentRollOpsBySeqNo = data => createAPI('schedule/getCurrentRollOpsBySeqNo', 'POST', data) + +// 获取当前派工单的时间记录 +export const getSfdcTimeByCon = data => createAPI('schedule/getSfdcTimeByCon', 'POST', data) + +// 获取当前派工单的刀模记录 +export const getOrderToolByCon = data => createAPI('schedule/getOrderToolByCon', 'POST', data) + +// 获取当前派工单的刀模记录 +export const getSfdcToolByCon = data => createAPI('schedule/getSfdcToolByCon', 'POST', data) + +// 获取当前工单的Bom记录 +export const getOrderBomByCon = data => createAPI('schedule/getOrderBomByCon', 'POST', data) + +// 获取当前派工单的材料记录 +export const getSfdcMaterialByCon = data => createAPI('schedule/getSfdcMaterialByCon', 'POST', data) + +// 获取当前派工单的上机卷记录 +export const getSfdcRollOpsByCon = data => createAPI('schedule/getSfdcRollOpsByCon', 'POST', data) + +// 获取当前派工单的不良卷记录 +export const getSfdcDefectByCon = data => createAPI('schedule/getSfdcDefectByCon', 'POST', data) + +// 获取当前上机卷信息 +export const getSfdcRollByCon = data => createAPI('schedule/getSfdcRollByCon', 'POST', data) + + + + + + + + diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index 71eca45..088c065 100644 --- a/src/assets/scss/global.scss +++ b/src/assets/scss/global.scss @@ -28,8 +28,8 @@ background-color: #17b3a3; color: #fff; height: 20px; - } + .el-table .cell { line-height: 14px; font-size: 12px; @@ -248,6 +248,42 @@ div.el-time-width{ padding-left: 23px; } +/* table单击选中行的样式 */ +.el-table__body tr.current-row > td{ + background-color: #d9edf7 !important; ; + /* color: #f19944; */ /* 设置文字颜色，可以选择不设置 */ +} + +/*全局的fieldset样式*/ +.customer-fieldset{ + padding: 0.125em; +} +/*全局fieldset的legend的样式*/ +.customer-fieldset > .customer-legend{ + font-size: 12px; + line-height: 20px; +} + +/*全局fieldset的页签内容的样式*/ +.customer-fieldset .el-tabs__item { + padding: 0 13px; + height: 26px; + line-height: 26px; + font-size: 12px; + font-weight: 500; +} + +/*定制组件的样式*/ +.customer-css .el-dialog{ + top: 10vh !important; + margin-top: 0px !important; + margin-bottom: 10px; +} +/* 定制模态框中 table的样式 */ +.customer-tab .el-table .is-leaf{ + line-height: 16px; +} + /*.el-form { margin-top: -8px !important; }*/ diff --git a/src/views/modules/schedule/order_schedule.vue b/src/views/modules/schedule/order_schedule.vue index b164e67..7a8b166 100644 --- a/src/views/modules/schedule/order_schedule.vue +++ b/src/views/modules/schedule/order_schedule.vue @@ -103,7 +103,7 @@ -
+
等待订单 @@ -1729,13 +1729,6 @@ export default { } - -