Browse Source

HL-6070检验方案,相关页面(包括新增/修改/查询),前端隐藏【每份样品数】,传给后端默认为1

hella_online_20240924
yufei_wang 2 months ago
parent
commit
bd6e4084c4
  1. 4
      src/views/qms/inspectionJob/addForm.vue
  2. 16
      src/views/qms/inspectionScheme/addForm.vue
  3. 16
      src/views/qms/inspectionScheme/inspectionScheme.data.ts

4
src/views/qms/inspectionJob/addForm.vue

@ -184,7 +184,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item <el-form-item
label="每份样品量" label="每份样品量"
prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize" prop="inspectionJobCharacteristicsUpdateReqVO.samplePieceSize"
@ -199,7 +199,7 @@
/> />
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
label="是否允许修改特征值" label="是否允许修改特征值"

16
src/views/qms/inspectionScheme/addForm.vue

@ -209,7 +209,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12"> <el-col :span="12">
<el-form-item label="每份样品量" prop="samplePieceSize"> <el-form-item label="每份样品量" prop="samplePieceSize">
<el-input <el-input
v-model="data.samplePieceSize" v-model="data.samplePieceSize"
@ -217,7 +217,7 @@
:disabled="isSamplePieceSizeDisabled" :disabled="isSamplePieceSizeDisabled"
/> />
</el-form-item> </el-form-item>
</el-col> --> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="生效时间" prop="effectiveDate"> <el-form-item label="生效时间" prop="effectiveDate">
<el-date-picker <el-date-picker
@ -802,7 +802,7 @@ const data = ref({
available: 'TRUE', available: 'TRUE',
dynamicUpdateCode: '', dynamicUpdateCode: '',
description: '', description: '',
samplePieceSize: 1, samplePieceSize: '',
uom: '', uom: '',
process: [] process: []
}) })
@ -828,10 +828,10 @@ const rules = ref({
// splitRule: [{ required: true, message: '', trigger: ['blur', 'change'] }], // splitRule: [{ required: true, message: '', trigger: ['blur', 'change'] }],
aql: [{ required: true, message: '请选择aql', trigger: ['blur', 'change'] }], aql: [{ required: true, message: '请选择aql', trigger: ['blur', 'change'] }],
inspectionLevel: [{ required: true, message: '请选择检验水平', trigger: ['blur', 'change'] }], inspectionLevel: [{ required: true, message: '请选择检验水平', trigger: ['blur', 'change'] }],
// samplePieceSize: [ samplePieceSize: [
// { required: true, message: '', trigger: ['blur', 'change'] }, { required: true, message: '请输入每份样品量', trigger: ['blur', 'change'] },
// { validator: validateTwoNum, message: '2', trigger: 'blur' } { validator: validateTwoNum, message: '小数点后最多2位', trigger: 'blur' }
// ], ],
effectiveDate: [{ required: true, message: '请选择生效时间', trigger: ['blur', 'change'] }], effectiveDate: [{ required: true, message: '请选择生效时间', trigger: ['blur', 'change'] }],
expirationDate: [{ required: true, message: '请选择失效时间', trigger: ['blur', 'change'] }], expirationDate: [{ required: true, message: '请选择失效时间', trigger: ['blur', 'change'] }],
@ -1017,7 +1017,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
available: 'TRUE', available: 'TRUE',
dynamicUpdateCode: '', dynamicUpdateCode: '',
description: '', description: '',
samplePieceSize: 1, samplePieceSize: '',
uom: '', uom: '',
process: [] process: []
} }

16
src/views/qms/inspectionScheme/inspectionScheme.data.ts

@ -107,14 +107,14 @@ export const InspectionSchemeMain = useCrudSchemas(
width: 175 width: 175
} }
}, },
// { {
// label: '每份样品量', label: '每份样品量',
// field: 'samplePieceSize', field: 'samplePieceSize',
// sort: 'custom', sort: 'custom',
// table: { table: {
// width: 140 width: 140
// } }
// }, },
{ {
label: '生效时间', label: '生效时间',

Loading…
Cancel
Save