yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

✨ feat(mes): 更新工作站表单，添加工序和设备选择功能

pull/871/MERGE
YunaiV 2026-03-28 18:06:46 +08:00
parent 1ad04812e1
commit f1b7e53b08
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/views/mes/md/workstation/WorkstationForm.vue
View File

@ -38,15 +38,27 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="线边库" prop="warehouseId"> <el-form-item label="所属工序" prop="processId">
<ProProcessSelect
v-model="formData.processId"
placeholder="请选择所属工序"
clearable
class="!w-1/1"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="仓库" prop="warehouseId">
<WmWarehouseSelect <WmWarehouseSelect
v-model="formData.warehouseId" v-model="formData.warehouseId"
placeholder="请选择线边库" placeholder="请选择仓库"
clearable clearable
@change="handleWarehouseSelectChange" @change="handleWarehouseSelectChange"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="库区" prop="locationId"> <el-form-item label="库区" prop="locationId">
<el-select <el-select
@ -66,8 +78,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="库位" prop="areaId"> <el-form-item label="库位" prop="areaId">
<el-select <el-select
@ -99,16 +109,6 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="所属工序" prop="processId">
<ProProcessSelect
v-model="formData.processId"
placeholder="请选择所属工序"
clearable
class="!w-1/1"
/>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">

6
src/views/mes/md/workstation/WorkstationMachineList.vue
View File

@ -35,10 +35,9 @@
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="设备" prop="machineryId"> <el-form-item label="设备" prop="machineryId">
<!-- TODO @芋艿：对接设备下拉列表，等 DV 设备模块完成后对接 --> <DvMachinerySelect
<el-input-number
v-model="formData.machineryId" v-model="formData.machineryId"
placeholder="请输入设备编号" placeholder="请选择设备"
class="!w-1/1" class="!w-1/1"
/> />
</el-form-item> </el-form-item>
@ -64,6 +63,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { MdWorkstationMachineApi, MdWorkstationMachineVO } from '@/api/mes/md/workstation/machine' import { MdWorkstationMachineApi, MdWorkstationMachineVO } from '@/api/mes/md/workstation/machine'
import DvMachinerySelect from '@/views/mes/dv/machinery/components/DvMachinerySelect.vue'
defineOptions({ name: 'WorkstationMachineList' }) defineOptions({ name: 'WorkstationMachineList' })

6
src/views/mes/md/workstation/WorkstationToolList.vue
View File

@ -36,10 +36,9 @@
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="工具类型" prop="toolTypeId"> <el-form-item label="工具类型" prop="toolTypeId">
<!-- TODO @芋艿：对接工具类型下拉列表，等 TM 工具模块完成后对接 --> <TmToolTypeSelect
<el-input-number
v-model="formData.toolTypeId" v-model="formData.toolTypeId"
placeholder="请输入工具类型编号" placeholder="请选择工具类型"
class="!w-1/1" class="!w-1/1"
:disabled="dialogFormType === 'update'" :disabled="dialogFormType === 'update'"
/> />
@ -66,6 +65,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { MdWorkstationToolApi, MdWorkstationToolVO } from '@/api/mes/md/workstation/tool' import { MdWorkstationToolApi, MdWorkstationToolVO } from '@/api/mes/md/workstation/tool'
import TmToolTypeSelect from '@/views/mes/tm/tool/components/TmToolTypeSelect.vue'
defineOptions({ name: 'WorkstationToolList' }) defineOptions({ name: 'WorkstationToolList' })