diff --git a/src/api/qms/inspectionJob/inspectionJobMain/index.ts b/src/api/qms/inspectionJob/inspectionJobMain/index.ts
index 0d6f85d56..3a8c0286b 100644
--- a/src/api/qms/inspectionJob/inspectionJobMain/index.ts
+++ b/src/api/qms/inspectionJob/inspectionJobMain/index.ts
@@ -44,7 +44,8 @@ export const exportInspectionJobMain = async (params) => {
export const importTemplate = () => {
return request.download({ url: '/qms/inspection-job-main/get-import-template' })
}
-//查询检验申请列表
+//查询包装列表
export const getInspectionJobPackageList = async (id: number) => {
- return await request.get({ url: `/qms/inspection-job-package/list?masterId=` + id })
-}
\ No newline at end of file
+ return await request.get({ url: `/qms/inspection-job-package/list?masterId=` + id })
+ }
+
\ No newline at end of file
diff --git a/src/views/qms/inspection/inspectionJob/addForm.vue b/src/views/qms/inspection/inspectionJob/addForm.vue
index 142805625..bfe5c5543 100644
--- a/src/views/qms/inspection/inspectionJob/addForm.vue
+++ b/src/views/qms/inspection/inspectionJob/addForm.vue
@@ -18,6 +18,23 @@
:is-col="true"
@opensearchTable="opensearchTable"
/>
+
-
+
@@ -277,7 +294,7 @@
v-if="item.inspectionJobCharacteristicsUpdateReqVO.featureType == 0"
>
-
+
{
editableTabsValue.value = index + 1
item.name = index + 1
diff --git a/src/views/qms/inspection/inspectionJob/index.vue b/src/views/qms/inspection/inspectionJob/index.vue
index 05efe2feb..509ad4f14 100644
--- a/src/views/qms/inspection/inspectionJob/index.vue
+++ b/src/views/qms/inspection/inspectionJob/index.vue
@@ -33,6 +33,8 @@
:formAllSchemasFeatures="InspectionTemplateFeatures.allSchemas"
:formAllSchemasProcess="InspectionTemplateProcess.allSchemas"
:formAllSchemasMain="InspectionTemplateMain.allSchemas"
+ :tableAllSchemas="InspectionJobPackage.allSchemas"
+ :tableFormRules="InspectionJobPackageRules"
:rules="InspectionJobMainRules"
:formAllSchemas="InspectionJobMain.allSchemas"
@submitForm="submitForm"
@@ -40,7 +42,8 @@
import download from '@/utils/download'
- import { InspectionJobMain, InspectionJobMainRules, InspectionJobDetail, InspectionJobDetailRules,InspectionJobPackage} from './inspectionJobMain.data'
+ import { InspectionJobMain, InspectionJobMainRules, InspectionJobDetail, InspectionJobDetailRules,InspectionJobPackage,InspectionJobPackageRules} from './inspectionJobMain.data'
import { InspectionTemplateMain,InspectionTemplateProcess,InspectionTemplateFeatures,InspectionTemplateRules } from '../../basicDataManage/inspectionTemplate/inspectionTemplate.data'
import * as InspectionJobMainApi from '@/api/qms/inspectionJob/inspectionJobMain'
@@ -63,6 +66,7 @@
import TableHead from '@/components/TableHead/src/TableHead.vue'
import AddForm from './addForm.vue'
import Detail from './detail.vue'
+ console.log(InspectionJobMain)
// 采购订单
defineOptions({ name: 'InspectionJobMain' })
diff --git a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
index 6ca9ed02d..2b3f7af27 100644
--- a/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
+++ b/src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
@@ -536,18 +536,27 @@ export const InspectionJobPackage = useCrudSchemas(reactive([
field: 'number',
sort: 'custom',
isSearch: true,
+ tableForm:{
+ disabled:true
+ }
},
{
label: '包装号',
field: 'packageCode',
sort: 'custom',
isSearch: true,
+ tableForm:{
+ disabled:true
+ }
},
{
label: '包装规格',
field: 'packageSpecificationCode',
sort: 'custom',
isSearch: true,
+ tableForm:{
+ disabled:true
+ }
},
{
label: '数量',
@@ -558,11 +567,23 @@ export const InspectionJobPackage = useCrudSchemas(reactive([
component: 'InputNumber',
value: 0
},
+ tableForm:{
+ disabled:true
+ }
},
{
label: '计量单位',
field: 'measuringUnit',
sort: 'custom',
isSearch: true,
+ tableForm:{
+ disabled:true
+ }
+ },
+ {
+ label: '采样数量',
+ field: 'sampleAmount',
+ sort: 'custom',
+ isSearch: true,
},
]))