Commit 549472fd by 张恒

feat(jcsj): 更新采集项管理功能的数据模型和界面配置

- 在 CjxModel.ts 中为 MesCollectionItemModel 接口新增多个字段包括
  qualityCategoryId、standardValue、upperValue、lowerValue 等
- 修改 config.ts 中的搜索表单和列配置,调整字段标签、组件类型和默认值设置
- 新增 qualityCategoryId 字段的下拉选择配置并修改相关组件属性
- 更新 workflowPermission.ts 中的工作流权限配置映射关系
- 调整表单组件的字段类型从 input 改为 auto-code 和其他合适类型
- 优化表格列的显示标题和组件类型配置以匹配新的数据结构
parent cd5542b0
......@@ -9,6 +9,8 @@ export interface MesCollectionItemPageParams extends BasicPageParams {
name: string;
contentType: string;
qualityCategoryId: string;
}
/**
......@@ -21,14 +23,77 @@ export interface MesCollectionItemPageModel {
name: string;
contentType: string;
dataType: string;
note: string;
standardValue: string;
contentType: string;
qualityCategoryId: string;
}
0;
/**
* @description: MesCollectionItem表类型
*/
export interface MesCollectionItemModel {
id: string;
code: string;
name: string;
required: string;
categoryId: string;
contentType: string;
dataType: string;
dictId: string;
relatedModelId: string;
relatedModelName: string;
relatedModelDomain: string;
standardValue: string;
upperValue: string;
lowerValue: string;
note: string;
companyId: string;
qualityCategoryId: string;
analysisMethod: string;
qualityMethodId: string;
destructive: string;
keyItem: string;
deleteMark: string;
createDate: string;
createUserId: string;
modifyDate: string;
modifyUserId: string;
sc: string;
dt: string;
bb: string;
}
/**
* @description: MesCollectionItem分页返回值结构
......
......@@ -135,3 +135,4 @@
</script>
\ No newline at end of file
......@@ -222,3 +222,4 @@
});
</script>
\ No newline at end of file
......@@ -3,32 +3,15 @@ export const permissionList = [
required: false,
view: true,
edit: false,
disabled: false,
disabled: true,
isSaveTable: false,
tableName: '',
fieldName: '编',
fieldName: '编',
fieldId: 'code',
isSubTable: false,
showChildren: true,
type: 'input',
key: '374ebba8374d4a47929c665aeee41a1d',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '分析方法',
fieldId: 'analysisMethod',
isSubTable: false,
showChildren: true,
type: 'select',
key: '92ceaadac6b04ae9961feffd63fc52a5',
type: 'auto-code',
key: '63358dcd4fc24817b7ed628c1628b768',
children: [],
options: {},
},
......@@ -55,31 +38,15 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '标准上限',
fieldId: 'upperValue',
isSubTable: false,
showChildren: true,
type: 'number',
key: 'd1f5113e7e8a462d8b33908230ea7fc3',
children: [],
options: {},
defaultValue: null,
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '检验方法',
fieldId: 'qualityMethodId',
fieldName: '标准值',
fieldId: 'standardValue',
isSubTable: false,
showChildren: true,
type: 'select',
key: '70a4ecf40c644d6bbc46b936230275d0',
type: 'input',
key: '6bcc83ede1a446bd95291c6af00ab4af',
children: [],
options: {},
defaultValue: '',
},
{
required: true,
......@@ -121,32 +88,14 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '标准值',
fieldId: 'standardValue',
isSubTable: false,
showChildren: true,
type: 'input',
key: '6bcc83ede1a446bd95291c6af00ab4af',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '标准下限',
fieldId: 'lowerValue',
fieldName: '标准上限',
fieldId: 'upperValue',
isSubTable: false,
showChildren: true,
type: 'number',
key: '076321d9eb244b1c9f6e2f9ddc53091e',
key: 'd1f5113e7e8a462d8b33908230ea7fc3',
children: [],
options: {},
defaultValue: null,
},
{
required: false,
......@@ -166,21 +115,20 @@ export const permissionList = [
defaultValue: 0,
},
{
required: false,
required: true,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '关键检测',
fieldId: 'keyItem',
fieldName: '数据类型',
fieldId: 'dataType',
isSubTable: false,
showChildren: true,
type: 'switch',
key: '8ade72b8c93f4554869e2822a057d401',
type: 'select',
key: 'a70a1e8f07f342a5b92de0a9e8bb1777',
children: [],
options: {},
defaultValue: 0,
},
{
required: false,
......@@ -189,29 +137,12 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '破坏性质检',
fieldId: 'destructive',
isSubTable: false,
showChildren: true,
type: 'switch',
key: '23a581bc95804803a0e73a66c97edab3',
children: [],
options: {},
defaultValue: 0,
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '数据类型',
fieldId: 'dataType',
fieldName: '标准下限',
fieldId: 'lowerValue',
isSubTable: false,
showChildren: true,
type: 'select',
key: 'a70a1e8f07f342a5b92de0a9e8bb1777',
type: 'number',
key: '076321d9eb244b1c9f6e2f9ddc53091e',
children: [],
options: {},
},
......
......@@ -133,7 +133,7 @@
//展示在列表内的按钮
const actionButtons = ref<string[]>(["view","edit","delete"]);
const buttonConfigs = computed(()=>{
const list = [{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isEnableLock":true},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true}]
const list = [{"buttonId":"2004078496413487104","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2004078496413487105","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2004078496413487106","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2004078496413487107","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
return filterButtonAuth(list);
})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment