Skip to content

W
weiqiao-vue
Commit 6ac42793 by 张珈源
Options

feat(ckgl/scll): 更新生产领料模块配置和数据模型 

- 添加业务组织字段(ywzz)到表单配置
- 将领料库存组织字段重命名为业务组织字段
- 库管员和业务组织字段位置对调
- 新增单据状态(zt)字段并配置下拉选择组件
- 为单据状态字段添加工作流权限配置
- 重新排列表单布局，备注字段独立成行
- 更新API数据模型以匹配新的字段结构
- 在子表中调整数量、货位号、应发数量等字段映射关系
- 添加批次号(pch)字段到子表配置
- 在工作流权限配置中同步字段名称变更
- 为新增字段添加完整的组件属性配置和验证规则
parent 3ed40a2f
Showing with 186 additions and 85 deletions
xjrsoft-vue3/src/api/ckgl/scll/model/ScllModel.ts
...@@ -9,6 +9,8 @@ export interface MesWarehousePromaterialPageParams extends BasicPageParams { ...@@ -9,6 +9,8 @@ export interface MesWarehousePromaterialPageParams extends BasicPageParams {
lldw: string; lldw: string;
llr: string; llr: string;
ywzz: string;
} }
/** /**
...@@ -25,10 +27,12 @@ export interface MesWarehousePromaterialPageModel { ...@@ -25,10 +27,12 @@ export interface MesWarehousePromaterialPageModel {
llr: string; llr: string;
llkczz: string;
kgy: string; kgy: string;
ywzz: string;
zt: string;
bz: string; bz: string;
} }
...@@ -48,10 +52,12 @@ export interface MesWarehousePromaterialModel { ...@@ -48,10 +52,12 @@ export interface MesWarehousePromaterialModel {
llr: string; llr: string;
llkczz: string; ywzz: string;
kgy: string; kgy: string;
zt: string;
bz: string; bz: string;
fj: string; fj: string;
...@@ -147,11 +153,9 @@ export interface MesWarehousePromaterialInfoModel { ...@@ -147,11 +153,9 @@ export interface MesWarehousePromaterialInfoModel {
dw: string; dw: string;
sl: string;
hwh: string; hwh: string;
yfsl: string; sl: string;
sfsl: string; sfsl: string;
...@@ -224,6 +228,8 @@ export interface MesWarehousePromaterialInfoModel { ...@@ -224,6 +228,8 @@ export interface MesWarehousePromaterialInfoModel {
modifyDate: string; modifyDate: string;
modifyUserId: string; modifyUserId: string;
pch: string;
} }
/** /**
......
xjrsoft-vue3/src/views/ckgl/scll/components/config.ts
...@@ -29,6 +29,13 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -29,6 +29,13 @@ export const searchFormSchema: FormSchema[] = [
placeholder: '请选择', placeholder: '请选择',
}, },
}, },
{
field: 'ywzz',
label: '业务组织',
defaultValue: undefined,
component: 'Input',
},
]; ];
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
...@@ -86,8 +93,8 @@ export const columns: BasicColumn[] = [ ...@@ -86,8 +93,8 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'llkczz', dataIndex: 'kgy',
title: '领料库存组织', title: '库管员',
componentType: 'input', componentType: 'input',
fixed: false, fixed: false,
...@@ -99,8 +106,8 @@ export const columns: BasicColumn[] = [ ...@@ -99,8 +106,8 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'kgy', dataIndex: 'ywzz',
title: '库管员', title: '业务组织',
componentType: 'input', componentType: 'input',
fixed: false, fixed: false,
...@@ -112,6 +119,19 @@ export const columns: BasicColumn[] = [ ...@@ -112,6 +119,19 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'zt',
title: '单据状态',
componentType: 'select',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'bz', dataIndex: 'bz',
title: '备注', title: '备注',
componentType: 'input', componentType: 'input',
...@@ -325,8 +345,8 @@ export const formProps: FormProps = { ...@@ -325,8 +345,8 @@ export const formProps: FormProps = {
list: [ list: [
{ {
key: 'cc6c68d8b8f740e0a4d16f334508e0c3', key: 'cc6c68d8b8f740e0a4d16f334508e0c3',
field: 'llkczz', field: 'ywzz',
label: '领料库存组织', label: '业务组织',
type: 'input', type: 'input',
component: 'Input', component: 'Input',
colProps: { span: 24 }, colProps: { span: 24 },
...@@ -335,7 +355,7 @@ export const formProps: FormProps = { ...@@ -335,7 +355,7 @@ export const formProps: FormProps = {
width: '100%', width: '100%',
span: 7, span: 7,
defaultValue: '', defaultValue: '',
placeholder: '请输入领料库存组织', placeholder: '请输入业务组织',
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -397,38 +417,46 @@ export const formProps: FormProps = { ...@@ -397,38 +417,46 @@ export const formProps: FormProps = {
], ],
}, },
{ {
span: 24, span: 8,
list: [ list: [
{ {
key: '47ae1b1e159b4f5787e9d59f219a3e9f', key: '9cdba668d8b348e8a581859ade8585b2',
field: 'bz', field: 'zt',
label: '备注', label: '单据状态',
type: 'input', type: 'select',
component: 'Input', component: 'XjrSelect',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '',
componentProps: { componentProps: {
width: '100%', width: '100%',
span: 2, span: 7,
defaultValue: '', placeholder: '请选择下拉选择',
placeholder: '请输入备注',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
allowClear: false,
showLabel: true, 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' },
],
defaultSelect: null,
datasourceType: 'dic',
params: { itemId: '2016321281785163777' },
labelField: 'name',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7',
},
dicOptions: [],
required: false, required: false,
rules: [], rules: [],
events: {}, events: {},
listStyle: '',
isSave: false,
isShow: true, isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2016321281785163777',
style: { width: '100%' }, style: { width: '100%' },
}, },
}, },
...@@ -464,6 +492,44 @@ export const formProps: FormProps = { ...@@ -464,6 +492,44 @@ export const formProps: FormProps = {
}, },
], ],
}, },
{
span: 24,
list: [
{
key: '47ae1b1e159b4f5787e9d59f219a3e9f',
field: 'bz',
label: '备注',
type: 'input',
component: 'Input',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 2,
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%' },
},
},
],
},
], ],
componentProps: { componentProps: {
gutter: 16, gutter: 16,
...@@ -610,30 +676,6 @@ export const formProps: FormProps = { ...@@ -610,30 +676,6 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '1026628c881d477b890e57ffd408b77a',
title: '数量',
dataIndex: 'sl',
componentType: 'InputNumber',
defaultValue: 0,
componentProps: {
width: '100%',
span: '',
defaultValue: 0,
min: 0,
step: 1,
disabled: false,
showLabel: true,
controls: true,
required: false,
subTotal: false,
isShow: true,
rules: [],
events: {},
tooltipConfig: { visible: false, title: '提示文本' },
listStyle: "return 'width:100%'",
},
},
{
key: '6561cde6f9ee4fd6a898ed3e3618eaca', key: '6561cde6f9ee4fd6a898ed3e3618eaca',
title: '货位号', title: '货位号',
dataIndex: 'hwh', dataIndex: 'hwh',
...@@ -664,9 +706,9 @@ export const formProps: FormProps = { ...@@ -664,9 +706,9 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: 'c90814d02b6f420f93d397202c8803fd', key: '1026628c881d477b890e57ffd408b77a',
title: '应发数量', title: '数量',
dataIndex: 'yfsl', dataIndex: 'sl',
componentType: 'InputNumber', componentType: 'InputNumber',
defaultValue: 0, defaultValue: 0,
componentProps: { componentProps: {
...@@ -712,6 +754,36 @@ export const formProps: FormProps = { ...@@ -712,6 +754,36 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: 'ee29558be5e24c4ca2a706ebfae5fd7a',
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: '8e0d25fb158a46c9a482d0f957cb88ae', key: '8e0d25fb158a46c9a482d0f957cb88ae',
title: '备注', title: '备注',
dataIndex: 'bz', dataIndex: 'bz',
......
xjrsoft-vue3/src/views/ckgl/scll/components/workflowPermission.ts
...@@ -72,8 +72,8 @@ export const permissionList = [ ...@@ -72,8 +72,8 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '领料库存组织', fieldName: '业务组织',
fieldId: 'llkczz', fieldId: 'ywzz',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'input',
...@@ -106,15 +106,14 @@ export const permissionList = [ ...@@ -106,15 +106,14 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '备注', fieldName: '单据状态',
fieldId: 'bz', fieldId: 'zt',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'select',
key: '47ae1b1e159b4f5787e9d59f219a3e9f', key: '9cdba668d8b348e8a581859ade8585b2',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -134,6 +133,23 @@ export const permissionList = [ ...@@ -134,6 +133,23 @@ export const permissionList = [
defaultValue: '', defaultValue: '',
}, },
{ {
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '备注',
fieldId: 'bz',
isSubTable: false,
showChildren: true,
type: 'input',
key: '47ae1b1e159b4f5787e9d59f219a3e9f',
children: [],
options: {},
defaultValue: '',
},
{
required: true, required: true,
view: true, view: true,
edit: true, edit: true,
...@@ -215,10 +231,10 @@ export const permissionList = [ ...@@ -215,10 +231,10 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'mesWarehousePromaterialInfoList', tableName: 'mesWarehousePromaterialInfoList',
fieldName: '数量', fieldName: '货位号',
fieldId: 'sl', fieldId: 'hwh',
type: 'InputNumber', type: 'Input',
key: '1026628c881d477b890e57ffd408b77a', key: '6561cde6f9ee4fd6a898ed3e3618eaca',
children: [], children: [],
}, },
{ {
...@@ -230,10 +246,10 @@ export const permissionList = [ ...@@ -230,10 +246,10 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'mesWarehousePromaterialInfoList', tableName: 'mesWarehousePromaterialInfoList',
fieldName: '货位号', fieldName: '数量',
fieldId: 'hwh', fieldId: 'sl',
type: 'Input', type: 'InputNumber',
key: '6561cde6f9ee4fd6a898ed3e3618eaca', key: '1026628c881d477b890e57ffd408b77a',
children: [], children: [],
}, },
{ {
...@@ -245,10 +261,10 @@ export const permissionList = [ ...@@ -245,10 +261,10 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'mesWarehousePromaterialInfoList', tableName: 'mesWarehousePromaterialInfoList',
fieldName: '应发数量', fieldName: '实发数量',
fieldId: 'yfsl', fieldId: 'sfsl',
type: 'InputNumber', type: 'InputNumber',
key: 'c90814d02b6f420f93d397202c8803fd', key: 'aed6a337f7a447538e0eb2faec5f9f06',
children: [], children: [],
}, },
{ {
...@@ -260,10 +276,10 @@ export const permissionList = [ ...@@ -260,10 +276,10 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'mesWarehousePromaterialInfoList', tableName: 'mesWarehousePromaterialInfoList',
fieldName: '实发数量', fieldName: '批次号',
fieldId: 'sfsl', fieldId: 'pch',
type: 'InputNumber', type: 'Input',
key: 'aed6a337f7a447538e0eb2faec5f9f06', key: 'ee29558be5e24c4ca2a706ebfae5fd7a',
children: [], children: [],
}, },
{ {
......
xjrsoft-vue3/src/views/ckgl/scll/index.vue
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
//展示在列表内的按钮 //展示在列表内的按钮
const actionButtons = ref<string[]>(["view","edit","delete"]); const actionButtons = ref<string[]>(["view","edit","delete"]);
const buttonConfigs = computed(()=>{ const buttonConfigs = computed(()=>{
const list = [{"buttonId":"2010557152968171520","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2010557152972365824","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2013779484670955520","name":"打印","code":"print","icon":"ant-design:printer-outlined","isDefault":true,"isUse":true},{"buttonId":"2010557152972365825","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}] const list = [{"buttonId":"2010557152968171520","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2010557152968171521","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2010557152972365824","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2013779484670955520","name":"打印","code":"print","icon":"ant-design:printer-outlined","isDefault":true,"isUse":true},{"buttonId":"2010557152972365825","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
return filterButtonAuth(list); return filterButtonAuth(list);
}) })
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
return buttonConfigs.value?.filter((x) => actionButtons.value.includes(x.code)); return buttonConfigs.value?.filter((x) => actionButtons.value.includes(x.code));
}); });
const btnEvent = {view : handleView,edit : handleEdit,print : handlePrint,delete : handleDelete,} const btnEvent = {view : handleView,add : handleAdd,edit : handleEdit,print : handlePrint,delete : handleDelete,}
const { currentRoute } = useRouter(); const { currentRoute } = useRouter();
...@@ -222,6 +222,13 @@ ...@@ -222,6 +222,13 @@
} }
function handleAdd() {
openModal(true, { isUpdate: false, });
}
async function handleEdit(record: Recordable) { async function handleEdit(record: Recordable) {
let field = 'id'; let field = 'id';
......
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