Commit 524796c3 by 张恒

feat(ccmx): 添加产出数量和入库状态字段并优化表格选择功能

- 在CcmxModel中新增csl(产出数量)和rkzt(入库状态)字段
- 配置文件中添加产出数量输入框和入库状态下拉选择组件
- 移除表格默认值配置中的多余defaultvalue设置
- 删除页面中选中行的相关逻辑代码和变量声明
- 移除入库申请按钮的显示配置
- 简化表格行点击事件处理逻辑
- 移除工作流权限配置中的默认值设置
parent dfc37e17
...@@ -12,6 +12,10 @@ export interface MesProductOutputPageParams extends BasicPageParams { ...@@ -12,6 +12,10 @@ export interface MesProductOutputPageParams extends BasicPageParams {
cpmc: string; cpmc: string;
csl: string;
rkzt: string;
cpbh: string; cpbh: string;
ccsj: string; ccsj: string;
......
...@@ -47,6 +47,30 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -47,6 +47,30 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input', component: 'Input',
}, },
{ {
field: 'csl',
label: '产出数量',
defaultValue: undefined,
component: 'InputNumber',
componentProps: {
style: { width: '100%' },
},
},
{
field: 'rkzt',
label: '入库状态',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'dic',
params: { itemId: '2016706939403292674' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'cpbh', field: 'cpbh',
label: '产品编号', label: '产品编号',
defaultValue: undefined, defaultValue: undefined,
...@@ -452,11 +476,9 @@ export const formProps: FormProps = { ...@@ -452,11 +476,9 @@ export const formProps: FormProps = {
type: 'number', type: 'number',
component: 'InputNumber', component: 'InputNumber',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: null,
componentProps: { componentProps: {
width: '100%', width: '100%',
span: 7, span: 7,
defaultValue: null,
min: 0, min: 0,
step: 1, step: 1,
disabled: true, disabled: true,
......
...@@ -97,7 +97,6 @@ export const permissionList = [ ...@@ -97,7 +97,6 @@ export const permissionList = [
key: '1c0bf170e3ba4be78474821571cda0e6', key: '1c0bf170e3ba4be78474821571cda0e6',
children: [], children: [],
options: {}, options: {},
defaultValue: null,
}, },
{ {
required: false, required: false,
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<template #resizeRight> <template #resizeRight>
<BasicTable @register="registerTable" isMenuTable ref="tableRef" :row-selection="{ selectedRowKeys: selectedKeys, onChange: onSelectChange }" <BasicTable @register="registerTable" isMenuTable ref="tableRef"
> >
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
//展示在列表内的按钮 //展示在列表内的按钮
const actionButtons = ref<string[]>(["view"]); const actionButtons = ref<string[]>(["view"]);
const buttonConfigs = computed(()=>{ const buttonConfigs = computed(()=>{
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"}] const list = [{"buttonId":"2010597918263234560","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true}]
return filterButtonAuth(list); return filterButtonAuth(list);
}) })
...@@ -155,8 +155,6 @@ ...@@ -155,8 +155,6 @@
const selectedKeys = ref<string[]>([]);
const selectedRowsData = ref<any[]>([]);
...@@ -189,8 +187,6 @@ ...@@ -189,8 +187,6 @@
selectedKeys.value = [];
selectedRowsData.value = [];
}, },
useSearchForm: true, useSearchForm: true,
...@@ -232,24 +228,10 @@ ...@@ -232,24 +228,10 @@
function onSelectChange(selectedRowKeys: [], selectedRows) {
selectedKeys.value = selectedRowKeys;
selectedRowsData.value = selectedRows;
}
function customRow(record: Recordable) { function customRow(record: Recordable) {
return { return {
onClick: () => {
let selectedRowKeys = [...selectedKeys.value];
if (selectedRowKeys.indexOf(record.id) >= 0) {
let index = selectedRowKeys.indexOf(record.id);
selectedRowKeys.splice(index, 1);
} else {
selectedRowKeys.push(record.id);
}
selectedKeys.value = selectedRowKeys;
},
ondblclick: () => { ondblclick: () => {
if (record.isCanEdit && hasPermission("ccmx:edit")) { if (record.isCanEdit && hasPermission("ccmx:edit")) {
handleEdit(record); handleEdit(record);
...@@ -261,8 +243,6 @@ ...@@ -261,8 +243,6 @@
function handleSuccess() { function handleSuccess() {
selectedKeys.value = [];
selectedRowsData.value = [];
reload(); reload();
} }
......
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