diff --git a/src/api/mes/prodShiftChange/types.ts b/src/api/mes/prodShiftChange/types.ts
index 2db59dc..e7a8cd4 100644
--- a/src/api/mes/prodShiftChange/types.ts
+++ b/src/api/mes/prodShiftChange/types.ts
@@ -39,6 +39,19 @@ export interface ProdShiftChangeVO {
*/
remark: string;
+ /**
+ * 机台名称
+ */
+ machineName?: string;
+ /**
+ * 班组名称
+ */
+ classTeamName?: string;
+ /**
+ * 班次名称
+ */
+ shiftName?: string;
+
}
export interface ProdShiftChangeForm extends BaseEntity {
@@ -82,6 +95,19 @@ export interface ProdShiftChangeForm extends BaseEntity {
*/
remark?: string;
+ /**
+ * 机台名称
+ */
+ machineName?: string;
+ /**
+ * 班组名称
+ */
+ classTeamName?: string;
+ /**
+ * 班次名称
+ */
+ shiftName?: string;
+
}
export interface ProdShiftChangeQuery extends PageQuery {
@@ -125,6 +151,19 @@ export interface ProdShiftChangeQuery extends PageQuery {
* 日期范围参数
*/
params?: any;
+
+ /**
+ * 机台名称
+ */
+ machineName?: string;
+ /**
+ * 班组名称
+ */
+ classTeamName?: string;
+ /**
+ * 班次名称
+ */
+ shiftName?: string;
}
diff --git a/src/views/mes/prodInputScanInfo/index.vue b/src/views/mes/prodInputScanInfo/index.vue
index 2dd68b2..5f07a30 100644
--- a/src/views/mes/prodInputScanInfo/index.vue
+++ b/src/views/mes/prodInputScanInfo/index.vue
@@ -31,7 +31,7 @@
-->
-
+
diff --git a/src/views/mes/prodOutputScanInfo/index.vue b/src/views/mes/prodOutputScanInfo/index.vue
index a2b5586..24087e2 100644
--- a/src/views/mes/prodOutputScanInfo/index.vue
+++ b/src/views/mes/prodOutputScanInfo/index.vue
@@ -25,7 +25,7 @@
-->
-
+
diff --git a/src/views/mes/prodShiftChange/index.vue b/src/views/mes/prodShiftChange/index.vue
index ecea036..fdf2733 100644
--- a/src/views/mes/prodShiftChange/index.vue
+++ b/src/views/mes/prodShiftChange/index.vue
@@ -66,9 +66,9 @@
{{ parseTime(scope.row.shiftChangeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
-
-
+
+
+
@@ -208,6 +208,9 @@ const initFormData: ProdShiftChangeForm = {
userId: undefined,
userName: undefined,
remark: undefined,
+ machineName: undefined,
+ classTeamName: undefined,
+ shiftName: undefined,
}
const data = reactive>({
form: {...initFormData},
@@ -221,6 +224,9 @@ const data = reactive>({
classTeamId: undefined,
userId: undefined,
userName: undefined,
+ machineName: undefined,
+ classTeamName: undefined,
+ shiftName: undefined,
params: {
}
},
diff --git a/src/views/mes/productPlanDetail/index.vue b/src/views/mes/productPlanDetail/index.vue
index ba197d1..640a425 100644
--- a/src/views/mes/productPlanDetail/index.vue
+++ b/src/views/mes/productPlanDetail/index.vue
@@ -11,11 +11,11 @@
-
-
+
+
-
-
+
+
@@ -101,8 +101,8 @@
-
-
+
+
@@ -182,11 +182,11 @@
-
-
+
+
-
-
+
+
@@ -341,8 +341,8 @@ const initFormData: ProductPlanDetailForm = {
planCode: undefined,
userId: undefined,
userName: undefined,
- classesId: undefined,
- teamId: undefined,
+ shiftId: undefined,
+ classTeamId: undefined,
completeAmount: undefined,
unitId: undefined,
unitName: undefined,
@@ -376,8 +376,8 @@ const data = reactive>({
planCode: undefined,
userId: undefined,
userName: undefined,
- classesId: undefined,
- teamId: undefined,
+ shiftId: undefined,
+ classTeamId: undefined,
completeAmount: undefined,
unitId: undefined,
unitName: undefined,
@@ -413,10 +413,10 @@ const data = reactive>({
planCode: [
{ required: true, message: '计划编号不能为空', trigger: 'blur' }
],
- classesId: [
+ shiftId: [
{ required: true, message: '班次名称不能为空', trigger: 'blur' }
],
- teamId: [
+ classTeamId: [
{ required: true, message: '班组名称不能为空', trigger: 'blur' }
],
completeAmount: [