-
-
-
- {{ titleValueRef }} {{ titleNameRef }}
-
-
-
-
-
-
-
-
- 检验工序
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 检验特性
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 检验工序
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 检验特性
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -108,79 +169,26 @@ import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
defineOptions({ name: 'Detail' })
-const editableTabsValue = ref('1')
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const updateKey = ref(0)
-
const props = defineProps({
- // 表单，列表 相关信息
- allSchemas: {
+ data: {
type: Object,
required: true,
default: null
- },
- // 明细列表相关信息
- detailAllSchemas: {
- type: Object,
- required: true,
- default: null
- },
- // 详情列表扩展操作按钮
- buttondataTable: {
- type: Array,
- required: false,
- default: ()=>{
- return []
- }
- },
-})
-const isShowDrawer = ref(false)
-const detailLoading = ref(false)
-const data = ref({
- code: '',
- itemCode: '',
- version: '',
- testTypeCode: '',
- programmeTemplateCode: '',
- splitRule: '',
- aql: '',
- inspectionLevel: '',
- effectiveDate: '',
- expirationDate: '',
- available: 'TRUE',
- subList: []
-})
-
-/** 打开弹窗 */
-const formRef = ref()
-const titleNameRef = ref()
-const titleValueRef = ref()
-const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => {
- titleNameRef.value = titleName
- titleValueRef.value = titleValue
-
- isShowDrawer.value = true
- if (row) {
- detailLoading.value = true
- try {
- data.value = row
- let list = []
- list = await InspectionJobDetailPageApi.getInspectionJobDetailList(row.id)
- list.forEach((item, index) => {
- editableTabsValue.value = index + 1
- item.name = index + 1
- })
- data.value.subList = list
- } finally {
- detailLoading.value = false
- }
}
-}
-defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗
-
+})
+console.log(props.data)
+const data = ref(props.data.data)
+const editableTabsValue = ref('1')
+onMounted(async () => {
+ let list = []
+ list = await InspectionJobDetailPageApi.getInspectionJobDetailList(data.value.id)
+ list.forEach((item, index) => {
+ editableTabsValue.value = index + 1
+ item.name = index + 1
+ })
+ data.value.subList = list
+})
diff --git a/src/views/qms/inspectionScheme/index.vue b/src/views/qms/inspectionScheme/index.vue
index bd233e050..723f7763e 100644
--- a/src/views/qms/inspectionScheme/index.vue
+++ b/src/views/qms/inspectionScheme/index.vue
@@ -32,9 +32,9 @@
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
-
-
- {{ row.reqCode }}
+
+
+ {{ row.code }}
@@ -50,13 +50,18 @@
+
+
+
+
+
+
+
{
/** 详情操作 */
const detailRef = ref()
const openDetail = (row: any, titleName: any, titleValue: any) => {
- detailRef.value.openDetail(row, titleName, titleValue, 'basicAgvLocationrelation')
+ detailRef.value.openDetail(row, titleName, titleValue, 'basicInspectionScheme')
}
/** 删除按钮操作 */
diff --git a/src/views/qms/inspectionScheme/inspectionScheme.data.ts b/src/views/qms/inspectionScheme/inspectionScheme.data.ts
index 07badf137..eb2c99142 100644
--- a/src/views/qms/inspectionScheme/inspectionScheme.data.ts
+++ b/src/views/qms/inspectionScheme/inspectionScheme.data.ts
@@ -45,25 +45,26 @@ export const InspectionSchemeMain = useCrudSchemas(
}
},
{
- label: '物料名称',
- field: 'itemName',
+ label: '物料编码',
+ field: 'itemCode',
sort: 'custom',
table: {
- width: 200
+ width: 150
},
isSearch: true
},
{
- label: '物料编码',
- field: 'itemCode',
+ label: '物料名称',
+ field: 'itemName',
sort: 'custom',
table: {
- width: 150
+ width: 200
},
isSearch: true
},
+
{
- label: '描述',
+ label: '方案描述',
field: 'description',
sort: 'custom',
table: {
@@ -79,7 +80,7 @@ export const InspectionSchemeMain = useCrudSchemas(
}
},
{
- label: '检验类型编码',
+ label: '检验类型',
field: 'inspectionType',
dictType: DICT_TYPE.INSPECTION_TYPE,
dictClass: 'string',
@@ -97,37 +98,15 @@ export const InspectionSchemeMain = useCrudSchemas(
width: 175
}
},
+
{
- label: '拆分规则',
- field: 'splitRule',
+ label: '动态修改规则',
+ field: 'dynamicUpdateCode',
sort: 'custom',
- dictType: DICT_TYPE.SPLIT_RULES,
- dictClass: 'string', // 默认都是字符串类型其他暂不考虑
table: {
width: 175
}
},
- {
- label: 'aql',
- field: 'aql',
- sort: 'custom',
- dictType: DICT_TYPE.BASIC_AQL,
- dictClass: 'string',
- table: {
- width: 150
- }
- },
- {
- label: '检验水平',
- field: 'inspectionLevel',
- sort: 'custom',
- dictType: DICT_TYPE.INSPECTION_LEVEL,
- dictClass: 'string',
- table: {
- width: 150
- },
- isSearch: true
- },
{
label: '每份样品量',
field: 'samplePieceSize',
@@ -136,6 +115,7 @@ export const InspectionSchemeMain = useCrudSchemas(
width: 140
}
},
+
{
label: '生效时间',
field: 'effectiveDate',
diff --git a/src/views/qms/inspectionTemplate/detail.vue b/src/views/qms/inspectionTemplate/detail.vue
new file mode 100644
index 000000000..509c20c43
--- /dev/null
+++ b/src/views/qms/inspectionTemplate/detail.vue
@@ -0,0 +1,423 @@
+
+
+
+
+ {{ element.description }}
+
+
+
+
+
+
检验工序
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
检验特性
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+