Skip to content

W
weiqiao-vue
Commit c030fbfd by 王宝涛
Options

feat(gps): 更新GPS配置表单字段 

- 移除班组字段及其相关配置
- 添加当日总产量字段并配置为数字输入框
- 更新数据模型移除banzu字段并添加drzcl字段
- 调整表格列配置移除班组列
- 修改工作流权限配置移除班组相关设置
- 隐藏删除按钮并调整网格布局结构
parent 02d778ab
Showing with 56 additions and 160 deletions
xjrsoft-vue3/src/api/chaiche/gps/model/GpsModel.ts
...@@ -8,8 +8,6 @@ export interface MesCheliangBgPageParams extends BasicPageParams { ...@@ -8,8 +8,6 @@ export interface MesCheliangBgPageParams extends BasicPageParams {
tjsj: string; tjsj: string;
banzu: string;
gzr: string; gzr: string;
sfwgcj: string; sfwgcj: string;
...@@ -23,6 +21,8 @@ export interface MesCheliangBgPageParams extends BasicPageParams { ...@@ -23,6 +21,8 @@ export interface MesCheliangBgPageParams extends BasicPageParams {
dhpsxx: string; dhpsxx: string;
dhxx: string; dhxx: string;
drzcl: string;
} }
/** /**
...@@ -54,8 +54,6 @@ export interface MesCheliangBgPageModel { ...@@ -54,8 +54,6 @@ export interface MesCheliangBgPageModel {
dhxx: string; dhxx: string;
drzcl: string; drzcl: string;
banzu: string;
} }
/** /**
......
xjrsoft-vue3/src/views/chaiche/gps/components/config.ts
...@@ -28,21 +28,6 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -28,21 +28,6 @@ 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', field: 'gzr',
label: '工作人', label: '工作人',
defaultValue: undefined, defaultValue: undefined,
...@@ -98,6 +83,15 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -98,6 +83,15 @@ export const searchFormSchema: FormSchema[] = [
defaultValue: undefined, defaultValue: undefined,
component: 'Input', component: 'Input',
}, },
{
field: 'drzcl',
label: '当日总产量',
defaultValue: undefined,
component: 'InputNumber',
componentProps: {
style: { width: '100%' },
},
},
]; ];
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
...@@ -256,19 +250,6 @@ export const columns: BasicColumn[] = [ ...@@ -256,19 +250,6 @@ export const columns: BasicColumn[] = [
styleConfig: undefined, styleConfig: undefined,
listStyle: undefined, listStyle: undefined,
}, },
{
resizable: true,
dataIndex: 'banzu',
title: '班组',
componentType: 'radio',
fixed: false,
sorter: true,
styleConfig: undefined,
listStyle: undefined,
},
]; ];
//表头合并配置 //表头合并配置
export const headerMergingData = []; export const headerMergingData = [];
...@@ -503,48 +484,6 @@ export const formProps: FormProps = { ...@@ -503,48 +484,6 @@ export const formProps: FormProps = {
span: 8, span: 8,
list: [ 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', key: '5764c97901a848bb8c8be56822bb6b1c',
field: 'gzr', field: 'gzr',
label: '工作人', label: '工作人',
...@@ -572,28 +511,6 @@ export const formProps: FormProps = { ...@@ -572,28 +511,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, span: 8,
list: [ list: [
...@@ -635,6 +552,28 @@ export const formProps: FormProps = { ...@@ -635,6 +552,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, span: 8,
list: [ list: [
...@@ -711,28 +650,6 @@ export const formProps: FormProps = { ...@@ -711,28 +650,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, span: 8,
list: [ list: [
...@@ -771,6 +688,28 @@ export const formProps: FormProps = { ...@@ -771,6 +688,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, span: 8,
list: [ list: [
...@@ -847,28 +786,6 @@ export const formProps: FormProps = { ...@@ -847,28 +786,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: 'ebe3ab4c22264453a17b142028eab977',
field: '',
label: '',
type: 'grid',
colProps: { span: 24 },
component: 'Grid',
children: [
{ {
span: 8, span: 8,
list: [ list: [
...@@ -901,8 +818,6 @@ export const formProps: FormProps = { ...@@ -901,8 +818,6 @@ export const formProps: FormProps = {
}, },
], ],
}, },
{ span: 8, list: [] },
{ span: 8, list: [] },
], ],
componentProps: { componentProps: {
gutter: 0, gutter: 0,
...@@ -1209,7 +1124,6 @@ export const formProps: FormProps = { ...@@ -1209,7 +1124,6 @@ export const formProps: FormProps = {
listStyle: "return 'width:100%'", listStyle: "return 'width:100%'",
}, },
}, },
{ title: '操作', key: 'action', fixed: 'right', width: '50px' },
], ],
span: '24', span: '24',
preloadType: 'api', preloadType: 'api',
...@@ -1264,7 +1178,7 @@ export const formProps: FormProps = { ...@@ -1264,7 +1178,7 @@ export const formProps: FormProps = {
isListView: false, isListView: false,
viewList: [], viewList: [],
isShowAdd: false, isShowAdd: false,
isShowDelete: true, isShowDelete: false,
hasCheckedCol: false, hasCheckedCol: false,
checkedColType: 'checkbox', checkedColType: 'checkbox',
pageSize: 10, pageSize: 10,
......
xjrsoft-vue3/src/views/chaiche/gps/components/workflowPermission.ts
...@@ -74,22 +74,6 @@ export const permissionList = [ ...@@ -74,22 +74,6 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', 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: '工作人', fieldName: '工作人',
fieldId: 'gzr', fieldId: 'gzr',
isSubTable: false, 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