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

生产计划编辑页详情页 客户名称为空 不请求

Browse Source
dev
qiuhongwu 3 months ago
parent ca3e5b0651
commit cff8fe0a84
2 changed files with 82 additions and 80 deletions
Show Stats Download Patch File Download Diff File

4
mes-ui/mes-ui-admin-vue3/src/views/biz/plan/detail.vue
Unescape View File

@ -373,7 +373,9 @@ onMounted(async () => {
formData.value.hasCraft = 1
var projectInit = await ProjectOrderApi.getProjectOrder(formData.value.projectId)
customerInit.value = await CustomerApi.getCustomer(projectInit.customerId)
if (projectInit.customerId !== null && projectInit.customerId !== undefined) {
customerInit.value = await CustomerApi.getCustomer(projectInit.customerId)
}
// var businessManInit = await UserApi.getUser(projectInit.businessMan)
formData.value.projectCode = projectInit.code
formData.value.projectStatus = projectInit.orderStatus

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

@ -274,12 +274,7 @@
min-width="140"
align="center"
/>
<el-table-column
prop="spec"
label="规格/型号"
align="center"
min-width="120"
/>
<el-table-column prop="spec" label="规格/型号" align="center" min-width="120" />
<el-table-column prop="amount" label="数量" min-width="100" align="center" />
<el-table-column prop="unit" label="单位" min-width="100" align="center">
<template #default="scope">
@ -353,83 +348,86 @@
<el-col>
<el-card class="hl-incard">
<el-button type="primary" size="large" @click="addcraftInfos">新增</el-button>
<el-form ref="subFormRef"
<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">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.workshopId`" class="mb-0px!">
<WorkshopSelect
v-model="row.workshopId"
:disabled="row.id"
style="width: 100%"
@update:newValue="handleSelectedWorkshop($index, $event)"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column
min-width="150"
label="责任人"
prop="leaderUserName"
align="center"
/>
<!-- <el-table-column min-width="150" label="责任人" prop="leaderUserId" align="center" >
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"
>
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.workshopId`" class="mb-0px!">
<WorkshopSelect
v-model="row.workshopId"
:disabled="row.id"
style="width: 100%"
@update:newValue="handleSelectedWorkshop($index, $event)"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column
min-width="150"
label="责任人"
prop="leaderUserName"
align="center"
/>
<!-- <el-table-column min-width="150" label="责任人" prop="leaderUserId" align="center" >
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.leaderUserId`" class="mb-0px!">
<UserSelect v-model="row.leaderUserId" style="width: 100%" @update:newValue="handleSelectedUser9($index,$event)" class="!w-265px" />
</el-form-item>
</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
style="width: 100%"
v-model="row.startTime"
type="date"
value-format="x"
placeholder="开始日期"
/>
</el-form-item>
</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
style="width: 100%"
v-model="row.endTime"
type="date"
value-format="x"
placeholder="结束日期"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column min-width="100" label="操作" align="center">
<template #default="{ row, $index }">
<el-button
link
:disabled="row.id"
type="danger"
@click="handleDelete(row, $index)"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
</el-form>
<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
style="width: 100%"
v-model="row.startTime"
type="date"
value-format="x"
placeholder="开始日期"
/>
</el-form-item>
</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
style="width: 100%"
v-model="row.endTime"
type="date"
value-format="x"
placeholder="结束日期"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column min-width="100" label="操作" align="center">
<template #default="{ row, $index }">
<el-button
link
:disabled="row.id"
type="danger"
@click="handleDelete(row, $index)"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
</el-form>
</el-card>
</el-col>
</el-row>
@ -496,7 +494,7 @@ const formRules = reactive({
const subFormRules = reactive({
planWorkshops: [{ required: true, message: '生产车间不能为空', trigger: 'blur' }],
startTime: [{ required: true, message: '预计开始日期不能为空', trigger: 'blur' }],
endTime: [{ required: true, message: '预计结束日期不能为空', trigger: 'blur' }],
endTime: [{ required: true, message: '预计结束日期不能为空', trigger: 'blur' }]
})
const projectOrderDialog = ref()
const openProjectOrderDialog = () => {
@ -535,9 +533,9 @@ const submitForm = async () => {
await formRef.value.validate()
await subFormRef.value.validate()
formData.value.planWorkshops = formData.value.planWorkshops.filter((item, index) => {
return item.workshopId !== '' || item.startTime !== '' || item.endTime !== '';
});
return item.workshopId !== '' || item.startTime !== '' || item.endTime !== ''
})
// 提交请求
formLoading.value = true
try {
@ -567,7 +565,9 @@ onMounted(async () => {
formData.value.hasCraft = 1
var projectInit = await ProjectOrderApi.getProjectOrder(formData.value.projectId)
customerInit.value = await CustomerApi.getCustomer(projectInit.customerId)
if (projectInit.customerId !== null && projectInit.customerId !== undefined) {
customerInit.value = await CustomerApi.getCustomer(projectInit.customerId)
}
// var businessManInit = await UserApi.getUser(projectInit.businessMan)
formData.value.projectCode = projectInit.code
formData.value.projectStatus = projectInit.orderStatus

Write Preview
Loading…
Cancel
Save