Browse Source

检验方案检验模版

master_hella_20240701
songguoqiang 7 months ago
parent
commit
728cf8eca0
  1. 1
      src/views/qms/basicDataManage/inspectionPlan/addForm.vue
  2. 11
      src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts
  3. 30
      src/views/qms/basicDataManage/inspectionTemplate/addForm.vue
  4. 5
      src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts

1
src/views/qms/basicDataManage/inspectionPlan/addForm.vue

@ -213,7 +213,6 @@
</el-form> </el-form>
<el-tabs <el-tabs
v-model="editableTabsValue" v-model="editableTabsValue"
editable
class="demo-tabs" class="demo-tabs"
@edit="handleTabsEdit" @edit="handleTabsEdit"
type="border-card" type="border-card"

11
src/views/qms/basicDataManage/inspectionPlan/inspectionPlan.data.ts

@ -85,6 +85,15 @@ export const InspectionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
} }
}, },
{
label: '物料名称',
field: 'itemName',
sort: 'custom',
table: {
width: 150
},
isSearch:true,
},
{ {
label: '物料编码', label: '物料编码',
field: 'itemCode', field: 'itemCode',
@ -103,6 +112,8 @@ export const InspectionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
},{ },{
label: '检验类型编码', label: '检验类型编码',
field: 'testTypeCode', field: 'testTypeCode',
dictType: DICT_TYPE.INSPECTION_TYPE,
dictClass: 'string',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150

30
src/views/qms/basicDataManage/inspectionTemplate/addForm.vue

@ -27,14 +27,14 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
label="动态修改规则编码" label="动态修改规则"
prop="dynamicUpdateCode" prop="dynamicUpdateCode"
> >
<div style="display: flex; width: 100%"> <div style="display: flex; width: 100%">
<el-input <el-input
v-model="data.dynamicUpdateName" v-model="data.dynamicUpdateName"
disabled disabled
placeholder="请选择动态修改规则编码" placeholder="请选择动态修改规则"
/> />
<el-button <el-button
type="info" type="info"
@ -44,7 +44,7 @@
opensearchTable( opensearchTable(
'dynamicUpdateCode', 'dynamicUpdateCode',
null, null,
'动态修改规则编码', '动态修改规则',
DynamicRule.allSchemas, DynamicRule.allSchemas,
DynamicRuleApi.getDynamicRulePage, DynamicRuleApi.getDynamicRulePage,
[ [
@ -97,7 +97,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="检验方案模板编码"> <el-form-item label="检验方案模板">
<el-input <el-input
v-model="item.inspectionCode" v-model="item.inspectionCode"
placeholder="根据系统生成" placeholder="根据系统生成"
@ -116,7 +116,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="检验特性编码"> <el-form-item label="检验特性">
<el-input <el-input
v-model="item.inspectionCharCode" v-model="item.inspectionCharCode"
placeholder="根据系统生成" placeholder="根据系统生成"
@ -192,7 +192,7 @@
<el-input <el-input
v-model="item.inspectionCharacteristicsBaseVO.samplingProcessName" v-model="item.inspectionCharacteristicsBaseVO.samplingProcessName"
disabled disabled
placeholder="请选择采样过程编码" placeholder="请选择采样过程"
/> />
<el-button <el-button
type="info" type="info"
@ -202,7 +202,7 @@
opensearchTable( opensearchTable(
'samplingProcessCode', 'samplingProcessCode',
null, null,
'采样过程编码', '采样过程',
SamplingProcess.allSchemas, SamplingProcess.allSchemas,
SamplingProcessApi.getSamplingProcessPage, SamplingProcessApi.getSamplingProcessPage,
[ [
@ -349,7 +349,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
label="选择集编码" label="选择集"
prop="inspectionCharacteristicsBaseVO.quantifyQuantifyCode" prop="inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
v-if="item.inspectionCharacteristicsBaseVO.featureType == 1" v-if="item.inspectionCharacteristicsBaseVO.featureType == 1"
> >
@ -357,7 +357,7 @@
<el-input <el-input
v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyName" v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyName"
disabled disabled
placeholder="请选择选择集编码" placeholder="请选择选择集"
/> />
<el-button <el-button
type="info" type="info"
@ -367,7 +367,7 @@
opensearchTable( opensearchTable(
'quantifyQuantifyCode', 'quantifyQuantifyCode',
null, null,
'选择集编码', '选择集',
SelectedSet.allSchemas, SelectedSet.allSchemas,
SelectedSetApi.getSelectedSetPage, SelectedSetApi.getSelectedSetPage,
[ [
@ -493,17 +493,17 @@ if (props.basicFormWidth) {
const rules = ref({ const rules = ref({
description: [{ required: true, message: '请填写描述', trigger: 'blur' }], description: [{ required: true, message: '请填写描述', trigger: 'blur' }],
version: [{ required: true, message: '请填写版本', trigger: 'blur' }], version: [{ required: true, message: '请填写版本', trigger: 'blur' }],
inspectionCode: [{ required: true, message: '请选择检验方案模板编码', trigger: 'blur' }], inspectionCode: [{ required: true, message: '请选择检验方案模板', trigger: 'blur' }],
sequenceCode: [{ required: true, message: '请填写顺序号', trigger: 'blur' }], sequenceCode: [{ required: true, message: '请填写顺序号', trigger: 'blur' }],
inspectionCharCode: [{ required: true, message: '请选择检验特性编码', trigger: 'blur' }], inspectionCharCode: [{ required: true, message: '请选择检验特性', trigger: 'blur' }],
'inspectionCharacteristicsBaseVO.description': [ 'inspectionCharacteristicsBaseVO.description': [
{ required: true, message: '请填写描述', trigger: ['blur', 'change'] } { required: true, message: '请填写描述', trigger: ['blur', 'change'] }
], ],
'inspectionCharacteristicsBaseVO.inspectionMethodCode': [ 'inspectionCharacteristicsBaseVO.inspectionMethodCode': [
{ required: true, message: '请选择检验方法编码', trigger: 'blur' } { required: true, message: '请选择检验方法', trigger: 'blur' }
], ],
dynamicUpdateCode: [ dynamicUpdateCode: [
{ required: true, message: '请选择动态修改规则编码', trigger: ['blur', 'change'] } { required: true, message: '请选择动态修改规则', trigger: ['blur', 'change'] }
], ],
'inspectionCharacteristicsBaseVO.samplingProcessCode': [ 'inspectionCharacteristicsBaseVO.samplingProcessCode': [
{ required: true, message: '请选择采样过程', trigger: ['blur', 'change'] } { required: true, message: '请选择采样过程', trigger: ['blur', 'change'] }
@ -530,7 +530,7 @@ const rules = ref({
{ required: true, message: '请输入小数位', trigger: 'blur' } { required: true, message: '请输入小数位', trigger: 'blur' }
], ],
'inspectionCharacteristicsBaseVO.quantifyQuantifyCode': [ 'inspectionCharacteristicsBaseVO.quantifyQuantifyCode': [
{ required: true, message: '请输入选择集编码', trigger: 'blur' } { required: true, message: '请输入选择集', trigger: 'blur' }
] ]
}) })
/** 打开弹窗 */ /** 打开弹窗 */

5
src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts

@ -86,6 +86,11 @@ export const InspectionTemplateMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'description', field: 'description',
sort: 'custom', sort: 'custom',
},{ },{
label: '动态修改规则',
field: 'dynamicUpdateName',
sort: 'custom',
},
,{
label: '版本', label: '版本',
field: 'version', field: 'version',
sort: 'custom', sort: 'custom',

Loading…
Cancel
Save