Skip to content

W
weiqiao-vue
Commit d9092c94 by 张珈源
Options

feat(ckgl): 更新生产入库单据配置和数据模型 

- 将搜索表单中的库存组织字段替换为单据编号字段
- 为仓库字段添加字典数据源支持多选和搜索功能
- 新增业务组织和单据状态字段到搜索表单
- 更新表格列配置以匹配新的字段结构
- 为单据编号设置自动生成码组件
- 在主表单中添加业务组织和单据状态下拉选择
- 调整工作流权限配置以反映字段变更
- 更新API模型接口定义以匹配新字段
- 在按钮配置中添加唯一标识符字段
- 移除多个字段的maxlength属性以简化配置
parent d5fae1bb
Showing with 194 additions and 149 deletions
xjrsoft-vue3/src/api/ckgl/scrk/model/ScrkModel.ts
...@@ -4,13 +4,15 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -4,13 +4,15 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
* @description: MesWarehouseProduct分页参数 模型 * @description: MesWarehouseProduct分页参数 模型
*/ */
export interface MesWarehouseProductPageParams extends BasicPageParams { export interface MesWarehouseProductPageParams extends BasicPageParams {
kczz: string; djbh: string;
ck: string; ck: string;
kgy: string;
scbm: string; scbm: string;
ywzz: string;
djzt: string;
} }
/** /**
...@@ -19,12 +21,8 @@ export interface MesWarehouseProductPageParams extends BasicPageParams { ...@@ -19,12 +21,8 @@ export interface MesWarehouseProductPageParams extends BasicPageParams {
export interface MesWarehouseProductPageModel { export interface MesWarehouseProductPageModel {
id: string; id: string;
kczz: string;
djrq: string; djrq: string;
ck: string;
crklx: string; crklx: string;
kgy: string; kgy: string;
...@@ -33,7 +31,13 @@ export interface MesWarehouseProductPageModel { ...@@ -33,7 +31,13 @@ export interface MesWarehouseProductPageModel {
djbh: string; djbh: string;
ck: string;
ywzz: string;
djzt: string; djzt: string;
bz: string;
} }
/** /**
...@@ -44,7 +48,7 @@ export interface MesWarehouseProductModel { ...@@ -44,7 +48,7 @@ export interface MesWarehouseProductModel {
deleteMark: string; deleteMark: string;
kczz: string; ywzz: string;
djrq: string; djrq: string;
...@@ -186,6 +190,8 @@ export interface MesWarehouseProductInfoModel { ...@@ -186,6 +190,8 @@ export interface MesWarehouseProductInfoModel {
modifyDate: string; modifyDate: string;
modifyUserId: string; modifyUserId: string;
rkdh: string;
} }
/** /**
......
xjrsoft-vue3/src/views/ckgl/scrk/components/config.ts
...@@ -4,8 +4,8 @@ import { uploadApi } from '/@/api/sys/upload'; ...@@ -4,8 +4,8 @@ import { uploadApi } from '/@/api/sys/upload';
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
{ {
field: 'kczz', field: 'djbh',
label: '库存组织', label: '单据编号',
defaultValue: undefined, defaultValue: undefined,
component: 'Input', component: 'Input',
}, },
...@@ -13,13 +13,16 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -13,13 +13,16 @@ export const searchFormSchema: FormSchema[] = [
field: 'ck', field: 'ck',
label: '仓库', label: '仓库',
defaultValue: undefined, defaultValue: undefined,
component: 'Input', component: 'XjrSelect',
componentProps: {
datasourceType: 'dic',
params: { itemId: '2010539474382962690' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
}, },
{
field: 'kgy',
label: '库管员',
defaultValue: undefined,
component: 'Input',
}, },
{ {
field: 'scbm', field: 'scbm',
...@@ -27,27 +30,57 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -27,27 +30,57 @@ export const searchFormSchema: FormSchema[] = [
defaultValue: undefined, defaultValue: undefined,
component: 'Input', component: 'Input',
}, },
{
field: 'ywzz',
label: '业务组织',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'dic',
params: { itemId: '2015724355955159041' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'djzt',
label: '单据状态',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'dic',
params: { itemId: '2016321281785163777' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
]; ];
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'kczz', dataIndex: 'djrq',
title: '库存组织', title: '单据日期',
componentType: 'input', componentType: 'date',
fixed: false, fixed: false,
sorter: true, sorter: true,
styleConfig: undefined, styleConfig: undefined,
listStyle: '', listStyle: undefined,
}, },
{ {
resizable: true, resizable: true,
dataIndex: 'djrq', dataIndex: 'crklx',
title: '单据日期', title: '出入库类型',
componentType: 'date', componentType: 'select',
fixed: false, fixed: false,
sorter: true, sorter: true,
...@@ -58,8 +91,8 @@ export const columns: BasicColumn[] = [ ...@@ -58,8 +91,8 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'ck', dataIndex: 'kgy',
title: '仓库', title: '库管员',
componentType: 'input', componentType: 'input',
fixed: false, fixed: false,
...@@ -71,60 +104,73 @@ export const columns: BasicColumn[] = [ ...@@ -71,60 +104,73 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'crklx', dataIndex: 'scbm',
title: '出入库类型', title: '生产部门',
componentType: 'select', componentType: 'input',
fixed: false, fixed: false,
sorter: true, sorter: true,
styleConfig: undefined, styleConfig: undefined,
listStyle: undefined, listStyle: '',
}, },
{ {
resizable: true, resizable: true,
dataIndex: 'kgy', dataIndex: 'djbh',
title: '库管员', title: '单据编号',
componentType: 'input', componentType: 'auto-code',
fixed: false, fixed: false,
sorter: true, sorter: true,
styleConfig: undefined, styleConfig: undefined,
listStyle: '', listStyle: undefined,
}, },
{ {
resizable: true, resizable: true,
dataIndex: 'scbm', dataIndex: 'ck',
title: '生产部门', title: '仓库',
componentType: 'input', componentType: 'select',
fixed: false, fixed: false,
sorter: true, sorter: true,
styleConfig: undefined, styleConfig: undefined,
listStyle: '', listStyle: undefined,
}, },
{ {
resizable: true, resizable: true,
dataIndex: 'djbh', dataIndex: 'ywzz',
title: '单据编号', title: '业务组织',
componentType: 'input', componentType: 'select',
fixed: false, fixed: false,
sorter: true, sorter: true,
styleConfig: undefined, styleConfig: undefined,
listStyle: '', listStyle: undefined,
}, },
{ {
resizable: true, resizable: true,
dataIndex: 'djzt', dataIndex: 'djzt',
title: '单据状态', title: '单据状态',
componentType: 'select',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'bz',
title: '备注',
componentType: 'input', componentType: 'input',
fixed: false, fixed: false,
...@@ -217,35 +263,24 @@ export const formProps: FormProps = { ...@@ -217,35 +263,24 @@ export const formProps: FormProps = {
span: 8, span: 8,
list: [ list: [
{ {
key: 'b7fc1a99eb11469fbffd723f8ce0629f', key: '783643292ed9482fae0d3a37d2ebef65',
field: 'kczz', field: 'djbh',
label: '库存组织', label: '单据编号',
type: 'input', type: 'auto-code',
component: 'Input', component: 'AutoCodeRule',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '',
componentProps: { componentProps: {
width: '100%', width: '100%',
span: 7, span: 7,
defaultValue: '', placeholder: '请输入单据编号',
placeholder: '请输入库存组织',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: false,
allowClear: false,
showLabel: true, showLabel: true,
required: true, autoCodeRule: 'scrkbh',
rules: [], required: false,
events: {},
listStyle: '',
isSave: false,
isShow: true, isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' }, style: { width: '100%' },
}, },
...@@ -288,36 +323,43 @@ export const formProps: FormProps = { ...@@ -288,36 +323,43 @@ export const formProps: FormProps = {
span: 8, span: 8,
list: [ list: [
{ {
key: '0f17a0106f2348bbbc3d19889815b9c7', key: '7a643e99ca7242c9a606dc550981d6af',
field: 'ck', field: 'ck',
label: '仓库', label: '仓库',
type: 'input', type: 'select',
component: 'Input', component: 'XjrSelect',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '',
componentProps: { componentProps: {
width: '100%', width: '100%',
span: 7, span: 7,
defaultValue: '', placeholder: '请选择下拉选择仓库',
placeholder: '请输入仓库',
maxlength: null,
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: '2010539474382962690' },
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: '2010539474382962690',
style: { width: '100%' }, style: { width: '100%' },
}, },
}, },
...@@ -385,7 +427,6 @@ export const formProps: FormProps = { ...@@ -385,7 +427,6 @@ export const formProps: FormProps = {
span: 7, span: 7,
defaultValue: '', defaultValue: '',
placeholder: '请输入库管员', placeholder: '请输入库管员',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -424,7 +465,6 @@ export const formProps: FormProps = { ...@@ -424,7 +465,6 @@ export const formProps: FormProps = {
span: 7, span: 7,
defaultValue: '', defaultValue: '',
placeholder: '请输入生产部门', placeholder: '请输入生产部门',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -451,36 +491,43 @@ export const formProps: FormProps = { ...@@ -451,36 +491,43 @@ export const formProps: FormProps = {
span: 8, span: 8,
list: [ list: [
{ {
key: 'd5e600afe891410882c273a7bc1b2ca2', key: 'b4b870255bc248e3adb580c6dbcbaac1',
field: 'djbh', field: 'ywzz',
label: '单据编号', label: '业务组织',
type: 'input', type: 'select',
component: 'Input', component: 'XjrSelect',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '',
componentProps: { componentProps: {
width: '100%', width: '100%',
span: 7, span: 7,
defaultValue: '', placeholder: '请选择下拉选择',
placeholder: '请输入单据编号',
maxlength: null,
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: '2015724355955159041' },
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: '2015724355955159041',
style: { width: '100%' }, style: { width: '100%' },
}, },
}, },
...@@ -490,36 +537,43 @@ export const formProps: FormProps = { ...@@ -490,36 +537,43 @@ export const formProps: FormProps = {
span: 8, span: 8,
list: [ list: [
{ {
key: '320589395feb4544a4c0b9ff283e3b2f', key: '16ad4aafe99c4797966fc6e01bc63e90',
field: 'djzt', field: 'djzt',
label: '单据状态', label: '单据状态',
type: 'input', type: 'select',
component: 'Input', component: 'XjrSelect',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '',
componentProps: { componentProps: {
width: '100%', width: '100%',
span: 7, span: 7,
defaultValue: '', placeholder: '请选择下拉选择',
placeholder: '请输入单据状态',
maxlength: null,
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%' },
}, },
}, },
...@@ -571,7 +625,6 @@ export const formProps: FormProps = { ...@@ -571,7 +625,6 @@ export const formProps: FormProps = {
span: 2, span: 2,
defaultValue: '', defaultValue: '',
placeholder: '请输入备注', placeholder: '请输入备注',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -610,7 +663,6 @@ export const formProps: FormProps = { ...@@ -610,7 +663,6 @@ export const formProps: FormProps = {
span: 7, span: 7,
defaultValue: '', defaultValue: '',
placeholder: '', placeholder: '',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -669,7 +721,6 @@ export const formProps: FormProps = { ...@@ -669,7 +721,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入物料编码', placeholder: '请输入物料编码',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -700,7 +751,6 @@ export const formProps: FormProps = { ...@@ -700,7 +751,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入物料名称', placeholder: '请输入物料名称',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -731,7 +781,6 @@ export const formProps: FormProps = { ...@@ -731,7 +781,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入规格', placeholder: '请输入规格',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -762,7 +811,6 @@ export const formProps: FormProps = { ...@@ -762,7 +811,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入型号', placeholder: '请输入型号',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -793,7 +841,6 @@ export const formProps: FormProps = { ...@@ -793,7 +841,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入批次号', placeholder: '请输入批次号',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -824,7 +871,6 @@ export const formProps: FormProps = { ...@@ -824,7 +871,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入货位', placeholder: '请输入货位',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -855,7 +901,6 @@ export const formProps: FormProps = { ...@@ -855,7 +901,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入实收件数', placeholder: '请输入实收件数',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -886,7 +931,6 @@ export const formProps: FormProps = { ...@@ -886,7 +931,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入备注', placeholder: '请输入备注',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -917,7 +961,6 @@ export const formProps: FormProps = { ...@@ -917,7 +961,6 @@ export const formProps: FormProps = {
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '', placeholder: '',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
......
xjrsoft-vue3/src/views/ckgl/scrk/components/workflowPermission.ts
export const permissionList = [ export const permissionList = [
{ {
required: true, required: false,
view: true, view: true,
edit: true, edit: false,
disabled: false, disabled: true,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '库存组织', fieldName: '单据编号',
fieldId: 'kczz', fieldId: 'djbh',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'auto-code',
key: 'b7fc1a99eb11469fbffd723f8ce0629f', key: '783643292ed9482fae0d3a37d2ebef65',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -44,11 +43,10 @@ export const permissionList = [ ...@@ -44,11 +43,10 @@ export const permissionList = [
fieldId: 'ck', fieldId: 'ck',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'select',
key: '0f17a0106f2348bbbc3d19889815b9c7', key: '7a643e99ca7242c9a606dc550981d6af',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -108,15 +106,14 @@ export const permissionList = [ ...@@ -108,15 +106,14 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '单据编号', fieldName: '业务组织',
fieldId: 'djbh', fieldId: 'ywzz',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'select',
key: 'd5e600afe891410882c273a7bc1b2ca2', key: 'b4b870255bc248e3adb580c6dbcbaac1',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -129,11 +126,10 @@ export const permissionList = [ ...@@ -129,11 +126,10 @@ export const permissionList = [
fieldId: 'djzt', fieldId: 'djzt',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'select',
key: '320589395feb4544a4c0b9ff283e3b2f', key: '16ad4aafe99c4797966fc6e01bc63e90',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
......
xjrsoft-vue3/src/views/ckgl/scrk/index.vue
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,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":"delete","icon":"ant-design:delete-outlined","isDefault":true}] const list = [{"buttonId":"2010538548100980736","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2010538548100980737","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2010538548100980738","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2010538548100980739","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