update 计划关联机台查询

master
yinq 2 weeks ago
parent 628e15746e
commit cf004c5e7f

@ -289,7 +289,7 @@ export interface PlanInfoForm extends BaseEntity {
/** /**
* 0 1 2 * 0 1 2
*/ */
finishFlag?: string; finishFlag?: string | [];
/** /**
* *
@ -321,6 +321,8 @@ export interface PlanInfoForm extends BaseEntity {
*/ */
workshopId?: number; workshopId?: number;
materialBoMName?: string | number;
} }
export interface PlanInfoQuery extends PageQuery { export interface PlanInfoQuery extends PageQuery {

@ -184,7 +184,7 @@
<el-form-item label='激活标识' prop='activeFlag'> <el-form-item label='激活标识' prop='activeFlag'>
<el-radio-group v-model='form.activeFlag'> <el-radio-group v-model='form.activeFlag'>
<el-radio <el-radio
v-for='dict in station_type' v-for='dict in active_flag'
:key='dict.value' :key='dict.value'
:value='dict.value' :value='dict.value'
>{{ dict.label }} >{{ dict.label }}

@ -227,13 +227,13 @@
>{{dict.label}}</el-radio> >{{dict.label}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="下达ID" prop="releaseId"> <el-form-item label="机台" prop="releaseId">
<el-select v-model="form.releaseId" placeholder="请选择"> <el-select v-model="form.releaseId" placeholder="请选择">
<el-option <el-option
v-for="item in stationList" v-for="item in releaseList"
:key="item.stationId" :key="item.machineId"
:label="item.stationName" :label="item.machineName"
:value="item.stationId" :value="item.machineId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -338,6 +338,7 @@ import BomSelect from '@/views/mes/materialBom/addBom.vue';
import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue'; import MaterialSelect from '@/views/mes/baseMaterialInfo/addMaterial.vue';
import { getProcessInfoList } from '@/api/mes/baseProcessInfo'; import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
import { getStationInfoList } from '@/api/mes/baseStationInfo'; import { getStationInfoList } from '@/api/mes/baseStationInfo';
import { getProdBaseMachineInfoList } from '@/api/mes/prodBaseMachineInfo';
const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { mes_import_flag, active_flag, mes_plan_status, mes_release_type, mes_finish_flag, mes_model_code } = toRefs<any>(proxy?.useDict('mes_import_flag', 'active_flag', 'mes_plan_status', 'mes_release_type', 'mes_finish_flag', 'mes_model_code')); const { mes_import_flag, active_flag, mes_plan_status, mes_release_type, mes_finish_flag, mes_model_code } = toRefs<any>(proxy?.useDict('mes_import_flag', 'active_flag', 'mes_plan_status', 'mes_release_type', 'mes_finish_flag', 'mes_model_code'));
@ -362,7 +363,7 @@ const dialog = reactive<DialogOption>({
const shiftList = ref([]); const shiftList = ref([]);
const classTeamList = ref([]); const classTeamList = ref([]);
const processList = ref([]); const processList = ref([]);
let stationList = ref([]); let releaseList = ref([]);
const materialBomOpen = ref(false); const materialBomOpen = ref(false);
const bomSelectRef = ref(); const bomSelectRef = ref();
const materialOpen = ref(false); const materialOpen = ref(false);
@ -389,9 +390,9 @@ const getProcessSelect = async () => {
}; };
/*获取工位下拉框*/ /*获取工位下拉框*/
const getStationSelect = async () => { const getReleaseSelect = async () => {
let res = await getStationInfoList(null); let res = await getProdBaseMachineInfoList({ processId: form.value.processId});
stationList.value = res.data; releaseList.value = res.data;
}; };
// //
@ -660,7 +661,15 @@ onMounted(() => {
getShiftSelect(); getShiftSelect();
getClassTeamSelect(); getClassTeamSelect();
getProcessSelect(); getProcessSelect();
getStationSelect(); getReleaseSelect();
getList(); getList();
}); });
// processId
watch(
() => form.value.processId, (newValue, oldValue) => {
//
getReleaseSelect(); //
}
);
</script> </script>

Loading…
Cancel
Save