Skip to content

W
weiqiao-vue
Commit 81a645d7 by 张珈源
Options

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

- 在config.ts中新增批次号字段配置
- 调整columns配置中的字段映射关系
- 修改model定义添加pch字段
- 更新workflowPermission权限配置
- 将上传附件组件移动到正确位置
- 移除多余的数据源默认选择配置
parent cd0cf086
Showing with 110 additions and 31 deletions
xjrsoft-vue3/src/api/ckgl/scrk/model/ScrkModel.ts
...@@ -13,6 +13,8 @@ export interface MesWarehouseProductPageParams extends BasicPageParams { ...@@ -13,6 +13,8 @@ export interface MesWarehouseProductPageParams extends BasicPageParams {
ywzz: string; ywzz: string;
djzt: string; djzt: string;
pch: string;
} }
/** /**
...@@ -21,6 +23,8 @@ export interface MesWarehouseProductPageParams extends BasicPageParams { ...@@ -21,6 +23,8 @@ export interface MesWarehouseProductPageParams extends BasicPageParams {
export interface MesWarehouseProductPageModel { export interface MesWarehouseProductPageModel {
id: string; id: string;
djbh: string;
djrq: string; djrq: string;
crklx: string; crklx: string;
...@@ -29,10 +33,10 @@ export interface MesWarehouseProductPageModel { ...@@ -29,10 +33,10 @@ export interface MesWarehouseProductPageModel {
scbm: string; scbm: string;
djbh: string;
ck: string; ck: string;
pch: string;
ywzz: string; ywzz: string;
djzt: string; djzt: string;
...@@ -60,6 +64,8 @@ export interface MesWarehouseProductModel { ...@@ -60,6 +64,8 @@ export interface MesWarehouseProductModel {
scbm: string; scbm: string;
pch: string;
djbh: string; djbh: string;
djzt: string; djzt: string;
......
xjrsoft-vue3/src/views/ckgl/scrk/components/config.ts
...@@ -60,11 +60,30 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -60,11 +60,30 @@ export const searchFormSchema: FormSchema[] = [
getPopupContainer: () => document.body, getPopupContainer: () => document.body,
}, },
}, },
{
field: 'pch',
label: '批次号',
defaultValue: undefined,
component: 'Input',
},
]; ];
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'djbh',
title: '单据编号',
componentType: 'auto-code',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'djrq', dataIndex: 'djrq',
title: '单据日期', title: '单据日期',
componentType: 'date', componentType: 'date',
...@@ -117,9 +136,9 @@ export const columns: BasicColumn[] = [ ...@@ -117,9 +136,9 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'djbh', dataIndex: 'ck',
title: '单据编号', title: '仓库',
componentType: 'auto-code', componentType: 'select',
fixed: false, fixed: false,
sorter: true, sorter: true,
...@@ -130,15 +149,15 @@ export const columns: BasicColumn[] = [ ...@@ -130,15 +149,15 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'ck', dataIndex: 'pch',
title: '仓库', title: '批次号',
componentType: 'select', componentType: 'input',
fixed: false, fixed: false,
sorter: true, sorter: true,
styleConfig: undefined, styleConfig: undefined,
listStyle: undefined, listStyle: '',
}, },
{ {
...@@ -343,7 +362,6 @@ export const formProps: FormProps = { ...@@ -343,7 +362,6 @@ export const formProps: FormProps = {
{ key: 2, label: 'Option 2', value: 'Option 2' }, { key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' }, { key: 3, label: 'Option 3', value: 'Option 3' },
], ],
defaultSelect: null,
datasourceType: 'dic', datasourceType: 'dic',
params: { itemId: '2010539474382962690' }, params: { itemId: '2010539474382962690' },
labelField: 'name', labelField: 'name',
...@@ -511,7 +529,6 @@ export const formProps: FormProps = { ...@@ -511,7 +529,6 @@ export const formProps: FormProps = {
{ key: 2, label: 'Option 2', value: 'Option 2' }, { key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' }, { key: 3, label: 'Option 3', value: 'Option 3' },
], ],
defaultSelect: null,
datasourceType: 'dic', datasourceType: 'dic',
params: { itemId: '2015724355955159041' }, params: { itemId: '2015724355955159041' },
labelField: 'name', labelField: 'name',
...@@ -557,7 +574,6 @@ export const formProps: FormProps = { ...@@ -557,7 +574,6 @@ export const formProps: FormProps = {
{ key: 2, label: 'Option 2', value: 'Option 2' }, { key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' }, { key: 3, label: 'Option 3', value: 'Option 3' },
], ],
defaultSelect: null,
datasourceType: 'dic', datasourceType: 'dic',
params: { itemId: '2016321281785163777' }, params: { itemId: '2016321281785163777' },
labelField: 'name', labelField: 'name',
...@@ -583,28 +599,37 @@ export const formProps: FormProps = { ...@@ -583,28 +599,37 @@ export const formProps: FormProps = {
span: 8, span: 8,
list: [ list: [
{ {
key: '904dcc9c92f2492eba6f775a2602847b', key: 'ec89abed664a4341acd26ac8509d311a',
field: 'fj', field: 'pch',
label: '上传附件', label: '批次号',
type: 'upload', type: 'input',
component: 'Upload', component: 'Input',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '',
componentProps: { componentProps: {
api: uploadApi, width: '100%',
span: 7, span: 7,
defaultValue: '', defaultValue: '',
accept: '', placeholder: '请输入批次号',
maxNumber: 5, maxlength: null,
maxSize: 5, prefix: '',
showLabel: true, suffix: '',
multiple: false, addonBefore: '',
addonAfter: '',
disabled: false, disabled: false,
allowClear: false,
showLabel: true,
required: false, required: false,
isShow: true, rules: [],
events: {}, events: {},
listType: 'text', listStyle: '',
sourceType: 'album,camera', isSave: false,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
}, },
}, },
], ],
...@@ -651,6 +676,36 @@ export const formProps: FormProps = { ...@@ -651,6 +676,36 @@ export const formProps: FormProps = {
span: 8, span: 8,
list: [ 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', key: 'bf9dbbefa3ed4ba08f51998b263f227e',
field: 'id', field: 'id',
label: 'ID', label: 'ID',
......
xjrsoft-vue3/src/views/ckgl/scrk/components/workflowPermission.ts
...@@ -138,12 +138,12 @@ export const permissionList = [ ...@@ -138,12 +138,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '上传附件', fieldName: '批次号',
fieldId: 'fj', fieldId: 'pch',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'upload', type: 'input',
key: '904dcc9c92f2492eba6f775a2602847b', key: 'ec89abed664a4341acd26ac8509d311a',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -172,6 +172,23 @@ export const permissionList = [ ...@@ -172,6 +172,23 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', 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', fieldName: 'ID',
fieldId: 'id', fieldId: 'id',
isSubTable: false, isSubTable: false,
......
xjrsoft-vue3/src/views/ckgl/scrk/index.vue
...@@ -382,4 +382,4 @@ ...@@ -382,4 +382,4 @@
</style> </style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment