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

- 新增qualityCategoryId字段到CjxModel接口定义
- 添加MesCollectionItemModel接口定义，包含完整的采集项目字段
- 更新搜索表单将编码标签改为编号，并调整默认值为undefined
- 配置新增质量分类字段的选择组件并设置多选模式
- 调整表格列配置，修改编码列为编号并使用自动生成码组件
- 添加采集内容列的表格显示配置
- 重新排列标准值、项目类别等字段的显示顺序
- 更新表单配置中的字段组件类型和属性设置
- 修改工作流权限配置中字段名称和禁用状态

xjrsoft-vue3/src/api/jcsj/cjx/model/CjxModel.ts

@@ -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分页返回值结构

xjrsoft-vue3/src/views/jcsj/cjx/components/CjxModal.vue

@@ -135,3 +135,4 @@
   
 </script>
 
+  

xjrsoft-vue3/src/views/jcsj/cjx/components/Form.vue

@@ -222,3 +222,4 @@
   });
 </script>
 
+  

xjrsoft-vue3/src/views/jcsj/cjx/components/config.ts

@@ -4,7 +4,7 @@ import { BasicColumn } from '/@/components/Table';
 export const searchFormSchema: FormSchema[] = [
   {
     field: 'code',
-    label: '编码',
+    label: '编号',
     defaultValue: undefined,
     component: 'Input',
   },
@@ -17,7 +17,7 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'contentType',
     label: '采集内容',
-    defaultValue: '',
+    defaultValue: undefined,
     component: 'XjrSelect',
     componentProps: {
       datasourceType: 'dic',
@@ -29,20 +29,35 @@ export const searchFormSchema: FormSchema[] = [
       getPopupContainer: () => document.body,
     },
   },
+  {
+    field: 'qualityCategoryId',
+    label: '项目类别',
+    defaultValue: undefined,
+    component: 'XjrSelect',
+    componentProps: {
+      datasourceType: 'dic',
+      params: { itemId: '2004075808237916162' },
+      labelField: 'name',
+      valueField: 'value',
+      mode: 'multiple',
+      showSearch: true,
+      getPopupContainer: () => document.body,
+    },
+  },
 ];
 
 export const columns: BasicColumn[] = [
   {
     resizable: true,
     dataIndex: 'code',
-    title: '编码',
-    componentType: 'input',
+    title: '编号',
+    componentType: 'auto-code',
 
     fixed: false,
     sorter: true,
 
     styleConfig: undefined,
-    listStyle: '',
+    listStyle: undefined,
   },
 
   {
@@ -60,6 +75,19 @@ export const columns: BasicColumn[] = [
 
   {
     resizable: true,
+    dataIndex: 'contentType',
+    title: '采集内容',
+    componentType: 'select',
+
+    fixed: false,
+    sorter: true,
+
+    styleConfig: undefined,
+    listStyle: undefined,
+  },
+
+  {
+    resizable: true,
     dataIndex: 'dataType',
     title: '数据类型',
     componentType: 'select',
@@ -73,21 +101,21 @@ export const columns: BasicColumn[] = [
 
   {
     resizable: true,
-    dataIndex: 'note',
-    title: '备注',
-    componentType: 'textarea',
+    dataIndex: 'standardValue',
+    title: '标准值',
+    componentType: 'input',
 
     fixed: false,
     sorter: true,
 
     styleConfig: undefined,
-    listStyle: undefined,
+    listStyle: '',
   },
 
   {
     resizable: true,
-    dataIndex: 'contentType',
-    title: '采集内容',
+    dataIndex: 'qualityCategoryId',
+    title: '项目类别',
     componentType: 'select',
 
     fixed: false,
@@ -180,77 +208,25 @@ export const formProps: FormProps = {
           span: 8,
           list: [
             {
-              key: '374ebba8374d4a47929c665aeee41a1d',
+              key: '63358dcd4fc24817b7ed628c1628b768',
               field: 'code',
-              label: '编码',
-              type: 'input',
-              component: 'Input',
+              label: '编号',
+              type: 'auto-code',
+              component: 'AutoCodeRule',
               colProps: { span: 24 },
-              defaultValue: '',
               componentProps: {
                 width: '100%',
                 span: 7,
-                defaultValue: '',
-                placeholder: '自动生成',
-                maxlength: null,
+                placeholder: '',
                 prefix: '',
                 suffix: '',
                 addonBefore: '',
                 addonAfter: '',
-                disabled: true,
-                allowClear: false,
                 showLabel: true,
+                autoCodeRule: 'CJX',
                 required: false,
-                rules: [],
-                events: {},
-                listStyle: '',
-                isSave: false,
-                isShow: true,
-                scan: false,
-                bordered: true,
-                isShowAi: false,
-                tooltipConfig: { visible: false, title: '提示文本' },
-                style: { width: '100%' },
-              },
-            },
-            {
-              key: '92ceaadac6b04ae9961feffd63fc52a5',
-              field: 'analysisMethod',
-              label: '分析方法',
-              type: 'select',
-              component: 'XjrSelect',
-              colProps: { span: 24 },
-              componentProps: {
-                width: '100%',
-                span: 7,
-                placeholder: '请选择下拉选择分析方法',
-                showLabel: true,
-                showSearch: false,
-                isMultiple: false,
-                clearable: false,
-                disabled: false,
-                staticOptions: [
-                  { key: 1, label: 'Option 1', value: 'Option 1' },
-                  { key: 2, label: 'Option 2', value: 'Option 2' },
-                  { key: 3, label: 'Option 3', value: 'Option 3' },
-                ],
-                defaultSelect: null,
-                datasourceType: 'dic',
-                params: { itemId: '2004075377524838401' },
-                labelField: 'name',
-                valueField: 'value',
-                apiConfig: {
-                  path: 'CodeGeneration/selection',
-                  method: 'GET',
-                  apiId: '93d735dcb7364a0f8102188ec4d77ac7',
-                },
-                dicOptions: [],
-                required: false,
-                rules: [],
-                events: {},
                 isShow: true,
                 tooltipConfig: { visible: false, title: '提示文本' },
-                itemId: '2004075377524838401',
                 style: { width: '100%' },
               },
             },
@@ -275,7 +251,6 @@ export const formProps: FormProps = {
                   { key: 2, label: 'Option 2', value: 'Option 2' },
                   { key: 3, label: 'Option 3', value: 'Option 3' },
                 ],
-                defaultSelect: null,
                 datasourceType: 'dic',
                 params: { itemId: '2004076110966001666' },
                 labelField: 'name',
@@ -296,71 +271,35 @@ export const formProps: FormProps = {
               },
             },
             {
-              key: 'd1f5113e7e8a462d8b33908230ea7fc3',
-              field: 'upperValue',
-              label: '标准上限',
-              type: 'number',
-              component: 'InputNumber',
+              key: '6bcc83ede1a446bd95291c6af00ab4af',
+              field: 'standardValue',
+              label: '标准值',
+              type: 'input',
+              component: 'Input',
               colProps: { span: 24 },
-              defaultValue: null,
+              defaultValue: '',
               componentProps: {
                 width: '100%',
                 span: 7,
-                defaultValue: null,
-                min: 0,
-                max: 100,
-                step: 0.01,
-                maxlength: null,
+                defaultValue: '',
+                placeholder: '',
+                prefix: '',
+                suffix: '',
+                addonBefore: '',
+                addonAfter: '',
                 disabled: false,
+                allowClear: false,
                 showLabel: true,
-                controls: true,
-                required: false,
-                subTotal: false,
-                isShow: true,
-                rules: [],
-                events: {},
-                tooltipConfig: { visible: false, title: '提示文本' },
-                style: { width: '100%' },
-              },
-            },
-            {
-              key: '70a4ecf40c644d6bbc46b936230275d0',
-              field: 'qualityMethodId',
-              label: '检验方法',
-              type: 'select',
-              component: 'XjrSelect',
-              colProps: { span: 24 },
-              componentProps: {
-                width: '100%',
-                span: 7,
-                placeholder: '请选择下拉选择检验方法',
-                showLabel: true,
-                showSearch: false,
-                isMultiple: false,
-                clearable: false,
-                disabled: false,
-                staticOptions: [
-                  { key: 1, label: 'Option 1', value: 'Option 1' },
-                  { key: 2, label: 'Option 2', value: 'Option 2' },
-                  { key: 3, label: 'Option 3', value: 'Option 3' },
-                ],
-                defaultSelect: null,
-                datasourceType: 'dic',
-                params: { itemId: '2004076670364520450' },
-                labelField: 'name',
-                valueField: 'value',
-                apiConfig: {
-                  path: 'CodeGeneration/selection',
-                  method: 'GET',
-                  apiId: '93d735dcb7364a0f8102188ec4d77ac7',
-                },
-                dicOptions: [],
                 required: false,
                 rules: [],
                 events: {},
+                listStyle: '',
+                isSave: false,
                 isShow: true,
+                scan: false,
+                bordered: true,
+                isShowAi: false,
                 tooltipConfig: { visible: false, title: '提示文本' },
-                itemId: '2004076670364520450',
                 style: { width: '100%' },
               },
             },
@@ -382,7 +321,6 @@ export const formProps: FormProps = {
                 span: 7,
                 defaultValue: '',
                 placeholder: '',
-                maxlength: null,
                 prefix: '',
                 suffix: '',
                 addonBefore: '',
@@ -424,7 +362,6 @@ export const formProps: FormProps = {
                   { key: 2, label: 'Option 2', value: 'Option 2' },
                   { key: 3, label: 'Option 3', value: 'Option 3' },
                 ],
-                defaultSelect: null,
                 datasourceType: 'dic',
                 params: { itemId: '2004075808237916162' },
                 labelField: 'name',
@@ -445,55 +382,18 @@ export const formProps: FormProps = {
               },
             },
             {
-              key: '6bcc83ede1a446bd95291c6af00ab4af',
-              field: 'standardValue',
-              label: '标准值',
-              type: 'input',
-              component: 'Input',
-              colProps: { span: 24 },
-              defaultValue: '',
-              componentProps: {
-                width: '100%',
-                span: 7,
-                defaultValue: '',
-                placeholder: '',
-                maxlength: null,
-                prefix: '',
-                suffix: '',
-                addonBefore: '',
-                addonAfter: '',
-                disabled: false,
-                allowClear: false,
-                showLabel: true,
-                required: false,
-                rules: [],
-                events: {},
-                listStyle: '',
-                isSave: false,
-                isShow: true,
-                scan: false,
-                bordered: true,
-                isShowAi: false,
-                tooltipConfig: { visible: false, title: '提示文本' },
-                style: { width: '100%' },
-              },
-            },
-            {
-              key: '076321d9eb244b1c9f6e2f9ddc53091e',
-              field: 'lowerValue',
-              label: '标准下限',
+              key: 'd1f5113e7e8a462d8b33908230ea7fc3',
+              field: 'upperValue',
+              label: '标准上限',
               type: 'number',
               component: 'InputNumber',
               colProps: { span: 24 },
-              defaultValue: null,
               componentProps: {
                 width: '100%',
                 span: 7,
-                defaultValue: null,
                 min: 0,
                 max: 100,
                 step: 0.01,
-                maxlength: null,
                 disabled: false,
                 showLabel: true,
                 controls: true,
@@ -535,52 +435,6 @@ export const formProps: FormProps = {
               },
             },
             {
-              key: '8ade72b8c93f4554869e2822a057d401',
-              field: 'keyItem',
-              label: '关键检测',
-              type: 'switch',
-              component: 'Switch',
-              colProps: { span: 24 },
-              defaultValue: 0,
-              componentProps: {
-                span: 7,
-                defaultValue: 0,
-                checkedChildren: '',
-                unCheckedChildren: '',
-                checkedColor: '#4da9ff',
-                unCheckedColor: '#6b6b6b',
-                showLabel: true,
-                disabled: false,
-                events: {},
-                isShow: true,
-                tooltipConfig: { visible: false, title: '提示文本' },
-                style: {},
-              },
-            },
-            {
-              key: '23a581bc95804803a0e73a66c97edab3',
-              field: 'destructive',
-              label: '破坏性质检',
-              type: 'switch',
-              component: 'Switch',
-              colProps: { span: 24 },
-              defaultValue: 0,
-              componentProps: {
-                span: 7,
-                defaultValue: 0,
-                checkedChildren: '',
-                unCheckedChildren: '',
-                checkedColor: '#4da9ff',
-                unCheckedColor: '#6b6b6b',
-                showLabel: true,
-                disabled: false,
-                events: {},
-                isShow: true,
-                tooltipConfig: { visible: false, title: '提示文本' },
-                style: {},
-              },
-            },
-            {
               key: 'a70a1e8f07f342a5b92de0a9e8bb1777',
               field: 'dataType',
               label: '数据类型',
@@ -601,7 +455,6 @@ export const formProps: FormProps = {
                   { key: 2, label: 'Option 2', value: 'Option 2' },
                   { key: 3, label: 'Option 3', value: 'Option 3' },
                 ],
-                defaultSelect: null,
                 datasourceType: 'dic',
                 params: { itemId: '2004076331787718658' },
                 labelField: 'name',
@@ -621,30 +474,33 @@ export const formProps: FormProps = {
                 style: { width: '100%' },
               },
             },
+            {
+              key: '076321d9eb244b1c9f6e2f9ddc53091e',
+              field: 'lowerValue',
+              label: '标准下限',
+              type: 'number',
+              component: 'InputNumber',
+              colProps: { span: 24 },
+              componentProps: {
+                width: '100%',
+                span: 7,
+                min: 0,
+                max: 100,
+                step: 0.01,
+                disabled: false,
+                showLabel: true,
+                controls: true,
+                required: false,
+                subTotal: false,
+                isShow: true,
+                rules: [],
+                events: {},
+                tooltipConfig: { visible: false, title: '提示文本' },
+                style: { width: '100%' },
+              },
+            },
           ],
         },
-      ],
-      componentProps: {
-        gutter: 16,
-        justify: 'start',
-        align: 'top',
-        isShow: true,
-        showBorder: false,
-        bordercolor: '#d9d9d9',
-        bordershowtype: [true, true, true, true],
-        borderwidth: 1,
-        padding: '10px',
-        margin: '10px',
-      },
-    },
-    {
-      key: '92d1871ca0d64b69ac370008fcd3be33',
-      field: '',
-      label: '',
-      type: 'grid',
-      colProps: { span: 24 },
-      component: 'Grid',
-      children: [
         {
           span: 24,
           list: [
@@ -661,7 +517,6 @@ export const formProps: FormProps = {
                 span: 7,
                 defaultValue: '',
                 placeholder: '请输入备注',
-                maxlength: null,
                 rows: 4,
                 autoSize: false,
                 showCount: false,

xjrsoft-vue3/src/views/jcsj/cjx/components/workflowPermission.ts

@@ -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: {},
   },

xjrsoft-vue3/src/views/jcsj/cjx/index.vue

@@ -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);
   })
 
@@ -382,4 +382,4 @@
   
   
   
-</style>
+</style>
\ No newline at end of file