diff --git a/src/views/NCcode/index.vue b/src/views/NCcode/index.vue index 2940aab..261adf2 100644 --- a/src/views/NCcode/index.vue +++ b/src/views/NCcode/index.vue @@ -976,7 +976,7 @@ const selectedDeviceIds = ref([]) function handlerConnectionDevice(row:any) { deviceDocumentConnectionVisible.value = true - title.value = row.deviceName + "设备工艺文档关联" + title.value = row.ncName + "关联设备" deviceDocumentConnection.sourceId = row.id getDeviceList(deviceDocumentConnection.sourceId) } diff --git a/src/views/biz/defectiveWarehouse/index.vue b/src/views/biz/defectiveWarehouse/index.vue index e9f1405..3c83c52 100644 --- a/src/views/biz/defectiveWarehouse/index.vue +++ b/src/views/biz/defectiveWarehouse/index.vue @@ -272,6 +272,9 @@ const columns: DataTableColumns = [ var status = row.status if (status == 0 || status == 1) { return h('div', {style: {display: 'flex', alignItems: 'center', gap: '8px', flexWrap: 'nowrap'}}, [ + h(NButton, {size: 'small', quaternary: true, onClick: () => handleDetail(row)}, { + default: () => ['详情'] + }), h(NButton, {size: 'small', quaternary: true, onClick: () => handleConfirm(row)}, { default: () => [h(NIcon, null, {default: () => h(CreateOutline)}), '确认入库'] }), @@ -280,18 +283,15 @@ const columns: DataTableColumns = [ }), h(NButton, {size: 'small', quaternary: true, type: 'error', onClick: () => handleDelete(row)}, { default: () => [h(NIcon, null, {default: () => h(TrashOutline)}), ' 删除'] - }), - h(NButton, {size: 'small', quaternary: true, onClick: () => handleDetail(row)}, { - default: () => ['详情'] }) ]) } else if (status == 2) { return h('div', {style: {display: 'flex', alignItems: 'center', gap: '8px', flexWrap: 'nowrap'}}, [ - h(NButton, {size: 'small', quaternary: true, onClick: () => handleCancel(row)}, { - default: () => [h(NIcon, null, {default: () => h(CreateOutline)}), '撤回入库'] - }), h(NButton, {size: 'small', quaternary: true, onClick: () => handleDetail(row)}, { default: () => ['详情'] + }), + h(NButton, {size: 'small', quaternary: true, onClick: () => handleCancel(row)}, { + default: () => [h(NIcon, null, {default: () => h(CreateOutline)}), '撤回入库'] }) ]) } diff --git a/src/views/biz/orderProcessPlan/board.vue b/src/views/biz/orderProcessPlan/board.vue index e84bb04..d0c3b49 100644 --- a/src/views/biz/orderProcessPlan/board.vue +++ b/src/views/biz/orderProcessPlan/board.vue @@ -1326,7 +1326,8 @@ function disphand(process: ProcessPlanItemVO, order?: OrderProcessPlanVO) { const planQty = Number(entity.quantity) || 0 const completedQty = Number(process.completedQty) || 0 - const remainQty = Math.max(0, planQty - completedQty) + const patchNum = Number(process.patchNum) || 0 + const remainQty = Math.max(0, planQty - patchNum) dispatchmodal.value = true dispatchformRef.value?.restoreValidation() dispatchform.id = entity.id diff --git a/src/views/biz/qualityTesting/index.vue b/src/views/biz/qualityTesting/index.vue index 01b768a..b19ce77 100644 --- a/src/views/biz/qualityTesting/index.vue +++ b/src/views/biz/qualityTesting/index.vue @@ -180,8 +180,8 @@ - - + + - + - +