Skip to content

W
weiqiao-vue
Commit 4fc271ac by 张珈源
Options

feat(ckgl): 更新销售出库模块配置和数据模型 

- 移除部门字段配置和对应的数据模型属性
- 添加单据编号、承运单位、收货日期、收货地址、收货人、备注等新字段配置
- 为表格列添加排序和调整大小功能
- 清理字段配置中的多余属性如maxlength和defaultSelect
- 更新按钮配置结构，添加buttonId标识
- 同步更新数据模型以匹配新的字段结构
parent d344eeca
Showing with 91 additions and 34 deletions
xjrsoft-vue3/src/api/ckgl/xsck/model/XsckModel.ts
...@@ -9,8 +9,6 @@ export interface MesWarehouseSaleoutPageParams extends BasicPageParams { ...@@ -9,8 +9,6 @@ export interface MesWarehouseSaleoutPageParams extends BasicPageParams {
ck: string; ck: string;
jbr: string; jbr: string;
bm: string;
} }
/** /**
...@@ -34,6 +32,18 @@ export interface MesWarehouseSaleoutPageModel { ...@@ -34,6 +32,18 @@ export interface MesWarehouseSaleoutPageModel {
ddkh: string; ddkh: string;
djzt: string; djzt: string;
djbh: string;
cydw: string;
shrq: string;
shdz: string;
shr: string;
bz: string;
} }
/** /**
......
xjrsoft-vue3/src/views/ckgl/xsck/components/config.ts
...@@ -21,12 +21,6 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -21,12 +21,6 @@ export const searchFormSchema: FormSchema[] = [
defaultValue: undefined, defaultValue: undefined,
component: 'Input', component: 'Input',
}, },
{
field: 'bm',
label: '部门',
defaultValue: undefined,
component: 'Input',
},
]; ];
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
...@@ -133,6 +127,84 @@ export const columns: BasicColumn[] = [ ...@@ -133,6 +127,84 @@ export const columns: BasicColumn[] = [
styleConfig: undefined, styleConfig: undefined,
listStyle: undefined, listStyle: undefined,
}, },
{
resizable: true,
dataIndex: 'djbh',
title: '单据编号',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'cydw',
title: '承运单位',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'shrq',
title: '收货日期',
componentType: 'date',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'shdz',
title: '收货地址',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'shr',
title: '收货人',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'bz',
title: '备注',
componentType: 'textarea',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
]; ];
//表头合并配置 //表头合并配置
export const headerMergingData = []; export const headerMergingData = [];
...@@ -229,7 +301,6 @@ export const formProps: FormProps = { ...@@ -229,7 +301,6 @@ export const formProps: FormProps = {
span: 8, span: 8,
defaultValue: '', defaultValue: '',
placeholder: '请输入库存组织', placeholder: '请输入库存组织',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -300,7 +371,6 @@ export const formProps: FormProps = { ...@@ -300,7 +371,6 @@ export const formProps: FormProps = {
span: 8, span: 8,
defaultValue: '', defaultValue: '',
placeholder: '请输入仓库', placeholder: '请输入仓库',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -347,7 +417,6 @@ export const formProps: FormProps = { ...@@ -347,7 +417,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: '2010533622867509249' }, params: { itemId: '2010533622867509249' },
labelField: 'name', labelField: 'name',
...@@ -385,7 +454,6 @@ export const formProps: FormProps = { ...@@ -385,7 +454,6 @@ export const formProps: FormProps = {
span: 8, span: 8,
defaultValue: '', defaultValue: '',
placeholder: '请输入经办人', placeholder: '请输入经办人',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -424,7 +492,6 @@ export const formProps: FormProps = { ...@@ -424,7 +492,6 @@ export const formProps: FormProps = {
span: 8, span: 8,
defaultValue: '', defaultValue: '',
placeholder: '请输入部门', placeholder: '请输入部门',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -463,7 +530,6 @@ export const formProps: FormProps = { ...@@ -463,7 +530,6 @@ export const formProps: FormProps = {
span: 8, span: 8,
defaultValue: '', defaultValue: '',
placeholder: '请输入订单客户', placeholder: '请输入订单客户',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -510,7 +576,6 @@ export const formProps: FormProps = { ...@@ -510,7 +576,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: '2010588655764074497' }, params: { itemId: '2010588655764074497' },
labelField: 'name', labelField: 'name',
...@@ -548,7 +613,6 @@ export const formProps: FormProps = { ...@@ -548,7 +613,6 @@ export const formProps: FormProps = {
span: 8, span: 8,
defaultValue: '', defaultValue: '',
placeholder: '请输入单据编号', placeholder: '请输入单据编号',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -587,7 +651,6 @@ export const formProps: FormProps = { ...@@ -587,7 +651,6 @@ export const formProps: FormProps = {
span: 8, span: 8,
defaultValue: '', defaultValue: '',
placeholder: '请输入承运单位', placeholder: '请输入承运单位',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -658,7 +721,6 @@ export const formProps: FormProps = { ...@@ -658,7 +721,6 @@ export const formProps: FormProps = {
span: 8, span: 8,
defaultValue: '', defaultValue: '',
placeholder: '请输入收货地址', placeholder: '请输入收货地址',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -697,7 +759,6 @@ export const formProps: FormProps = { ...@@ -697,7 +759,6 @@ export const formProps: FormProps = {
span: 8, span: 8,
defaultValue: '', defaultValue: '',
placeholder: '请输入收货人', placeholder: '请输入收货人',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -736,7 +797,6 @@ export const formProps: FormProps = { ...@@ -736,7 +797,6 @@ export const formProps: FormProps = {
span: 2, span: 2,
defaultValue: '', defaultValue: '',
placeholder: '请输入备注', placeholder: '请输入备注',
maxlength: null,
rows: 4, rows: 4,
autoSize: false, autoSize: false,
showCount: false, showCount: false,
...@@ -820,7 +880,6 @@ export const formProps: FormProps = { ...@@ -820,7 +880,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入物料编码', placeholder: '请输入物料编码',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -851,7 +910,6 @@ export const formProps: FormProps = { ...@@ -851,7 +910,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入物料名称', placeholder: '请输入物料名称',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -882,7 +940,6 @@ export const formProps: FormProps = { ...@@ -882,7 +940,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入规格', placeholder: '请输入规格',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -913,7 +970,6 @@ export const formProps: FormProps = { ...@@ -913,7 +970,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入型号', placeholder: '请输入型号',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -944,7 +1000,6 @@ export const formProps: FormProps = { ...@@ -944,7 +1000,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入批次号', placeholder: '请输入批次号',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -975,9 +1030,7 @@ export const formProps: FormProps = { ...@@ -975,9 +1030,7 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: 0, defaultValue: 0,
min: 0, min: 0,
max: null,
step: 1, step: 1,
maxlength: null,
disabled: false, disabled: false,
showLabel: true, showLabel: true,
controls: true, controls: true,
...@@ -1001,9 +1054,7 @@ export const formProps: FormProps = { ...@@ -1001,9 +1054,7 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: 0, defaultValue: 0,
min: 0, min: 0,
max: null,
step: 1, step: 1,
maxlength: null,
disabled: false, disabled: false,
showLabel: true, showLabel: true,
controls: true, controls: true,
...@@ -1027,9 +1078,7 @@ export const formProps: FormProps = { ...@@ -1027,9 +1078,7 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: 0, defaultValue: 0,
min: 0, min: 0,
max: null,
step: 1, step: 1,
maxlength: null,
disabled: false, disabled: false,
showLabel: true, showLabel: true,
controls: true, controls: true,
...@@ -1053,7 +1102,6 @@ export const formProps: FormProps = { ...@@ -1053,7 +1102,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入单位', placeholder: '请输入单位',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -1084,7 +1132,6 @@ export const formProps: FormProps = { ...@@ -1084,7 +1132,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入备注', placeholder: '请输入备注',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
......
xjrsoft-vue3/src/views/ckgl/xsck/index.vue
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
//展示在列表内的按钮 //展示在列表内的按钮
const actionButtons = ref<string[]>(["view","edit","delete"]); const actionButtons = ref<string[]>(["view","edit","delete"]);
const buttonConfigs = computed(()=>{ const buttonConfigs = computed(()=>{
const list = [{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isEnableLock":true},{"isUse":true,"name":"快速导入","code":"import","icon":"ant-design:import-outlined","isDefault":true},{"isUse":true,"name":"快速导出","code":"export","icon":"ant-design:export-outlined","isDefault":true},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true}] const list = [{"buttonId":"2010591769687232512","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2010591769687232513","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2010591769687232514","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2010591769687232515","name":"快速导入","code":"import","icon":"ant-design:import-outlined","isDefault":true,"isUse":true},{"buttonId":"2010591769687232516","name":"快速导出","code":"export","icon":"ant-design:export-outlined","isDefault":true,"isUse":true},{"buttonId":"2010591769687232517","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
return filterButtonAuth(list); return filterButtonAuth(list);
}) })
......
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