feat(ckgl): 添加批次号字段并调整表单配置

- 在config.ts中新增批次号字段配置
- 调整columns配置中的字段映射关系
- 修改model定义添加pch字段
- 更新workflowPermission权限配置
- 将上传附件组件移动到正确位置
- 移除多余的数据源默认选择配置

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

@@ -13,6 +13,8 @@ export interface MesWarehouseProductPageParams extends BasicPageParams {
   ywzz: string;
 
   djzt: string;
+
+  pch: string;
 }
 
 /**
@@ -21,6 +23,8 @@ export interface MesWarehouseProductPageParams extends BasicPageParams {
 export interface MesWarehouseProductPageModel {
   id: string;
 
+  djbh: string;
+
   djrq: string;
 
   crklx: string;
@@ -29,10 +33,10 @@ export interface MesWarehouseProductPageModel {
 
   scbm: string;
 
-  djbh: string;
-
   ck: string;
 
+  pch: string;
+
   ywzz: string;
 
   djzt: string;
@@ -60,6 +64,8 @@ export interface MesWarehouseProductModel {
 
   scbm: string;
 
+  pch: string;
+
   djbh: string;
 
   djzt: string;

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

@@ -60,11 +60,30 @@ export const searchFormSchema: FormSchema[] = [
       getPopupContainer: () => document.body,
     },
   },
+  {
+    field: 'pch',
+    label: '批次号',
+    defaultValue: undefined,
+    component: 'Input',
+  },
 ];
 
 export const columns: BasicColumn[] = [
   {
     resizable: true,
+    dataIndex: 'djbh',
+    title: '单据编号',
+    componentType: 'auto-code',
+
+    fixed: false,
+    sorter: true,
+
+    styleConfig: undefined,
+    listStyle: undefined,
+  },
+
+  {
+    resizable: true,
     dataIndex: 'djrq',
     title: '单据日期',
     componentType: 'date',
@@ -117,9 +136,9 @@ export const columns: BasicColumn[] = [
 
   {
     resizable: true,
-    dataIndex: 'djbh',
-    title: '单据编号',
-    componentType: 'auto-code',
+    dataIndex: 'ck',
+    title: '仓库',
+    componentType: 'select',
 
     fixed: false,
     sorter: true,
@@ -130,15 +149,15 @@ export const columns: BasicColumn[] = [
 
   {
     resizable: true,
-    dataIndex: 'ck',
-    title: '仓库',
-    componentType: 'select',
+    dataIndex: 'pch',
+    title: '批次号',
+    componentType: 'input',
 
     fixed: false,
     sorter: true,
 
     styleConfig: undefined,
-    listStyle: undefined,
+    listStyle: '',
   },
 
   {
@@ -343,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: '2010539474382962690' },
                 labelField: 'name',
@@ -511,7 +529,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',
@@ -557,7 +574,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: '2016321281785163777' },
                 labelField: 'name',
@@ -583,28 +599,37 @@ export const formProps: FormProps = {
           span: 8,
           list: [
             {
-              key: '904dcc9c92f2492eba6f775a2602847b',
-              field: 'fj',
-              label: '上传附件',
-              type: 'upload',
-              component: 'Upload',
+              key: 'ec89abed664a4341acd26ac8509d311a',
+              field: 'pch',
+              label: '批次号',
+              type: 'input',
+              component: 'Input',
               colProps: { span: 24 },
+              defaultValue: '',
               componentProps: {
-                api: uploadApi,
+                width: '100%',
                 span: 7,
                 defaultValue: '',
-                accept: '',
-                maxNumber: 5,
-                maxSize: 5,
-                showLabel: true,
-                multiple: false,
+                placeholder: '请输入批次号',
+                maxlength: null,
+                prefix: '',
+                suffix: '',
+                addonBefore: '',
+                addonAfter: '',
                 disabled: false,
+                allowClear: false,
+                showLabel: true,
                 required: false,
-                isShow: true,
+                rules: [],
                 events: {},
-                listType: 'text',
-                sourceType: 'album,camera',
+                listStyle: '',
+                isSave: false,
+                isShow: true,
+                scan: false,
+                bordered: true,
+                isShowAi: false,
                 tooltipConfig: { visible: false, title: '提示文本' },
+                style: { width: '100%' },
               },
             },
           ],
@@ -651,6 +676,36 @@ export const formProps: FormProps = {
           span: 8,
           list: [
             {
+              key: '904dcc9c92f2492eba6f775a2602847b',
+              field: 'fj',
+              label: '上传附件',
+              type: 'upload',
+              component: 'Upload',
+              colProps: { span: 24 },
+              componentProps: {
+                api: uploadApi,
+                span: 7,
+                defaultValue: '',
+                accept: '',
+                maxNumber: 5,
+                maxSize: 5,
+                showLabel: true,
+                multiple: false,
+                disabled: false,
+                required: false,
+                isShow: true,
+                events: {},
+                listType: 'text',
+                sourceType: 'album,camera',
+                tooltipConfig: { visible: false, title: '提示文本' },
+              },
+            },
+          ],
+        },
+        {
+          span: 8,
+          list: [
+            {
               key: 'bf9dbbefa3ed4ba08f51998b263f227e',
               field: 'id',
               label: 'ID',

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

@@ -138,12 +138,12 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '上传附件',
-    fieldId: 'fj',
+    fieldName: '批次号',
+    fieldId: 'pch',
     isSubTable: false,
     showChildren: true,
-    type: 'upload',
-    key: '904dcc9c92f2492eba6f775a2602847b',
+    type: 'input',
+    key: 'ec89abed664a4341acd26ac8509d311a',
     children: [],
     options: {},
     defaultValue: '',
@@ -172,6 +172,23 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
+    fieldName: '上传附件',
+    fieldId: 'fj',
+    isSubTable: false,
+    showChildren: true,
+    type: 'upload',
+    key: '904dcc9c92f2492eba6f775a2602847b',
+    children: [],
+    options: {},
+    defaultValue: '',
+  },
+  {
+    required: false,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSaveTable: false,
+    tableName: '',
     fieldName: 'ID',
     fieldId: 'id',
     isSubTable: false,