feat(qclywbgjl): 添加炉次号、时间范围筛选和班组相关字段

- 在表单配置中新增炉次号字段（lch）
- 添加开始时间和结束时间范围选择器（kssj、jssj）
- 在表格列配置中增加报工人（bgr）和班次（bc）字段
- 更新模型文件中的字段定义，调整字段顺序
- 在工作流权限配置中将备注字段改为班次选择框
- 恢复备注字段的独立配置并调整其位置
- 配置时间范围组件映射关系到查询参数中

xjrsoft-vue3/src/api/scgl/qclywbgjl/model/QclywbgjlModel.ts

@@ -16,9 +16,13 @@ export interface MesQclbgRecordPageParams extends BasicPageParams {
 
   ywzz: string;
 
+  lch: string;
+
   lx: string;
 
-  lch: string;
+  kssj: string;
+
+  jssj: string;
 }
 
 /**
@@ -44,6 +48,10 @@ export interface MesQclbgRecordPageModel {
   jssj: string;
 
   ywzz: string;
+
+  bgr: string;
+
+  bc: string;
 }
 
 /**
@@ -114,6 +122,8 @@ export interface MesQclbgRecordModel {
 
   p10: string;
 
+  bc: string;
+
   mesQclbgRecordMaterialList?: MesQclbgRecordMaterialModel;
 }
 

xjrsoft-vue3/src/views/scgl/qclywbgjl/components/config.ts

@@ -98,6 +98,12 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
+    field: 'lch',
+    label: '炉次号',
+    defaultValue: undefined,
+    component: 'Input',
+  },
+  {
     field: 'lx',
     label: '类型',
     defaultValue: undefined,
@@ -113,10 +119,27 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    field: 'lch',
-    label: '炉次号',
-    defaultValue: '',
-    component: 'Input',
+    field: 'kssj',
+    label: '开始时间',
+    defaultValue: undefined,
+    component: 'RangePicker',
+    componentProps: {
+      format: 'YYYY-MM-DD HH:mm:ss',
+      style: { width: '100%' },
+      getPopupContainer: () => document.body,
+    },
+  },
+
+  {
+    field: 'jssj',
+    label: '结束时间',
+    defaultValue: undefined,
+    component: 'RangePicker',
+    componentProps: {
+      format: 'YYYY-MM-DD HH:mm:ss',
+      style: { width: '100%' },
+      getPopupContainer: () => document.body,
+    },
   },
 ];
 
@@ -237,6 +260,32 @@ export const columns: BasicColumn[] = [
     styleConfig: undefined,
     listStyle: undefined,
   },
+
+  {
+    resizable: true,
+    dataIndex: 'bgr',
+    title: '报工人',
+    componentType: 'user',
+
+    fixed: false,
+    sorter: true,
+
+    styleConfig: undefined,
+    listStyle: undefined,
+  },
+
+  {
+    resizable: true,
+    dataIndex: 'bc',
+    title: '班次',
+    componentType: 'select',
+
+    fixed: false,
+    sorter: true,
+
+    styleConfig: undefined,
+    listStyle: undefined,
+  },
 ];
 //表头合并配置
 export const headerMergingData = [];
@@ -422,30 +471,49 @@ export const formProps: FormProps = {
               },
             },
             {
-              key: '18903fa0d3954b97926972e785f3f036',
-              field: 'bz',
-              label: '备注',
-              type: 'textarea',
-              component: 'InputTextArea',
+              key: '86954d3fab3d4146834394228c16e64d',
+              field: 'bc',
+              label: '班次',
+              type: 'select',
+              component: 'XjrSelect',
               colProps: { span: 24 },
-              defaultValue: '',
               componentProps: {
                 width: '100%',
                 span: 7,
-                defaultValue: '',
-                placeholder: '请输入备注',
-                rows: 2,
-                autoSize: false,
-                showCount: false,
-                disabled: false,
+                placeholder: '请选择下拉选择',
                 showLabel: true,
-                allowClear: false,
+                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' },
+                ],
+                datasourceType: 'dic',
+                params: { itemId: '2021042614763266049' },
+                labelField: 'name',
+                valueField: 'value',
+                apiConfig: {
+                  path: '/jcxx/getProductList',
+                  method: 'GET',
+                  apiId: 'copy1766041321701d99854',
+                  apiParams: [
+                    { key: '1', title: 'Query Params', tableInfo: [] },
+                    { key: '2', title: 'Header', tableInfo: [] },
+                    { key: '3', title: 'Body' },
+                  ],
+                  script:
+                    'var sql="select id as value,cpmc as label from mes_base_product_info where delete_mark = 0";\r\nreturn db.select(sql);',
+                },
+                dicOptions: [],
                 required: false,
-                isShow: true,
-                isShowAi: false,
                 rules: [],
                 events: {},
+                isShow: true,
                 tooltipConfig: { visible: false, title: '提示文本' },
+                itemId: '2021042614763266049',
                 style: { width: '100%' },
               },
             },
@@ -626,6 +694,34 @@ export const formProps: FormProps = {
                 style: { width: '100%' },
               },
             },
+            {
+              key: '18903fa0d3954b97926972e785f3f036',
+              field: 'bz',
+              label: '备注',
+              type: 'textarea',
+              component: 'InputTextArea',
+              colProps: { span: 24 },
+              defaultValue: '',
+              componentProps: {
+                width: '100%',
+                span: 7,
+                defaultValue: '',
+                placeholder: '请输入备注',
+                rows: 2,
+                autoSize: false,
+                showCount: false,
+                disabled: false,
+                showLabel: true,
+                allowClear: false,
+                required: false,
+                isShow: true,
+                isShowAi: false,
+                rules: [],
+                events: {},
+                tooltipConfig: { visible: false, title: '提示文本' },
+                style: { width: '100%' },
+              },
+            },
           ],
         },
         {

xjrsoft-vue3/src/views/scgl/qclywbgjl/components/workflowPermission.ts

@@ -73,15 +73,14 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '备注',
-    fieldId: 'bz',
+    fieldName: '班次',
+    fieldId: 'bc',
     isSubTable: false,
     showChildren: true,
-    type: 'textarea',
-    key: '18903fa0d3954b97926972e785f3f036',
+    type: 'select',
+    key: '86954d3fab3d4146834394228c16e64d',
     children: [],
     options: {},
-    defaultValue: '',
   },
   {
     required: false,
@@ -155,6 +154,23 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
+    fieldName: '备注',
+    fieldId: 'bz',
+    isSubTable: false,
+    showChildren: true,
+    type: 'textarea',
+    key: '18903fa0d3954b97926972e785f3f036',
+    children: [],
+    options: {},
+    defaultValue: '',
+  },
+  {
+    required: false,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSaveTable: false,
+    tableName: '',
     fieldName: '类型',
     fieldId: 'lx',
     isSubTable: false,

xjrsoft-vue3/src/views/scgl/qclywbgjl/index.vue

@@ -176,7 +176,8 @@
     formConfig: {
       labelWidth: 100,
       schemas: searchFormSchema,
-      fieldMapToTime: [],
+      fieldMapToTime: [['kssj', ['kssjStart', 'kssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],
+['jssj', ['jssjStart', 'jssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],],
       showResetButton: false,
     },
      bordered:false,