Merge remote-tracking branch 'origin/master'

src/api/schedule/order_schedule.js

@@ -0,0 +1,10 @@
+import { createAPI } from '@/utils/httpRequest.js'
+
+// 获取机台休息班次的信息
+export const getResourceRestList = data => createAPI('schedule/getResourceRestList', 'POST', data)
+
+// 获取信息
+export const getShopOrderList = data => createAPI('schedule/getShopOrderList', 'POST', data)
+
+// 获取信息
+export const getOrderScheduleList = data => createAPI('schedule/getOrderScheduleList', 'POST', data)

src/assets/scss/global.scss

@@ -221,3 +221,31 @@
   text-overflow: ellipsis;
 }
 
+/* 全局缩小行间距 LR*/
+/* 针对普通的input*/
+.customer-css .el-form-item__content{
+  margin-top: -10px;
+}
+
+
+/*全局年与日类型  宽度*/
+div.el-time-width{
+  width: 120px !important;
+}
+/* 全局时间右边框*/
+.customer-css input.el-input__inner{
+  height: 22px !important;
+  padding-right: 0px !important;
+}
+
+/* 时间框选择样式 */
+.customer-css span.el-input__prefix{
+  top: -3px;
+  left: 1px;
+}
+/* 时间HH:MM的样式*/
+.el-input--prefix .el-input__inner {
+  padding-left: 23px;
+}
+
+