Skip to content

W
weiqiao-vue
Commit 13c8299c by 张珈源
Options

refactor(ckgl): 更新生产领料模块组件配置和字段类型 

- 将领料单位字段从Input组件改为Dept组件，并添加相应属性配置
- 将领料人字段从Input组件改为User组件，并配置选择器属性
- 更新表格列定义中的组件类型为对应的选择器组件
- 调整表单布局配置中的组件类型和属性设置
- 修改工作流权限配置中的字段类型定义
- 添加单据编号字段到数据模型接口
- 更新按钮配置中的打印功能ID
parent 7fe9c7af
Showing with 52 additions and 63 deletions
xjrsoft-vue3/src/api/ckgl/scll/model/ScllModel.ts
...@@ -17,6 +17,8 @@ export interface MesWarehousePromaterialPageParams extends BasicPageParams { ...@@ -17,6 +17,8 @@ export interface MesWarehousePromaterialPageParams extends BasicPageParams {
export interface MesWarehousePromaterialPageModel { export interface MesWarehousePromaterialPageModel {
id: string; id: string;
djbh: string;
djrq: string; djrq: string;
lldw: string; lldw: string;
...@@ -27,8 +29,6 @@ export interface MesWarehousePromaterialPageModel { ...@@ -27,8 +29,6 @@ export interface MesWarehousePromaterialPageModel {
kgy: string; kgy: string;
djbh: string;
bz: string; bz: string;
} }
......
xjrsoft-vue3/src/views/ckgl/scll/components/config.ts
...@@ -13,19 +13,40 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -13,19 +13,40 @@ export const searchFormSchema: FormSchema[] = [
field: 'lldw', field: 'lldw',
label: '领料单位', label: '领料单位',
defaultValue: undefined, defaultValue: undefined,
component: 'Input', component: 'Dept',
componentProps: {
placeholder: '请选择',
getPopupContainer: () => document.body,
},
}, },
{ {
field: 'llr', field: 'llr',
label: '领料人', label: '领料人',
defaultValue: undefined, defaultValue: undefined,
component: 'Input', component: 'User',
componentProps: {
suffix: 'ant-design:setting-outlined',
placeholder: '请选择',
},
}, },
]; ];
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'djbh',
title: '单据编号',
componentType: 'auto-code',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'djrq', dataIndex: 'djrq',
title: '单据日期', title: '单据日期',
componentType: 'date', componentType: 'date',
...@@ -41,26 +62,26 @@ export const columns: BasicColumn[] = [ ...@@ -41,26 +62,26 @@ export const columns: BasicColumn[] = [
resizable: true, resizable: true,
dataIndex: 'lldw', dataIndex: 'lldw',
title: '领料单位', title: '领料单位',
componentType: 'input', componentType: 'organization',
fixed: false, fixed: false,
sorter: true, sorter: true,
styleConfig: undefined, styleConfig: undefined,
listStyle: '', listStyle: undefined,
}, },
{ {
resizable: true, resizable: true,
dataIndex: 'llr', dataIndex: 'llr',
title: '领料人', title: '领料人',
componentType: 'input', componentType: 'user',
fixed: false, fixed: false,
sorter: true, sorter: true,
styleConfig: undefined, styleConfig: undefined,
listStyle: '', listStyle: undefined,
}, },
{ {
...@@ -91,19 +112,6 @@ export const columns: BasicColumn[] = [ ...@@ -91,19 +112,6 @@ export const columns: BasicColumn[] = [
{ {
resizable: true, resizable: true,
dataIndex: 'djbh',
title: '单据编号',
componentType: 'auto-code',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'bz', dataIndex: 'bz',
title: '备注', title: '备注',
componentType: 'input', componentType: 'input',
...@@ -258,34 +266,23 @@ export const formProps: FormProps = { ...@@ -258,34 +266,23 @@ export const formProps: FormProps = {
span: 8, span: 8,
list: [ list: [
{ {
key: '2e1a848d54b144d994cb147279cc1b96', key: '70dd6f50e807416eafb7ca0ea7fdc401',
field: 'lldw', field: 'lldw',
label: '领料单位', label: '领料单位',
type: 'input', type: 'organization',
component: 'Input', component: 'Dept',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '',
componentProps: { componentProps: {
width: '100%',
span: 7, span: 7,
defaultValue: '', width: '100%',
placeholder: '请输入领料单位', orgzType: 0,
prefix: '', placeholder: '请选择领料单位',
suffix: '', isShowAllName: false,
addonBefore: '',
addonAfter: '',
disabled: false,
allowClear: false,
showLabel: true, showLabel: true,
disabled: false,
required: false, required: false,
rules: [],
events: {},
listStyle: '',
isSave: false,
isShow: true, isShow: true,
scan: false, events: {},
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' }, style: { width: '100%' },
}, },
...@@ -296,34 +293,27 @@ export const formProps: FormProps = { ...@@ -296,34 +293,27 @@ export const formProps: FormProps = {
span: 8, span: 8,
list: [ list: [
{ {
key: '602d674a8361431fa689d42f72bf4662', key: '2e8683cce6cd40dea3d890b3d421a588',
field: 'llr', field: 'llr',
label: '领料人', label: '领料人',
type: 'input', type: 'user',
component: 'Input', component: 'User',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '', defaultValue: '',
componentProps: { componentProps: {
width: '100%',
span: 7, span: 7,
width: '100%',
defaultValue: '', defaultValue: '',
placeholder: '请输入领料人', placeholder: '请选择领料人',
userType: 0,
prefix: '', prefix: '',
suffix: '', suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
allowClear: false,
showLabel: true, showLabel: true,
disabled: false,
required: false, required: false,
rules: [], multiple: true,
events: {},
listStyle: '',
isSave: false,
isShow: true, isShow: true,
scan: false, events: {},
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' }, style: { width: '100%' },
}, },
......
xjrsoft-vue3/src/views/ckgl/scll/components/workflowPermission.ts
...@@ -43,11 +43,10 @@ export const permissionList = [ ...@@ -43,11 +43,10 @@ export const permissionList = [
fieldId: 'lldw', fieldId: 'lldw',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'organization',
key: '2e1a848d54b144d994cb147279cc1b96', key: '70dd6f50e807416eafb7ca0ea7fdc401',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -60,8 +59,8 @@ export const permissionList = [ ...@@ -60,8 +59,8 @@ export const permissionList = [
fieldId: 'llr', fieldId: 'llr',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'user',
key: '602d674a8361431fa689d42f72bf4662', key: '2e8683cce6cd40dea3d890b3d421a588',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
......
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},{"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":"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);
}) })
......
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