diff --git a/src/api/production.js b/src/api/production.js
index ee1a373..0e74d3f 100644
--- a/src/api/production.js
+++ b/src/api/production.js
@@ -28,6 +28,20 @@ export const dailyPlanReportSave=data => createAPI(`dailyPlan/dailyPlanReportSav
export const dailyPlanReportsSave=data => createAPI(`dailyPlan/dailyPlanReportsSave`, 'post', data);
export const productionBlankingSearch=data => createAPI(`dailyPlan/productionBlankingSearch`, 'post', data);
+export const getOperatorData=data => createAPI(`dailyPlan/getOperatorData`, 'post', data);
+
+export const getWorkCenterData=data => createAPI(`dailyPlan/getWorkCenterData`, 'post', data);
+
+export const getWorkCenterOperatorData=data => createAPI(`dailyPlan/getWorkCenterOperatorData`, 'post', data);
+
+export const addSkill=data => createAPI(`dailyPlan/addSkill`, 'post', data);
+
+export const deleteSkill=data => createAPI(`dailyPlan/deleteSkill`, 'post', data);
+
+export const getShopOrderRoutingData=data => createAPI(`dailyPlan/getShopOrderRoutingData`, 'post', data);
+
+export const getSOTastRoutingData=data => createAPI(`dailyPlan/getSOTastRoutingData`, 'post', data);
+
diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss
index 43f2c37..3b6bf0f 100644
--- a/src/assets/scss/global.scss
+++ b/src/assets/scss/global.scss
@@ -128,4 +128,84 @@
flex-direction: row-reverse;
gap: 10px;
}
+// 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;
+}
+/*全局 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;
+}
+
+.inputTable input.el-input__inner {
+ height: 14px !important;
+ border: 0px !important;
+}
+
+.inputTable .el-input--medium .el-input__icon {
+ line-height: 14px;
+}
+.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/pad/padPart1.vue b/src/views/modules/pad/padPart1.vue
index 76688ea..f5ee810 100644
--- a/src/views/modules/pad/padPart1.vue
+++ b/src/views/modules/pad/padPart1.vue
@@ -11,7 +11,7 @@
-
+
查询
diff --git a/src/views/modules/pad/padPartAttribute.vue b/src/views/modules/pad/padPartAttribute.vue
index d5fcf7b..ce66774 100644
--- a/src/views/modules/pad/padPartAttribute.vue
+++ b/src/views/modules/pad/padPartAttribute.vue
@@ -12,20 +12,20 @@
-
+
-
+
上一条
-
+
下一条
-
+
关闭
diff --git a/src/views/modules/pad/padPartPhoto.vue b/src/views/modules/pad/padPartPhoto.vue
index 7521871..acf40fa 100644
--- a/src/views/modules/pad/padPartPhoto.vue
+++ b/src/views/modules/pad/padPartPhoto.vue
@@ -21,13 +21,13 @@
-
+
上一张
-
+
下一张
-
+
关闭
diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue
index 4a9b2fc..aaf9a82 100644
--- a/src/views/modules/production/dailyPlan.vue
+++ b/src/views/modules/production/dailyPlan.vue
@@ -14,10 +14,10 @@
placeholder="选择日期">
-
+
➞
-
+
-
+
➞
-
+
-
-
@@ -66,10 +64,10 @@
placeholder="选择日期">
-
+
➞
-
+
-
-
+
+
-
+
查询
@@ -182,7 +180,7 @@
-
+
@@ -199,8 +197,10 @@
- 批量新增
- 新增
+
+ 批量新增
+ 新增
+
-
+
@@ -380,7 +380,7 @@
startDate3: '',
endDate3: '',
site: this.$store.state.user.site,
- planStatus: 'a.LotSize >ISNULL(so.scheduling_size,0)'
+ planStatus: 'ROUND(a.LotSize,3) >ROUND(ISNULL(so.scheduling_size,0),3)'
},
// table高度
height: 200
@@ -388,7 +388,7 @@
},
mounted () {
this.$nextTick(() => {
- this.height = window.innerHeight - 270
+ this.height = window.innerHeight - 240
})
},
methods: {
diff --git a/src/views/modules/production/dailyPlanReport.vue b/src/views/modules/production/dailyPlanReport.vue
index 3c092b5..48c87ea 100644
--- a/src/views/modules/production/dailyPlanReport.vue
+++ b/src/views/modules/production/dailyPlanReport.vue
@@ -19,10 +19,10 @@
placeholder="选择日期">
-
+
➞
-
+
- 查询
- 批量报工
+
+ 查询
+ 批量报工
+
{
- this.height = window.innerHeight - 210;
+ this.height = window.innerHeight - 180;
})
},
methods: {
diff --git a/src/views/modules/production/operator.vue b/src/views/modules/production/operator.vue
new file mode 100644
index 0000000..32d5e61
--- /dev/null
+++ b/src/views/modules/production/operator.vue
@@ -0,0 +1,338 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ {{'导出'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 技能矩阵
+
+
+
+
+
+
+ 操作员编码：
+ 操作员姓名：
+
+
+
+ 可选技能：
+
+
+
+
+
+
+
+
+
+ 添加技能>>
+
+
+ 删除技能<<
+
+
+
+ 已选技能：
+
+
+
+
+
+
+
+
+
+
+
+
+
{
- this.height = window.innerHeight - 210
+ this.height = window.innerHeight - 180
})
// this.autoRoll()
},
diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue
new file mode 100644
index 0000000..797ed4b
--- /dev/null
+++ b/src/views/modules/production/scheduleForSOTask.vue
@@ -0,0 +1,547 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ➞
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ {{'导出'}}
+
+
+
+
+
+
+
+ 派工
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加
+ 保存
+ 关闭
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ➞
+
+
+
+
+
+
+
+
+
+
+ ➞
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ➞
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+ {{'导出'}}
+
+
+
+
+
+
+
+ 派工
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加
+ 保存
+ 关闭
+
+
+
+
+ 关闭
+
+
+
+