diff --git a/src/api/orderProcessPlan.ts b/src/api/orderProcessPlan.ts
index ec1f2ec..121e686 100644
--- a/src/api/orderProcessPlan.ts
+++ b/src/api/orderProcessPlan.ts
@@ -143,6 +143,7 @@ export interface ProcessPlanItemVO {
assignWorkList?: AssignWorkItem[]
+ reportedQuantity?: number | null
}
diff --git a/src/views/biz/orderProcessPlan/components/ProcessCard.vue b/src/views/biz/orderProcessPlan/components/ProcessCard.vue
index 8fe8511..812080e 100644
--- a/src/views/biz/orderProcessPlan/components/ProcessCard.vue
+++ b/src/views/biz/orderProcessPlan/components/ProcessCard.vue
@@ -28,12 +28,12 @@
完成
- {{ completedQty }} / {{ totalQty }}
+ {{ reportedQuantity }} / {{ totalQty }}
合格 / 不合格
- {{ qualifiedQty }}
+ {{ completedQty }}
/
{{ scrapQty }}
@@ -155,6 +155,7 @@ const emit = defineEmits<{
submitDetail: [process: ProcessPlanItemVO]
}>()
+const reportedQuantity = computed(() => props.process.reportedQuantity ?? 0)
const totalQty = computed(() => props.process.quantity ?? 0)
const completedQty = computed(() => props.process.completedQty ?? 0)
const scrapQty = computed(() => props.process.scrapQty ?? 0)
diff --git a/src/views/biz/orderProcessPlan/pgitem.vue b/src/views/biz/orderProcessPlan/pgitem.vue
index f06bc41..b9a37ff 100644
--- a/src/views/biz/orderProcessPlan/pgitem.vue
+++ b/src/views/biz/orderProcessPlan/pgitem.vue
@@ -37,6 +37,7 @@
clearable
remote
:clear-filter-after-select="false"
+ @change="loadNc"
/>
@@ -192,11 +193,11 @@ async function loadSection() {
}
//加载下发数据
-async function loadNc() {
- const res = await loadAllNcCode()
+async function loadNc(row) {
+ const res = await loadAllNcCode(row)
ncList.value = res.map((n: any) => {
return {
- label: n.ncName,
+ label: n.name,
value: n.id
}
})
@@ -206,6 +207,5 @@ async function loadNc() {
loadSection()
slehand()
-loadNc()
\ No newline at end of file