Skip to content

W
weiqiao-vue
Commit 7fdc1cb8 by 王宝涛
Options

refactor(ccbg): 重构车辆变更模块的字段配置和组件设置 

- 将工作人字段(gzr)替换为班组字段(banzu)，并修改相关组件类型
- 新增车辆颜色字段(clys)到搜索表单配置
- 调整工作人(gzr)和物料状态(wlzt)字段位置和组件配置
- 移除工作项目字段中的max属性限制
- 更新流程权限配置中的字段映射关系
- 添加班组字段到表格列配置中
- 重新组织搜索表单中各字段的顺序和组件属性
parent 5a11b6f0
Showing with 175 additions and 81 deletions
xjrsoft-vue3/src/api/chaiche/ccbg/model/CcbgModel.ts
...@@ -4,16 +4,20 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel'; ...@@ -4,16 +4,20 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
* @description: MesCheliangBg分页参数 模型 * @description: MesCheliangBg分页参数 模型
*/ */
export interface MesCheliangBgPageParams extends BasicPageParams { export interface MesCheliangBgPageParams extends BasicPageParams {
gzr: string; banzu: string;
cllx: string; cllx: string;
clys: string;
gzjssj: string; gzjssj: string;
gzxm: string; gzr: string;
wlzt: string; wlzt: string;
gzxm: string;
cphm: string; cphm: string;
clppxh: string; clppxh: string;
...@@ -52,6 +56,8 @@ export interface MesCheliangBgPageModel { ...@@ -52,6 +56,8 @@ export interface MesCheliangBgPageModel {
gzsc: string; gzsc: string;
wlzt: string; wlzt: string;
banzu: string;
} }
/** /**
...@@ -130,6 +136,8 @@ export interface MesCheliangBgModel { ...@@ -130,6 +136,8 @@ export interface MesCheliangBgModel {
psqzp: string; psqzp: string;
banzu: string;
bz: string; bz: string;
createDate: string; createDate: string;
......
xjrsoft-vue3/src/views/chaiche/ccbg/components/config.ts
...@@ -4,16 +4,20 @@ import { uploadApi } from '/@/api/sys/upload'; ...@@ -4,16 +4,20 @@ import { uploadApi } from '/@/api/sys/upload';
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
{ {
field: 'gzr', field: 'banzu',
label: '工作人', label: '班组',
defaultValue: undefined, defaultValue: undefined,
component: 'User', component: 'XjrSelect',
componentProps: { componentProps: {
suffix: 'ant-design:setting-outlined', datasourceType: 'dic',
placeholder: '请选择', params: { itemId: '2021042614763266049' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
}, },
}, },
{ {
field: 'cllx', field: 'cllx',
label: '车辆类型', label: '车辆类型',
...@@ -30,6 +34,12 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -30,6 +34,12 @@ export const searchFormSchema: FormSchema[] = [
}, },
}, },
{ {
field: 'clys',
label: '车辆颜色',
defaultValue: undefined,
component: 'Input',
},
{
field: 'gzjssj', field: 'gzjssj',
label: '工作结束时间', label: '工作结束时间',
defaultValue: undefined, defaultValue: undefined,
...@@ -42,6 +52,32 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -42,6 +52,32 @@ export const searchFormSchema: FormSchema[] = [
}, },
{ {
field: 'gzr',
label: '工作人',
defaultValue: undefined,
component: 'User',
componentProps: {
suffix: 'ant-design:setting-outlined',
placeholder: '请选择',
},
},
{
field: 'wlzt',
label: '物料状态',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'dic',
params: { itemId: '2019657322189856770' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'gzxm', field: 'gzxm',
label: '工作项目', label: '工作项目',
defaultValue: undefined, defaultValue: undefined,
...@@ -75,21 +111,6 @@ export const searchFormSchema: FormSchema[] = [ ...@@ -75,21 +111,6 @@ export const searchFormSchema: FormSchema[] = [
}, },
}, },
{ {
field: 'wlzt',
label: '物料状态',
defaultValue: undefined,
component: 'XjrSelect',
componentProps: {
datasourceType: 'dic',
params: { itemId: '2019657322189856770' },
labelField: 'name',
valueField: 'value',
mode: 'multiple',
showSearch: true,
getPopupContainer: () => document.body,
},
},
{
field: 'cphm', field: 'cphm',
label: '车牌号码', label: '车牌号码',
defaultValue: undefined, defaultValue: undefined,
...@@ -343,6 +364,19 @@ export const columns: BasicColumn[] = [ ...@@ -343,6 +364,19 @@ 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 = [];
...@@ -460,29 +494,40 @@ export const formProps: FormProps = { ...@@ -460,29 +494,40 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '21906e99fb08459ea4318c04707797ca', key: 'fdb254d1c2dc4370a1905ffd85148370',
field: 'gzr', field: 'banzu',
label: '工作人', label: '班组',
type: 'user', type: 'radio',
component: 'User', component: 'ApiRadioGroup',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '',
componentProps: { componentProps: {
span: 7, span: 7,
width: '100%',
defaultValue: '',
placeholder: '请选择工作人',
userType: 0,
prefix: '',
suffix: 'ant-design:setting-outlined',
showLabel: true, showLabel: true,
disabled: false, 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, required: false,
multiple: true, rules: [],
isShow: true,
events: {}, events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' }, params: { itemId: '2021042614763266049' },
itemId: '2021042614763266049',
style: {},
}, },
}, },
{ {
...@@ -624,46 +669,27 @@ export const formProps: FormProps = { ...@@ -624,46 +669,27 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '0d265387754f487886c4b77058fd49a0', key: '21906e99fb08459ea4318c04707797ca',
field: 'gzxm', field: 'gzr',
label: '工作项目', label: '工作人',
type: 'associate-popup', type: 'user',
component: 'MultiplePopup', component: 'User',
colProps: { span: 24 }, colProps: { span: 24 },
defaultValue: '',
componentProps: { componentProps: {
popupType: 'associate',
width: '100%',
span: 7, span: 7,
placeholder: '请选择工作项目', width: '100%',
defaultValue: '',
placeholder: '请选择工作人',
userType: 0,
prefix: '',
suffix: 'ant-design:setting-outlined',
showLabel: true, showLabel: true,
disabled: false, disabled: false,
datasourceType: 'api',
labelField: 'label',
valueField: 'value',
pageSize: 10,
assoTitle: '工作项目',
apiConfig: {
path: '/cheliang/gzx',
method: 'GET',
apiId: 'd31f8fea01274bdf9f1f72464daa59e8',
apiParams: [
{
key: '1',
title: 'Query Params',
tableInfo: [{ name: 'keyword', required: false, bindType: '' }],
},
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql = \'SELECT id AS `value`, gzx AS label FROM mes_base_gongzuoxiang ?{keyword, WHERE gzx LIKE CONCAT("%", #{keyword}, "%")};\';\r\nreturn db.select(sql);',
outputParams: [{ name: 'label', tableTitle: '工作项', show: true, width: 150 }],
},
dicOptions: [],
required: false, required: false,
rules: [], multiple: true,
events: {},
isShow: true, isShow: true,
events: {},
tooltipConfig: { visible: false, title: '提示文本' }, tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' }, style: { width: '100%' },
}, },
...@@ -764,7 +790,6 @@ export const formProps: FormProps = { ...@@ -764,7 +790,6 @@ export const formProps: FormProps = {
span: 7, span: 7,
defaultValue: '', defaultValue: '',
min: 0, min: 0,
max: null,
step: 1, step: 1,
disabled: false, disabled: false,
showLabel: true, showLabel: true,
...@@ -825,6 +850,51 @@ export const formProps: FormProps = { ...@@ -825,6 +850,51 @@ export const formProps: FormProps = {
}, },
}, },
{ {
key: '0d265387754f487886c4b77058fd49a0',
field: 'gzxm',
label: '工作项目',
type: 'associate-popup',
component: 'MultiplePopup',
colProps: { span: 24 },
componentProps: {
popupType: 'associate',
width: '100%',
span: 7,
placeholder: '请选择工作项目',
showLabel: true,
disabled: false,
datasourceType: 'api',
labelField: 'label',
valueField: 'value',
pageSize: 10,
assoTitle: '工作项目',
apiConfig: {
path: '/cheliang/gzx',
method: 'GET',
apiId: 'd31f8fea01274bdf9f1f72464daa59e8',
apiParams: [
{
key: '1',
title: 'Query Params',
tableInfo: [{ name: 'keyword', required: false, bindType: '' }],
},
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
],
script:
'var sql = \'SELECT id AS `value`, gzx AS label FROM mes_base_gongzuoxiang ?{keyword, WHERE gzx LIKE CONCAT("%", #{keyword}, "%")};\';\r\nreturn db.select(sql);',
outputParams: [{ name: 'label', tableTitle: '工作项', show: true, width: 150 }],
},
dicOptions: [],
required: false,
rules: [],
events: {},
isShow: true,
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
},
{
key: 'f89a9cedaa7a4f98958d46860ac84ad6', key: 'f89a9cedaa7a4f98958d46860ac84ad6',
field: 'cphm', field: 'cphm',
label: '车牌号码', label: '车牌号码',
......
xjrsoft-vue3/src/views/chaiche/ccbg/components/workflowPermission.ts
...@@ -23,15 +23,14 @@ export const permissionList = [ ...@@ -23,15 +23,14 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作人', fieldName: '班组',
fieldId: 'gzr', fieldId: 'banzu',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'user', type: 'radio',
key: '21906e99fb08459ea4318c04707797ca', key: 'fdb254d1c2dc4370a1905ffd85148370',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -107,14 +106,15 @@ export const permissionList = [ ...@@ -107,14 +106,15 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作项目', fieldName: '工作人',
fieldId: 'gzxm', fieldId: 'gzr',
isSubTable: false, isSubTable: false,
showChildren: true, showChildren: true,
type: 'associate-popup', type: 'user',
key: '0d265387754f487886c4b77058fd49a0', key: '21906e99fb08459ea4318c04707797ca',
children: [], children: [],
options: {}, options: {},
defaultValue: '',
}, },
{ {
required: false, required: false,
...@@ -207,6 +207,22 @@ export const permissionList = [ ...@@ -207,6 +207,22 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '工作项目',
fieldId: 'gzxm',
isSubTable: false,
showChildren: true,
type: 'associate-popup',
key: '0d265387754f487886c4b77058fd49a0',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '车牌号码', fieldName: '车牌号码',
fieldId: 'cphm', fieldId: 'cphm',
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