feat(cjx): 更新采集项管理功能

- 在CjxModel中添加dataType字段并调整字段顺序
- 新增MesCollectionScItOptionModel接口定义
- 添加选项子表单配置支持
- 集成数据类型下拉选择组件
- 实现选项名称和备注字段的表格展示
- 配置工作流权限中的子表单权限控制

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

@@ -6,11 +6,13 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
 export interface MesCollectionItemPageParams extends BasicPageParams {
   code: string;
 
-  name: string;
-
   contentType: string;
 
+  name: string;
+
   qualityCategoryId: string;
+
+  dataType: string;
 }
 
 /**
@@ -27,8 +29,6 @@ export interface MesCollectionItemPageModel {
 
   dataType: string;
 
-  standardValue: string;
-
   qualityCategoryId: string;
 }
 
@@ -93,6 +93,33 @@ export interface MesCollectionItemModel {
   dt: string;
 
   bb: string;
+
+  mesCollectionScItOptionList?: MesCollectionScItOptionModel;
+}
+
+/**
+ * @description: MesCollectionScItOption表类型
+ */
+export interface MesCollectionScItOptionModel {
+  id: string;
+
+  code: string;
+
+  name: string;
+
+  stemId: string;
+
+  note: string;
+
+  deleteMark: string;
+
+  createDate: string;
+
+  createUserId: string;
+
+  modifyDate: string;
+
+  modifyUserId: string;
 }
 
 /**

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

@@ -9,12 +9,6 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    field: 'name',
-    label: '名称',
-    defaultValue: undefined,
-    component: 'Input',
-  },
-  {
     field: 'contentType',
     label: '采集内容',
     defaultValue: undefined,
@@ -30,6 +24,12 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
+    field: 'name',
+    label: '名称',
+    defaultValue: undefined,
+    component: 'Input',
+  },
+  {
     field: 'qualityCategoryId',
     label: '项目类别',
     defaultValue: undefined,
@@ -44,6 +44,21 @@ export const searchFormSchema: FormSchema[] = [
       getPopupContainer: () => document.body,
     },
   },
+  {
+    field: 'dataType',
+    label: '数据类型',
+    defaultValue: undefined,
+    component: 'XjrSelect',
+    componentProps: {
+      datasourceType: 'dic',
+      params: { itemId: '2004076331787718658' },
+      labelField: 'name',
+      valueField: 'value',
+      mode: 'multiple',
+      showSearch: true,
+      getPopupContainer: () => document.body,
+    },
+  },
 ];
 
 export const columns: BasicColumn[] = [
@@ -101,19 +116,6 @@ export const columns: BasicColumn[] = [
 
   {
     resizable: true,
-    dataIndex: 'standardValue',
-    title: '标准值',
-    componentType: 'input',
-
-    fixed: false,
-    sorter: true,
-
-    styleConfig: undefined,
-    listStyle: '',
-  },
-
-  {
-    resizable: true,
     dataIndex: 'qualityCategoryId',
     title: '项目类别',
     componentType: 'select',
@@ -444,7 +446,7 @@ export const formProps: FormProps = {
               componentProps: {
                 width: '100%',
                 span: 7,
-                placeholder: '请选择下拉选择数据类型',
+                placeholder: '',
                 showLabel: true,
                 showSearch: false,
                 isMultiple: false,
@@ -548,6 +550,166 @@ export const formProps: FormProps = {
         margin: '10px',
       },
     },
+    {
+      key: '0b0cc0ebc7c0471b85de8d6894339d09',
+      field: '',
+      label: '',
+      type: 'tab',
+      colProps: { span: 24 },
+      component: 'Tab',
+      children: [
+        {
+          span: 24,
+          name: '选项',
+          prefix: '',
+          suffix: '',
+          activeColor: '#1c8dff',
+          folderId: '',
+          imageUrl: '',
+          conFolderId: '',
+          conImageUrl: '',
+          list: [
+            {
+              key: 'df08e26c0e8a40c6bb78510f7091d068',
+              label: '',
+              field: 'mesCollectionScItOptionList',
+              type: 'form',
+              component: 'SubForm',
+              required: true,
+              colProps: { span: 24 },
+              componentProps: {
+                mainKey: 'mesCollectionScItOptionList',
+                columns: [
+                  {
+                    key: '56b0f6cb30cd421286fe2c0bb2bb729e',
+                    title: '选项名称',
+                    dataIndex: 'name',
+                    componentType: 'Input',
+                    defaultValue: '',
+                    componentProps: {
+                      width: '100%',
+                      span: '',
+                      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: '提示文本' },
+                    },
+                  },
+                  {
+                    key: '7cccbcf52f1c45b3916221a20f593586',
+                    title: '备注',
+                    dataIndex: 'note',
+                    componentType: 'Input',
+                    defaultValue: '',
+                    componentProps: {
+                      width: '100%',
+                      span: '',
+                      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: '提示文本' },
+                    },
+                  },
+                  { title: '操作', key: 'action', fixed: 'right', width: '50px' },
+                ],
+                span: '24',
+                preloadType: 'api',
+                apiConfig: {},
+                itemId: '',
+                dicOptions: [],
+                useSelectButton: false,
+                buttonName: '选择数据',
+                showLabel: true,
+                showComponentBorder: true,
+                showBorder: false,
+                backgroundStyle: {
+                  isShow: false,
+                  bgColor: '#ffffff',
+                  bgImgUrl: '',
+                  fontColor: '',
+                  borderColor: '',
+                },
+                theadStyle: {
+                  isShow: false,
+                  fontSize: 14,
+                  fontColor: '#000000',
+                  bgType: 'color',
+                  gradientDegree: '',
+                  gradientColors: '',
+                  bgImageUrl: '',
+                  bgColor: '',
+                  bgRepeat: 'no-repeat',
+                },
+                tbodyStyle: {
+                  isShow: false,
+                  fontSize: 14,
+                  fontColor: '#000000',
+                  bgType: 'color',
+                  gradientDegree: '',
+                  gradientColors: '',
+                  bgImageUrl: '',
+                  bgColor: '',
+                  bgRepeat: 'no-repeat',
+                },
+                bordercolor: '#f0f0f0',
+                bordershowtype: [true, true, true, true],
+                borderwidth: 1,
+                showIndex: true,
+                isShow: true,
+                multipleHeads: [],
+                buttonList: [],
+                topButtonList: [],
+                isExport: false,
+                isImport: false,
+                isDeleteSelected: false,
+                isListView: false,
+                viewList: [],
+                isShowAdd: true,
+                isShowDelete: true,
+                hasCheckedCol: false,
+                checkedColType: 'checkbox',
+                pageSize: 10,
+                events: {},
+                showPagenation: true,
+              },
+            },
+          ],
+        },
+      ],
+      componentProps: { tabPosition: 'top', size: 'default', type: 'line', isShow: true },
+    },
   ],
   showActionButtonGroup: false,
   buttonLocation: 'center',

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

@@ -163,4 +163,49 @@ export const permissionList = [
     options: {},
     defaultValue: '',
   },
+  {
+    required: true,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSubTable: true,
+    showChildren: false,
+    tableName: 'mesCollectionScItOptionList',
+    fieldName: '',
+    fieldId: 'mesCollectionScItOptionList',
+    type: 'form',
+    key: 'df08e26c0e8a40c6bb78510f7091d068',
+    children: [
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesCollectionScItOptionList',
+        fieldName: '选项名称',
+        fieldId: 'name',
+        type: 'Input',
+        key: '56b0f6cb30cd421286fe2c0bb2bb729e',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesCollectionScItOptionList',
+        fieldName: '备注',
+        fieldId: 'note',
+        type: 'Input',
+        key: '7cccbcf52f1c45b3916221a20f593586',
+        children: [],
+      },
+    ],
+  },
 ];