From 5cee091eeff41199913ae19729b8b2494b6df0a9 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Fri, 7 Mar 2025 09:44:45 +0800
Subject: [PATCH] =?UTF-8?q?change(mes):=20=E4=BF=AE=E6=94=B9=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 调整表单项的 label-width 属性
- 在接口类型中添加新的字段，以支持机台名称、班组名称和班次名称的查询和显示
---
 src/api/mes/prodShiftChange/types.ts       | 39 ++++++++++++++++++++++
 src/views/mes/prodInputScanInfo/index.vue  |  2 +-
 src/views/mes/prodOutputScanInfo/index.vue |  2 +-
 src/views/mes/prodShiftChange/index.vue    | 12 +++++--
 src/views/mes/productPlanDetail/index.vue  | 32 +++++++++---------
 5 files changed, 66 insertions(+), 21 deletions(-)

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 @@
             <el-form-item label="扫描结果" prop="scanResult">
               <el-input v-model="queryParams.scanResult" placeholder="请输入扫描结果" clearable @keyup.enter="handleQuery" />
             </el-form-item>-->
-            <el-form-item label="记录人名称" prop="userName">
+            <el-form-item label="记录人名称" prop="userName" label-width="100px">
               <el-input v-model="queryParams.userName" placeholder="请输入记录人名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
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 @@
             <el-form-item label="扫描结果" prop="scanResult">
               <el-input v-model="queryParams.scanResult" placeholder="请输入扫描结果" clearable @keyup.enter="handleQuery" />
             </el-form-item>-->
-            <el-form-item label="记录人名称" prop="userName">
+            <el-form-item label="记录人名称" prop="userName" label-width="100px">
               <el-input v-model="queryParams.userName" placeholder="请输入记录人名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
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 @@
             <span>{{ parseTime(scope.row.shiftChangeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="机台" align="center" prop="machineId" v-if="columns[3].visible"/>
-        <el-table-column label="班次" align="center" prop="shiftId" v-if="columns[4].visible"/>
-        <el-table-column label="班组" align="center" prop="classTeamId" v-if="columns[5].visible"/>
+        <el-table-column label="机台" align="center" prop="machineName" v-if="columns[3].visible"/>
+        <el-table-column label="班次" align="center" prop="shiftName" v-if="columns[4].visible"/>
+        <el-table-column label="班组" align="center" prop="classTeamName" v-if="columns[5].visible"/>
 <!--        <el-table-column label="接班人" align="center" prop="userId" v-if="columns[6].visible"/>-->
         <el-table-column label="接班人名称" align="center" prop="userName" v-if="columns[6].visible"/>
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[7].visible"/>
@@ -208,6 +208,9 @@ const initFormData: ProdShiftChangeForm = {
   userId: undefined,
   userName: undefined,
   remark: undefined,
+  machineName: undefined,
+  classTeamName: undefined,
+  shiftName: undefined,
 }
 const data = reactive<PageData<ProdShiftChangeForm, ProdShiftChangeQuery>>({
   form: {...initFormData},
@@ -221,6 +224,9 @@ const data = reactive<PageData<ProdShiftChangeForm, ProdShiftChangeQuery>>({
     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 @@
             <el-form-item label='计划编号' prop='planCode'>
               <el-input v-model='queryParams.planCode' placeholder='请输入计划编号' clearable @keyup.enter='handleQuery' />
             </el-form-item>
-            <el-form-item label='班次名称' prop='classesId'>
-              <el-input v-model='queryParams.classesId' placeholder='请输入班次名称' clearable @keyup.enter='handleQuery' />
+            <el-form-item label='班次名称' prop='shiftId'>
+              <el-input v-model='queryParams.shiftId' placeholder='请输入班次名称' clearable @keyup.enter='handleQuery' />
             </el-form-item>
-            <el-form-item label='班组名称' prop='teamId'>
-              <el-input v-model='queryParams.teamId' placeholder='请输入班组名称' clearable @keyup.enter='handleQuery' />
+            <el-form-item label='班组名称' prop='classTeamId'>
+              <el-input v-model='queryParams.classTeamId' placeholder='请输入班组名称' clearable @keyup.enter='handleQuery' />
             </el-form-item>
             <!--            <el-form-item label="实际开始时间" prop="realBeginTime">-->
             <!--              <el-date-picker clearable-->
@@ -101,8 +101,8 @@
         <el-table-column label='计划编号' align='center' prop='planCode' v-if='columns[4].visible' width='100'/>
         <el-table-column label='操作人员ID' align='center' prop='userId' v-if='columns[5].visible' />
         <el-table-column label='操作人员名称' align='center' prop='userName' v-if='columns[6].visible' width='110' />
-        <el-table-column label='班次名称' align='center' prop='classesId' v-if='columns[7].visible' />
-        <el-table-column label='班组名称' align='center' prop='teamId' v-if='columns[8].visible' />
+        <el-table-column label='班次名称' align='center' prop='shiftId' v-if='columns[7].visible' />
+        <el-table-column label='班组名称' align='center' prop='classTeamId' v-if='columns[8].visible' />
         <el-table-column label='完成数量' align='center' prop='completeAmount' v-if='columns[9].visible' />
         <el-table-column label='单位ID' align='center' prop='unitId' v-if='columns[10].visible' />
         <el-table-column label='单位名称' align='center' prop='unitName' v-if='columns[11].visible' />
@@ -182,11 +182,11 @@
         <el-form-item label='操作人员名称' prop='userName'>
           <el-input v-model='form.userName' placeholder='请输入操作人员名称' />
         </el-form-item>
-        <el-form-item label='班次名称' prop='classesId'>
-          <el-input v-model='form.classesId' placeholder='请输入班次名称' />
+        <el-form-item label='班次名称' prop='shiftId'>
+          <el-input v-model='form.shiftId' placeholder='请输入班次名称' />
         </el-form-item>
-        <el-form-item label='班组名称' prop='teamId'>
-          <el-input v-model='form.teamId' placeholder='请输入班组名称' />
+        <el-form-item label='班组名称' prop='classTeamId'>
+          <el-input v-model='form.classTeamId' placeholder='请输入班组名称' />
         </el-form-item>
         <el-form-item label='完成数量' prop='completeAmount'>
           <el-input-number v-model='form.completeAmount' placeholder='请输入完成数量' style='width: 220px' />
@@ -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<PageData<ProductPlanDetailForm, ProductPlanDetailQuery>>({
     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<PageData<ProductPlanDetailForm, ProductPlanDetailQuery>>({
     planCode: [
       { required: true, message: '计划编号不能为空', trigger: 'blur' }
     ],
-    classesId: [
+    shiftId: [
       { required: true, message: '班次名称不能为空', trigger: 'blur' }
     ],
-    teamId: [
+    classTeamId: [
       { required: true, message: '班组名称不能为空', trigger: 'blur' }
     ],
     completeAmount: [