diff --git a/src/views/qms/inspectionRecord/addForm.vue b/src/views/qms/inspectionRecord/addForm.vue index c430495c8..d804838f6 100644 --- a/src/views/qms/inspectionRecord/addForm.vue +++ b/src/views/qms/inspectionRecord/addForm.vue @@ -7,44 +7,584 @@ :close-on-click-modal="false" :vLoading="formLoading" > -
-
-
包装列表
-
- -
+
+ + + + + + + + + + + + + + + + +
+ + + +
+
+
+ + + + + + + + + + + + +
+ + + +
+
+
+ + + + + + + + + + + + + + + +
+
+ + + +
+
检验工序
+ + + + + + + + + + + + + + + + + + + + + + + + +
检验特性
+ +
+ + + + + + + + + + + + + +
+ +
+
+
+ + +
+ +
+
+
+ + +
+ +
+
+
+ + + +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+ +
+ + + + + +
+ +
- - @@ -300,13 +1389,26 @@ const submitForm = async () => { color: #1a8bfc; font-size: 16px; } +.tabs-box{ + max-height:calc(80vh - 40px) ; + overflow-x: hidden; + overflow-y: auto; +} diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index 4bce94b0c..129473287 100644 --- a/src/views/qms/inspectionRecord/index.vue +++ b/src/views/qms/inspectionRecord/index.vue @@ -27,7 +27,7 @@ - + + + { +// 头部按钮事件 +const buttonBaseClick = (val, item) => { if (val == 'add') { // 新增 openForm('create') } else if (val == 'import') { // 导入 @@ -167,7 +196,7 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' } }) } - openForm('update', row) + openUseForm('update', row) }else if (val == 'mainPackage') { // 包装 list.value = await InspectionRecordPackageApi.getInspectionRecordPackageList(row.id) list.value.forEach(item=>{ @@ -184,10 +213,15 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' handleOrderPub(row) } } - - /** 添加/修改操作 */ - const formRef = ref() + /** 添加/修改操作 */ + const basicFormRef = ref() const openForm = async (type : string, row ?: number) => { + tableData.value = [] // 重置明细数据 + basicFormRef.value.open(type, row) + } + /** 使用决策操作操作 */ + const formRef = ref() + const openUseForm = async (type : string, row ?: number) => { tableData.value = [] // 重置明细数据 formRef.value.open(type, row) } diff --git a/src/views/qms/inspectionRecord/useAddForm.vue b/src/views/qms/inspectionRecord/useAddForm.vue new file mode 100644 index 000000000..c430495c8 --- /dev/null +++ b/src/views/qms/inspectionRecord/useAddForm.vue @@ -0,0 +1,312 @@ + + + + +