Skip to content

W
weiqiao-vue
Commit 874b6e5e by 王宝涛
Options

feat(gps): 添加班组字段配置和权限设置 

- 在表单配置中新增班组选择组件，支持多选和搜索功能
- 为班组字段添加表格列配置，支持排序和调整大小
- 在模型定义中添加banzu字段到GpsModel接口
- 移除机器编号相关的表单布局配置
- 更新工作流权限配置，添加班组字段的查看和编辑权限
- 修改表格组件属性，调整边框和布局样式
- 禁用AI显示功能并隐藏新增按钮
parent c729b3ab
Showing with 162 additions and 184 deletions
xjrsoft-vue3/src/api/chaiche/gps/model/GpsModel.ts
......@@ -8,6 +8,8 @@ export interface MesCheliangBgPageParams extends BasicPageParams {
tjsj: string;
banzu: string;
gzr: string;
sfwgcj: string;
......@@ -52,6 +54,8 @@ export interface MesCheliangBgPageModel {
dhxx: string;
drzcl: string;
banzu: string;
}
/**
......@@ -130,6 +134,8 @@ export interface MesCheliangBgModel {
psqzp: string;
banzu: string;
bz: string;
createDate: string;
......
xjrsoft-vue3/src/views/chaiche/gps/components/config.ts
......@@ -28,6 +28,21 @@ export const searchFormSchema: FormSchema[] = [
},
{
field: 'banzu',
label: '班组',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'dic',
params: { itemId: '2021042614763266049' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'gzr',
label: '工作人',
defaultValue: undefined,
......@@ -241,6 +256,19 @@ export const columns: BasicColumn[] = [
styleConfig: undefined,
listStyle: undefined,
},
{
resizable: true,
dataIndex: 'banzu',
title: '班组',
componentType: 'radio',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
];
//表头合并配置
export const headerMergingData = [];
......@@ -314,112 +342,6 @@ export const formProps: FormProps = {
size: 'default',
schemas: [
{
key: 'f8d72e4a26a34e808f53439fdb60cdc6',
field: '',
label: '',
type: 'grid',
colProps: { span: 24 },
component: 'Grid',
children: [
{
span: 12,
list: [
{
key: '7dcf08ec1d9e4363ab1dac2ec6d4d353',
field: 'danXingWenBen3915',
label: '机器编号',
type: 'input',
component: 'Input',
colProps: { span: 24 },
defaultValue: '',
componentProps: {
width: '100%',
span: 7,
defaultValue: '',
placeholder: '请输入机器编号',
prefix: '',
suffix: '',
addonBefore: '',
addonAfter: '',
disabled: true,
allowClear: false,
showLabel: true,
required: false,
rules: [],
events: {},
listStyle: '',
isSave: true,
isShow: true,
scan: false,
bordered: true,
isShowAi: false,
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
],
},
{
span: 12,
list: [
{
key: 'c3dc7ab3505b4aceafbd956a0f6e0e0e',
label: '自动获取',
type: 'button',
component: 'Button',
colProps: { span: 24 },
componentProps: {
name: '自动获取',
buttonStyleType: 'primary',
buttonWidth: '',
buttonHeight: '',
datasourceType: 'api',
prefix: '',
suffix: '',
labelField: 'label',
valueField: 'value',
apiConfig: {
path: 'CodeGeneration/assoc-selection',
method: 'GET',
apiId: 'ac61f579074c465aaf017d64284a44a3',
outputParams: [
{ name: 'label', tableTitle: 'label' },
{ name: 'value', tableTitle: 'value' },
],
},
dicOptions: [],
disabled: false,
isShow: true,
margin: '10px',
events: {
click:
"formActionType.httpRequest({\n requestType: 'get', //请求方式有: get、post、put、delete\n requestUrl: '/system/dictionary-detail', //请求地址\n params: {\n itemId: '1419276800524423168'\n },//请求参数\n errorMessageMode: 'none' //错误提示方式，默认为none\n})\n// errorMessageMode='message' 错误提示为消息提示\n// errorMessageMode='modal' 显示modal错误弹窗，用于一些比较重要的错误\n// errorMessageMode='none' 一般是调用时明确表示不希望自动弹出错误提示",
},
type: 1,
event: [],
tooltipConfig: { visible: false, title: '提示文本' },
span: 7,
width: '',
height: '',
},
},
],
},
],
componentProps: {
gutter: 0,
justify: 'start',
align: 'top',
isShow: true,
showBorder: false,
bordercolor: '#d9d9d9',
bordershowtype: [true, true, true, true],
borderwidth: 1,
padding: '10px',
margin: '10px',
},
},
{
key: '6b4803efd3bb400baa4c4b9181befec3',
field: '',
label: '',
......@@ -581,6 +503,48 @@ export const formProps: FormProps = {
span: 8,
list: [
{
key: 'bbc92accfa5b4def90d343b129322110',
field: 'banzu',
label: '班组',
type: 'radio',
component: 'ApiRadioGroup',
colProps: { span: 24 },
componentProps: {
span: 7,
showLabel: true,
disabled: false,
optionType: 'default',
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' },
],
datasourceType: 'dic',
labelField: 'name',
valueField: 'value',
defaultSelect: null,
apiConfig: {
path: 'CodeGeneration/selection',
method: 'GET',
apiId: '93d735dcb7364a0f8102188ec4d77ac7',
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
params: { itemId: '2021042614763266049' },
itemId: '2021042614763266049',
style: {},
},
},
],
},
{
span: 8,
list: [
{
key: '5764c97901a848bb8c8be56822bb6b1c',
field: 'gzr',
label: '工作人',
......@@ -608,6 +572,28 @@ export const formProps: FormProps = {
},
],
},
],
componentProps: {
gutter: 0,
justify: 'start',
align: 'top',
isShow: true,
showBorder: false,
bordercolor: '#d9d9d9',
bordershowtype: [true, true, true, true],
borderwidth: 1,
padding: '10px',
margin: '10px',
},
},
{
key: 'ac2e369650594a0394d01b51dee15aa1',
field: '',
label: '',
type: 'grid',
colProps: { span: 24 },
component: 'Grid',
children: [
{
span: 8,
list: [
......@@ -649,28 +635,6 @@ export const formProps: FormProps = {
},
],
},
],
componentProps: {
gutter: 0,
justify: 'start',
align: 'top',
isShow: true,
showBorder: false,
bordercolor: '#d9d9d9',
bordershowtype: [true, true, true, true],
borderwidth: 1,
padding: '10px',
margin: '10px',
},
},
{
key: 'ac2e369650594a0394d01b51dee15aa1',
field: '',
label: '',
type: 'grid',
colProps: { span: 24 },
component: 'Grid',
children: [
{
span: 8,
list: [
......@@ -747,6 +711,28 @@ export const formProps: FormProps = {
},
],
},
],
componentProps: {
gutter: 0,
justify: 'start',
align: 'top',
isShow: true,
showBorder: false,
bordercolor: '#d9d9d9',
bordershowtype: [true, true, true, true],
borderwidth: 1,
padding: '10px',
margin: '10px',
},
},
{
key: '76c345091afa464f960e058090eea807',
field: '',
label: '',
type: 'grid',
colProps: { span: 24 },
component: 'Grid',
children: [
{
span: 8,
list: [
......@@ -785,28 +771,6 @@ export const formProps: FormProps = {
},
],
},
],
componentProps: {
gutter: 0,
justify: 'start',
align: 'top',
isShow: true,
showBorder: false,
bordercolor: '#d9d9d9',
bordershowtype: [true, true, true, true],
borderwidth: 1,
padding: '10px',
margin: '10px',
},
},
{
key: '76c345091afa464f960e058090eea807',
field: '',
label: '',
type: 'grid',
colProps: { span: 24 },
component: 'Grid',
children: [
{
span: 8,
list: [
......@@ -883,6 +847,28 @@ export const formProps: FormProps = {
},
],
},
],
componentProps: {
gutter: 0,
justify: 'start',
align: 'top',
isShow: true,
showBorder: false,
bordercolor: '#d9d9d9',
bordershowtype: [true, true, true, true],
borderwidth: 1,
padding: '10px',
margin: '10px',
},
},
{
key: 'ebe3ab4c22264453a17b142028eab977',
field: '',
label: '',
type: 'grid',
colProps: { span: 24 },
component: 'Grid',
children: [
{
span: 8,
list: [
......@@ -915,6 +901,8 @@ export const formProps: FormProps = {
},
],
},
{ span: 8, list: [] },
{ span: 8, list: [] },
],
componentProps: {
gutter: 0,
......@@ -951,7 +939,7 @@ export const formProps: FormProps = {
allowClear: false,
required: false,
isShow: true,
isShowAi: true,
isShowAi: false,
rules: [],
events: {},
tooltipConfig: { visible: false, title: '提示文本' },
......@@ -1275,7 +1263,7 @@ export const formProps: FormProps = {
isDeleteSelected: false,
isListView: false,
viewList: [],
isShowAdd: true,
isShowAdd: false,
isShowDelete: true,
hasCheckedCol: false,
checkedColType: 'checkbox',
......
xjrsoft-vue3/src/views/chaiche/gps/components/workflowPermission.ts
......@@ -2,38 +2,6 @@ export const permissionList = [
{
required: false,
view: true,
edit: false,
disabled: true,
isSaveTable: true,
tableName: '',
fieldName: '机器编号',
fieldId: 'danXingWenBen3915',
isSubTable: false,
showChildren: true,
type: 'input',
key: '7dcf08ec1d9e4363ab1dac2ec6d4d353',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '自动获取',
isSubTable: false,
showChildren: true,
type: 'button',
key: 'c3dc7ab3505b4aceafbd956a0f6e0e0e',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
......@@ -106,6 +74,22 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '班组',
fieldId: 'banzu',
isSubTable: false,
showChildren: true,
type: 'radio',
key: 'bbc92accfa5b4def90d343b129322110',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '工作人',
fieldId: 'gzr',
isSubTable: 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