feat(ckgl): 更新仓库管理模块的数据模型和界面配置

- 在CgdhModel中添加sysl字段用于记录剩余数量
- 在CgrkModel中添加cspc字段并分离规格型号为gg和xh两个独立字段
- 更新Cgdh组件配置，移除maxlength限制并添加批量报检功能
- 为Cgrk组件添加厂商批次字段及其对应的表格列和表单控件
- 将ScrKModel中的规格型号拆分为gg和xh字段并新增多个业务字段
- 在ScrK组件中实现标签页布局，分为物料清单和入库明细两个选项卡
- 新增MesWarehouseProductChangeModel接口用于管理入库变更数据

xjrsoft-vue3/src/api/ckgl/cgdh/model/CgdhModel.ts

@@ -125,6 +125,8 @@ export interface MesWarehouseArrivedInfoModel {
 
   sssl: string;
 
+  sysl: string;
+
   xqbm: string;
 
   cspc: string;

xjrsoft-vue3/src/api/ckgl/cgrk/model/CgrkModel.ts

@@ -15,6 +15,8 @@ export interface MesWarehouseInPageParams extends BasicPageParams {
   pch: string;
 
   ywzz: string;
+
+  cspc: string;
 }
 
 /**
@@ -37,6 +39,8 @@ export interface MesWarehouseInPageModel {
 
   pch: string;
 
+  cspc: string;
+
   ywzz: string;
 
   bz: string;
@@ -70,6 +74,8 @@ export interface MesWarehouseInModel {
 
   pch: string;
 
+  cspc: string;
+
   p5: string;
 
   p6: string;
@@ -109,10 +115,14 @@ export interface MesWarehouseInInfoModel {
 
   wlmc: string;
 
-  ggxh: string;
+  gg: string;
+
+  xh: string;
 
   dw: string;
 
+  cspc: string;
+
   pch: string;
 
   yssl: string;

xjrsoft-vue3/src/api/ckgl/scrk/model/ScrkModel.ts

@@ -100,7 +100,11 @@ export interface MesWarehouseProductModel {
 
   modifyUserId: string;
 
+  ccmxid: string;
+
   mesWarehouseProductInfoList?: MesWarehouseProductInfoModel;
+
+  mesWarehouseProductChangeList?: MesWarehouseProductChangeModel;
 }
 
 /**
@@ -125,8 +129,109 @@ export interface MesWarehouseProductInfoModel {
 
   hw: string;
 
+  ysjs: string;
+
   ssjs: string;
 
+  syjs: string;
+
+  bz: string;
+
+  scid: string;
+
+  fj: string;
+
+  p3: string;
+
+  p4: string;
+
+  p5: string;
+
+  p6: string;
+
+  p7: string;
+
+  p8: string;
+
+  p9: string;
+
+  p10: string;
+
+  p11: string;
+
+  p12: string;
+
+  p13: string;
+
+  p14: string;
+
+  p15: string;
+
+  p16: string;
+
+  p17: string;
+
+  p18: string;
+
+  p19: string;
+
+  p20: string;
+
+  p21: string;
+
+  p22: string;
+
+  p23: string;
+
+  p24: string;
+
+  p25: string;
+
+  p26: string;
+
+  p27: string;
+
+  p28: string;
+
+  p29: string;
+
+  p30: string;
+
+  createDate: string;
+
+  createUserId: string;
+
+  modifyDate: string;
+
+  modifyUserId: string;
+
+  rkdh: string;
+}
+
+/**
+ * @description: MesWarehouseProductChange表类型
+ */
+export interface MesWarehouseProductChangeModel {
+  id: string;
+
+  deleteMark: string;
+
+  wlid: string;
+
+  wlbm: string;
+
+  wlmc: string;
+
+  gg: string;
+
+  xh: string;
+
+  pch: string;
+
+  hw: string;
+
+  rksl: string;
+
   bz: string;
 
   scid: string;

xjrsoft-vue3/src/views/ckgl/cgdh/components/config.ts

@@ -564,7 +564,6 @@ export const formProps: FormProps = {
                 span: 7,
                 defaultValue: '',
                 placeholder: '请输入厂商批次',
-                maxlength: null,
                 prefix: '',
                 suffix: '',
                 addonBefore: '',
@@ -1007,6 +1006,33 @@ export const formProps: FormProps = {
             },
           },
           {
+            key: '3b7ca3cc16344d6787f1676dcd3a77b7',
+            title: '剩余数量',
+            dataIndex: 'sysl',
+            componentType: 'InputNumber',
+            defaultValue: '',
+            componentProps: {
+              width: '100%',
+              span: '',
+              defaultValue: '',
+              min: 0,
+              max: null,
+              step: 1,
+              maxlength: null,
+              disabled: false,
+              showLabel: true,
+              controls: true,
+              required: false,
+              subTotal: false,
+              isShow: true,
+              rules: [],
+              events: {},
+              placeholder: '请输入剩余数量',
+              tooltipConfig: { visible: false, title: '提示文本' },
+              listStyle: "return 'width:100%'",
+            },
+          },
+          {
             key: '9a27b6bf1d2445e796c474269ee23514',
             title: '需求部门',
             dataIndex: 'xqbm',
@@ -1048,7 +1074,6 @@ export const formProps: FormProps = {
               span: '',
               defaultValue: '',
               placeholder: '请输入厂商批次',
-              maxlength: null,
               prefix: '',
               suffix: '',
               addonBefore: '',
@@ -1240,16 +1265,7 @@ export const formProps: FormProps = {
             label: '批量报检',
             icon: 'ant-design:alert-outlined',
             style: 'primary',
-            event: [
-              {
-                key: '1',
-                type: 2,
-                operateType: 2,
-                operateConfig: {
-                  js: "if (formActionType.selectedRowsData && formActionType.selectedRowsData.length === 0) { formActionType.showMessage('请先勾选物料明细数据'); } else { const ids = formActionType.selectedRowsData.map(item => item.id); console.log('Extracted ids:', ids); formActionType.httpRequest({ requestUrl: '/ckgl/cgdh/quailty', requestType: 'put', params: ids, errorMessageMode: 'message' }).then(response => { console.log('Quality check response:', response); if (formActionType.showSuccessMessage) { formActionType.showSuccessMessage('报检处理成功！'); } else if (formActionType.message) { formActionType.message.success('报检处理成功！'); } else { formActionType.showMessage('报检处理成功！'); } if (formActionType.clearSelection) { formActionType.clearSelection(); } }).catch(error => { console.error('Quality check error:', error); formActionType.showMessage('批量报检失败，请重试！'); }); }"
-                }
-              }
-            ],
+            event: [],
             type: 1,
           },
         ],

xjrsoft-vue3/src/views/ckgl/cgdh/components/workflowPermission.ts

@@ -357,6 +357,21 @@ export const permissionList = [
         isSaveTable: false,
         showChildren: false,
         tableName: 'mesWarehouseArrivedInfoList',
+        fieldName: '剩余数量',
+        fieldId: 'sysl',
+        type: 'InputNumber',
+        key: '3b7ca3cc16344d6787f1676dcd3a77b7',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseArrivedInfoList',
         fieldName: '需求部门',
         fieldId: 'xqbm',
         type: 'Input',

xjrsoft-vue3/src/views/ckgl/cgrk/components/config.ts

@@ -62,6 +62,12 @@ export const searchFormSchema: FormSchema[] = [
       getPopupContainer: () => document.body,
     },
   },
+  {
+    field: 'cspc',
+    label: '厂商批次',
+    defaultValue: undefined,
+    component: 'Input',
+  },
 ];
 
 export const columns: BasicColumn[] = [
@@ -158,6 +164,19 @@ export const columns: BasicColumn[] = [
 
   {
     resizable: true,
+    dataIndex: 'cspc',
+    title: '厂商批次',
+    componentType: 'input',
+
+    fixed: false,
+    sorter: true,
+
+    styleConfig: undefined,
+    listStyle: '',
+  },
+
+  {
+    resizable: true,
     dataIndex: 'ywzz',
     title: '业务组织',
     componentType: 'select',
@@ -339,7 +358,7 @@ export const formProps: FormProps = {
                 showSearch: false,
                 isMultiple: false,
                 clearable: false,
-                disabled: false,
+                disabled: true,
                 staticOptions: [
                   { key: 1, label: 'Option 1', value: 'Option 1' },
                   { key: 2, label: 'Option 2', value: 'Option 2' },
@@ -361,6 +380,7 @@ export const formProps: FormProps = {
                 isShow: true,
                 tooltipConfig: { visible: false, title: '提示文本' },
                 itemId: '2010533622867509249',
+                defaultSelect: '入库',
                 style: { width: '100%' },
               },
             },
@@ -499,7 +519,7 @@ export const formProps: FormProps = {
                 addonBefore: '',
                 addonAfter: '',
                 showLabel: true,
-                autoCodeRule: 'cgrkpc',
+                autoCodeRule: 'pcbm',
                 required: false,
                 isShow: true,
                 tooltipConfig: { visible: false, title: '提示文本' },
@@ -584,6 +604,45 @@ export const formProps: FormProps = {
           ],
         },
         {
+          span: 8,
+          list: [
+            {
+              key: '37db1b3e3e8a4dc99591a09f41f50a04',
+              field: 'cspc',
+              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%' },
+              },
+            },
+          ],
+        },
+        {
           span: 24,
           list: [
             {
@@ -755,15 +814,46 @@ export const formProps: FormProps = {
                   },
                   {
                     key: '8face1e45e07429ea0acfb219e3ff194',
-                    title: '规格型号',
-                    dataIndex: 'ggxh',
+                    title: '规格',
+                    dataIndex: 'gg',
                     componentType: 'Input',
                     defaultValue: '',
                     componentProps: {
                       width: '100%',
                       span: '',
                       defaultValue: '',
-                      placeholder: '请输入规格型号',
+                      placeholder: '请输入规格',
+                      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: '39bb1d4caa9140abbdf113d6572796f4',
+                    title: '型号',
+                    dataIndex: 'xh',
+                    componentType: 'Input',
+                    defaultValue: '',
+                    componentProps: {
+                      width: '100%',
+                      span: '',
+                      defaultValue: '',
+                      placeholder: '请输入型号',
+                      maxlength: null,
                       prefix: '',
                       suffix: '',
                       addonBefore: '',
@@ -814,6 +904,37 @@ export const formProps: FormProps = {
                     },
                   },
                   {
+                    key: 'a3177210f3b44c3db75231dec93b018b',
+                    title: '厂商批次',
+                    dataIndex: 'cspc',
+                    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: 'b32a9b93b59a40eab7ba494960fc46b4',
                     title: '批次号',
                     dataIndex: 'pch',
@@ -824,7 +945,6 @@ export const formProps: FormProps = {
                       span: '',
                       defaultValue: '',
                       placeholder: '请输入批次号',
-                      maxlength: null,
                       prefix: '',
                       suffix: '',
                       addonBefore: '',

xjrsoft-vue3/src/views/ckgl/cgrk/components/workflowPermission.ts

@@ -35,7 +35,7 @@ export const permissionList = [
   {
     required: false,
     view: true,
-    edit: true,
+    edit: false,
     disabled: false,
     isSaveTable: false,
     tableName: '',
@@ -47,6 +47,7 @@ export const permissionList = [
     key: '1c43d86e91db4adfb5b16407d8641fe2',
     children: [],
     options: {},
+    defaultValue: '入库',
   },
   {
     required: false,
@@ -154,6 +155,23 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
+    fieldName: '厂商批次',
+    fieldId: 'cspc',
+    isSubTable: false,
+    showChildren: true,
+    type: 'input',
+    key: '37db1b3e3e8a4dc99591a09f41f50a04',
+    children: [],
+    options: {},
+    defaultValue: '',
+  },
+  {
+    required: false,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSaveTable: false,
+    tableName: '',
     fieldName: '备注',
     fieldId: 'bz',
     isSubTable: false,
@@ -231,8 +249,8 @@ export const permissionList = [
         isSaveTable: false,
         showChildren: false,
         tableName: 'mesWarehouseInInfoList',
-        fieldName: '规格型号',
-        fieldId: 'ggxh',
+        fieldName: '规格',
+        fieldId: 'gg',
         type: 'Input',
         key: '8face1e45e07429ea0acfb219e3ff194',
         children: [],
@@ -246,6 +264,21 @@ export const permissionList = [
         isSaveTable: false,
         showChildren: false,
         tableName: 'mesWarehouseInInfoList',
+        fieldName: '型号',
+        fieldId: 'xh',
+        type: 'Input',
+        key: '39bb1d4caa9140abbdf113d6572796f4',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseInInfoList',
         fieldName: '单位',
         fieldId: 'dw',
         type: 'Input',
@@ -261,6 +294,21 @@ export const permissionList = [
         isSaveTable: false,
         showChildren: false,
         tableName: 'mesWarehouseInInfoList',
+        fieldName: '厂商批次',
+        fieldId: 'cspc',
+        type: 'Input',
+        key: 'a3177210f3b44c3db75231dec93b018b',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseInInfoList',
         fieldName: '批次号',
         fieldId: 'pch',
         type: 'Input',

xjrsoft-vue3/src/views/ckgl/scrk/components/config.ts

@@ -755,312 +755,721 @@ export const formProps: FormProps = {
       },
     },
     {
-      key: '82fc7feecfa140368698bd80d6cae114',
+      key: 'c44cb32754d441b5ae7b4de916c0bedb',
+      field: '',
       label: '',
-      field: 'mesWarehouseProductInfoList',
-      type: 'form',
-      component: 'SubForm',
-      required: true,
+      type: 'tab',
       colProps: { span: 24 },
-      componentProps: {
-        mainKey: 'mesWarehouseProductInfoList',
-        columns: [
-          {
-            key: '67758677bce44720b4af09091d5590f3',
-            title: '物料编码',
-            dataIndex: 'wlbm',
-            componentType: 'Input',
-            defaultValue: '',
-            componentProps: {
-              width: '100%',
-              span: '',
-              defaultValue: '',
-              placeholder: '请输入物料编码',
-              prefix: '',
-              suffix: '',
-              addonBefore: '',
-              addonAfter: '',
-              disabled: false,
-              allowClear: false,
-              showLabel: true,
+      component: 'Tab',
+      children: [
+        {
+          span: 24,
+          name: '物料清单',
+          prefix: '',
+          suffix: '',
+          activeColor: '#1c8dff',
+          folderId: '',
+          imageUrl: '',
+          conFolderId: '',
+          conImageUrl: '',
+          list: [
+            {
+              key: '82fc7feecfa140368698bd80d6cae114',
+              label: '',
+              field: 'mesWarehouseProductInfoList',
+              type: 'form',
+              component: 'SubForm',
               required: true,
-              rules: [],
-              events: {},
-              listStyle: '',
-              isSave: false,
-              isShow: true,
-              scan: false,
-              bordered: true,
-              isShowAi: false,
-              tooltipConfig: { visible: false, title: '提示文本' },
-            },
-          },
-          {
-            key: '90eb56185b5c419b9f0d7d6179beed9b',
-            title: '物料名称',
-            dataIndex: 'wlmc',
-            componentType: 'Input',
-            defaultValue: '',
-            componentProps: {
-              width: '100%',
-              span: '',
-              defaultValue: '',
-              placeholder: '请输入物料名称',
-              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: 'e5b7433c899c4af095639be8726ede96',
-            title: '规格',
-            dataIndex: 'gg',
-            componentType: 'Input',
-            defaultValue: '',
-            componentProps: {
-              width: '100%',
-              span: '',
-              defaultValue: '',
-              placeholder: '请输入规格',
-              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: '3d33a3a9e46545c5ba831660038ebc88',
-            title: '型号',
-            dataIndex: 'xh',
-            componentType: 'Input',
-            defaultValue: '',
-            componentProps: {
-              width: '100%',
-              span: '',
-              defaultValue: '',
-              placeholder: '请输入型号',
-              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: '5fa9ca15c8b84592b93abbd7702d1306',
-            title: '实收件数',
-            dataIndex: 'ssjs',
-            componentType: 'InputNumber',
-            defaultValue: '',
-            componentProps: {
-              width: '100%',
-              span: '',
-              defaultValue: '',
-              min: 0,
-              step: 1,
-              disabled: false,
-              showLabel: true,
-              controls: true,
-              required: false,
-              subTotal: false,
-              isShow: true,
-              rules: [],
-              events: {},
-              placeholder: '请输入实收件数',
-              tooltipConfig: { visible: false, title: '提示文本' },
-              listStyle: "return 'width:100%'",
-            },
-          },
-          {
-            key: 'f4f6844ab6454be7af329f780e80447f',
-            title: '批次号',
-            dataIndex: 'pch',
-            componentType: 'Input',
-            defaultValue: '',
-            componentProps: {
-              width: '100%',
-              span: '',
-              defaultValue: '',
-              placeholder: '请输入批次号',
-              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: '5d9a11c345e24ff59f416012ae5fb4c1',
-            title: '货位',
-            dataIndex: 'hw',
-            componentType: 'Input',
-            defaultValue: '',
-            componentProps: {
-              width: '100%',
-              span: '',
-              defaultValue: '',
-              placeholder: '请输入货位',
-              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: 'b15dfaeae0884f338b4bfcd631d3e16e',
-            title: '备注',
-            dataIndex: 'bz',
-            componentType: 'Input',
-            defaultValue: '',
-            componentProps: {
-              width: '100%',
-              span: '',
-              defaultValue: '',
-              placeholder: '请输入备注',
-              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: '提示文本' },
+              colProps: { span: 24 },
+              componentProps: {
+                mainKey: 'mesWarehouseProductInfoList',
+                columns: [
+                  {
+                    key: '67758677bce44720b4af09091d5590f3',
+                    title: '物料编码',
+                    dataIndex: 'wlbm',
+                    componentType: 'Input',
+                    defaultValue: '',
+                    componentProps: {
+                      width: '100%',
+                      span: '',
+                      defaultValue: '',
+                      placeholder: '请输入物料编码',
+                      prefix: '',
+                      suffix: '',
+                      addonBefore: '',
+                      addonAfter: '',
+                      disabled: false,
+                      allowClear: false,
+                      showLabel: true,
+                      required: true,
+                      rules: [],
+                      events: {},
+                      listStyle: '',
+                      isSave: false,
+                      isShow: true,
+                      scan: false,
+                      bordered: true,
+                      isShowAi: false,
+                      tooltipConfig: { visible: false, title: '提示文本' },
+                    },
+                  },
+                  {
+                    key: '90eb56185b5c419b9f0d7d6179beed9b',
+                    title: '物料名称',
+                    dataIndex: 'wlmc',
+                    componentType: 'Input',
+                    defaultValue: '',
+                    componentProps: {
+                      width: '100%',
+                      span: '',
+                      defaultValue: '',
+                      placeholder: '请输入物料名称',
+                      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: 'e5b7433c899c4af095639be8726ede96',
+                    title: '规格',
+                    dataIndex: 'gg',
+                    componentType: 'Input',
+                    defaultValue: '',
+                    componentProps: {
+                      width: '100%',
+                      span: '',
+                      defaultValue: '',
+                      placeholder: '请输入规格',
+                      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: '3d33a3a9e46545c5ba831660038ebc88',
+                    title: '型号',
+                    dataIndex: 'xh',
+                    componentType: 'Input',
+                    defaultValue: '',
+                    componentProps: {
+                      width: '100%',
+                      span: '',
+                      defaultValue: '',
+                      placeholder: '请输入型号',
+                      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: '39886d58fa664d0990b761fa8148abf0',
+                    title: '应收件数',
+                    dataIndex: 'ysjs',
+                    componentType: 'InputNumber',
+                    defaultValue: '',
+                    componentProps: {
+                      width: '100%',
+                      span: '',
+                      defaultValue: '',
+                      min: 0,
+                      max: null,
+                      step: 1,
+                      maxlength: null,
+                      disabled: false,
+                      showLabel: true,
+                      controls: true,
+                      required: false,
+                      subTotal: false,
+                      isShow: true,
+                      rules: [],
+                      events: {},
+                      placeholder: '请输入应收件数',
+                      tooltipConfig: { visible: false, title: '提示文本' },
+                      listStyle: "return 'width:100%'",
+                    },
+                  },
+                  {
+                    key: '5fa9ca15c8b84592b93abbd7702d1306',
+                    title: '实收件数',
+                    dataIndex: 'ssjs',
+                    componentType: 'InputNumber',
+                    defaultValue: '',
+                    componentProps: {
+                      width: '100%',
+                      span: '',
+                      defaultValue: '',
+                      min: 0,
+                      step: 1,
+                      disabled: false,
+                      showLabel: true,
+                      controls: true,
+                      required: false,
+                      subTotal: false,
+                      isShow: true,
+                      rules: [],
+                      events: {},
+                      placeholder: '请输入实收件数',
+                      tooltipConfig: { visible: false, title: '提示文本' },
+                      listStyle: "return 'width:100%'",
+                    },
+                  },
+                  {
+                    key: 'b0ce49273f2844e29bb1542aa3eeffa4',
+                    title: '剩余件数',
+                    dataIndex: 'syjs',
+                    componentType: 'InputNumber',
+                    defaultValue: '',
+                    componentProps: {
+                      width: '100%',
+                      span: '',
+                      defaultValue: '',
+                      min: 0,
+                      max: null,
+                      step: 1,
+                      maxlength: null,
+                      disabled: false,
+                      showLabel: true,
+                      controls: true,
+                      required: false,
+                      subTotal: false,
+                      isShow: true,
+                      rules: [],
+                      events: {},
+                      placeholder: '请输入剩余件数',
+                      tooltipConfig: { visible: false, title: '提示文本' },
+                      listStyle: "return 'width:100%'",
+                    },
+                  },
+                  {
+                    key: 'f4f6844ab6454be7af329f780e80447f',
+                    title: '批次号',
+                    dataIndex: 'pch',
+                    componentType: 'Input',
+                    defaultValue: '',
+                    componentProps: {
+                      width: '100%',
+                      span: '',
+                      defaultValue: '',
+                      placeholder: '请输入批次号',
+                      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: '5d9a11c345e24ff59f416012ae5fb4c1',
+                    title: '货位',
+                    dataIndex: 'hw',
+                    componentType: 'Input',
+                    defaultValue: '',
+                    componentProps: {
+                      width: '100%',
+                      span: '',
+                      defaultValue: '',
+                      placeholder: '请输入货位',
+                      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: 'b15dfaeae0884f338b4bfcd631d3e16e',
+                    title: '备注',
+                    dataIndex: 'bz',
+                    componentType: 'Input',
+                    defaultValue: '',
+                    componentProps: {
+                      width: '100%',
+                      span: '',
+                      defaultValue: '',
+                      placeholder: '请输入备注',
+                      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: '4cb64c1c2b6f4ae5a0a03cafd47a1669',
+                    title: 'ID',
+                    dataIndex: 'id',
+                    componentType: 'Input',
+                    defaultValue: '',
+                    componentProps: {
+                      width: '100%',
+                      span: '',
+                      defaultValue: '',
+                      placeholder: '',
+                      prefix: '',
+                      suffix: '',
+                      addonBefore: '',
+                      addonAfter: '',
+                      disabled: false,
+                      allowClear: false,
+                      showLabel: true,
+                      required: false,
+                      rules: [],
+                      events: {},
+                      listStyle: '',
+                      isSave: false,
+                      isShow: false,
+                      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,
+                bordercolor: '#f0f0f0',
+                bordershowtype: [true, true, true, true],
+                borderwidth: 1,
+                showIndex: false,
+                isShow: true,
+                multipleHeads: [],
+                buttonList: [],
+                topButtonList: [],
+                isExport: false,
+                isImport: false,
+                isDeleteSelected: false,
+                isListView: false,
+                viewList: [],
+                isShowAdd: true,
+                isShowDelete: true,
+                hasCheckedCol: false,
+                events: {},
+                showPagenation: true,
+              },
             },
-          },
-          {
-            key: '4cb64c1c2b6f4ae5a0a03cafd47a1669',
-            title: 'ID',
-            dataIndex: 'id',
-            componentType: 'Input',
-            defaultValue: '',
-            componentProps: {
-              width: '100%',
-              span: '',
-              defaultValue: '',
-              placeholder: '',
-              prefix: '',
-              suffix: '',
-              addonBefore: '',
-              addonAfter: '',
-              disabled: false,
-              allowClear: false,
-              showLabel: true,
-              required: false,
-              rules: [],
-              events: {},
-              listStyle: '',
-              isSave: false,
-              isShow: false,
-              scan: false,
-              bordered: true,
-              isShowAi: false,
-              tooltipConfig: { visible: false, title: '提示文本' },
+          ],
+        },
+        {
+          span: 24,
+          name: '入库明细',
+          prefix: '',
+          suffix: '',
+          activeColor: '#1c8dff',
+          folderId: '',
+          imageUrl: '',
+          conFolderId: '',
+          conImageUrl: '',
+          list: [
+            {
+              key: '1f2030b729ba4b0fb98306f28033b5b4',
+              label: '',
+              field: 'mesWarehouseProductChangeList',
+              type: 'form',
+              component: 'SubForm',
+              required: true,
+              colProps: { span: 24 },
+              componentProps: {
+                mainKey: 'mesWarehouseProductChangeList',
+                columns: [
+                  {
+                    key: 'd1de0271a0aa489e8fbed33e705c4f5a',
+                    title: '物料编码',
+                    dataIndex: 'wlbm',
+                    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: '0f703bdd6bbe49f1ac1bac1b332090f2',
+                    title: '物料名称',
+                    dataIndex: 'wlmc',
+                    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: 'c35ad73504024d5ba769b876b00733d2',
+                    title: '规格',
+                    dataIndex: 'gg',
+                    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: '431253da65194e0290f806281603a46f',
+                    title: '型号',
+                    dataIndex: 'xh',
+                    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: 'f58562b1db284a49a35471930edc21ed',
+                    title: '批次号',
+                    dataIndex: 'pch',
+                    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: '4ff849ba704342fa901be52adeab6bb8',
+                    title: '货位',
+                    dataIndex: 'hw',
+                    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: 'bb45b800013b44d68612972ccf12a0cb',
+                    title: '入库数量',
+                    dataIndex: 'rksl',
+                    componentType: 'InputNumber',
+                    defaultValue: '',
+                    componentProps: {
+                      width: '100%',
+                      span: '',
+                      defaultValue: '',
+                      min: 0,
+                      max: null,
+                      step: 1,
+                      maxlength: null,
+                      disabled: false,
+                      showLabel: true,
+                      controls: true,
+                      required: false,
+                      subTotal: false,
+                      isShow: true,
+                      rules: [],
+                      events: {},
+                      placeholder: '请输入入库数量',
+                      tooltipConfig: { visible: false, title: '提示文本' },
+                      listStyle: "return 'width:100%'",
+                    },
+                  },
+                  {
+                    key: '063a40637394438da3e5657c4a813688',
+                    title: '备注',
+                    dataIndex: 'bz',
+                    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: false,
+                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,
+              },
             },
-          },
-          { title: '操作', key: 'action', fixed: 'right', width: '50px' },
-        ],
-        span: '24',
-        preloadType: 'api',
-        apiConfig: {},
-        itemId: '',
-        dicOptions: [],
-        useSelectButton: false,
-        buttonName: '选择物料',
-        showLabel: true,
-        showComponentBorder: true,
-        showBorder: false,
-        bordercolor: '#f0f0f0',
-        bordershowtype: [true, true, true, true],
-        borderwidth: 1,
-        showIndex: false,
-        isShow: true,
-        multipleHeads: [],
-        buttonList: [],
-        topButtonList: [],
-        isExport: false,
-        isImport: false,
-        isDeleteSelected: false,
-        isListView: false,
-        viewList: [],
-        isShowAdd: true,
-        isShowDelete: true,
-        hasCheckedCol: false,
-        events: {},
-        showPagenation: true,
-      },
+          ],
+        },
+      ],
+      componentProps: { tabPosition: 'top', size: 'default', type: 'line', isShow: true },
     },
   ],
   showActionButtonGroup: false,

xjrsoft-vue3/src/views/ckgl/scrk/components/workflowPermission.ts

@@ -282,6 +282,21 @@ export const permissionList = [
         isSaveTable: false,
         showChildren: false,
         tableName: 'mesWarehouseProductInfoList',
+        fieldName: '应收件数',
+        fieldId: 'ysjs',
+        type: 'InputNumber',
+        key: '39886d58fa664d0990b761fa8148abf0',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseProductInfoList',
         fieldName: '实收件数',
         fieldId: 'ssjs',
         type: 'InputNumber',
@@ -297,6 +312,21 @@ export const permissionList = [
         isSaveTable: false,
         showChildren: false,
         tableName: 'mesWarehouseProductInfoList',
+        fieldName: '剩余件数',
+        fieldId: 'syjs',
+        type: 'InputNumber',
+        key: 'b0ce49273f2844e29bb1542aa3eeffa4',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseProductInfoList',
         fieldName: '批次号',
         fieldId: 'pch',
         type: 'Input',
@@ -350,4 +380,139 @@ export const permissionList = [
       },
     ],
   },
+  {
+    required: true,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSubTable: true,
+    showChildren: false,
+    tableName: 'mesWarehouseProductChangeList',
+    fieldName: '',
+    fieldId: 'mesWarehouseProductChangeList',
+    type: 'form',
+    key: '1f2030b729ba4b0fb98306f28033b5b4',
+    children: [
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseProductChangeList',
+        fieldName: '物料编码',
+        fieldId: 'wlbm',
+        type: 'Input',
+        key: 'd1de0271a0aa489e8fbed33e705c4f5a',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseProductChangeList',
+        fieldName: '物料名称',
+        fieldId: 'wlmc',
+        type: 'Input',
+        key: '0f703bdd6bbe49f1ac1bac1b332090f2',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseProductChangeList',
+        fieldName: '规格',
+        fieldId: 'gg',
+        type: 'Input',
+        key: 'c35ad73504024d5ba769b876b00733d2',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseProductChangeList',
+        fieldName: '型号',
+        fieldId: 'xh',
+        type: 'Input',
+        key: '431253da65194e0290f806281603a46f',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseProductChangeList',
+        fieldName: '批次号',
+        fieldId: 'pch',
+        type: 'Input',
+        key: 'f58562b1db284a49a35471930edc21ed',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseProductChangeList',
+        fieldName: '货位',
+        fieldId: 'hw',
+        type: 'Input',
+        key: '4ff849ba704342fa901be52adeab6bb8',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseProductChangeList',
+        fieldName: '入库数量',
+        fieldId: 'rksl',
+        type: 'InputNumber',
+        key: 'bb45b800013b44d68612972ccf12a0cb',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseProductChangeList',
+        fieldName: '备注',
+        fieldId: 'bz',
+        type: 'Input',
+        key: '063a40637394438da3e5657c4a813688',
+        children: [],
+      },
+    ],
+  },
 ];