Skip to content

W
weiqiao-vue
Commit 258b8f99 by 王宝涛
Options

feat(cheliangxx): 更新车辆信息模块以支持更多字段和优化界面布局 

- 将模态框高度从500调整为600像素
- 将模态框宽度从900调整为1200像素以适应更多内容
- 在模型定义中添加车辆编号、厂牌型号、车架号等新字段
- 添加出库时间、精拆登记、已排液、危废处理等相关字段
- 配置表单中的新字段，包括车辆编号、厂牌型号、车架号等
- 添加出库时间日期选择器组件和相关配置
- 为精拆登记、已排液、危废处理等字段配置选择器组件
- 在表格列配置中添加新字段对应的列定义
- 重构表单布局，使用卡片组件组织不同信息区域
- 添加燃料类型、玻璃水、机油等附加信息字段及其配置
- 完善所有新增字段的数据绑定和显示功能
parent ae30092a
Showing with 477 additions and 6 deletions
xjrsoft-vue3/src/api/chaiche/cheliangxx/model/CheliangxxModel.ts
...@@ -10,7 +10,23 @@ export interface MesBaseCheliangPageParams extends BasicPageParams { ...@@ -10,7 +10,23 @@ export interface MesBaseCheliangPageParams extends BasicPageParams {
clmc: string; clmc: string;
bz: string; clbh: string;
cpxh: string;
cjh: string;
cksj: string;
jcdj: string;
ypy: string;
wfcl: string;
ypybg: string;
sfcj: string;
} }
/** /**
...@@ -25,7 +41,25 @@ export interface MesBaseCheliangPageModel { ...@@ -25,7 +41,25 @@ export interface MesBaseCheliangPageModel {
clmc: string; clmc: string;
bz: string; clbh: string;
cpxh: string;
cjh: string;
gbzl: string;
cksj: string;
jcdj: string;
ypy: string;
wfcl: string;
ypybg: string;
sfcj: string;
} }
/** /**
...@@ -40,7 +74,55 @@ export interface MesBaseCheliangModel { ...@@ -40,7 +74,55 @@ export interface MesBaseCheliangModel {
clmc: string; clmc: string;
clbh: string;
bz: string; bz: string;
cjh: string;
jcdj: string;
gbzl: string;
cpxh: string;
cksj: string;
ypy: string;
wfcl: string;
ypybg: string;
sfcj: string;
qcy: string;
bls: string;
jy: string;
zdy: string;
bsxy: string;
ns: string;
yyy: string;
zly: string;
fdy: string;
qtfyy: string;
sych: string;
cllt: string;
aqqn: string;
dp: string;
} }
/** /**
......
xjrsoft-vue3/src/views/chaiche/cheliangxx/components/CheliangxxModal.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<BasicModal <BasicModal
:height="500" :height="600"
v-bind="$attrs" @register="registerModal" :title="getTitle" v-bind="$attrs" @register="registerModal" :title="getTitle"
@ok="handleSubmit" @cancel="handleClose" > @ok="handleSubmit" @cancel="handleClose" >
<ModalForm ref="formRef" v-model:value="state.formModel" :fromPage="FromPageType.MENU" /> <ModalForm ref="formRef" v-model:value="state.formModel" :fromPage="FromPageType.MENU" />
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
showCancelBtn: !state.isView, showCancelBtn: !state.isView,
showOkBtn: !state.isView, showOkBtn: !state.isView,
canFullscreen: true, canFullscreen: true,
width: 900, width: 1200,
footer: state.isView ? null : undefined,defaultFullscreen:true, footer: state.isView ? null : undefined,defaultFullscreen:true,
}); });
......
xjrsoft-vue3/src/views/chaiche/cheliangxx/components/workflowPermission.ts
...@@ -56,6 +56,171 @@ export const permissionList = [ ...@@ -56,6 +56,171 @@ export const permissionList = [
disabled: false, disabled: false,
isSaveTable: false, isSaveTable: false,
tableName: '', tableName: '',
fieldName: '车辆编号',
fieldId: 'clbh',
isSubTable: false,
showChildren: true,
type: 'input',
key: 'dc6f609189394b79b231523655452daa',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '厂牌型号',
fieldId: 'cpxh',
isSubTable: false,
showChildren: true,
type: 'input',
key: '069634cbcf7b4eb99dd167a91f9c4028',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '车架号',
fieldId: 'cjh',
isSubTable: false,
showChildren: true,
type: 'input',
key: '4861266b93634eecabc22c20df57f1e5',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '过磅重量(t)',
fieldId: 'gbzl',
isSubTable: false,
showChildren: true,
type: 'number',
key: 'ce1146f2655e4478a755f51dd14860ab',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '出库时间',
fieldId: 'cksj',
isSubTable: false,
showChildren: true,
type: 'date',
key: '52100632055d4a86afa6abf9b6519545',
children: [],
options: {},
defaultValue: '',
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '精拆登记',
fieldId: 'jcdj',
isSubTable: false,
showChildren: true,
type: 'radio',
key: 'b1f8a7b985a649fcb1622be08e18f5e0',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '已排液',
fieldId: 'ypy',
isSubTable: false,
showChildren: true,
type: 'radio',
key: '41fe600e188a419e8f81a0d2237b9c6b',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '已危废处理',
fieldId: 'wfcl',
isSubTable: false,
showChildren: true,
type: 'radio',
key: 'e817cfb5fcb94e6498b8420f93633188',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '已排液报工',
fieldId: 'ypybg',
isSubTable: false,
showChildren: true,
type: 'radio',
key: 'c650357ddb43498186d3e450c4dc9b96',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '已拆解',
fieldId: 'sfcj',
isSubTable: false,
showChildren: true,
type: 'radio',
key: '1fa401aa7d4a4c8db3756c363332df17',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '备注', fieldName: '备注',
fieldId: 'bz', fieldId: 'bz',
isSubTable: false, isSubTable: false,
...@@ -66,4 +231,228 @@ export const permissionList = [ ...@@ -66,4 +231,228 @@ export const permissionList = [
options: {}, options: {},
defaultValue: '', defaultValue: '',
}, },
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '汽/柴油',
fieldId: 'qcy',
isSubTable: false,
showChildren: true,
type: 'radio',
key: '20998e26a46b4887969a51f901179916',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '玻璃水',
fieldId: 'bls',
isSubTable: false,
showChildren: true,
type: 'radio',
key: '51b785daa6614711a6f7b5ca2923a6c3',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '机油',
fieldId: 'jy',
isSubTable: false,
showChildren: true,
type: 'radio',
key: '694d57edc5ef495e874f4e8d33a0178c',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '制动液',
fieldId: 'zdy',
isSubTable: false,
showChildren: true,
type: 'radio',
key: 'e261c77e317c4c62b8ce298b87e5233d',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '变速箱油',
fieldId: 'bsxy',
isSubTable: false,
showChildren: true,
type: 'radio',
key: '4da5b53d257b46f8b4689da3e0822462',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '尿素',
fieldId: 'ns',
isSubTable: false,
showChildren: true,
type: 'radio',
key: 'b1eae4ad0ad8403ba401150f170f9be4',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '液压油',
fieldId: 'yyy',
isSubTable: false,
showChildren: true,
type: 'radio',
key: '80704cb0a1194d2c97af6cd55fadc3eb',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '制冷液',
fieldId: 'zly',
isSubTable: false,
showChildren: true,
type: 'radio',
key: 'e034a7eea71e45a29255529bdcae050c',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '防冻液',
fieldId: 'fdy',
isSubTable: false,
showChildren: true,
type: 'radio',
key: 'd5acf49953f44859914119e1ad097063',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '其他废油液',
fieldId: 'qtfyy',
isSubTable: false,
showChildren: true,
type: 'radio',
key: '19c1a2df12aa477aa7a9424a1aee1f4d',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '三元催化',
fieldId: 'sych',
isSubTable: false,
showChildren: true,
type: 'radio',
key: '72e006508bf643d793670c60f095e41f',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '轮胎',
fieldId: 'cllt',
isSubTable: false,
showChildren: true,
type: 'radio',
key: '87e731c99df842b68550e75d88dbc47e',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '安全气囊',
fieldId: 'aqqn',
isSubTable: false,
showChildren: true,
type: 'radio',
key: '39b9c90a2b214d3bab1904b118424bad',
children: [],
options: {},
},
{
required: false,
view: true,
edit: true,
disabled: false,
isSaveTable: false,
tableName: '',
fieldName: '电瓶',
fieldId: 'dp',
isSubTable: false,
showChildren: true,
type: 'radio',
key: '9cbd10bbcb9d4ef2be721112b292f1fd',
children: [],
options: {},
},
]; ];
xjrsoft-vue3/src/views/chaiche/cheliangxx/index.vue
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
//展示在列表内的按钮 //展示在列表内的按钮
const actionButtons = ref<string[]>(["view","edit","delete"]); const actionButtons = ref<string[]>(["view","edit","delete"]);
const buttonConfigs = computed(()=>{ 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":"2017108379092635648","name":"查看","code":"view","icon":"ant-design:eye-outlined","isDefault":true,"isUse":true},{"buttonId":"2017108379092635649","name":"新增","code":"add","icon":"ant-design:plus-outlined","isDefault":true,"isUse":true},{"buttonId":"2017108379092635650","name":"编辑","code":"edit","icon":"ant-design:form-outlined","isDefault":true,"isUse":true,"isEnableLock":true},{"buttonId":"2017108379092635651","name":"删除","code":"delete","icon":"ant-design:delete-outlined","isDefault":true,"isUse":true}]
return filterButtonAuth(list); return filterButtonAuth(list);
}) })
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
formConfig: { formConfig: {
labelWidth: 100, labelWidth: 100,
schemas: searchFormSchema, schemas: searchFormSchema,
fieldMapToTime: [], fieldMapToTime: [['cksj', ['cksjStart', 'cksjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],],
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