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(index): 更新来源单据字段及调整表单项顺序

pull/871/MERGE
YunaiV 2026-04-11 14:12:00 +08:00
parent 9fb0659615
commit 3e203a9536
18 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/mes/pro/task/issue/index.ts
View File

@ -6,11 +6,11 @@ export interface ProTaskIssueVO {
taskId: number // 生产任务编号
workOrderId: number // 生产工单编号
workstationId: number // 工作站编号
sourceDocId: number // 来源单据编号
sourceDocCode: string // 来源单据编码
sourceDocType: string // 来源单据类型
batchCode: string // 投料批次
sourceDocId: number // 来源单据编号
sourceLineId: number // 来源单据行编号
sourceDocCode: string // 来源单据编码
batchCode: string // 投料批次
itemId: number // 产品物料编号
itemName: string // 产品名称
itemCode: string // 产品编码

2
src/api/mes/qc/ipqc/index.ts
View File

@ -7,8 +7,8 @@ export interface QcIpqcVO {
name: string // 检验单名称
type: string // IPQC 检验类型
templateId: number // 检验模板 ID
sourceDocId: number // 来源单据 ID
sourceDocType: number // 来源单据类型
sourceDocId: number // 来源单据 ID
sourceLineId: number // 来源单据行 ID
workOrderId: number // 生产工单 ID
workOrderCode: string // 工单编号（关联查询）

2
src/api/mes/qc/iqc/index.ts
View File

@ -6,8 +6,8 @@ export interface QcIqcVO {
code: string // 检验单编号
name: string // 检验单名称
templateId: number // 检验模板 ID
sourceDocId: number // 来源单据 ID
sourceDocType: number // 来源单据类型
sourceDocId: number // 来源单据 ID
sourceLineId: number // 来源单据行 ID
vendorId: number // 供应商 ID
vendorNickname: string // 供应商简称（关联查询）

2
src/api/mes/qc/oqc/index.ts
View File

@ -6,8 +6,8 @@ export interface QcOqcVO {
code: string // 检验单编号
name: string // 检验单名称
templateId: number // 检验模板 ID
sourceDocId: number // 来源单据 ID
sourceDocType: string // 来源单据类型
sourceDocId: number // 来源单据 ID
sourceLineId: number // 来源单据行 ID
clientId: number // 客户 ID
clientNickname: string // 客户简称（关联查询）

4
src/api/mes/qc/pendinginspect/index.ts
View File

@ -2,10 +2,10 @@ import request from '@/config/axios'
// MES 待检任务 VO
export interface QcPendingInspectVO {
sourceDocId: number
sourceDocType: number
sourceDocCode: string
sourceDocId: number
sourceLineId: number
sourceDocCode: string
qcType: number
itemId: number
itemCode: string

8
src/api/mes/qc/rqc/index.ts
View File

@ -6,8 +6,8 @@ export interface QcRqcVO {
code: string // 检验单编号
name: string // 检验单名称
templateId: number // 检验模板 ID
sourceDocId: number // 来源单据 ID
sourceDocType: string // 来源单据类型
sourceDocId: number // 来源单据 ID
sourceLineId: number // 来源单据行 ID
type: number // 检验类型
itemId: number // 产品物料 ID
@ -26,12 +26,12 @@ export interface QcRqcVO {
status: number // 状态
remark: string // 备注
// 缺陷统计
criticalQuantity: number // 致命缺陷数量
majorQuantity: number // 严重缺陷数量
minorQuantity: number // 轻微缺陷数量
criticalRate: number // 致命缺陷率（%）
majorRate: number // 严重缺陷率（%）
minorRate: number // 轻微缺陷率（%）
criticalQuantity: number // 致命缺陷数量
majorQuantity: number // 严重缺陷数量
minorQuantity: number // 轻微缺陷数量
}
// MES 退货检验单 API

2
src/api/mes/wm/miscissue/index.ts
View File

@ -6,9 +6,9 @@ export interface WmMiscIssueVO {
code: string
name: string
type: string
sourceDocType: string
sourceDocId: number
sourceDocCode: string
sourceDocType: string
issueDate: string
status: number
remark: string

2
src/api/mes/wm/miscreceipt/index.ts
View File

@ -6,9 +6,9 @@ export interface WmMiscReceiptVO {
code: string
name: string
type: number
sourceDocType: string
sourceDocId: number
sourceDocCode: string
sourceDocType: string
receiptDate: string
status: number
remark: string

24
src/views/mes/pro/card/components/ProCardSelectDialog.vue
View File

@ -28,6 +28,13 @@
class="!w-220px"
/>
</el-form-item>
<el-form-item label="产品物料" prop="itemId">
<MdItemSelect
v-model="queryParams.itemId"
placeholder="请选择产品物料"
class="!w-220px"
/>
</el-form-item>
<el-form-item label="批次号" prop="batchCode">
<el-input
v-model="queryParams.batchCode"
@ -37,13 +44,6 @@
class="!w-220px"
/>
</el-form-item>
<el-form-item label="产品物料" prop="itemId">
<MdItemSelect
v-model="queryParams.itemId"
placeholder="请选择产品物料"
class="!w-220px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery">
<Icon icon="ep:search" class="mr-5px" /> 搜索
@ -89,8 +89,8 @@
</el-table-column>
<el-table-column label="流转卡编号" align="center" prop="code" width="160" />
<el-table-column label="生产工单编号" align="center" prop="workOrderCode" width="160" />
<el-table-column label="批次号" align="center" prop="batchCode" width="120" />
<el-table-column label="产品物料编码" align="center" prop="itemCode" width="140" />
<el-table-column label="批次号" align="center" prop="batchCode" width="120" />
<el-table-column label="产品物料名称" align="left" prop="itemName" min-width="150" />
<el-table-column label="规格型号" align="center" prop="specification" width="120" />
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
@ -181,8 +181,8 @@ const queryParams = reactive({
pageSize: 10, // 每页条数
code: undefined as string | undefined, // 流转卡编号
workOrderId: undefined as number | undefined, // 生产工单编号
batchCode: undefined as string | undefined, // 批次号
itemId: undefined as number | undefined // 产品物料编号
itemId: undefined as number | undefined, // 产品物料编号
batchCode: undefined as string | undefined // 批次号
})
/** 查询流转卡列表 */
@ -233,8 +233,8 @@ const handleQuery = () => {
const resetQuery = () => {
queryParams.code = undefined
queryParams.workOrderId = undefined
queryParams.batchCode = undefined
queryParams.itemId = undefined
queryParams.batchCode = undefined
handleQuery()
}
@ -264,8 +264,8 @@ const open = async (selectedIds?: number[]) => {
// 重置查询条件 + 页码，避免二次打开继承上次过滤上下文
queryParams.code = undefined
queryParams.workOrderId = undefined
queryParams.batchCode = undefined
queryParams.itemId = undefined
queryParams.batchCode = undefined
queryParams.pageNo = 1
// 清空上一次的选中状态
selectedRows.value = []

8
src/views/mes/qc/ipqc/IpqcForm.vue
View File

@ -340,10 +340,10 @@ const formData = ref({
status: undefined as number | undefined,
type: undefined,
templateId: undefined,
sourceDocId: undefined,
sourceDocType: undefined,
sourceDocCode: undefined,
sourceDocId: undefined,
sourceLineId: undefined,
sourceDocCode: undefined,
workOrderId: undefined,
taskId: undefined,
workstationId: undefined,
@ -483,10 +483,10 @@ const resetForm = () => {
status: undefined,
type: undefined,
templateId: undefined,
sourceDocId: undefined,
sourceDocType: undefined,
sourceDocCode: undefined,
sourceDocId: undefined,
sourceLineId: undefined,
sourceDocCode: undefined,
workOrderId: undefined,
taskId: undefined,
workstationId: undefined,

8
src/views/mes/qc/iqc/IqcForm.vue
View File

@ -276,10 +276,10 @@ const formData = ref({
code: undefined,
name: undefined,
status: undefined as number | undefined,
sourceDocId: undefined,
sourceDocType: undefined,
sourceDocCode: undefined,
sourceDocId: undefined,
sourceLineId: undefined,
sourceDocCode: undefined,
vendorId: undefined,
vendorBatch: undefined,
itemId: undefined,
@ -400,10 +400,10 @@ const resetForm = () => {
code: undefined,
name: undefined,
status: undefined,
sourceDocId: undefined,
sourceDocType: undefined,
sourceDocCode: undefined,
sourceDocId: undefined,
sourceLineId: undefined,
sourceDocCode: undefined,
vendorId: undefined,
vendorBatch: undefined,
itemId: undefined,

8
src/views/mes/qc/oqc/OqcForm.vue
View File

@ -284,10 +284,10 @@ const formData = ref({
code: undefined,
name: undefined,
status: undefined as number | undefined,
sourceDocId: undefined,
sourceDocType: undefined,
sourceDocCode: undefined,
sourceDocId: undefined,
sourceLineId: undefined,
sourceDocCode: undefined,
clientId: undefined,
batchCode: undefined,
itemId: undefined,
@ -408,10 +408,10 @@ const resetForm = () => {
code: undefined,
name: undefined,
status: undefined,
sourceDocId: undefined,
sourceDocType: undefined,
sourceDocCode: undefined,
sourceDocId: undefined,
sourceLineId: undefined,
sourceDocCode: undefined,
clientId: undefined,
batchCode: undefined,
itemId: undefined,

16
src/views/mes/qc/pendinginspect/index.vue
View File

@ -51,12 +51,12 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="来源单据编号" align="center" prop="sourceDocCode" width="160" />
<el-table-column label="来源单据类型" align="center" prop="sourceDocType" width="130">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_QC_SOURCE_DOC_TYPE" :value="scope.row.sourceDocType" />
</template>
</el-table-column>
<el-table-column label="来源单据编号" align="center" prop="sourceDocCode" width="160" />
<el-table-column label="检验类型" align="center" prop="qcType" min-width="150">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_QC_TYPE" :value="scope.row.qcType" />
@ -175,10 +175,10 @@ const resetQuery = () => {
const iqcFormRef = ref()
const handleCreateIqc = (row: QcPendingInspectVO) => {
iqcFormRef.value.open('create', undefined, {
sourceDocId: row.sourceDocId,
sourceDocType: row.sourceDocType,
sourceDocCode: row.sourceDocCode,
sourceDocId: row.sourceDocId,
sourceLineId: row.sourceLineId,
sourceDocCode: row.sourceDocCode,
vendorId: row.vendorId,
itemId: row.itemId,
receivedQuantity: row.quantity,
@ -191,10 +191,10 @@ const handleCreateIqc = (row: QcPendingInspectVO) => {
const ipqcFormRef = ref()
const handleCreateIpqc = (row: QcPendingInspectVO) => {
ipqcFormRef.value.open('create', undefined, {
sourceDocId: row.sourceDocId,
sourceDocType: row.sourceDocType,
sourceDocCode: row.sourceDocCode,
sourceDocId: row.sourceDocId,
sourceLineId: row.sourceLineId,
sourceDocCode: row.sourceDocCode,
itemId: row.itemId,
workOrderId: row.workOrderId,
workstationId: row.workstationId,
@ -209,8 +209,8 @@ const handleCreateIpqc = (row: QcPendingInspectVO) => {
const rqcFormRef = ref()
const handleCreateRqc = (row: QcPendingInspectVO) => {
rqcFormRef.value.open('create', undefined, {
sourceDocId: row.sourceDocId,
sourceDocType: row.sourceDocType,
sourceDocId: row.sourceDocId,
sourceLineId: row.sourceLineId,
sourceDocCode: row.sourceDocCode,
clientId: row.clientId,
@ -227,10 +227,10 @@ const handleCreateRqc = (row: QcPendingInspectVO) => {
const oqcFormRef = ref()
const handleCreateOqc = (row: QcPendingInspectVO) => {
oqcFormRef.value.open('create', undefined, {
sourceDocId: row.sourceDocId,
sourceDocType: row.sourceDocType,
sourceDocCode: row.sourceDocCode,
sourceDocId: row.sourceDocId,
sourceLineId: row.sourceLineId,
sourceDocCode: row.sourceDocCode,
clientId: row.clientId,
itemId: row.itemId,
outQuantity: row.quantity,

4
src/views/mes/qc/rqc/RqcForm.vue
View File

@ -272,8 +272,8 @@ const formData = ref({
name: undefined,
status: undefined as number | undefined,
templateId: undefined,
sourceDocId: undefined,
sourceDocType: undefined,
sourceDocId: undefined,
sourceLineId: undefined,
sourceDocCode: undefined,
type: undefined,
@ -394,8 +394,8 @@ const resetForm = () => {
name: undefined,
status: undefined,
templateId: undefined,
sourceDocId: undefined,
sourceDocType: undefined,
sourceDocId: undefined,
sourceLineId: undefined,
sourceDocCode: undefined,
type: undefined,

16
src/views/mes/wm/miscissue/MiscIssueForm.vue
View File

@ -63,19 +63,19 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="来源单据编号" prop="sourceDocCode">
<el-form-item label="来源单据类型" prop="sourceDocType">
<el-input
v-model="formData.sourceDocCode"
placeholder="请输入来源单据编号"
v-model="formData.sourceDocType"
placeholder="请输入来源单据类型"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="来源单据类型" prop="sourceDocType">
<el-form-item label="来源单据编号" prop="sourceDocCode">
<el-input
v-model="formData.sourceDocType"
placeholder="请输入来源单据类型"
v-model="formData.sourceDocCode"
placeholder="请输入来源单据编号"
:disabled="isHeaderReadonly"
/>
</el-form-item>
@ -153,8 +153,8 @@ const formData = ref({
type: undefined,
status: undefined as number | undefined,
issueDate: undefined,
sourceDocCode: undefined,
sourceDocType: undefined,
sourceDocCode: undefined,
remark: undefined
})
const formRules = reactive({
@ -262,8 +262,8 @@ const resetForm = () => {
type: undefined,
status: undefined,
issueDate: undefined,
sourceDocCode: undefined,
sourceDocType: undefined,
sourceDocCode: undefined,
remark: undefined
}
formRef.value?.resetFields()

16
src/views/mes/wm/miscissue/index.vue
View File

@ -40,19 +40,19 @@
/>
</el-select>
</el-form-item>
<el-form-item label="来源单据编号" prop="sourceDocCode">
<el-form-item label="来源单据类型" prop="sourceDocType">
<el-input
v-model="queryParams.sourceDocCode"
placeholder="请输入来源单据编号"
v-model="queryParams.sourceDocType"
placeholder="请输入来源单据类型"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="来源单据类型" prop="sourceDocType">
<el-form-item label="来源单据编号" prop="sourceDocCode">
<el-input
v-model="queryParams.sourceDocType"
placeholder="请输入来源单据类型"
v-model="queryParams.sourceDocCode"
placeholder="请输入来源单据编号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
@ -123,8 +123,8 @@
<dict-tag :type="DICT_TYPE.MES_WM_MISC_ISSUE_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="来源单据编号" align="center" prop="sourceDocCode" min-width="150" />
<el-table-column label="来源单据类型" align="center" prop="sourceDocType" min-width="120" />
<el-table-column label="来源单据编号" align="center" prop="sourceDocCode" min-width="150" />
<el-table-column
label="出库日期"
align="center"
@ -214,8 +214,8 @@ const queryParams = reactive({
code: undefined,
name: undefined,
type: undefined,
sourceDocCode: undefined,
sourceDocType: undefined,
sourceDocCode: undefined,
issueDate: undefined,
status: undefined
})

16
src/views/mes/wm/miscreceipt/MiscReceiptForm.vue
View File

@ -53,19 +53,19 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="来源单据编码" prop="sourceDocCode">
<el-form-item label="来源单据类型" prop="sourceDocType">
<el-input
v-model="formData.sourceDocCode"
placeholder="请输入来源单据编码"
v-model="formData.sourceDocType"
placeholder="请输入来源单据类型"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="来源单据类型" prop="sourceDocType">
<el-form-item label="来源单据编码" prop="sourceDocCode">
<el-input
v-model="formData.sourceDocType"
placeholder="请输入来源单据类型"
v-model="formData.sourceDocCode"
placeholder="请输入来源单据编码"
:disabled="isHeaderReadonly"
/>
</el-form-item>
@ -155,9 +155,9 @@ const formData = ref({
name: undefined,
type: undefined,
status: undefined as number | undefined,
sourceDocType: undefined,
sourceDocId: undefined,
sourceDocCode: undefined,
sourceDocType: undefined,
receiptDate: undefined,
remark: undefined
})
@ -264,9 +264,9 @@ const resetForm = () => {
name: undefined,
type: undefined,
status: undefined,
sourceDocType: undefined,
sourceDocId: undefined,
sourceDocCode: undefined,
sourceDocType: undefined,
receiptDate: undefined,
remark: undefined
}

16
src/views/mes/wm/miscreceipt/index.vue
View File

@ -40,19 +40,19 @@
/>
</el-select>
</el-form-item>
<el-form-item label="来源单据编号" prop="sourceDocCode">
<el-form-item label="来源单据类型" prop="sourceDocType">
<el-input
v-model="queryParams.sourceDocCode"
placeholder="请输入来源单据编号"
v-model="queryParams.sourceDocType"
placeholder="请输入来源单据类型"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="来源单据类型" prop="sourceDocType">
<el-form-item label="来源单据编号" prop="sourceDocCode">
<el-input
v-model="queryParams.sourceDocType"
placeholder="请输入来源单据类型"
v-model="queryParams.sourceDocCode"
placeholder="请输入来源单据编号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
@ -124,8 +124,8 @@
<dict-tag :type="DICT_TYPE.MES_WM_MISC_RECEIPT_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="来源单据编号" align="center" prop="sourceDocCode" min-width="150" />
<el-table-column label="来源单据类型" align="center" prop="sourceDocType" min-width="120" />
<el-table-column label="来源单据编号" align="center" prop="sourceDocCode" min-width="150" />
<el-table-column
label="入库日期"
align="center"
@ -215,8 +215,8 @@ const queryParams = reactive({
code: undefined,
name: undefined,
type: undefined,
sourceDocCode: undefined,
sourceDocType: undefined,
sourceDocCode: undefined,
status: undefined,
receiptDate: undefined
})