xins
/
hwmom-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change(mes): 修改显示

Browse Source 
- 调整表单项的 label-width 属性
- 在接口类型中添加新的字段，以支持机台名称、班组名称和班次名称的查询和显示
master
zch 4 months ago
parent 2e8711e656
commit 5cee091eef
5 changed files with 66 additions and 21 deletions
Show Stats Download Patch File Download Diff File

39
src/api/mes/prodShiftChange/types.ts
Unescape Escape View File

@ -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;
}

2
src/views/mes/prodInputScanInfo/index.vue
Unescape Escape View File

@ -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>

2
src/views/mes/prodOutputScanInfo/index.vue
Unescape Escape View File

@ -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>

12
src/views/mes/prodShiftChange/index.vue
Unescape Escape View File

@ -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: {
}
},

32
src/views/mes/productPlanDetail/index.vue
Unescape Escape View File

@ -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: [

Write Preview
Loading…
Cancel
Save