Skip to content

W
weiqiao-vue
Commit e2c84db8 by 金民
Options

feat(jjbgl): 添加业务组织字段支持 

- 在配置文件中新增p20业务组织字段及其相关组件配置
- 添加业务组织字段的表格列显示配置
- 集成XjrSelect组件并配置字典数据源
- 更新工作流权限配置以包含业务组织字段
- 配置多选模式和搜索功能

feat(sbgl): 重构设备管理业务组织字段

- 将原工作中心字段替换为业务组织字段
- 统一使用字典数据源替代API调用方式
- 删除多余设备属性字段如规格型号、建档号等
- 更新表格列配置以反映字段变更
- 调整查询表单的时间字段映射配置

refactor(models): 同步更新设备管理接口模型

- 修改MesEquipmentPageParams接口字段定义
- 移除已删除的设备属性相关参数
- 保留核心业务字段如名称、分类、状态等
- 确保API模型与前端配置保持一致

refactor(workflow): 更新工作流权限配置

- 调整交接班管理业务组织字段权限设置
- 重新映射设备管理字段ID与显示名称对应关系
- 更新子表字段配置顺序和类型定义
- 确保工作流中字段可见性和编辑权限正确设置
parent c7359f81
Showing with 125 additions and 78 deletions
xjrsoft-vue3/src/api/sbgl/shebeigl/model/ShebeiglModel.ts
...@@ -6,35 +6,11 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -6,35 +6,11 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
export interface MesEquipmentPageParams extends BasicPageParams { export interface MesEquipmentPageParams extends BasicPageParams {
name: string; name: string;
workCenterId: string; companyId: string;
specification: string;
archivesCode: string;
code: string;
location: string;
registerCode: string;
createArchivesUserId: string;
categoryId: string; categoryId: string;
userId: string;
usePermitCode: string;
manufacturer: string;
eState: string; eState: string;
companyId: string;
indexCode: string;
manufactureDate: string;
} }
/** /**
...@@ -47,33 +23,11 @@ export interface MesEquipmentPageModel { ...@@ -47,33 +23,11 @@ export interface MesEquipmentPageModel {
specification: string; specification: string;
code: string;
categoryId: string; categoryId: string;
userId: string;
eState: string; eState: string;
companyId: string; companyId: string;
workCenterId: string;
archivesCode: string;
location: string;
registerCode: string;
createArchivesUserId: string;
usePermitCode: string;
manufacturer: string;
indexCode: string;
manufactureDate: string;
} }
/** /**
......
xjrsoft-vue3/src/views/jjbgl/jjbgl/components/config.ts
...@@ -9,6 +9,21 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -9,6 +9,21 @@ export const searchFormSchema: FormSchema[] = [
component: 'Input', component: 'Input',
}, },
{ {
field: 'p20',
label: '业务组织',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'dic',
params: { itemId: '2015724355955159041' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'jbbz', field: 'jbbz',
label: '交班班组', label: '交班班组',
defaultValue: undefined, defaultValue: undefined,
...@@ -166,6 +181,19 @@ export const columns: BasicColumn[] = [ ...@@ -166,6 +181,19 @@ export const columns: BasicColumn[] = [
styleConfig: undefined, styleConfig: undefined,
listStyle: '', listStyle: '',
}, },
{
resizable: true,
dataIndex: 'p20',
title: '业务组织',
componentType: 'select',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
]; ];
//表头合并配置 //表头合并配置
export const headerMergingData = []; export const headerMergingData = [];
...@@ -250,6 +278,54 @@ export const formProps: FormProps = { ...@@ -250,6 +278,54 @@ export const formProps: FormProps = {
span: 8, span: 8,
list: [ list: [
{ {
key: 'lkajsldjaljdla',
field: 'p20',
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',
labelField: 'name',
valueField: 'value',
apiConfig: {
path: '/bmxx/getCompanyList',
method: 'GET',
apiId: 'copy1765431632890d13798',
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 res_company";\r\nreturn db.select(sql);',
},
dicOptions: [],
required: true,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
params: { itemId: '2015724355955159041' },
itemId: '2015724355955159041',
style: { width: '100%' },
},
},
{
key: 'fd1b0f4df3ff44179f86dfa5ec6a5c1f', key: 'fd1b0f4df3ff44179f86dfa5ec6a5c1f',
field: 'jjdh', field: 'jjdh',
label: '交接单号', label: '交接单号',
......
xjrsoft-vue3/src/views/jjbgl/jjbgl/components/workflowPermission.ts
...@@ -183,4 +183,20 @@ export const permissionList = [ ...@@ -183,4 +183,20 @@ export const permissionList = [
options: {}, options: {},
defaultValue: '', defaultValue: '',
}, },
{
required: true,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '业务组织',
fieldId: 'p20',
isSubTable: false,
showChildren: true,
type: 'select',
key: 'lkajsldjaljdla',
children: [],
options: {},
},
]; ];
xjrsoft-vue3/src/views/jjbgl/jjbgl/index.vue
...@@ -121,8 +121,9 @@ ...@@ -121,8 +121,9 @@
const { t } = useI18n(); const { t } = useI18n();
defineEmits(['register']); defineEmits(['register']);
const { filterColumnAuth, filterButtonAuth, hasPermission } = usePermission(); const { filterColumnAuth, filterButtonAuth, hasPermission } = usePermission();
// console.log('初始值',columns)
const filterColumns = filterColumnAuth(columns); const filterColumns = filterColumnAuth(columns);
// console.log('过滤后的列表',filterColumns)
const tableRef = ref(); const tableRef = ref();
......
xjrsoft-vue3/src/views/sbgl/shebeigl/components/workflowPermission.ts
...@@ -67,6 +67,22 @@ export const permissionList = [ ...@@ -67,6 +67,22 @@ export const permissionList = [
defaultValue: '', defaultValue: '',
}, },
{ {
required: true,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '业务组织',
fieldId: 'companyId',
isSubTable: false,
showChildren: true,
type: 'select',
key: '25184c444b82451c970b1b6702aa7fa9',
children: [],
options: {},
},
{
required: false, required: false,
view: true, view: true,
edit: false, edit: false,
...@@ -123,23 +139,6 @@ export const permissionList = [ ...@@ -123,23 +139,6 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '建档人',
fieldId: 'createArchivesUserId',
isSubTable: false,
showChildren: true,
type: 'user',
key: 'de0cf6d1a54c42e0b3dbe4a845bd1859',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '设备类别', fieldName: '设备类别',
fieldId: 'categoryId', fieldId: 'categoryId',
isSubTable: false, isSubTable: false,
...@@ -224,14 +223,15 @@ export const permissionList = [ ...@@ -224,14 +223,15 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '公司', fieldName: '整机编号',
fieldId: 'companyId', fieldId: 'indexCode',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'select', type: 'input',
key: '25184c444b82451c970b1b6702aa7fa9', key: '45fb316373fa4a9390907b157823eef3',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -240,12 +240,12 @@ export const permissionList = [ ...@@ -240,12 +240,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '整机编号', fieldName: '生产日期',
fieldId: 'indexCode', fieldId: 'manufactureDate',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'input', type: 'date',
key: '45fb316373fa4a9390907b157823eef3', key: '6fcb84a124a741deb3b3d6d17553b39e',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
...@@ -257,12 +257,12 @@ export const permissionList = [ ...@@ -257,12 +257,12 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '生产日期', fieldName: '建档人',
fieldId: 'manufactureDate', fieldId: 'createArchivesUserId',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'date', type: 'user',
key: '6fcb84a124a741deb3b3d6d17553b39e', key: 'de0cf6d1a54c42e0b3dbe4a845bd1859',
children: [], children: [],
options: {}, options: {},
defaultValue: '', defaultValue: '',
......
xjrsoft-vue3/src/views/sbgl/shebeigl/index.vue
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
formConfig: { formConfig: {
labelWidth: 100, labelWidth: 100,
schemas: searchFormSchema, schemas: searchFormSchema,
fieldMapToTime: [['manufactureDate', ['manufactureDateStart', 'manufactureDateEnd'], 'YYYY-MM-DD ', true],], fieldMapToTime: [],
showResetButton: false, showResetButton: false,
}, },
bordered:false, bordered:false,
......
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