diff --git a/src/api/base/site.js b/src/api/base/site.js
new file mode 100644
index 0000000..7332225
--- /dev/null
+++ b/src/api/base/site.js
@@ -0,0 +1,26 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+//------------加工中心----------------
+// 加工中心数据
+export const getWorkCenterData = data => createAPI(`/base/getWorkCenterData`,'post',data)
+// 获取加工中心子数据
+export const getWorkCenterDataDetail = data => createAPI(`/base/getWorkCenterDataDetail`,'post',data)
+
+// 生产线数据
+export const getProLineNoDetail = data => createAPI(`/base/getProLineNoDetail`,'post',data)
+// 保存加工中心数据
+export const saveWorkCenterData = data => createAPI(`/base/saveWorkCenterData`,'post',data)
+// 删除加工中心数据
+export const deleteWorkCenterData = data => createAPI(`/base/deleteWorkCenterData`,'post',data)
+
+//校验客户编号是否存在
+export const checkCustomerID = data => createAPI(`/base/checkCustomerID`,'post',data)
+//保存机台
+export const saveResource = data => createAPI(`/base/saveResource`,'post',data)
+//删除机台
+export const deleteResource = data => createAPI(`/base/deleteResource`,'post',data)
+
+//删除机台
+export const setResourceFlag = data => createAPI(`/base/setResourceFlag`,'post',data)
+
+export const searchPartNoData = data => createAPI(`/base/searchPartNoData`,'post',data)
diff --git a/src/api/chooselist/chooselist.js b/src/api/chooselist/chooselist.js
new file mode 100644
index 0000000..75b72c8
--- /dev/null
+++ b/src/api/chooselist/chooselist.js
@@ -0,0 +1,7 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+
+export const getChooselist = data => createAPI(`/chooselist/getChooselist/${data.tagNo}`,'get',data)
+
+
+export const getChooselistData = data => createAPI(`/chooselist/getChooselistData`,'post',data)
diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss
index fa96f3c..2097949 100644
--- a/src/assets/scss/global.scss
+++ b/src/assets/scss/global.scss
@@ -14,27 +14,31 @@
padding: 0 45px;
min-width: 200px;
}
+.site-sidebar__inner {
+ width: 256px;
+}
+.site-sidebar__inner {
+ width: 260px;
+}
/* 侧边导航栏 end*/
/*table start*/
-
.el-table th {
display: table-cell !important;
background-color: #17b3a3;
color: #fff;
height: 20px;
-
}
+
.el-table .cell {
line-height: 14px;
font-size: 12px;
- height: 15px;
+ height: 14px;
}
.el-input--medium .el-input__inner {
height: 28px;
line-height: 20px;
}
-
.el-table--medium td, .el-table--medium th {
padding: 5px 0;
}
@@ -52,7 +56,6 @@
.el-select-dropdown__item {
font-size: 12px;
}
-
.el-form-item {
margin-bottom: 0px;
}
@@ -60,7 +63,6 @@
width: 12px;
height: 11px;
}
-
/* 输入框 end*/
@@ -95,12 +97,23 @@
/* el-dialog start*/
.el-dialog__body{
- padding: 0px 20px;
+ padding: 0px 10px;
}
/* el-dialog end*/
+/* el-form-item 间距 start*/
+.el-form--label-top .el-form-item__label {
+ float: none;
+ display: inline-block;
+ text-align: left;
+ padding: 0px 0 0px;
+
+}
+/* el-form-item 间距 end*/
+
/* el-form-item 间距 start*/
+
.el-form--label-top .el-form-item__label {
float: none;
display: inline-block;
@@ -111,26 +124,18 @@
.el-form-item--medium .el-form-item__content, .el-form-item--medium .el-form-item__label {
line-height: 30px;
}
-/* el-form-item 间距 end*/
-/* el-form-item 对话框标题 start*/
-.el-dialog__title{
- font-size: 14px;
- font-weight: bold;
+.el-form-item--mini.el-form-item, .el-form-item--small.el-form-item {
+ margin-bottom: 1px;
}
-/* el-form-item 对话框标题 end*/
+/* el-form-item 间距 end*/
-/* el-form-item 控件标题 start*/
-.el-form-item__label{
- font-size: 12px;
+/* 提示消息 start */
+.el-message{
+ margin-top: 20%;
}
-/* el-form-item 控件标题 end*/
+/* end */
-/* el-form-item 时间选择器图标 start*/
-.el-input--medium .el-input__icon {
- line-height: 31px;
-}
-/* el-form-item 时间选择器图标 end*/
/* 布局间距 */
@@ -172,6 +177,15 @@
line-height: 40px;
}
+/*按钮*/
+.el-dialog__footer {
+ padding: 10px 20px 20px;
+ text-align: center;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+}
+
+
/*提示消息 按钮 确认在右 取消仔左*/
.el-message-box__btns {
padding: 5px 15px 0;
@@ -179,3 +193,150 @@
flex-direction: row-reverse;
gap: 10px;
}
+
+/* 树结构label 字体*/
+.el-tree-node__label {
+ font-size: 12px;
+}
+/* form-item__label*/
+.el-form-item__label {
+ font-size: 12px;
+}
+
+/* checkbox__label */
+.el-checkbox__label {
+ font-size: 12px;
+}
+/* radio__label */
+.el-radio__label {
+ font-size: 12px;
+}
+
+
+.el-table .cell, .el-table th div, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell {
+ padding-left: 5px;
+}
+.el-table .cell, .el-table th div {
+ padding-right: 4px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
+/* 全局缩小行间距 LR*/
+/* 针对普通的input*/
+.el-form-item__content{
+ margin-top: -3px;
+}
+
+
+/*全局年与日类型 宽度*/
+div.el-time-width{
+ width: 120px !important;
+}
+/* 全局时间右边框*/
+input.el-input__inner{
+ height: 22px !important;
+ padding-right: 0px !important;
+}
+
+/* 时间框选择样式 */
+.customer-css span.el-input__prefix{
+ left: 1px;
+}
+/* 时间HH:MM的样式*/
+.el-input--prefix .el-input__inner {
+ 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;
+}*/
+
+
+
+// 2021-12-14 13:29 sxm
+.el-form-item--medium .el-form-item__label {
+ height: 20px;
+ line-height: 20px;
+}
+.el-input--medium .el-input__inner,.el-form-item--medium .el-form-item__content {
+ height: 24px;
+ line-height: 20px;
+}
+.el-input--medium .el-input__icon {
+ line-height: 20px;
+}
+
+.el-form-item--mini .el-form-item__content, .el-form-item--mini .el-form-item__label {
+ line-height: 20px;
+}
+.el-form-item--mini .el-form-item__label {
+ line-height: 20px;
+}
+
+
+// sxm 模态框 2021-12-22
+.el-dialog__header {
+ padding: 5px 10px 5px;
+}
+
+.el-dialog__footer {
+ padding: 5px 10px 5px;
+}
+.el-dialog--center .el-dialog__body {
+ text-align: initial;
+ padding: 0px 10px 0px;
+}
+
+.el-dialog__headerbtn {
+ position: absolute;
+ top: 5px;
+ right: 10px;
+ padding: 0;
+ background: 0 0;
+ border: none;
+ outline: 0;
+ cursor: pointer;
+ font-size: 16px;
+}
+
+
+
+
+
diff --git a/src/views/modules/base/calendar.vue b/src/views/modules/base/calendar.vue
index b94af77..438994b 100644
--- a/src/views/modules/base/calendar.vue
+++ b/src/views/modules/base/calendar.vue
@@ -46,7 +46,7 @@
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed"
- :width="item.columnWidth"
+ :min-width="item.columnWidth"
:label="item.columnLabel">
{{scope.row[item.columnProp]}}
@@ -72,7 +72,7 @@
-
+
@@ -157,14 +157,14 @@
placeholder="选择日期">
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -175,144 +175,143 @@
:value="item.value">
+ {{'查询'}}
+ {{'保存日历'}}
-
- {{'查询'}}
- {{'保存日历'}}
-
+
-
-
-
- {{scope.row[item.columnProp]}}
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {{scope.row[item.columnProp]}}
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+