feat(ckgl/cgdh): 添加厂商批次字段支持

- 在CgdhModel.ts中为四个接口模型添加cspc字段定义
- 在config.ts中配置厂商批次字段的表单组件和表格列
- 将原有的总数量字段位置调整，新增厂商批次字段配置
- 更新workflowPermission.ts中的工作流权限配置映射
- 移除多余的数据源默认选择配置项

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

@@ -13,6 +13,8 @@ export interface MesWarehouseArrivedPageParams extends BasicPageParams {
   zdr: string;
 
   ywzz: string;
+
+  cspc: string;
 }
 
 /**
@@ -38,6 +40,8 @@ export interface MesWarehouseArrivedPageModel {
   ywzz: string;
 
   bz: string;
+
+  cspc: string;
 }
 
 /**
@@ -64,6 +68,8 @@ export interface MesWarehouseArrivedModel {
 
   ywzz: string;
 
+  cspc: string;
+
   fj: string;
 
   bz: string;
@@ -121,6 +127,8 @@ export interface MesWarehouseArrivedInfoModel {
 
   xqbm: string;
 
+  cspc: string;
+
   sfzp: string;
 
   sfzj: string;

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

@@ -56,6 +56,12 @@ export const searchFormSchema: FormSchema[] = [
       getPopupContainer: () => document.body,
     },
   },
+  {
+    field: 'cspc',
+    label: '厂商批次',
+    defaultValue: undefined,
+    component: 'Input',
+  },
 ];
 
 export const columns: BasicColumn[] = [
@@ -175,6 +181,19 @@ export const columns: BasicColumn[] = [
     styleConfig: undefined,
     listStyle: undefined,
   },
+
+  {
+    resizable: true,
+    dataIndex: 'cspc',
+    title: '厂商批次',
+    componentType: 'input',
+
+    fixed: false,
+    sorter: true,
+
+    styleConfig: undefined,
+    listStyle: '',
+  },
 ];
 //表头合并配置
 export const headerMergingData = [];
@@ -349,7 +368,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: '2010533622867509249' },
                 labelField: 'name',
@@ -395,7 +413,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: '2010539474382962690' },
                 labelField: 'name',
@@ -510,7 +527,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: '2015724355955159041' },
                 labelField: 'name',
@@ -536,27 +552,35 @@ export const formProps: FormProps = {
           span: 8,
           list: [
             {
-              key: '4ca80a2d3a8244bc8d3380b6b0457c25',
-              field: 'zsl',
-              label: '总数量',
-              type: 'number',
-              component: 'InputNumber',
+              key: 'ac1495dbcbde4305b9e30167b92fcc7b',
+              field: 'cspc',
+              label: '厂商批次',
+              type: 'input',
+              component: 'Input',
               colProps: { span: 24 },
-              defaultValue: 0,
+              defaultValue: '',
               componentProps: {
                 width: '100%',
                 span: 7,
-                defaultValue: 0,
-                min: 0,
-                step: 1,
+                defaultValue: '',
+                placeholder: '请输入厂商批次',
+                maxlength: null,
+                prefix: '',
+                suffix: '',
+                addonBefore: '',
+                addonAfter: '',
                 disabled: false,
+                allowClear: false,
                 showLabel: true,
-                controls: true,
                 required: false,
-                subTotal: false,
-                isShow: false,
                 rules: [],
                 events: {},
+                listStyle: '',
+                isSave: false,
+                isShow: true,
+                scan: false,
+                bordered: true,
+                isShowAi: false,
                 tooltipConfig: { visible: false, title: '提示文本' },
                 style: { width: '100%' },
               },
@@ -664,6 +688,37 @@ export const formProps: FormProps = {
             },
           ],
         },
+        {
+          span: 8,
+          list: [
+            {
+              key: '4ca80a2d3a8244bc8d3380b6b0457c25',
+              field: 'zsl',
+              label: '总数量',
+              type: 'number',
+              component: 'InputNumber',
+              colProps: { span: 24 },
+              defaultValue: 0,
+              componentProps: {
+                width: '100%',
+                span: 7,
+                defaultValue: 0,
+                min: 0,
+                step: 1,
+                disabled: false,
+                showLabel: true,
+                controls: true,
+                required: false,
+                subTotal: false,
+                isShow: false,
+                rules: [],
+                events: {},
+                tooltipConfig: { visible: false, title: '提示文本' },
+                style: { width: '100%' },
+              },
+            },
+          ],
+        },
       ],
       componentProps: {
         gutter: 16,
@@ -855,7 +910,6 @@ export const formProps: FormProps = {
               span: '',
               defaultValue: '',
               placeholder: '',
-              maxlength: null,
               prefix: '',
               suffix: '',
               addonBefore: '',
@@ -984,6 +1038,37 @@ export const formProps: FormProps = {
             },
           },
           {
+            key: 'd5ad3321ea444ead9034b6acb9e376a8',
+            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: 'd2d0c0c885684a99a792beb3dc3415ba',
             title: '是否赠品',
             dataIndex: 'sfzp',

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

@@ -122,15 +122,15 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '总数量',
-    fieldId: 'zsl',
+    fieldName: '厂商批次',
+    fieldId: 'cspc',
     isSubTable: false,
     showChildren: true,
-    type: 'number',
-    key: '4ca80a2d3a8244bc8d3380b6b0457c25',
+    type: 'input',
+    key: 'ac1495dbcbde4305b9e30167b92fcc7b',
     children: [],
     options: {},
-    defaultValue: 0,
+    defaultValue: '',
   },
   {
     required: false,
@@ -184,6 +184,23 @@ export const permissionList = [
     defaultValue: '',
   },
   {
+    required: false,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSaveTable: false,
+    tableName: '',
+    fieldName: '总数量',
+    fieldId: 'zsl',
+    isSubTable: false,
+    showChildren: true,
+    type: 'number',
+    key: '4ca80a2d3a8244bc8d3380b6b0457c25',
+    children: [],
+    options: {},
+    defaultValue: 0,
+  },
+  {
     required: true,
     view: true,
     edit: true,
@@ -355,6 +372,21 @@ export const permissionList = [
         isSaveTable: false,
         showChildren: false,
         tableName: 'mesWarehouseArrivedInfoList',
+        fieldName: '厂商批次',
+        fieldId: 'cspc',
+        type: 'Input',
+        key: 'd5ad3321ea444ead9034b6acb9e376a8',
+        children: [],
+      },
+      {
+        required: true,
+        view: true,
+        edit: true,
+        disabled: false,
+        isSubTable: false,
+        isSaveTable: false,
+        showChildren: false,
+        tableName: 'mesWarehouseArrivedInfoList',
         fieldName: '是否赠品',
         fieldId: 'sfzp',
         type: 'Input',