diff --git a/src/api/mes/pro/task/index.ts b/src/api/mes/pro/task/index.ts
index 6b405bbbf..2a3cc5a84 100644
--- a/src/api/mes/pro/task/index.ts
+++ b/src/api/mes/pro/task/index.ts
@@ -67,5 +67,10 @@ export const ProTaskApi = {
// 导出生产任务 Excel
exportTask: async (params: any) => {
return await request.download({ url: `/mes/pro/task/export-excel`, params })
+ },
+
+ // 获得任务精简列表(下拉选项)
+ getTaskSimpleList: async (workOrderId?: number) => {
+ return await request.get({ url: `/mes/pro/task/simple-list`, params: { workOrderId } })
}
}
diff --git a/src/views/mes/pro/card/CardForm.vue b/src/views/mes/pro/card/CardForm.vue
index e39887e32..1461511ce 100644
--- a/src/views/mes/pro/card/CardForm.vue
+++ b/src/views/mes/pro/card/CardForm.vue
@@ -22,13 +22,7 @@
-
-
+
@@ -66,11 +60,7 @@
-
+
@@ -95,11 +85,7 @@
-
+
@@ -115,6 +101,7 @@ import { ProCardApi, ProCardVO } from '@/api/mes/pro/card'
import { MdItemVO } from '@/api/mes/md/item'
import { generateRandomStr } from '@/utils'
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
+import ProWorkOrderSelect from '@/views/mes/pro/workorder/components/ProWorkOrderSelect.vue'
import CardProcessList from './CardProcessList.vue'
defineOptions({ name: 'CardForm' })
@@ -133,8 +120,8 @@ const formData = ref({
workOrderId: undefined,
batchCode: undefined,
itemId: undefined,
- specification: undefined,
- unitMeasureId: undefined,
+ // TODO @AI:specification 不用展示;
+ specification: undefined, // 仅展示,不存储(从 item 获取)
barcodeUrl: undefined,
transferedQuantity: undefined,
status: undefined,
@@ -176,15 +163,9 @@ const open = async (type: string, id?: number) => {
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
-/** 产品变更:自动填充单位和规格 */
-// TODO @AI:这 2 个字段,不用存储,通过 item 查询即可。
+/** 产品变更:自动填充规格型号(仅展示) */
const handleItemChange = (item: MdItemVO) => {
- if (item?.unitMeasureId) {
- formData.value.unitMeasureId = item.unitMeasureId
- }
- if (item?.specification) {
- formData.value.specification = item.specification
- }
+ formData.value.specification = item?.specification
}
/** 提交表单 */
@@ -217,7 +198,6 @@ const resetForm = () => {
batchCode: undefined,
itemId: undefined,
specification: undefined,
- unitMeasureId: undefined,
barcodeUrl: undefined,
transferedQuantity: undefined,
status: undefined,
diff --git a/src/views/mes/pro/card/CardProcessList.vue b/src/views/mes/pro/card/CardProcessList.vue
new file mode 100644
index 000000000..e6c17375d
--- /dev/null
+++ b/src/views/mes/pro/card/CardProcessList.vue
@@ -0,0 +1,253 @@
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mes/pro/card/index.vue b/src/views/mes/pro/card/index.vue
index 770ba4e32..42ec57406 100644
--- a/src/views/mes/pro/card/index.vue
+++ b/src/views/mes/pro/card/index.vue
@@ -18,8 +18,14 @@
class="!w-240px"
/>
-
-
+
+
+
+
@@ -103,6 +109,7 @@
/>
+