Skip to content

W
weiqiao-vue
Commit 669b55dc by 张珈源
Options

refactor(ckgl): 重构库存账表组件字段配置 

- 将字段pch从批次号改为kcg可采购字段
- 将字段ck从仓库改为kxs可销售字段
- 将字段hw从货位改为erpid字段
- 添加业务组织字段ywzz到表格列配置
- 移除原有的批次号、仓库、货位相关列配置
- 更新模型接口定义中的字段映射关系
- 调整工作流权限配置中的字段定义
- 重新配置批次号、仓库、货位字段为输入框类型
- 移除数字输入框的最小值限制属性
parent ae30092a
Showing with 169 additions and 269 deletions
xjrsoft-vue3/src/api/ckgl/kczb/model/KczbModel.ts
......@@ -12,11 +12,11 @@ export interface MesWarehouseProductNumberPageParams extends BasicPageParams {
ywzz: string;
pch: string;
kcg: string;
ck: string;
kxs: string;
hw: string;
erpid: string;
}
/**
......@@ -25,6 +25,8 @@ export interface MesWarehouseProductNumberPageParams extends BasicPageParams {
export interface MesWarehouseProductNumberPageModel {
id: string;
ywzz: string;
cpbh: string;
cpmc: string;
......@@ -37,14 +39,6 @@ export interface MesWarehouseProductNumberPageModel {
sl: string;
ywzz: string;
pch: string;
ck: string;
hw: string;
kcg: string;
kxs: string;
......@@ -82,8 +76,6 @@ export interface MesWarehouseProductNumberModel {
ywzz: string;
pch: string;
ck: string;
hw: string;
......@@ -137,6 +129,12 @@ export interface MesWarehouseProductNumInfoModel {
bgrq: string;
pch: string;
ck: string;
hw: string;
bz: string;
p1: string;
......
xjrsoft-vue3/src/views/ckgl/kczb/components/config.ts
......@@ -46,46 +46,41 @@ export const searchFormSchema: FormSchema[] = [
},
},
{
field: 'pch',
label: '批次号',
field: 'kcg',
label: '可采购',
defaultValue: undefined,
component: 'Input',
},
{
field: 'ck',
label: '仓库',
field: 'kxs',
label: '可销售',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'dic',
params: { itemId: '2010539474382962690' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
component: 'Input',
},
{
field: 'hw',
label: '货位',
field: 'erpid',
label: 'ERPID',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'dic',
params: { itemId: '2010541442849521665' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
component: 'Input',
},
];
export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'ywzz',
title: '业务组织',
componentType: 'select',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'cpbh',
title: '产品编号',
componentType: 'input',
......@@ -164,58 +159,6 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'ywzz',
title: '业务组织',
componentType: 'select',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'pch',
title: '批次号',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'ck',
title: '仓库',
componentType: 'select',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'hw',
title: '货位',
componentType: 'select',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'kcg',
title: '可采购',
componentType: 'input',
......@@ -623,134 +566,6 @@ export const formProps: FormProps = {
span: 8,
list: [
{
key: 'd3e96c4ef414491c9082a0cabec7b9f7',
field: 'pch',
label: '批次号',
type: 'input',
component: 'Input',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
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: '提示文本' },
style: { width: '100%' },
},
},
],
},
{
span: 8,
list: [
{
key: '3ff42968656549af99ff32d0a420b9ff',
field: 'ck',
label: '仓库',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 7,
placeholder: '请选择仓库',
showLabel: true,
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: '2010539474382962690' },
labelField: 'name',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7',
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2010539474382962690',
style: { width: '100%' },
},
},
],
},
{
span: 8,
list: [
{
key: '24975956e188454fa0db49650cbb5500',
field: 'hw',
label: '货位',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 7,
placeholder: '请选择货位',
showLabel: true,
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: '2010541442849521665' },
labelField: 'name',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7',
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2010541442849521665',
style: { width: '100%' },
},
},
],
},
{
span: 8,
list: [
{
key: '4579a36e3cb44566a7a0ff589b398d42',
field: 'kcg',
label: '可采购',
......@@ -959,7 +774,6 @@ export const formProps: FormProps = {
width: '100%',
span: '',
defaultValue: '',
min: null,
step: 1,
disabled: true,
showLabel: true,
......@@ -998,6 +812,98 @@ export const formProps: FormProps = {
searchType: 'time',
},
},
{
key: 'b53d662674c5424b8a3280fb2c6aaa6e',
title: '批次号',
dataIndex: 'pch',
componentType: 'Input',
defaultValue: '',
componentProps: {
width: '100%',
span: '',
defaultValue: '',
placeholder: '请输入批次号批次号',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: true,
allowClear: false,
showLabel: true,
required: false,
rules: [],
events: {},
listStyle: '',
isSave: false,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{
key: 'f84cf4f2535e429ea2e3ac6d2850859d',
title: '仓库',
dataIndex: 'ck',
componentType: 'Input',
defaultValue: '',
componentProps: {
width: '100%',
span: '',
defaultValue: '',
placeholder: '请输入仓库',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: true,
allowClear: false,
showLabel: true,
required: false,
rules: [],
events: {},
listStyle: '',
isSave: false,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
},
},
{
key: 'de367affec9a4b2a9d7c3c44b0f7740e',
title: '货位',
dataIndex: 'hw',
componentType: 'Input',
defaultValue: '',
componentProps: {
width: '100%',
span: '',
defaultValue: '',
placeholder: '请输入货位',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: true,
allowClear: false,
showLabel: true,
required: false,
rules: [],
events: {},
listStyle: '',
isSave: false,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
},
},
],
span: '24',
preloadType: 'api',
......
xjrsoft-vue3/src/views/ckgl/kczb/components/workflowPermission.ts
......@@ -123,55 +123,6 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '批次号',
fieldId: 'pch',
isSubTable: false,
showChildren: true,
type: 'input',
key: 'd3e96c4ef414491c9082a0cabec7b9f7',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '仓库',
fieldId: 'ck',
isSubTable: false,
showChildren: true,
type: 'select',
key: '3ff42968656549af99ff32d0a420b9ff',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '货位',
fieldId: 'hw',
isSubTable: false,
showChildren: true,
type: 'select',
key: '24975956e188454fa0db49650cbb5500',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '可采购',
fieldId: 'kcg',
isSubTable: false,
......@@ -293,6 +244,51 @@ export const permissionList = [
key: '797ceeda94264e81b0e955852ddd70ac',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesWarehouseProductNumInfoList',
fieldName: '批次号',
fieldId: 'pch',
type: 'Input',
key: 'b53d662674c5424b8a3280fb2c6aaa6e',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesWarehouseProductNumInfoList',
fieldName: '仓库',
fieldId: 'ck',
type: 'Input',
key: 'f84cf4f2535e429ea2e3ac6d2850859d',
children: [],
},
{
required: true,
view: true,
edit: true,
disabled: false,
isSubTable: false,
isSaveTable: false,
showChildren: false,
tableName: 'mesWarehouseProductNumInfoList',
fieldName: '货位',
fieldId: 'hw',
type: 'Input',
key: 'de367affec9a4b2a9d7c3c44b0f7740e',
children: [],
},
],
},
];
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