yunxi
/
mes-majoys
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

生产订单 生产设备 生产计划...优化

Browse Source
dev
qiuhongwu 5 months ago
parent 511699c7bb
commit b8a45a2df4
5 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File

5
mes-ui/mes-ui-admin-vue3/src/views/biz/equipmanufacture/EquipManufactureForm.vue
Unescape View File

@ -8,7 +8,7 @@
<el-input v-model="formData.name" placeholder="请输入设备名称" class="!w-250px" />
</el-form-item>
<!-- 新增所属车间 -->
<el-form-item label="所属车间" prop="workshopName">
<el-form-item label="所属车间" prop="workshopId">
<WorkshopSelect v-model="formData.workshopId" class="!w-250px" @update:newValue="handleSelectedWorkshop" />
</el-form-item>
<el-form-item label="设备型号" prop="model">
@ -54,7 +54,8 @@ const formData = ref({
})
const formRules = reactive({
code: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
name: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }]
name: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
workshopId: [{ required: true, message: '所属车间不能为空', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref

3
mes-ui/mes-ui-admin-vue3/src/views/biz/equipmanufacture/index.vue
Unescape View File

@ -57,8 +57,7 @@
<el-table-column type="index" width="100" label="序号" align="center" />
<el-table-column label="设备编号" align="center" prop="code" />
<el-table-column label="设备名称" align="center" prop="name" />
<!-- 新增所属车间 -->
<el-table-column label="所属车间" align="center" prop="workshopName" />
<el-table-column label="所属车间" align="center" prop="workShopName" />
<el-table-column label="设备型号" align="center" prop="model" />
<el-table-column label="设备类型" align="center" prop="type" />
<el-table-column label="启用状态" align="center" prop="status">

16
mes-ui/mes-ui-admin-vue3/src/views/biz/plan/edit.vue
Unescape View File

@ -353,6 +353,11 @@
<el-col>
<el-card class="hl-incard">
<el-button type="primary" size="large" @click="addcraftInfos">新增</el-button>
<el-form ref="subFormRef"
:model="formData.planWorkshops"
:rules="subFormRules"
v-loading="subFormLoading"
label-width="0">
<el-table :data="formData.planWorkshops" class="hl-table">
<el-table-column label="序号" prop="id" type="index" width="80" />
<el-table-column min-width="120" prop="workshopId" label="生产车间" align="center">
@ -381,6 +386,9 @@
</template>
</el-table-column> -->
<el-table-column min-width="150" label="预计开始日期" align="center">
<template #header>
<span style="color:red">*</span>预计开始日期
</template>
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.startTime`" class="mb-0px!">
<el-date-picker
@ -394,6 +402,9 @@
</template>
</el-table-column>
<el-table-column min-width="150" label="预计完成日期" align="center">
<template #header>
<span style="color:red">*</span>预计完成日期
</template>
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.endTime`" class="mb-0px!">
<el-date-picker
@ -418,6 +429,7 @@
</template>
</el-table-column>
</el-table>
</el-form>
</el-card>
</el-col>
</el-row>
@ -482,7 +494,9 @@ const formRules = reactive({
projectCode: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }]
})
const subFormRules = reactive({
planWorkshops: [{ required: true, message: '生产车间不能为空', trigger: 'blur' }]
planWorkshops: [{ required: true, message: '生产车间不能为空', trigger: 'blur' }],
startTime: [{ required: true, message: '预计开始日期不能为空', trigger: 'blur' }],
endTime: [{ required: true, message: '预计结束日期不能为空', trigger: 'blur' }],
})
const projectOrderDialog = ref()
const openProjectOrderDialog = () => {

16
mes-ui/mes-ui-admin-vue3/src/views/biz/productcraftpath/pathdetail.vue
Unescape View File

@ -85,8 +85,9 @@
min-width="120"
align="center"
>
<template #header> <span style="color: red">*</span>工序名称 </template>
<template #default="scope">
<el-form-item :prop="`${scope.$index}.procedureId`" class="mb-0px!">
<el-form-item :prop="procedureId" class="mb-0px!">
<ProcedureSelect
:disabled="detailDisabled"
v-model="scope.row.procedureId"
@ -194,7 +195,9 @@
>
<el-table :data="formData.matItemDOList" class="hl-table">
<el-table-column type="index" label="序号" align="center" min-width="60" fixed />
<el-table-column prop="matCode" label="物料编码" min-width="120" align="center" />
<el-table-column prop="matCode" label="物料编码" min-width="120" align="center">
<template #header> <span style="color: red">*</span>物料编码 </template>
</el-table-column>
<el-table-column prop="matName" label="物料名称" min-width="120" align="center" />
<el-table-column prop="matType" label="物料类型" min-width="125" align="center">
<template #default="scope">
@ -227,7 +230,7 @@
link
type="danger"
size="small"
@click.prevent="handleDeleteMat(scope.row,scope.$index)"
@click.prevent="handleDeleteMat(scope.row, scope.$index)"
:disabled="detailDisabled"
>
删除
@ -345,9 +348,12 @@ const formData = ref({
})
const formRules = reactive({
code: [{ required: true, message: '编码，唯一不能为空', trigger: 'blur' }],
name: [{ required: true, message: '工艺路线名称，唯一不能为空', trigger: 'blur' }],
status: [{ required: true, message: '状态,1表示正常，2表示禁用不能为空', trigger: 'blur' }]
})
const subFormRules = reactive({
procedureId: [{ required: true, message: '工序名称不能为空', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
//工序明细的新增
@ -456,7 +462,7 @@ const queryData = async (type: string, id?: number) => {
const sub = await ProcessApi.getProcessDetailPage(queryParams)
sub?.list.forEach((row) => {
row.deleteFlag=0
row.deleteFlag = 0
if (row.type == 1) {
row.processId = id
formData.value.subList.push(row)

6
mes-ui/mes-ui-admin-vue3/src/views/biz/projectorder/detail.vue
Unescape View File

@ -48,7 +48,7 @@
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="提出部门" prop="">
<el-form-item label="所属部门" prop="businessDeptId">
<el-tree-select
class="!w-250px"
v-model="formData.businessDeptId"
@ -57,7 +57,7 @@
check-strictly
node-key="id"
clearable
placeholder="请选择提出部门"
placeholder="请选择所属部门"
:disabled="alterDisabled || detailDisabled"
/>
</el-form-item>
@ -670,7 +670,7 @@ const formData = ref({
warehouseId: undefined
})
const formRules = reactive({
businessDeptId: [{ required: true, message: '提出部门不能为空', trigger: 'blur' }],
businessDeptId: [{ required: true, message: '所属部门不能为空', trigger: 'blur' }],
customerId: [{ required: true, message: '客户名称不能为空', trigger: 'blur' }],
projectName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
businessLine: [{ required: true, message: '所属业务线不能为空', trigger: 'change' }],

Write Preview
Loading…
Cancel
Save