Merge remote-tracking branch 'origin/master'

src/api/mes/prodShiftChange/types.ts

@@ -46,7 +46,7 @@ export interface ProdShiftChangeVO {
   /**
    * 班组名称
    */
-  classTeamName?: string;
+  teamName?: string;
   /**
    * 班次名称
    */
@@ -102,7 +102,7 @@ export interface ProdShiftChangeForm extends BaseEntity {
   /**
    * 班组名称
    */
-  classTeamName?: string;
+  teamName?: string;
   /**
    * 班次名称
    */
@@ -159,7 +159,7 @@ export interface ProdShiftChangeQuery extends PageQuery {
   /**
    * 班组名称
    */
-  classTeamName?: string;
+  teamName?: string;
   /**
    * 班次名称
    */

src/views/mes/prodShiftChange/index.vue

@@ -68,7 +68,7 @@
         </el-table-column>
         <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="teamName" 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"/>
@@ -209,7 +209,7 @@ const initFormData: ProdShiftChangeForm = {
   userName: undefined,
   remark: undefined,
   machineName: undefined,
-  classTeamName: undefined,
+  teamName: undefined,
   shiftName: undefined,
 }
 const data = reactive<PageData<ProdShiftChangeForm, ProdShiftChangeQuery>>({
@@ -225,7 +225,7 @@ const data = reactive<PageData<ProdShiftChangeForm, ProdShiftChangeQuery>>({
     userId: undefined,
     userName: undefined,
     machineName: undefined,
-    classTeamName: undefined,
+    teamName: undefined,
     shiftName: undefined,
     params: {
     }