Skip to content

W
weiqiao-vue
Commit 371832af by 张珈源
Options

refactor(ckgl): 更新出入库管理配置和字段映射 

- 将入库单配置中的部分字段设置为禁用状态
- 修改默认选择值从数字ID改为中文描述
- 调整搜索表单字段映射关系
- 重新排列表格列的顺序和组件类型
- 更新工作流权限配置中的字段定义
- 修改销售出库模型接口字段映射
- 添加新的业务组织和批次号字段支持
- 调整表单布局和组件属性配置
parent 0d7bce99
Showing with 233 additions and 138 deletions
xjrsoft-vue3/src/api/ckgl/xsck/model/XsckModel.ts
...@@ -4,11 +4,13 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -4,11 +4,13 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
* @description: MesWarehouseSaleout分页参数 模型 * @description: MesWarehouseSaleout分页参数 模型
*/ */
export interface MesWarehouseSaleoutPageParams extends BasicPageParams { export interface MesWarehouseSaleoutPageParams extends BasicPageParams {
kczz: string; djbh: string;
ck: string; ck: string;
jbr: string; ywzz: string;
pch: string;
} }
/** /**
...@@ -17,7 +19,7 @@ export interface MesWarehouseSaleoutPageParams extends BasicPageParams { ...@@ -17,7 +19,7 @@ export interface MesWarehouseSaleoutPageParams extends BasicPageParams {
export interface MesWarehouseSaleoutPageModel { export interface MesWarehouseSaleoutPageModel {
id: string; id: string;
kczz: string; djbh: string;
djrq: string; djrq: string;
...@@ -29,11 +31,9 @@ export interface MesWarehouseSaleoutPageModel { ...@@ -29,11 +31,9 @@ export interface MesWarehouseSaleoutPageModel {
bm: string; bm: string;
ddkh: string; pch: string;
djzt: string;
djbh: string; ddkh: string;
cydw: string; cydw: string;
...@@ -43,6 +43,10 @@ export interface MesWarehouseSaleoutPageModel { ...@@ -43,6 +43,10 @@ export interface MesWarehouseSaleoutPageModel {
shr: string; shr: string;
ywzz: string;
djzt: string;
bz: string; bz: string;
} }
...@@ -54,7 +58,7 @@ export interface MesWarehouseSaleoutModel { ...@@ -54,7 +58,7 @@ export interface MesWarehouseSaleoutModel {
deleteMark: string; deleteMark: string;
kczz: string; ywzz: string;
djrq: string; djrq: string;
...@@ -68,6 +72,8 @@ export interface MesWarehouseSaleoutModel { ...@@ -68,6 +72,8 @@ export interface MesWarehouseSaleoutModel {
ddkh: string; ddkh: string;
pch: string;
djzt: string; djzt: string;
djbh: string; djbh: string;
...@@ -187,6 +193,8 @@ export interface MesWarehouseSaleoutInfoModel { ...@@ -187,6 +193,8 @@ export interface MesWarehouseSaleoutInfoModel {
bz: string; bz: string;
ckdh: string;
p1: string; p1: string;
p2: string; p2: string;
......
xjrsoft-vue3/src/views/ckgl/scrk/components/config.ts
...@@ -401,13 +401,13 @@ export const formProps: FormProps = { ...@@ -401,13 +401,13 @@ export const formProps: FormProps = {
showSearch: false, showSearch: false,
isMultiple: false, isMultiple: false,
clearable: false, clearable: false,
disabled: false, disabled: true,
staticOptions: [ staticOptions: [
{ key: 1, label: 'Option 1', value: 'Option 1' }, { key: 1, label: 'Option 1', value: 'Option 1' },
{ 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: '2', defaultSelect: '入库',
datasourceType: 'dic', datasourceType: 'dic',
params: { itemId: '2010533622867509249' }, params: { itemId: '2010533622867509249' },
labelField: 'name', labelField: 'name',
...@@ -568,7 +568,7 @@ export const formProps: FormProps = { ...@@ -568,7 +568,7 @@ export const formProps: FormProps = {
showSearch: false, showSearch: false,
isMultiple: false, isMultiple: false,
clearable: false, clearable: false,
disabled: false, disabled: true,
staticOptions: [ staticOptions: [
{ key: 1, label: 'Option 1', value: 'Option 1' }, { key: 1, label: 'Option 1', value: 'Option 1' },
{ key: 2, label: 'Option 2', value: 'Option 2' }, { key: 2, label: 'Option 2', value: 'Option 2' },
...@@ -590,6 +590,7 @@ export const formProps: FormProps = { ...@@ -590,6 +590,7 @@ export const formProps: FormProps = {
isShow: true, isShow: true,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2016321281785163777', itemId: '2016321281785163777',
defaultSelect: '已下发',
style: { width: '100%' }, style: { width: '100%' },
}, },
}, },
...@@ -611,7 +612,6 @@ export const formProps: FormProps = { ...@@ -611,7 +612,6 @@ export const formProps: FormProps = {
span: 7, span: 7,
defaultValue: '', defaultValue: '',
placeholder: '请输入批次号', placeholder: '请输入批次号',
maxlength: null,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -886,46 +886,41 @@ export const formProps: FormProps = { ...@@ -886,46 +886,41 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: 'f4f6844ab6454be7af329f780e80447f', key: '5fa9ca15c8b84592b93abbd7702d1306',
title: '批次号', title: '实收件数',
dataIndex: 'pch', dataIndex: 'ssjs',
componentType: 'Input', componentType: 'InputNumber',
defaultValue: '', defaultValue: '',
componentProps: { componentProps: {
width: '100%', width: '100%',
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入批次号', min: 0,
prefix: '', step: 1,
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false, disabled: false,
allowClear: false,
showLabel: true, showLabel: true,
controls: true,
required: false, required: false,
subTotal: false,
isShow: true,
rules: [], rules: [],
events: {}, events: {},
listStyle: '', placeholder: '请输入实收件数',
isSave: false,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
listStyle: "return 'width:100%'",
}, },
}, },
{ {
key: '5d9a11c345e24ff59f416012ae5fb4c1', key: 'f4f6844ab6454be7af329f780e80447f',
title: '货位', title: '批次号',
dataIndex: 'hw', dataIndex: 'pch',
componentType: 'Input', componentType: 'Input',
defaultValue: '', defaultValue: '',
componentProps: { componentProps: {
width: '100%', width: '100%',
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入货位', placeholder: '请输入批次号',
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
...@@ -946,16 +941,16 @@ export const formProps: FormProps = { ...@@ -946,16 +941,16 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: 'daec33570ef04811860b88bfe4b743d7', key: '5d9a11c345e24ff59f416012ae5fb4c1',
title: '实收件数', title: '货位',
dataIndex: 'ssjs', dataIndex: 'hw',
componentType: 'Input', componentType: 'Input',
defaultValue: '', defaultValue: '',
componentProps: { componentProps: {
width: '100%', width: '100%',
span: '', span: '',
defaultValue: '', defaultValue: '',
placeholder: '请输入实收件数', placeholder: '请输入货位',
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
......
xjrsoft-vue3/src/views/ckgl/scrk/components/workflowPermission.ts
...@@ -51,7 +51,7 @@ export const permissionList = [ ...@@ -51,7 +51,7 @@ export const permissionList = [
{ {
required: false, required: false,
view: true, view: true,
edit: true, edit: false,
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
...@@ -63,7 +63,7 @@ export const permissionList = [ ...@@ -63,7 +63,7 @@ export const permissionList = [
key: '2ebc5694329846dc975c563118968daa', key: '2ebc5694329846dc975c563118968daa',
children: [], children: [],
options: {}, options: {},
defaultValue: '2', defaultValue: '入库',
}, },
{ {
required: false, required: false,
...@@ -118,7 +118,7 @@ export const permissionList = [ ...@@ -118,7 +118,7 @@ export const permissionList = [
{ {
required: false, required: false,
view: true, view: true,
edit: true, edit: false,
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
...@@ -130,6 +130,7 @@ export const permissionList = [ ...@@ -130,6 +130,7 @@ export const permissionList = [
key: '16ad4aafe99c4797966fc6e01bc63e90', key: '16ad4aafe99c4797966fc6e01bc63e90',
children: [], children: [],
options: {}, options: {},
defaultValue: '已下发',
}, },
{ {
required: false, required: false,
...@@ -281,10 +282,10 @@ export const permissionList = [ ...@@ -281,10 +282,10 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'mesWarehouseProductInfoList', tableName: 'mesWarehouseProductInfoList',
fieldName: '批次号', fieldName: '实收件数',
fieldId: 'pch', fieldId: 'ssjs',
type: 'Input', type: 'InputNumber',
key: 'f4f6844ab6454be7af329f780e80447f', key: '5fa9ca15c8b84592b93abbd7702d1306',
children: [], children: [],
}, },
{ {
...@@ -296,10 +297,10 @@ export const permissionList = [ ...@@ -296,10 +297,10 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'mesWarehouseProductInfoList', tableName: 'mesWarehouseProductInfoList',
fieldName: '货位', fieldName: '批次号',
fieldId: 'hw', fieldId: 'pch',
type: 'Input', type: 'Input',
key: '5d9a11c345e24ff59f416012ae5fb4c1', key: 'f4f6844ab6454be7af329f780e80447f',
children: [], children: [],
}, },
{ {
...@@ -311,10 +312,10 @@ export const permissionList = [ ...@@ -311,10 +312,10 @@ export const permissionList = [
isSaveTable: false, isSaveTable: false,
showChildren: false, showChildren: false,
tableName: 'mesWarehouseProductInfoList', tableName: 'mesWarehouseProductInfoList',
fieldName: '实收件数', fieldName: '货位',
fieldId: 'ssjs', fieldId: 'hw',
type: 'Input', type: 'Input',
key: 'daec33570ef04811860b88bfe4b743d7', key: '5d9a11c345e24ff59f416012ae5fb4c1',
children: [], children: [],
}, },
{ {
......
xjrsoft-vue3/src/views/ckgl/xsck/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',
}, },
...@@ -16,8 +16,23 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -16,8 +16,23 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input', component: 'Input',
}, },
{ {
field: 'jbr', field: 'ywzz',
label: '经办人', label: '业务组织',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'dic',
params: { itemId: '2015724355955159041' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'pch',
label: '批次号',
defaultValue: undefined, defaultValue: undefined,
component: 'Input', component: 'Input',
}, },
...@@ -26,15 +41,15 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -26,15 +41,15 @@ export const searchFormSchema: FormSchema[] = [
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'kczz', dataIndex: 'djbh',
title: '库存组织', title: '单据编号',
componentType: 'input', componentType: 'auto-code',
fixed: false, fixed: false,
sorter: true, sorter: true,
styleConfig: undefined, styleConfig: undefined,
listStyle: '', listStyle: undefined,
}, },
{ {
...@@ -104,8 +119,8 @@ export const columns: BasicColumn[] = [ ...@@ -104,8 +119,8 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'ddkh', dataIndex: 'pch',
title: '订单客户', title: '批次号',
componentType: 'input', componentType: 'input',
fixed: false, fixed: false,
...@@ -117,28 +132,15 @@ export const columns: BasicColumn[] = [ ...@@ -117,28 +132,15 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'djzt', dataIndex: 'ddkh',
title: '单据状态', title: '订单客户',
componentType: 'select', componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'djbh',
title: '单据编号',
componentType: 'auto-code',
fixed: false, fixed: false,
sorter: true, sorter: true,
styleConfig: undefined, styleConfig: undefined,
listStyle: undefined, listStyle: '',
}, },
{ {
...@@ -195,6 +197,32 @@ export const columns: BasicColumn[] = [ ...@@ -195,6 +197,32 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'ywzz',
title: '业务组织',
componentType: 'select',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'djzt',
title: '单据状态',
componentType: 'select',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'bz', dataIndex: 'bz',
title: '备注', title: '备注',
componentType: 'textarea', componentType: 'textarea',
...@@ -289,34 +317,24 @@ export const formProps: FormProps = { ...@@ -289,34 +317,24 @@ export const formProps: FormProps = {
span: 6, span: 6,
list: [ list: [
{ {
key: 'd45d2f98fcef445d8b777914fd4193f2', key: '160979df6a214cb590fa0b8f20bcd98c',
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: 8, span: 8,
defaultValue: '', placeholder: '请输入单据编号',
placeholder: '请输入库存组织',
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '', addonBefore: '',
addonAfter: '', addonAfter: '',
disabled: false,
allowClear: false,
showLabel: true, showLabel: true,
autoCodeRule: 'XSCK',
required: false, required: false,
rules: [],
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%' },
}, },
...@@ -601,25 +619,43 @@ export const formProps: FormProps = { ...@@ -601,25 +619,43 @@ export const formProps: FormProps = {
span: 6, span: 6,
list: [ list: [
{ {
key: '160979df6a214cb590fa0b8f20bcd98c', key: '0c1920884b36455b88ead8d844503ad4',
field: 'djbh', field: 'ywzz',
label: '单据编号', label: '业务组织',
type: 'auto-code', type: 'select',
component: 'AutoCodeRule', component: 'XjrSelect',
colProps: { span: 24 }, colProps: { span: 24 },
componentProps: { componentProps: {
width: '100%', width: '100%',
span: 7, span: 8,
placeholder: '请输入单据编号', placeholder: '请选择业务组织',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
showLabel: true, showLabel: true,
autoCodeRule: 'XSCK', showSearch: false,
required: 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: true,
rules: [],
events: {},
isShow: true, isShow: true,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2015724355955159041',
style: { width: '100%' }, style: { width: '100%' },
}, },
}, },
...@@ -772,32 +808,38 @@ export const formProps: FormProps = { ...@@ -772,32 +808,38 @@ export const formProps: FormProps = {
], ],
}, },
{ {
span: 24, span: 6,
list: [ list: [
{ {
key: 'c6c4bc8735f141829c4712c0433c907e', key: '90803d7f28ce4e2e92678ff6e0a3fc45',
field: 'bz', field: 'pch',
label: '备注', label: '批次号',
type: 'textarea', type: 'input',
component: 'InputTextArea', component: 'Input',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '', defaultValue: '',
componentProps: { componentProps: {
width: '100%', width: '100%',
span: 2, span: 8,
defaultValue: '', defaultValue: '',
placeholder: '请输入备注', placeholder: '请输入批次号',
rows: 4, maxlength: null,
autoSize: false, prefix: '',
showCount: false, suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false, disabled: false,
showLabel: true,
allowClear: false, allowClear: false,
showLabel: true,
required: false, required: false,
isShow: true,
isShowAi: false,
rules: [], rules: [],
events: {}, events: {},
listStyle: '',
isSave: false,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' }, style: { width: '100%' },
}, },
...@@ -834,6 +876,39 @@ export const formProps: FormProps = { ...@@ -834,6 +876,39 @@ export const formProps: FormProps = {
}, },
], ],
}, },
{
span: 24,
list: [
{
key: 'c6c4bc8735f141829c4712c0433c907e',
field: 'bz',
label: '备注',
type: 'textarea',
component: 'InputTextArea',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 2,
defaultValue: '',
placeholder: '请输入备注',
rows: 4,
autoSize: false,
showCount: false,
disabled: false,
showLabel: true,
allowClear: false,
required: false,
isShow: true,
isShowAi: false,
rules: [],
events: {},
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
],
},
], ],
componentProps: { componentProps: {
gutter: 16, gutter: 16,
......
xjrsoft-vue3/src/views/ckgl/xsck/components/workflowPermission.ts
...@@ -2,19 +2,18 @@ export const permissionList = [ ...@@ -2,19 +2,18 @@ export const permissionList = [
{ {
required: false, 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: 'd45d2f98fcef445d8b777914fd4193f2', key: '160979df6a214cb590fa0b8f20bcd98c',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -134,18 +133,18 @@ export const permissionList = [ ...@@ -134,18 +133,18 @@ export const permissionList = [
options: {}, options: {},
}, },
{ {
required: false, required: true,
view: true, view: true,
edit: false, edit: true,
disabled: true, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '单据编号', fieldName: '业务组织',
fieldId: 'djbh', fieldId: 'ywzz',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'auto-code', type: 'select',
key: '160979df6a214cb590fa0b8f20bcd98c', key: '0c1920884b36455b88ead8d844503ad4',
children: [], children: [],
options: {}, options: {},
}, },
...@@ -224,12 +223,12 @@ export const permissionList = [ ...@@ -224,12 +223,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '备注', fieldName: '批次号',
fieldId: 'bz', fieldId: 'pch',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'textarea', type: 'input',
key: 'c6c4bc8735f141829c4712c0433c907e', key: '90803d7f28ce4e2e92678ff6e0a3fc45',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -252,6 +251,23 @@ export const permissionList = [ ...@@ -252,6 +251,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: 'textarea',
key: 'c6c4bc8735f141829c4712c0433c907e',
children: [],
options: {},
defaultValue: '',
},
{
required: true, required: true,
view: true, view: true,
edit: true, edit: true,
......
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