update 生产工单信息查询优化

master
yinq 2 months ago
parent ea59268910
commit 0f4bfcc4a1

@ -23,7 +23,8 @@
<!-- <el-input v-model="queryParams.processId" placeholder="请输入工序ID" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<el-form-item label='机台名称' prop='releaseId'>
<el-select v-model='queryParams.releaseId' placeholder='请选择机台名称'>
<el-select v-model='queryParams.releaseId' placeholder='请选择机台名称'clearable
@keyup.enter='handleQuery'>
<el-option
v-for='item in releaseList'
:key='item.machineId'
@ -32,16 +33,19 @@
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="计划时间" prop="planBeginTime">-->
<!-- <el-date-picker clearable-->
<!-- v-model="queryParams.planBeginTime"-->
<!-- type="date"-->
<!-- value-format="YYYY-MM-DD"-->
<!-- placeholder="请选择计划时间"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label='计划时间' prop='planRangeTime'>
<el-date-picker clearable
v-model='queryParams.planRangeTime'
type='datetimerange'
range-separator='至'
start-placeholder='开始日期'
end-placeholder='结束日期'
value-format='YYYY-MM-DD HH:mm:ss'
/>
</el-form-item>
<el-form-item label='计划状态' prop='planStatus'>
<el-select v-model='queryParams.planStatus' placeholder='请选择计划状态' clearable>
<el-select v-model='queryParams.planStatus' placeholder='请选择计划状态' clearable
@keyup.enter='handleQuery'>
<el-option v-for='dict in mes_plan_status' :key='dict.value' :label='dict.label' :value='dict.value' />
</el-select>
</el-form-item>
@ -51,11 +55,12 @@
<!-- <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='modelCode'>
<el-select v-model='queryParams.modelCode' placeholder='请选择模号' clearable>
<el-option v-for='dict in mes_model_code' :key='dict.value' :label='dict.label' :value='dict.value' />
</el-select>
</el-form-item>
<!-- <el-form-item label='模号' prop='modelCode'>-->
<!-- <el-select v-model='queryParams.modelCode' placeholder='请选择模号' clearable-->
<!-- @keyup.enter='handleQuery'>-->
<!-- <el-option v-for='dict in mes_model_code' :key='dict.value' :label='dict.label' :value='dict.value' />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
<el-button icon='Refresh' @click='resetQuery'>重置</el-button>
@ -400,12 +405,22 @@
</template>
<el-container style='height: 500px; border: 1px solid #eee'>
<div style='width: 400px; height: 100%; overflow: auto'>
<el-form-item label='工序名称' prop='processId'>
<el-select v-model='form.processId' placeholder='请先选择工序,再选择机台' @change='getMachine'>
<el-option
v-for='item in processList'
:key='item.processId'
:label='item.processName'
:value='item.processId'
/>
</el-select>
</el-form-item>
<el-divider content-position='center'>机台信息</el-divider>
<div style='margin-bottom: 8px'>
<span style='font-weight:700; padding: 0 4px'>已勾选机台:</span>
<el-tag type='primary' v-for='tag in machineNameTags'>{{ tag }}</el-tag>
</div>
<el-form ref='queryFormRef' :model='machineQueryParams' :inline='true' label-width='68px'>
<el-form ref='querySfpFormRef' :model='machineQueryParams' :inline='true' label-width='68px'>
<span style='font-weight:700; padding: 0 4px'>
机台编号
</span>
@ -450,16 +465,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label='工序名称' prop='processId'>
<el-select v-model='form.processId' placeholder='请先选择工序,再选择机台' @change='getMachine'>
<el-option
v-for='item in processList'
:key='item.processId'
:label='item.processName'
:value='item.processId'
/>
</el-select>
</el-form-item>
<el-form-item label='计划时间' prop='planBeginTime'>
<el-date-picker clearable
v-model='form.planBeginTime'
@ -523,7 +529,7 @@
<span style='font-weight:700; padding: 0 4px'>已勾选机台:</span>
<el-tag type='primary' v-for='tag in machineNameTags'>{{ tag }}</el-tag>
</div>
<el-form ref='queryFormRef' :model='machineQueryParams' :inline='true' label-width='68px'>
<el-form ref='queryFormingFormRef' :model='machineQueryParams' :inline='true' label-width='68px'>
<span style='font-weight:700; padding: 0 4px'>
机台编号
</span>
@ -631,7 +637,7 @@
<span style='font-weight:700; padding: 0 4px'>已勾选机台:</span>
<el-tag type='primary' v-for='tag in machineNameTags'>{{ tag }}</el-tag>
</div>
<el-form ref='queryFormRef' :model='machineQueryParams' :inline='true' label-width='68px'>
<el-form ref='queryVulFormRef' :model='machineQueryParams' :inline='true' label-width='68px'>
<span style='font-weight:700; padding: 0 4px'>
机台编号
</span>
@ -1050,6 +1056,18 @@ const data = reactive<PageData<PlanInfoForm, PlanInfoQuery>>({
],
planAmount: [
{ required: true, message: '计划数量不能为空', trigger: 'blur' }
],
planBeginTime: [
{ required: true, message: '计划日期不能为空', trigger: 'blur' }
],
planAmount1: [
{ required: true, message: '早班数量不能为空', trigger: 'blur' }
],
planAmount2: [
{ required: true, message: '中班数量不能为空', trigger: 'blur' }
],
planAmount3: [
{ required: true, message: '晚班数量不能为空', trigger: 'blur' }
]
}
});
@ -1066,10 +1084,18 @@ const getWorkshopId = async () => {
/** 查询生产计划信息列表 */
const getList = async () => {
loading.value = true;
const res = await listPlanInfo(queryParams.value);
try {
const params = {
...queryParams.value,
planBeginTime: queryParams.value.planRangeTime?.[0],
planEndTime: queryParams.value.planRangeTime?.[1]
};
const res = await listPlanInfo(params);
planInfoList.value = res.rows;
total.value = res.total;
} finally {
loading.value = false;
}
};
/** 取消按钮 */

Loading…
Cancel
Save