Browse Source

修改bug。

master_hella_20240701
liuchen864 5 months ago
parent
commit
fb0b523bb1
  1. 2
      src/views/qms/inspection/inspectionRequest/index.vue
  2. 22
      src/views/qms/inspection/inspectionRequest/inspectionRequestMain.data.ts
  3. 35
      src/views/qms/samplingProcess/samplingProcess.data.ts

2
src/views/qms/inspection/inspectionRequest/index.vue

@ -61,7 +61,7 @@
<script setup lang="ts"> <script setup lang="ts">
import download from '@/utils/download' import download from '@/utils/download'
import { InspectionMain, InspectionMainRules,InspectionRequestPackage,InspectionRequestPackageRules } from './inspectionMain.data' import { InspectionMain, InspectionMainRules,InspectionRequestPackage,InspectionRequestPackageRules } from './inspectionRequestMain.data'
import * as InspectionMainApi from '@/api/qms/inspectionRequest' import * as InspectionMainApi from '@/api/qms/inspectionRequest'
import * as InspectionRequestPackageApi from '@/api/qms/inspectionRequest/InspectionRequestPackage' import * as InspectionRequestPackageApi from '@/api/qms/inspectionRequest/InspectionRequestPackage'
import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as defaultButtons from '@/utils/disposition/defaultButtons'

22
src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts → src/views/qms/inspection/inspectionRequest/inspectionRequestMain.data.ts

@ -338,8 +338,26 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
} }
}, }, {
{ label: '检验水平',
field: 'inspectionLevel',
sort: 'custom',
dictType: DICT_TYPE.INSPECTION_LEVEL,
dictClass: 'string',
table: {
width: 150
},
isSearch: true,
}, {
label: 'aql',
field: 'aql',
sort: 'custom',
dictType: DICT_TYPE.BASIC_AQL,
dictClass: 'string',
table: {
width: 150
}
}, {
label: '操作', label: '操作',
field: 'action', field: 'action',
isForm: false, isForm: false,

35
src/views/qms/samplingProcess/samplingProcess.data.ts

@ -29,10 +29,7 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
label: '描述', label: '描述',
field: 'description', field: 'description',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true
table: {
width: 175
}
}, },
{ {
label: '取样类型', label: '取样类型',
@ -43,31 +40,22 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true, isSearch: true,
form: { form: {
component: 'Select' component: 'Select'
},
table: {
width: 140
} }
}, },
{ {
label: '评估模式', label: '评估模式',
field: 'evaluationMode', field: 'evaluationMode',
sort: 'custom', sort: 'custom',
dictType: DICT_TYPE.EVALUATION_MODE, dictType: DICT_TYPE.EVALUATION_MODE,
dictClass: 'string', // 默认都是字符串类型其他暂不考虑 dictClass: 'string', // 默认都是字符串类型其他暂不考虑
form: { form: {
component: 'Select' component: 'Select'
}, }
table: {
width: 140
}
}, },
{ {
label: '样品份数', label: '样品份数',
field: 'sampleQty', field: 'sampleQty',
sort: 'custom', sort: 'custom'
table: {
width: 140
}
}, },
{ {
label: '采样方案编码', label: '采样方案编码',
@ -82,9 +70,6 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
valueField: 'code' valueField: 'code'
}, },
} }
},
table: {
width: 175
} }
}, },
{ {
@ -104,9 +89,6 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
dateFormat: 'YYYY-MM-DD HH:mm:ss', dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x', valueFormat: 'x',
} }
},
table: {
width: 175
} }
}, },
{ {
@ -122,9 +104,6 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
inactiveValue: 'FALSE', inactiveValue: 'FALSE',
activeValue: 'TRUE' activeValue: 'TRUE'
} }
},
table: {
width: 110
} }
}, },
{ {

Loading…
Cancel
Save