This commit is contained in:
zlwu committed 2026-05-28 19:11:31 +08:00
1 parent 5e91791ebf
commit 912ada02eb
36 files changed
+3353 -3471

No files matched your search

@@ -691,11 +691,11 @@
}
}
async function submitRemarkEdit(remark: string) {
async function submitRemarkEdit(payload: { remark: string; workOrderStatus?: string }) {
if (!remarkEditRow.value?.id) return
remarkEditLoading.value = true
try {
await fetchUpdateProductionWorkOrder(remarkEditRow.value.id, { remark })
await fetchUpdateProductionWorkOrder(remarkEditRow.value.id, { remark: payload.remark })
ElMessage.success('保存成功')
remarkEditVisible.value = false
loadData()
@@ -419,7 +419,7 @@
@click="handleConfigure(row)"
>
<el-icon><Setting /></el-icon
>{{ row.workOrderStatus === 'ypz' ? '调整检测' : '配置检测' }}
>{{ row.workOrderStatus !== 'dpz' ? '调整检测' : '配置检测' }}
</el-button>
<el-button v-else class="btn-op-item primary" @click="handleView(row)">
<el-icon><View /></el-icon>查看
@@ -697,6 +697,8 @@
v-model:visible="remarkEditVisible"
:title="remarkEditTitle"
:initial-remark="remarkEditInitialRemark"
:initial-work-order-status="remarkEditInitialStatus"
show-work-order-status
:submitting="remarkEditLoading"
@submit="submitRemarkEdit"
/>
@@ -944,9 +946,9 @@
addVisible.value = true
}
/** 待配置 / 已配置时可配置或调整检测 */
function canConfigureWorkOrder(row: QcWorkOrder) {
return row.workOrderStatus === 'dpz' || row.workOrderStatus === 'ypz'
/** 任意状态均可配置或调整检测 */
function canConfigureWorkOrder(_row: QcWorkOrder) {
return true
}
/** 临时工单 Tab 下可编辑质检对象 */
@@ -1015,20 +1017,24 @@
const remarkEditRow = ref<QcWorkOrder | null>(null)
const remarkEditTitle = computed(
() =>
`编辑备注${remarkEditRow.value?.workOrderNo ? ` — ${remarkEditRow.value.workOrderNo}` : ''}`
`编辑工单${remarkEditRow.value?.workOrderNo ? ` — ${remarkEditRow.value.workOrderNo}` : ''}`
)
const remarkEditInitialRemark = computed(() => remarkEditRow.value?.remark || '')
const remarkEditInitialStatus = computed(() => remarkEditRow.value?.workOrderStatus || '')
function handleEditRemark(row: QcWorkOrder) {
remarkEditRow.value = row
remarkEditVisible.value = true
}
async function submitRemarkEdit(remark: string) {
async function submitRemarkEdit(payload: { remark: string; workOrderStatus?: string }) {
if (!remarkEditRow.value?.id) return
remarkEditLoading.value = true
try {
await fetchUpdateQcWorkOrder(remarkEditRow.value.id, { remark })
await fetchUpdateQcWorkOrder(remarkEditRow.value.id, {
remark: payload.remark,
workOrderStatus: payload.workOrderStatus
})
ElMessage.success('保存成功')
remarkEditVisible.value = false
loadData()
@@ -1593,7 +1599,7 @@
async function handleConfigure(row: QcWorkOrder) {
configuringId.value = row.id
configureIsEdit.value = row.workOrderStatus === 'ypz'
configureIsEdit.value = row.workOrderStatus !== 'dpz'
labOptions.value = (await fetchQcLabTestItemsActive()) || []
thirdOptions.value = (await fetchQcThirdPartyItemsActive()) || []
if (configureIsEdit.value) {
@@ -241,7 +241,7 @@
/>
<el-table-column
label="操作"
min-width="220"
min-width="280"
fixed="right"
align="center"
header-align="center"
@@ -473,12 +473,12 @@
</script>
<style scoped lang="scss">
/* Narrower op column than global 260px (fits 查看/审核/样本入库) */
/* 操作列:查看 / 审核 / 样本入库 */
.storage-release-review-table {
:deep(td.el-table__cell:has(.btn-op-item)),
:deep(td.el-table-fixed-column--right:has(.btn-op-item)),
:deep(th.el-table-fixed-column--right) {
min-width: 220px !important;
min-width: 280px !important;
}
}
</style>