Skip to content

W
weiqiao-vue
Commit e980a4c0 by 张珈源
Options

feat(cgdh): 添加采购到货单质检状态和相关字段 

- 在CgdhModel模型中新增zsl(总数量)、zt(质检状态)、bz(备注)字段
- 配置文件中添加总数量、质检状态、备注三个表格列的显示配置
- 表单配置中添加质检状态选择组件及其相关属性设置
- 工作流权限配置中增加质检状态字段的权限控制
- 更新操作按钮配置，添加生成入库单功能按钮
- 调整表格操作列宽度以适应更多按钮显示
- 移除批量报检按钮的事件绑定逻辑
- 优化表单组件中的sendMessageForAllIframe函数格式
parent 684dd5c3
Showing with 115 additions and 23 deletions
xjrsoft-vue3/src/api/ckgl/cgdh/model/CgdhModel.ts
...@@ -30,6 +30,12 @@ export interface MesWarehouseArrivedPageModel { ...@@ -30,6 +30,12 @@ export interface MesWarehouseArrivedPageModel {
zdr: string; zdr: string;
kczz: string; kczz: string;
zsl: string;
zt: string;
bz: string;
} }
/** /**
...@@ -60,7 +66,7 @@ export interface MesWarehouseArrivedModel { ...@@ -60,7 +66,7 @@ export interface MesWarehouseArrivedModel {
bz: string; bz: string;
p3: string; zt: string;
p4: string; p4: string;
......
xjrsoft-vue3/src/views/ckgl/cgdh/components/Form.vue
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
function handleChange(val) { function handleChange(val) {
emits('update:value', val); emits('update:value', val);
} }
async function sendMessageForAllIframe() { async function sendMessageForAllIframe() {
try { try {
if (systemFormRef.value && systemFormRef.value.sendMessageForAllIframe) { if (systemFormRef.value && systemFormRef.value.sendMessageForAllIframe) {
systemFormRef.value.sendMessageForAllIframe(); systemFormRef.value.sendMessageForAllIframe();
......
xjrsoft-vue3/src/views/ckgl/cgdh/components/config.ts
...@@ -114,6 +114,45 @@ export const columns: BasicColumn[] = [ ...@@ -114,6 +114,45 @@ export const columns: BasicColumn[] = [
styleConfig: undefined, styleConfig: undefined,
listStyle: '', listStyle: '',
}, },
{
resizable: true,
dataIndex: 'zsl',
title: '总数量',
componentType: 'number',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'zt',
title: '质检状态',
componentType: 'select',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'bz',
title: '备注',
componentType: 'textarea',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
]; ];
//表头合并配置 //表头合并配置
export const headerMergingData = []; export const headerMergingData = [];
...@@ -586,6 +625,52 @@ export const formProps: FormProps = { ...@@ -586,6 +625,52 @@ export const formProps: FormProps = {
}, },
], ],
}, },
{
span: 8,
list: [
{
key: '8e9c97d8cc0e40c8b1a28183050df250',
field: 'zt',
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: '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: '2012042307269611522' },
labelField: 'name',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/selection',
method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7',
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: false,
tooltipConfig: { visible: false, title: '提示文本' },
itemId: '2012042307269611522',
style: { width: '100%' },
},
},
],
},
], ],
componentProps: { componentProps: {
gutter: 16, gutter: 16,
...@@ -1013,15 +1098,9 @@ export const formProps: FormProps = { ...@@ -1013,15 +1098,9 @@ export const formProps: FormProps = {
{ {
name: 'dhdid', name: 'dhdid',
value: '{"bindField":"id","fieldKey":"139048460226487596074dfbbaedba0c"}', value: '{"bindField":"id","fieldKey":"139048460226487596074dfbbaedba0c"}',
description: null,
required: true, required: true,
dataType: 'String', dataType: 'String',
type: null,
defaultValue: '0', defaultValue: '0',
validateType: null,
error: null,
expression: null,
children: null,
bindType: 'data', bindType: 'data',
}, },
], ],
...@@ -1052,18 +1131,9 @@ export const formProps: FormProps = { ...@@ -1052,18 +1131,9 @@ export const formProps: FormProps = {
label: '批量报检', label: '批量报检',
icon: 'ant-design:alert-outlined', icon: 'ant-design:alert-outlined',
style: 'primary', style: 'primary',
event: [ event: [],
{
key: '1',
type: 2,
operateType: 2,
operateConfig: {
js: "if (formActionType.selectedRowsData && formActionType.selectedRowsData.length === 0) { formActionType.showMessage('请先勾选物料明细数据'); } else { const ids = formActionType.selectedRowsData.map(item => item.id); console.log('Extracted ids:', ids); formActionType.httpRequest({ requestUrl: '/ckgl/cgdh/quailty', requestType: 'put', params: ids, errorMessageMode: 'message' }).then(response => { console.log('Quality check response:', response); if (formActionType.showSuccessMessage) { formActionType.showSuccessMessage('报检处理成功！'); } else if (formActionType.message) { formActionType.message.success('报检处理成功！'); } else { formActionType.showMessage('报检处理成功！'); } if (formActionType.clearSelection) { formActionType.clearSelection(); } }).catch(error => { console.error('Quality check error:', error); formActionType.showMessage('批量报检失败，请重试！'); }); }"
}
}
],
type: 1, type: 1,
} },
], ],
isExport: false, isExport: false,
isImport: false, isImport: false,
......
xjrsoft-vue3/src/views/ckgl/cgdh/components/workflowPermission.ts
...@@ -187,6 +187,22 @@ export const permissionList = [ ...@@ -187,6 +187,22 @@ export const permissionList = [
defaultValue: '', defaultValue: '',
}, },
{ {
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '质检状态',
fieldId: 'zt',
isSubTable: false,
showChildren: true,
type: 'select',
key: '8e9c97d8cc0e40c8b1a28183050df250',
children: [],
options: {},
},
{
required: true, required: true,
view: true, view: true,
edit: true, edit: true,
......
xjrsoft-vue3/src/views/ckgl/cgdh/index.vue
...@@ -129,11 +129,11 @@ ...@@ -129,11 +129,11 @@
//展示在列表内的按钮 //展示在列表内的按钮
const actionButtons = ref<string[]>(["view","edit"]); const actionButtons = ref<string[]>(["view","edit","create"]);
const buttonConfigs = computed(()=>{ const buttonConfigs = computed(()=>{
const list = [{"buttonId":"2009445983314264064","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2009445983314264066","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2009478676487966720","name":"同步","code":"get","icon":"ant-design:arrow-down-outlined","isDefault":false,"isUse":true,"setting":[],"showType":"top","buttonType":"primary"}] const list = [{"buttonId":"2009445983314264064","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2009445983314264066","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2009478676487966720","name":"同步","code":"get","icon":"ant-design:arrow-down-outlined","isDefault":false,"isUse":true,"setting":[],"showType":"top","buttonType":"primary"},{"buttonId":"2012037219988561920","name":"生成入库单","code":"create","icon":"ant-design:download-outlined","isDefault":false,"isUse":true,"setting":[],"showType":"inline","buttonType":"primary"}]
return filterButtonAuth(list); return filterButtonAuth(list);
}) });
const tableButtonConfig = computed(() => { const tableButtonConfig = computed(() => {
return buttonConfigs.value?.filter((x) => !actionButtons.value.includes(x.code)); return buttonConfigs.value?.filter((x) => !actionButtons.value.includes(x.code));
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
striped: false, striped: false,
actionColumn: { actionColumn: {
width: 130, width: 195,
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
slots: { customRender: 'action' }, slots: { customRender: 'action' },
......
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