Skip to content

W
weiqiao-vue
Commit c20eee00 by 张恒
Options

feat(jcsj): 完善cjx模块数据模型和界面配置 

- 新增qualityCategoryId字段到CjxModel接口定义
- 添加MesCollectionItemModel接口定义，包含完整的采集项目字段
- 更新搜索表单将编码标签改为编号，并调整默认值为undefined
- 配置新增质量分类字段的选择组件并设置多选模式
- 调整表格列配置，修改编码列为编号并使用自动生成码组件
- 添加采集内容列的表格显示配置
- 重新排列标准值、项目类别等字段的显示顺序
- 更新表单配置中的字段组件类型和属性设置
- 修改工作流权限配置中字段名称和禁用状态
parent a9c25ed3
Showing with 92 additions and 94 deletions
xjrsoft-vue3/src/api/jcsj/cjx/model/CjxModel.ts
...@@ -9,6 +9,8 @@ export interface MesCollectionItemPageParams extends BasicPageParams { ...@@ -9,6 +9,8 @@ export interface MesCollectionItemPageParams extends BasicPageParams {
name: string; name: string;
contentType: string; contentType: string;
qualityCategoryId: string;
} }
/** /**
...@@ -21,14 +23,77 @@ export interface MesCollectionItemPageModel { ...@@ -21,14 +23,77 @@ export interface MesCollectionItemPageModel {
name: string; name: string;
contentType: string;
dataType: 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分页返回值结构 * @description: MesCollectionItem分页返回值结构
......
xjrsoft-vue3/src/views/jcsj/cjx/components/CjxModal.vue
...@@ -135,3 +135,4 @@ ...@@ -135,3 +135,4 @@
</script> </script>
xjrsoft-vue3/src/views/jcsj/cjx/components/Form.vue
...@@ -222,3 +222,4 @@ ...@@ -222,3 +222,4 @@
}); });
</script> </script>
xjrsoft-vue3/src/views/jcsj/cjx/components/workflowPermission.ts
...@@ -3,32 +3,15 @@ export const permissionList = [ ...@@ -3,32 +3,15 @@ export const permissionList = [
required: false, required: false,
view: true, view: true,
edit: false, edit: false,
disabled: false, disabled: true,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '编码', fieldName: '编号',
fieldId: 'code', fieldId: 'code',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'auto-code',
key: '374ebba8374d4a47929c665aeee41a1d', key: '63358dcd4fc24817b7ed628c1628b768',
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',
children: [], children: [],
options: {}, options: {},
}, },
...@@ -55,31 +38,15 @@ export const permissionList = [ ...@@ -55,31 +38,15 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '标准上限', fieldName: '标准值',
fieldId: 'upperValue', fieldId: 'standardValue',
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',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'select', type: 'input',
key: '70a4ecf40c644d6bbc46b936230275d0', key: '6bcc83ede1a446bd95291c6af00ab4af',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: true, required: true,
...@@ -121,32 +88,14 @@ export const permissionList = [ ...@@ -121,32 +88,14 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '标准值', fieldName: '标准上限',
fieldId: 'standardValue', fieldId: 'upperValue',
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',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'number', type: 'number',
key: '076321d9eb244b1c9f6e2f9ddc53091e', key: 'd1f5113e7e8a462d8b33908230ea7fc3',
children: [], children: [],
options: {}, options: {},
defaultValue: null,
}, },
{ {
required: false, required: false,
...@@ -166,21 +115,20 @@ export const permissionList = [ ...@@ -166,21 +115,20 @@ export const permissionList = [
defaultValue: 0, defaultValue: 0,
}, },
{ {
required: false, required: true,
view: true, view: true,
edit: true, edit: true,
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '关键检测', fieldName: '数据类型',
fieldId: 'keyItem', fieldId: 'dataType',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'switch', type: 'select',
key: '8ade72b8c93f4554869e2822a057d401', key: 'a70a1e8f07f342a5b92de0a9e8bb1777',
children: [], children: [],
options: {}, options: {},
defaultValue: 0,
}, },
{ {
required: false, required: false,
...@@ -189,29 +137,12 @@ export const permissionList = [ ...@@ -189,29 +137,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '破坏性质检', fieldName: '标准下限',
fieldId: 'destructive', fieldId: 'lowerValue',
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',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'select', type: 'number',
key: 'a70a1e8f07f342a5b92de0a9e8bb1777', key: '076321d9eb244b1c9f6e2f9ddc53091e',
children: [], children: [],
options: {}, options: {},
}, },
......
xjrsoft-vue3/src/views/jcsj/cjx/index.vue
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
//展示在列表内的按钮 //展示在列表内的按钮
const actionButtons = ref<string[]>(["view","edit","delete"]); const actionButtons = ref<string[]>(["view","edit","delete"]);
const buttonConfigs = computed(()=>{ 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); 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