Skip to content

W
weiqiao-vue
Commit d4c05731 by 张恒
Options

feat(ccmx): 调整产成品明细模块界面布局和字段配置 

- 修改模态框高度从500调整为400，宽度从900调整为1400
- 将字段名称从'炉批号'改为'炉次号'，对应字段从'lph'改为'lch'
- 移除静态数据源改为API动态获取客户列表
- 删除产出量和入库状态字段配置
- 新增业务组织、重量、捆数等字段
- 将编号字段类型改为自动生成编码
- 调整表格列配置，重新排列字段显示顺序
- 设置多个字段为禁用状态以符合业务流程
- 修改产出量字段标题为'产出数量'
- 更新入库状态和客户字段的位置
- 添加业务组织字段到表单配置中
- 修改入库申请按钮的buttonId
- 在工作流权限配置中更新字段编辑权限设置
parent 925bd006
Showing with 240 additions and 145 deletions
xjrsoft-vue3/src/api/scgl/ccmx/model/CcmxModel.ts
......@@ -6,19 +6,17 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
export interface MesProductOutputPageParams extends BasicPageParams {
bh: string;
lph: string;
lch: string;
kh: string;
cpmc: string;
csl: string;
rkzt: string;
cpbh: string;
ccsj: string;
ywzz: string;
}
/**
......@@ -29,19 +27,21 @@ export interface MesProductOutputPageModel {
bh: string;
lph: string;
lch: string;
kh: string;
cpbh: string;
cpmc: string;
csl: string;
rkzt: string;
kh: string;
cpbh: string;
rkzt: string;
ccsj: string;
ywzz: string;
}
/**
......@@ -119,6 +119,16 @@ export interface MesProductOutputModel {
modifyDate: string;
modifyUserId: string;
ywzz: string;
lch: string;
zl: string;
ks: string;
cpid: string;
}
/**
......
xjrsoft-vue3/src/views/scgl/ccmx/components/CcmxModal.vue
......@@ -3,7 +3,7 @@
<BasicModal
:height="500"
:height="400"
v-bind="$attrs" @register="registerModal" :title="getTitle"
@ok="handleSubmit" @cancel="handleClose" >
<ModalForm ref="formRef" v-model:value="state.formModel" :fromPage="FromPageType.MENU" />
......@@ -72,7 +72,7 @@
showCancelBtn: false,
showOkBtn: false,
canFullscreen: true,
width: 900,
width: 1400,
footer: state.isView ? null : undefined,defaultFullscreen:true,
});
......
xjrsoft-vue3/src/views/scgl/ccmx/components/config.ts
......@@ -9,8 +9,8 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input',
},
{
field: 'lph',
label: '炉批号',
field: 'lch',
label: '炉次号',
defaultValue: undefined,
component: 'Input',
},
......@@ -20,11 +20,19 @@ export const searchFormSchema: FormSchema[] = [
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'staticData',
staticOptions: [
{ key: 1, label: '张三', value: '张三' },
{ key: 2, label: '李四', value: '李四' },
],
datasourceType: 'api',
apiConfig: {
path: '/jcxx/getKhList',
method: 'GET',
apiId: '7bc8db3faba24b19a997856f6ef0b27e',
apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] },
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql="select id as value,name as label from roke_partner where delete_mark = 0 and customer = \'1\'";\r\nreturn db.select(sql);',
},
labelField: 'label',
valueField: 'value',
mode: 'multiple',
......@@ -39,34 +47,6 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input',
},
{
field: 'csl',
label: '产出量',
defaultValue: undefined,
component: 'InputNumber',
componentProps: {
style: { width: '100%' },
},
},
{
field: 'rkzt',
label: '入库状态',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'staticData',
staticOptions: [
{ key: 1, label: '进行中', value: '进行中' },
{ key: 2, label: '已入库', value: '已入库' },
{ key: 3, label: '未入库', value: '未入库' },
],
labelField: 'label',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'cpbh',
label: '产品编号',
defaultValue: undefined,
......@@ -83,6 +63,7 @@ export const searchFormSchema: FormSchema[] = [
getPopupContainer: () => document.body,
},
},
{
field: 'ywzz',
label: '业务组织',
......@@ -105,19 +86,7 @@ export const columns: BasicColumn[] = [
resizable: true,
dataIndex: 'bh',
title: '编号',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
},
{
resizable: true,
dataIndex: 'ywzz',
title: '业务组织',
componentType: 'select',
componentType: 'auto-code',
fixed: false,
sorter: true,
......@@ -125,10 +94,11 @@ export const columns: BasicColumn[] = [
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'lph',
title: '炉批号',
dataIndex: 'lch',
title: '炉次号',
componentType: 'input',
fixed: false,
......@@ -140,24 +110,15 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'kh',
title: '客户',
componentType: 'select',
customRender: ({ record }) => {
const staticOptions = [
{ key: 1, label: '张三', value: '张三' },
{ key: 2, label: '李四', value: '李四' },
];
return staticOptions.filter((x) => x.value == record.kh)[0]?.label;
},
dataIndex: 'cpbh',
title: '产品编号',
componentType: 'input',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
listStyle: '',
},
{
......@@ -176,7 +137,7 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'csl',
title: '产出量',
title: '产出数量',
componentType: 'number',
fixed: false,
......@@ -188,20 +149,10 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'rkzt',
title: '入库状态',
dataIndex: 'kh',
title: '客户',
componentType: 'select',
customRender: ({ record }) => {
const staticOptions = [
{ key: 1, label: '进行中', value: '进行中' },
{ key: 2, label: '已入库', value: '已入库' },
{ key: 3, label: '未入库', value: '未入库' },
];
return staticOptions.filter((x) => x.value == record.rkzt)[0]?.label;
},
fixed: false,
sorter: true,
......@@ -211,15 +162,15 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'cpbh',
title: '产品编号',
componentType: 'input',
dataIndex: 'rkzt',
title: '入库状态',
componentType: 'select',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: '',
listStyle: undefined,
},
{
......@@ -234,6 +185,19 @@ export const columns: BasicColumn[] = [
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'ywzz',
title: '业务组织',
componentType: 'select',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
];
//表头合并配置
export const headerMergingData = [];
......@@ -318,42 +282,32 @@ export const formProps: FormProps = {
span: 8,
list: [
{
key: 'c31870ac60a74049bbf979f225394251',
key: 'ea62ca64d4e04d7b9b5113ccbfcfe537',
field: 'bh',
label: '编号',
type: 'input',
component: 'Input',
type: 'auto-code',
component: 'AutoCodeRule',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
defaultValue: '',
placeholder: '',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
allowClear: false,
showLabel: true,
autoCodeRule: 'CCMX',
required: false,
rules: [],
events: {},
listStyle: '',
isSave: false,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
{
key: 'e31e3c2a30b243ca8753bded8b4a62cc',
field: 'lph',
label: '炉批号',
field: 'lch',
label: '炉次号',
type: 'input',
component: 'Input',
colProps: { span: 24 },
......@@ -367,7 +321,7 @@ export const formProps: FormProps = {
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
disabled: true,
allowClear: false,
showLabel: true,
required: false,
......@@ -398,19 +352,25 @@ export const formProps: FormProps = {
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
disabled: true,
staticOptions: [
{ key: 1, label: '张三', value: '张三' },
{ key: 2, label: '李四', value: '李四' },
],
defaultSelect: '',
datasourceType: 'staticData',
datasourceType: 'api',
labelField: 'label',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
path: '/jcxx/getKhList',
method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7',
apiId: '7bc8db3faba24b19a997856f6ef0b27e',
apiParams: [
{ key: '1', title: 'Query Params', tableInfo: [] },
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql="select id as value,name as label from roke_partner where delete_mark = 0 and customer = \'1\'";\r\nreturn db.select(sql);',
},
dicOptions: [],
required: false,
......@@ -421,6 +381,32 @@ export const formProps: FormProps = {
style: { width: '100%' },
},
},
{
key: 'dc4db2b098ab4dd198655c04b27f4df6',
field: 'zl',
label: '重量',
type: 'number',
component: 'InputNumber',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
defaultValue: '',
step: 0.01,
disabled: true,
showLabel: true,
controls: true,
required: false,
subTotal: false,
isShow: false,
rules: [],
events: {},
placeholder: '',
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
],
},
{
......@@ -443,7 +429,7 @@ export const formProps: FormProps = {
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
disabled: true,
allowClear: false,
showLabel: true,
required: false,
......@@ -462,19 +448,18 @@ export const formProps: FormProps = {
{
key: '1c0bf170e3ba4be78474821571cda0e6',
field: 'csl',
label: '产出量',
label: '产出数量',
type: 'number',
component: 'InputNumber',
colProps: { span: 24 },
defaultValue: 0,
defaultValue: null,
componentProps: {
width: '100%',
span: 7,
defaultValue: 0,
defaultValue: null,
min: 0,
max: 100,
step: 1,
disabled: false,
disabled: true,
showLabel: true,
controls: true,
required: false,
......@@ -507,9 +492,8 @@ export const formProps: FormProps = {
{ key: 2, label: '已入库', value: '已入库' },
{ key: 3, label: '未入库', value: '未入库' },
],
defaultSelect: '',
datasourceType: 'staticData',
labelField: 'label',
datasourceType: 'dic',
labelField: 'name',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
......@@ -522,6 +506,34 @@ export const formProps: FormProps = {
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
params: { itemId: '2016706939403292674' },
itemId: '2016706939403292674',
style: { width: '100%' },
},
},
{
key: '9b0eb4203d0f48bda446532f1db3cbdb',
field: 'ks',
label: '捆数',
type: 'number',
component: 'InputNumber',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
defaultValue: '',
step: 0.01,
disabled: true,
showLabel: true,
controls: true,
required: false,
subTotal: false,
isShow: false,
rules: [],
events: {},
placeholder: '',
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
......@@ -547,7 +559,7 @@ export const formProps: FormProps = {
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: false,
disabled: true,
allowClear: false,
showLabel: true,
required: false,
......@@ -578,8 +590,8 @@ export const formProps: FormProps = {
placeholder: '',
format: 'YYYY-MM-DD HH:mm:ss',
showLabel: true,
allowClear: true,
disabled: false,
allowClear: false,
disabled: true,
required: false,
isShow: true,
rules: [],
......@@ -590,6 +602,46 @@ export const formProps: FormProps = {
style: { width: '100%' },
},
},
{
key: 'd0e0407ab883414baed7b5e4ac06dca1',
field: 'ywzz',
label: '业务组织',
type: 'select',
component: 'XjrSelect',
colProps: { span: 24 },
componentProps: {
width: '100%',
span: 7,
placeholder: '',
showLabel: true,
showSearch: false,
isMultiple: false,
clearable: false,
disabled: false,
staticOptions: [
{ key: 1, label: '进行中', value: '进行中' },
{ key: 2, label: '已入库', value: '已入库' },
{ key: 3, label: '未入库', value: '未入库' },
],
datasourceType: 'dic',
labelField: 'name',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7',
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
params: { itemId: '2015724355955159041' },
itemId: '2015724355955159041',
style: { width: '100%' },
},
},
],
},
],
......@@ -642,7 +694,7 @@ export const formButtons = [
name: '重置',
style: 'default',
event: [],
isShow: true,
isShow: false,
index: 0,
type: 1,
},
......
xjrsoft-vue3/src/views/scgl/ccmx/components/workflowPermission.ts
......@@ -2,29 +2,28 @@ export const permissionList = [
{
required: false,
view: true,
edit: true,
disabled: false,
edit: false,
disabled: true,
isSaveTable: false,
tableName: '',
fieldName: '编号',
fieldId: 'bh',
isSubTable: false,
showChildren: true,
type: 'input',
key: 'c31870ac60a74049bbf979f225394251',
type: 'auto-code',
key: 'ea62ca64d4e04d7b9b5113ccbfcfe537',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
view: true,
edit: true,
edit: false,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '炉批号',
fieldId: 'lph',
fieldName: '炉次号',
fieldId: 'lch',
isSubTable: false,
showChildren: true,
type: 'input',
......@@ -36,7 +35,7 @@ export const permissionList = [
{
required: false,
view: true,
edit: true,
edit: false,
disabled: false,
isSaveTable: false,
tableName: '',
......@@ -52,7 +51,24 @@ export const permissionList = [
{
required: false,
view: true,
edit: true,
edit: false,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '重量',
fieldId: 'zl',
isSubTable: false,
showChildren: true,
type: 'number',
key: 'dc4db2b098ab4dd198655c04b27f4df6',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
view: true,
edit: false,
disabled: false,
isSaveTable: false,
tableName: '',
......@@ -69,11 +85,11 @@ export const permissionList = [
{
required: false,
view: true,
edit: true,
edit: false,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '产出量',
fieldName: '产出数量',
fieldId: 'csl',
isSubTable: false,
showChildren: true,
......@@ -81,7 +97,7 @@ export const permissionList = [
key: '1c0bf170e3ba4be78474821571cda0e6',
children: [],
options: {},
defaultValue: 0,
defaultValue: null,
},
{
required: false,
......@@ -102,7 +118,24 @@ export const permissionList = [
{
required: false,
view: true,
edit: true,
edit: false,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '捆数',
fieldId: 'ks',
isSubTable: false,
showChildren: true,
type: 'number',
key: '9b0eb4203d0f48bda446532f1db3cbdb',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
view: true,
edit: false,
disabled: false,
isSaveTable: false,
tableName: '',
......@@ -119,7 +152,7 @@ export const permissionList = [
{
required: false,
view: true,
edit: true,
edit: false,
disabled: false,
isSaveTable: false,
tableName: '',
......@@ -134,7 +167,7 @@ export const permissionList = [
defaultValue: '',
},
{
required: true,
required: false,
view: true,
edit: true,
disabled: false,
......@@ -145,7 +178,7 @@ export const permissionList = [
isSubTable: false,
showChildren: true,
type: 'select',
key: 'lkajsldjaljdla',
key: 'd0e0407ab883414baed7b5e4ac06dca1',
children: [],
options: {},
},
......
xjrsoft-vue3/src/views/scgl/ccmx/index.vue
......@@ -131,7 +131,7 @@
//展示在列表内的按钮
const actionButtons = ref<string[]>(["view"]);
const buttonConfigs = computed(()=>{
const list = [{"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2010596152129912832","name":"入库申请","code":"rksq","icon":"","isDefault":false,"isUse":true,"setting":[],"showType":"top","buttonType":"primary"}]
const list = [{"buttonId":"2010597918263234560","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2010596152129912832","name":"入库申请","code":"rksq","icon":"","isDefault":false,"isUse":true,"setting":[],"showType":"top","buttonType":"primary"}]
return filterButtonAuth(list);
})
......
xjrsoft-vue3/src/views/scgl/scrw/components/config.ts
......@@ -1745,7 +1745,7 @@ export const formProps: FormProps = {
disabled: false,
showLabel: true,
controls: true,
required: false,
required: true,
subTotal: false,
isShow: true,
rules: [],
......
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