Skip to content

W
weiqiao-vue
Commit faa94c7f by 王宝涛
Options

feat(cheliangxx): 更新车辆信息模型和配置 

- 在 CheliangxxModel 中添加 createDate、modifyDate、createUserId 和 modifyUserId 字段
- 移除 keyword 字段中的多余属性配置
- 将工作时长标题统一修改为"工作时长(h)"
- 将车辆重量标题从"车辆重量(kg)"改为"车辆重量"
- 移除报工类型字段
- 简化查询参数表信息结构
- 移除 maxlength 配置项
- 添加默认选择值 defaultSelect: '0'
- 将 gutter 间距从 16 改为 0
- 将最大数值限制从 100/1000 提升至 1000000
- 将附件上传 multiple 属性设置为 true
- 在按钮配置中添加 buttonId 标识
- 移除 PybgModel 中的 bglx 字段
- 在工作流权限配置中同步更新字段名称和添加默认值
parent 2f1cc80f
Showing with 45 additions and 98 deletions
xjrsoft-vue3/src/api/chaiche/cheliangxx/model/CheliangxxModel.ts
......@@ -123,6 +123,14 @@ export interface MesBaseCheliangModel {
aqqn: string;
dp: string;
createDate: string;
modifyDate: string;
createUserId: string;
modifyUserId: string;
}
/**
......
xjrsoft-vue3/src/api/chaiche/pybg/model/PybgModel.ts
......@@ -10,8 +10,6 @@ export interface MesCheliangBgPageParams extends BasicPageParams {
gzkssj: string;
bglx: string;
cllx: string;
gzxm: string;
......
xjrsoft-vue3/src/views/chaiche/ccbg/components/config.ts
......@@ -99,15 +99,8 @@ export const searchFormSchema: FormSchema[] = [
{
name: 'keyword',
value: '',
description: null,
required: false,
dataType: 'String',
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: 'value',
},
],
......@@ -319,7 +312,7 @@ export const columns: BasicColumn[] = [
{
resizable: true,
dataIndex: 'gzsc',
title: '工作时长',
title: '工作时长(h)',
componentType: 'number',
fixed: false,
......@@ -666,7 +659,7 @@ export const formProps: FormProps = {
span: 7,
defaultValue: '',
min: 0,
max: 100,
max: 1000000,
step: 1,
disabled: false,
showLabel: true,
......@@ -740,7 +733,7 @@ export const formProps: FormProps = {
{
key: 'ae4a15e58ffe4710b337560f7d3b0703',
field: 'gzsc',
label: '工作时长',
label: '工作时长(h)',
type: 'number',
component: 'InputNumber',
colProps: { span: 24 },
......@@ -760,7 +753,7 @@ export const formProps: FormProps = {
isShow: true,
rules: [],
events: {},
placeholder: '请输入工作时长',
placeholder: '请输入工作时长(h)',
tooltipConfig: { visible: false, title: '提示文本' },
style: { width: '100%' },
},
......@@ -801,15 +794,8 @@ export const formProps: FormProps = {
{
name: 'keyword',
value: '',
description: null,
required: false,
dataType: 'String',
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: 'value',
},
],
......@@ -1006,7 +992,7 @@ export const formProps: FormProps = {
maxNumber: 5,
maxSize: 5,
showLabel: true,
multiple: false,
multiple: true,
disabled: false,
required: false,
isShow: true,
......@@ -1031,7 +1017,7 @@ export const formProps: FormProps = {
maxNumber: 5,
maxSize: 5,
showLabel: true,
multiple: false,
multiple: true,
disabled: false,
required: false,
isShow: true,
......@@ -1056,7 +1042,7 @@ export const formProps: FormProps = {
maxNumber: 5,
maxSize: 5,
showLabel: true,
multiple: false,
multiple: true,
disabled: false,
required: false,
isShow: true,
......@@ -1081,7 +1067,7 @@ export const formProps: FormProps = {
maxNumber: 5,
maxSize: 5,
showLabel: true,
multiple: false,
multiple: true,
disabled: false,
required: false,
isShow: true,
......@@ -1106,7 +1092,7 @@ export const formProps: FormProps = {
maxNumber: 5,
maxSize: 5,
showLabel: true,
multiple: false,
multiple: true,
disabled: false,
required: false,
isShow: true,
......
xjrsoft-vue3/src/views/chaiche/ccbg/components/workflowPermission.ts
......@@ -174,7 +174,7 @@ export const permissionList = [
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '工作时长',
fieldName: '工作时长(h)',
fieldId: 'gzsc',
isSubTable: false,
showChildren: true,
......
xjrsoft-vue3/src/views/chaiche/cheliangxx/components/config.ts
......@@ -521,7 +521,7 @@ export const formProps: FormProps = {
},
],
componentProps: {
gutter: 16,
gutter: 0,
justify: 'start',
align: 'top',
isShow: true,
......@@ -657,7 +657,7 @@ export const formProps: FormProps = {
},
],
componentProps: {
gutter: 16,
gutter: 0,
justify: 'start',
align: 'top',
isShow: true,
......@@ -693,7 +693,7 @@ export const formProps: FormProps = {
span: 7,
defaultValue: '',
min: 0,
max: 1000,
max: 1000000,
step: 1,
disabled: false,
showLabel: true,
......@@ -785,7 +785,7 @@ export const formProps: FormProps = {
},
],
componentProps: {
gutter: 16,
gutter: 0,
justify: 'start',
align: 'top',
isShow: true,
......@@ -841,6 +841,7 @@ export const formProps: FormProps = {
tooltipConfig: { visible: false, title: '提示文本' },
params: { itemId: '2018146494923980802' },
itemId: '2018146494923980802',
defaultSelect: '0',
style: {},
},
},
......@@ -882,6 +883,7 @@ export const formProps: FormProps = {
tooltipConfig: { visible: false, title: '提示文本' },
params: { itemId: '2018146494923980802' },
itemId: '2018146494923980802',
defaultSelect: '0',
style: {},
},
},
......@@ -923,6 +925,7 @@ export const formProps: FormProps = {
tooltipConfig: { visible: false, title: '提示文本' },
params: { itemId: '2018146494923980802' },
itemId: '2018146494923980802',
defaultSelect: '0',
style: {},
},
},
......@@ -930,7 +933,7 @@ export const formProps: FormProps = {
},
],
componentProps: {
gutter: 16,
gutter: 0,
justify: 'start',
align: 'top',
isShow: true,
......@@ -986,6 +989,7 @@ export const formProps: FormProps = {
tooltipConfig: { visible: false, title: '提示文本' },
params: { itemId: '2018146494923980802' },
itemId: '2018146494923980802',
defaultSelect: '0',
style: {},
},
},
......@@ -995,7 +999,7 @@ export const formProps: FormProps = {
{ span: 8, list: [] },
],
componentProps: {
gutter: 16,
gutter: 0,
justify: 'start',
align: 'top',
isShow: true,
......@@ -1155,7 +1159,7 @@ export const formProps: FormProps = {
},
],
componentProps: {
gutter: 16,
gutter: 0,
justify: 'start',
align: 'top',
isShow: true,
......@@ -1259,7 +1263,7 @@ export const formProps: FormProps = {
},
],
componentProps: {
gutter: 16,
gutter: 0,
justify: 'start',
align: 'top',
isShow: true,
......@@ -1363,7 +1367,7 @@ export const formProps: FormProps = {
},
],
componentProps: {
gutter: 16,
gutter: 0,
justify: 'start',
align: 'top',
isShow: true,
......@@ -1467,7 +1471,7 @@ export const formProps: FormProps = {
},
],
componentProps: {
gutter: 16,
gutter: 0,
justify: 'start',
align: 'top',
isShow: true,
......@@ -1571,7 +1575,7 @@ export const formProps: FormProps = {
},
],
componentProps: {
gutter: 16,
gutter: 0,
justify: 'start',
align: 'top',
isShow: true,
......@@ -1703,7 +1707,7 @@ export const formProps: FormProps = {
},
],
componentProps: {
gutter: 16,
gutter: 0,
justify: 'start',
align: 'top',
isShow: true,
......@@ -1807,7 +1811,7 @@ export const formProps: FormProps = {
},
],
componentProps: {
gutter: 16,
gutter: 0,
justify: 'start',
align: 'top',
isShow: true,
......
xjrsoft-vue3/src/views/chaiche/cheliangxx/components/workflowPermission.ts
......@@ -165,6 +165,7 @@ export const permissionList = [
key: '41fe600e188a419e8f81a0d2237b9c6b',
children: [],
options: {},
defaultValue: '0',
},
{
required: false,
......@@ -181,6 +182,7 @@ export const permissionList = [
key: 'e817cfb5fcb94e6498b8420f93633188',
children: [],
options: {},
defaultValue: '0',
},
{
required: false,
......@@ -197,6 +199,7 @@ export const permissionList = [
key: 'c650357ddb43498186d3e450c4dc9b96',
children: [],
options: {},
defaultValue: '0',
},
{
required: false,
......@@ -213,6 +216,7 @@ export const permissionList = [
key: '1fa401aa7d4a4c8db3756c363332df17',
children: [],
options: {},
defaultValue: '0',
},
{
required: false,
......
xjrsoft-vue3/src/views/chaiche/pybg/components/config.ts
......@@ -22,15 +22,8 @@ export const searchFormSchema: FormSchema[] = [
{
name: 'keyword',
value: '',
description: null,
required: false,
dataType: 'String',
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: 'value',
},
],
......@@ -45,7 +38,7 @@ export const searchFormSchema: FormSchema[] = [
{ name: 'cllx_name', tableTitle: '车辆类型', bindField: '', show: true, width: 150 },
{
name: 'gbzl',
tableTitle: '车辆重量(kg)',
tableTitle: '车辆重量',
bindField: 'clzl',
show: true,
width: 150,
......@@ -100,12 +93,6 @@ export const searchFormSchema: FormSchema[] = [
},
{
field: 'bglx',
label: '报工类型',
defaultValue: undefined,
component: 'Input',
},
{
field: 'cllx',
label: '车辆类型',
defaultValue: undefined,
......@@ -135,22 +122,7 @@ export const searchFormSchema: FormSchema[] = [
{
key: '1',
title: 'Query Params',
tableInfo: [
{
name: 'keyword',
value: null,
description: null,
required: false,
dataType: 'String',
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: '',
},
],
tableInfo: [{ name: 'keyword', required: false, dataType: 'String', bindType: '' }],
},
{ key: '2', title: 'Header', tableInfo: [] },
{ key: '3', title: 'Body' },
......@@ -381,7 +353,6 @@ export const formProps: FormProps = {
span: 7,
defaultValue: '',
placeholder: '请输入车辆id',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -433,15 +404,8 @@ export const formProps: FormProps = {
{
name: 'keyword',
value: '',
description: null,
required: false,
dataType: 'String',
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: 'value',
},
],
......@@ -456,7 +420,7 @@ export const formProps: FormProps = {
{ name: 'cllx_name', tableTitle: '车辆类型', show: true, width: 150 },
{
name: 'gbzl',
tableTitle: '车辆重量(kg)',
tableTitle: '车辆重量',
bindField: 'clzl',
show: true,
width: 150,
......@@ -560,7 +524,6 @@ export const formProps: FormProps = {
span: 7,
defaultValue: '',
placeholder: '请输入报工类型',
maxlength: null,
prefix: '',
suffix: '',
addonBefore: '',
......@@ -602,7 +565,6 @@ export const formProps: FormProps = {
{ key: 2, label: 'Option 2', value: 'Option 2' },
{ key: 3, label: 'Option 3', value: 'Option 3' },
],
defaultSelect: null,
datasourceType: 'dic',
params: { itemId: '2017066632836796418' },
labelField: 'name',
......@@ -650,20 +612,7 @@ export const formProps: FormProps = {
key: '1',
title: 'Query Params',
tableInfo: [
{
name: 'keyword',
value: null,
description: null,
required: false,
dataType: 'String',
type: null,
defaultValue: null,
validateType: null,
error: null,
expression: null,
children: null,
bindType: '',
},
{ name: 'keyword', required: false, dataType: 'String', bindType: '' },
],
},
{ key: '2', title: 'Header', tableInfo: [] },
......@@ -727,9 +676,8 @@ export const formProps: FormProps = {
span: 7,
defaultValue: '',
min: 0,
max: 100,
max: 1000000,
step: 1,
maxlength: null,
disabled: false,
showLabel: true,
controls: true,
......@@ -758,7 +706,6 @@ export const formProps: FormProps = {
min: 0,
max: 100,
step: 1,
maxlength: null,
disabled: false,
showLabel: true,
controls: true,
......
xjrsoft-vue3/src/views/chaiche/pybg/index.vue
......@@ -133,7 +133,7 @@
//展示在列表内的按钮
const actionButtons = ref<string[]>(["view","edit","delete"]);
const buttonConfigs = computed(()=>{
const list = [{"isUse":true,"name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true},{"isUse":true,"name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true},{"isUse":true,"name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isEnableLock":true},{"isUse":true,"name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true}]
const list = [{"buttonId":"2019239342196994048","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2019239342196994049","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2019239342196994050","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2019239342196994051","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
return filterButtonAuth(list);
})
......
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