Commit d4c05731 by 张恒

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

- 修改模态框高度从500调整为400,宽度从900调整为1400
- 将字段名称从'炉批号'改为'炉次号',对应字段从'lph'改为'lch'
- 移除静态数据源改为API动态获取客户列表
- 删除产出量和入库状态字段配置
- 新增业务组织、重量、捆数等字段
- 将编号字段类型改为自动生成编码
- 调整表格列配置,重新排列字段显示顺序
- 设置多个字段为禁用状态以符合业务流程
- 修改产出量字段标题为'产出数量'
- 更新入库状态和客户字段的位置
- 添加业务组织字段到表单配置中
- 修改入库申请按钮的buttonId
- 在工作流权限配置中更新字段编辑权限设置
parent 925bd006
......@@ -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;
}
/**
......
......@@ -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,
});
......
......@@ -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: {},
},
......
......@@ -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);
})
......
......@@ -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