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

- 在 CheliangxxModel 中添加 createDate、modifyDate、createUserId 和 modifyUserId 字段
- 移除 keyword 字段中的多余属性配置
- 将工作时长标题统一修改为"工作时长(h)"
- 将车辆重量标题从"车辆重量(kg)"改为"车辆重量"
- 移除报工类型字段
- 简化查询参数表信息结构
- 移除 maxlength 配置项
- 添加默认选择值 defaultSelect: '0'
- 将 gutter 间距从 16 改为 0
- 将最大数值限制从 100/1000 提升至 1000000
- 将附件上传 multiple 属性设置为 true
- 在按钮配置中添加 buttonId 标识
- 移除 PybgModel 中的 bglx 字段
- 在工作流权限配置中同步更新字段名称和添加默认值

xjrsoft-vue3/src/api/chaiche/cheliangxx/model/CheliangxxModel.ts

@@ -123,6 +123,14 @@ export interface MesBaseCheliangModel {
   aqqn: string;
   aqqn: string;
 
 
   dp: 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;
   gzkssj: string;
 
 
-  bglx: string;
-
   cllx: string;
   cllx: string;
 
 
   gzxm: string;
   gzxm: string;

xjrsoft-vue3/src/views/chaiche/ccbg/components/config.ts

@@ -99,15 +99,8 @@ export const searchFormSchema: FormSchema[] = [
               {
               {
                 name: 'keyword',
                 name: 'keyword',
                 value: '',
                 value: '',
-                description: null,
                 required: false,
                 required: false,
                 dataType: 'String',
                 dataType: 'String',
-                type: null,
-                defaultValue: null,
-                validateType: null,
-                error: null,
-                expression: null,
-                children: null,
                 bindType: 'value',
                 bindType: 'value',
               },
               },
             ],
             ],
@@ -319,7 +312,7 @@ export const columns: BasicColumn[] = [
   {
   {
     resizable: true,
     resizable: true,
     dataIndex: 'gzsc',
     dataIndex: 'gzsc',
-    title: '工作时长',
+    title: '工作时长(h)',
     componentType: 'number',
     componentType: 'number',
 
 
     fixed: false,
     fixed: false,
@@ -666,7 +659,7 @@ export const formProps: FormProps = {
                 span: 7,
                 span: 7,
                 defaultValue: '',
                 defaultValue: '',
                 min: 0,
                 min: 0,
-                max: 100,
+                max: 1000000,
                 step: 1,
                 step: 1,
                 disabled: false,
                 disabled: false,
                 showLabel: true,
                 showLabel: true,
@@ -740,7 +733,7 @@ export const formProps: FormProps = {
             {
             {
               key: 'ae4a15e58ffe4710b337560f7d3b0703',
               key: 'ae4a15e58ffe4710b337560f7d3b0703',
               field: 'gzsc',
               field: 'gzsc',
-              label: '工作时长',
+              label: '工作时长(h)',
               type: 'number',
               type: 'number',
               component: 'InputNumber',
               component: 'InputNumber',
               colProps: { span: 24 },
               colProps: { span: 24 },
@@ -760,7 +753,7 @@ export const formProps: FormProps = {
                 isShow: true,
                 isShow: true,
                 rules: [],
                 rules: [],
                 events: {},
                 events: {},
-                placeholder: '请输入工作时长',
+                placeholder: '请输入工作时长(h)',
                 tooltipConfig: { visible: false, title: '提示文本' },
                 tooltipConfig: { visible: false, title: '提示文本' },
                 style: { width: '100%' },
                 style: { width: '100%' },
               },
               },
@@ -801,15 +794,8 @@ export const formProps: FormProps = {
                         {
                         {
                           name: 'keyword',
                           name: 'keyword',
                           value: '',
                           value: '',
-                          description: null,
                           required: false,
                           required: false,
                           dataType: 'String',
                           dataType: 'String',
-                          type: null,
-                          defaultValue: null,
-                          validateType: null,
-                          error: null,
-                          expression: null,
-                          children: null,
                           bindType: 'value',
                           bindType: 'value',
                         },
                         },
                       ],
                       ],
@@ -1006,7 +992,7 @@ export const formProps: FormProps = {
         maxNumber: 5,
         maxNumber: 5,
         maxSize: 5,
         maxSize: 5,
         showLabel: true,
         showLabel: true,
-        multiple: false,
+        multiple: true,
         disabled: false,
         disabled: false,
         required: false,
         required: false,
         isShow: true,
         isShow: true,
@@ -1031,7 +1017,7 @@ export const formProps: FormProps = {
         maxNumber: 5,
         maxNumber: 5,
         maxSize: 5,
         maxSize: 5,
         showLabel: true,
         showLabel: true,
-        multiple: false,
+        multiple: true,
         disabled: false,
         disabled: false,
         required: false,
         required: false,
         isShow: true,
         isShow: true,
@@ -1056,7 +1042,7 @@ export const formProps: FormProps = {
         maxNumber: 5,
         maxNumber: 5,
         maxSize: 5,
         maxSize: 5,
         showLabel: true,
         showLabel: true,
-        multiple: false,
+        multiple: true,
         disabled: false,
         disabled: false,
         required: false,
         required: false,
         isShow: true,
         isShow: true,
@@ -1081,7 +1067,7 @@ export const formProps: FormProps = {
         maxNumber: 5,
         maxNumber: 5,
         maxSize: 5,
         maxSize: 5,
         showLabel: true,
         showLabel: true,
-        multiple: false,
+        multiple: true,
         disabled: false,
         disabled: false,
         required: false,
         required: false,
         isShow: true,
         isShow: true,
@@ -1106,7 +1092,7 @@ export const formProps: FormProps = {
         maxNumber: 5,
         maxNumber: 5,
         maxSize: 5,
         maxSize: 5,
         showLabel: true,
         showLabel: true,
-        multiple: false,
+        multiple: true,
         disabled: false,
         disabled: false,
         required: false,
         required: false,
         isShow: true,
         isShow: true,

xjrsoft-vue3/src/views/chaiche/ccbg/components/workflowPermission.ts

@@ -174,7 +174,7 @@ export const permissionList = [
     disabled: false,
     disabled: false,
     isSaveTable: false,
     isSaveTable: false,
     tableName: '',
     tableName: '',
-    fieldName: '工作时长',
+    fieldName: '工作时长(h)',
     fieldId: 'gzsc',
     fieldId: 'gzsc',
     isSubTable: false,
     isSubTable: false,
     showChildren: true,
     showChildren: true,

xjrsoft-vue3/src/views/chaiche/cheliangxx/components/config.ts

@@ -521,7 +521,7 @@ export const formProps: FormProps = {
                 },
                 },
               ],
               ],
               componentProps: {
               componentProps: {
-                gutter: 16,
+                gutter: 0,
                 justify: 'start',
                 justify: 'start',
                 align: 'top',
                 align: 'top',
                 isShow: true,
                 isShow: true,
@@ -657,7 +657,7 @@ export const formProps: FormProps = {
                 },
                 },
               ],
               ],
               componentProps: {
               componentProps: {
-                gutter: 16,
+                gutter: 0,
                 justify: 'start',
                 justify: 'start',
                 align: 'top',
                 align: 'top',
                 isShow: true,
                 isShow: true,
@@ -693,7 +693,7 @@ export const formProps: FormProps = {
                         span: 7,
                         span: 7,
                         defaultValue: '',
                         defaultValue: '',
                         min: 0,
                         min: 0,
-                        max: 1000,
+                        max: 1000000,
                         step: 1,
                         step: 1,
                         disabled: false,
                         disabled: false,
                         showLabel: true,
                         showLabel: true,
@@ -785,7 +785,7 @@ export const formProps: FormProps = {
                 },
                 },
               ],
               ],
               componentProps: {
               componentProps: {
-                gutter: 16,
+                gutter: 0,
                 justify: 'start',
                 justify: 'start',
                 align: 'top',
                 align: 'top',
                 isShow: true,
                 isShow: true,
@@ -841,6 +841,7 @@ export const formProps: FormProps = {
                         tooltipConfig: { visible: false, title: '提示文本' },
                         tooltipConfig: { visible: false, title: '提示文本' },
                         params: { itemId: '2018146494923980802' },
                         params: { itemId: '2018146494923980802' },
                         itemId: '2018146494923980802',
                         itemId: '2018146494923980802',
+                        defaultSelect: '0',
                         style: {},
                         style: {},
                       },
                       },
                     },
                     },
@@ -882,6 +883,7 @@ export const formProps: FormProps = {
                         tooltipConfig: { visible: false, title: '提示文本' },
                         tooltipConfig: { visible: false, title: '提示文本' },
                         params: { itemId: '2018146494923980802' },
                         params: { itemId: '2018146494923980802' },
                         itemId: '2018146494923980802',
                         itemId: '2018146494923980802',
+                        defaultSelect: '0',
                         style: {},
                         style: {},
                       },
                       },
                     },
                     },
@@ -923,6 +925,7 @@ export const formProps: FormProps = {
                         tooltipConfig: { visible: false, title: '提示文本' },
                         tooltipConfig: { visible: false, title: '提示文本' },
                         params: { itemId: '2018146494923980802' },
                         params: { itemId: '2018146494923980802' },
                         itemId: '2018146494923980802',
                         itemId: '2018146494923980802',
+                        defaultSelect: '0',
                         style: {},
                         style: {},
                       },
                       },
                     },
                     },
@@ -930,7 +933,7 @@ export const formProps: FormProps = {
                 },
                 },
               ],
               ],
               componentProps: {
               componentProps: {
-                gutter: 16,
+                gutter: 0,
                 justify: 'start',
                 justify: 'start',
                 align: 'top',
                 align: 'top',
                 isShow: true,
                 isShow: true,
@@ -986,6 +989,7 @@ export const formProps: FormProps = {
                         tooltipConfig: { visible: false, title: '提示文本' },
                         tooltipConfig: { visible: false, title: '提示文本' },
                         params: { itemId: '2018146494923980802' },
                         params: { itemId: '2018146494923980802' },
                         itemId: '2018146494923980802',
                         itemId: '2018146494923980802',
+                        defaultSelect: '0',
                         style: {},
                         style: {},
                       },
                       },
                     },
                     },
@@ -995,7 +999,7 @@ export const formProps: FormProps = {
                 { span: 8, list: [] },
                 { span: 8, list: [] },
               ],
               ],
               componentProps: {
               componentProps: {
-                gutter: 16,
+                gutter: 0,
                 justify: 'start',
                 justify: 'start',
                 align: 'top',
                 align: 'top',
                 isShow: true,
                 isShow: true,
@@ -1155,7 +1159,7 @@ export const formProps: FormProps = {
                 },
                 },
               ],
               ],
               componentProps: {
               componentProps: {
-                gutter: 16,
+                gutter: 0,
                 justify: 'start',
                 justify: 'start',
                 align: 'top',
                 align: 'top',
                 isShow: true,
                 isShow: true,
@@ -1259,7 +1263,7 @@ export const formProps: FormProps = {
                 },
                 },
               ],
               ],
               componentProps: {
               componentProps: {
-                gutter: 16,
+                gutter: 0,
                 justify: 'start',
                 justify: 'start',
                 align: 'top',
                 align: 'top',
                 isShow: true,
                 isShow: true,
@@ -1363,7 +1367,7 @@ export const formProps: FormProps = {
                 },
                 },
               ],
               ],
               componentProps: {
               componentProps: {
-                gutter: 16,
+                gutter: 0,
                 justify: 'start',
                 justify: 'start',
                 align: 'top',
                 align: 'top',
                 isShow: true,
                 isShow: true,
@@ -1467,7 +1471,7 @@ export const formProps: FormProps = {
                 },
                 },
               ],
               ],
               componentProps: {
               componentProps: {
-                gutter: 16,
+                gutter: 0,
                 justify: 'start',
                 justify: 'start',
                 align: 'top',
                 align: 'top',
                 isShow: true,
                 isShow: true,
@@ -1571,7 +1575,7 @@ export const formProps: FormProps = {
                 },
                 },
               ],
               ],
               componentProps: {
               componentProps: {
-                gutter: 16,
+                gutter: 0,
                 justify: 'start',
                 justify: 'start',
                 align: 'top',
                 align: 'top',
                 isShow: true,
                 isShow: true,
@@ -1703,7 +1707,7 @@ export const formProps: FormProps = {
                 },
                 },
               ],
               ],
               componentProps: {
               componentProps: {
-                gutter: 16,
+                gutter: 0,
                 justify: 'start',
                 justify: 'start',
                 align: 'top',
                 align: 'top',
                 isShow: true,
                 isShow: true,
@@ -1807,7 +1811,7 @@ export const formProps: FormProps = {
                 },
                 },
               ],
               ],
               componentProps: {
               componentProps: {
-                gutter: 16,
+                gutter: 0,
                 justify: 'start',
                 justify: 'start',
                 align: 'top',
                 align: 'top',
                 isShow: true,
                 isShow: true,

xjrsoft-vue3/src/views/chaiche/cheliangxx/components/workflowPermission.ts

@@ -165,6 +165,7 @@ export const permissionList = [
     key: '41fe600e188a419e8f81a0d2237b9c6b',
     key: '41fe600e188a419e8f81a0d2237b9c6b',
     children: [],
     children: [],
     options: {},
     options: {},
+    defaultValue: '0',
   },
   },
   {
   {
     required: false,
     required: false,
@@ -181,6 +182,7 @@ export const permissionList = [
     key: 'e817cfb5fcb94e6498b8420f93633188',
     key: 'e817cfb5fcb94e6498b8420f93633188',
     children: [],
     children: [],
     options: {},
     options: {},
+    defaultValue: '0',
   },
   },
   {
   {
     required: false,
     required: false,
@@ -197,6 +199,7 @@ export const permissionList = [
     key: 'c650357ddb43498186d3e450c4dc9b96',
     key: 'c650357ddb43498186d3e450c4dc9b96',
     children: [],
     children: [],
     options: {},
     options: {},
+    defaultValue: '0',
   },
   },
   {
   {
     required: false,
     required: false,
@@ -213,6 +216,7 @@ export const permissionList = [
     key: '1fa401aa7d4a4c8db3756c363332df17',
     key: '1fa401aa7d4a4c8db3756c363332df17',
     children: [],
     children: [],
     options: {},
     options: {},
+    defaultValue: '0',
   },
   },
   {
   {
     required: false,
     required: false,

xjrsoft-vue3/src/views/chaiche/pybg/components/config.ts

@@ -22,15 +22,8 @@ export const searchFormSchema: FormSchema[] = [
               {
               {
                 name: 'keyword',
                 name: 'keyword',
                 value: '',
                 value: '',
-                description: null,
                 required: false,
                 required: false,
                 dataType: 'String',
                 dataType: 'String',
-                type: null,
-                defaultValue: null,
-                validateType: null,
-                error: null,
-                expression: null,
-                children: null,
                 bindType: 'value',
                 bindType: 'value',
               },
               },
             ],
             ],
@@ -45,7 +38,7 @@ export const searchFormSchema: FormSchema[] = [
           { name: 'cllx_name', tableTitle: '车辆类型', bindField: '', show: true, width: 150 },
           { name: 'cllx_name', tableTitle: '车辆类型', bindField: '', show: true, width: 150 },
           {
           {
             name: 'gbzl',
             name: 'gbzl',
-            tableTitle: '车辆重量(kg)',
+            tableTitle: '车辆重量',
             bindField: 'clzl',
             bindField: 'clzl',
             show: true,
             show: true,
             width: 150,
             width: 150,
@@ -100,12 +93,6 @@ export const searchFormSchema: FormSchema[] = [
   },
   },
 
 
   {
   {
-    field: 'bglx',
-    label: '报工类型',
-    defaultValue: undefined,
-    component: 'Input',
-  },
-  {
     field: 'cllx',
     field: 'cllx',
     label: '车辆类型',
     label: '车辆类型',
     defaultValue: undefined,
     defaultValue: undefined,
@@ -135,22 +122,7 @@ export const searchFormSchema: FormSchema[] = [
           {
           {
             key: '1',
             key: '1',
             title: 'Query Params',
             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: '2', title: 'Header', tableInfo: [] },
           { key: '3', title: 'Body' },
           { key: '3', title: 'Body' },
@@ -381,7 +353,6 @@ export const formProps: FormProps = {
                 span: 7,
                 span: 7,
                 defaultValue: '',
                 defaultValue: '',
                 placeholder: '请输入车辆id',
                 placeholder: '请输入车辆id',
-                maxlength: null,
                 prefix: '',
                 prefix: '',
                 suffix: '',
                 suffix: '',
                 addonBefore: '',
                 addonBefore: '',
@@ -433,15 +404,8 @@ export const formProps: FormProps = {
                         {
                         {
                           name: 'keyword',
                           name: 'keyword',
                           value: '',
                           value: '',
-                          description: null,
                           required: false,
                           required: false,
                           dataType: 'String',
                           dataType: 'String',
-                          type: null,
-                          defaultValue: null,
-                          validateType: null,
-                          error: null,
-                          expression: null,
-                          children: null,
                           bindType: 'value',
                           bindType: 'value',
                         },
                         },
                       ],
                       ],
@@ -456,7 +420,7 @@ export const formProps: FormProps = {
                     { name: 'cllx_name', tableTitle: '车辆类型', show: true, width: 150 },
                     { name: 'cllx_name', tableTitle: '车辆类型', show: true, width: 150 },
                     {
                     {
                       name: 'gbzl',
                       name: 'gbzl',
-                      tableTitle: '车辆重量(kg)',
+                      tableTitle: '车辆重量',
                       bindField: 'clzl',
                       bindField: 'clzl',
                       show: true,
                       show: true,
                       width: 150,
                       width: 150,
@@ -560,7 +524,6 @@ export const formProps: FormProps = {
                 span: 7,
                 span: 7,
                 defaultValue: '',
                 defaultValue: '',
                 placeholder: '请输入报工类型',
                 placeholder: '请输入报工类型',
-                maxlength: null,
                 prefix: '',
                 prefix: '',
                 suffix: '',
                 suffix: '',
                 addonBefore: '',
                 addonBefore: '',
@@ -602,7 +565,6 @@ export const formProps: FormProps = {
                   { key: 2, label: 'Option 2', value: 'Option 2' },
                   { key: 2, label: 'Option 2', value: 'Option 2' },
                   { key: 3, label: 'Option 3', value: 'Option 3' },
                   { key: 3, label: 'Option 3', value: 'Option 3' },
                 ],
                 ],
-                defaultSelect: null,
                 datasourceType: 'dic',
                 datasourceType: 'dic',
                 params: { itemId: '2017066632836796418' },
                 params: { itemId: '2017066632836796418' },
                 labelField: 'name',
                 labelField: 'name',
@@ -650,20 +612,7 @@ export const formProps: FormProps = {
                       key: '1',
                       key: '1',
                       title: 'Query Params',
                       title: 'Query Params',
                       tableInfo: [
                       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: [] },
                     { key: '2', title: 'Header', tableInfo: [] },
@@ -727,9 +676,8 @@ export const formProps: FormProps = {
                 span: 7,
                 span: 7,
                 defaultValue: '',
                 defaultValue: '',
                 min: 0,
                 min: 0,
-                max: 100,
+                max: 1000000,
                 step: 1,
                 step: 1,
-                maxlength: null,
                 disabled: false,
                 disabled: false,
                 showLabel: true,
                 showLabel: true,
                 controls: true,
                 controls: true,
@@ -758,7 +706,6 @@ export const formProps: FormProps = {
                 min: 0,
                 min: 0,
                 max: 100,
                 max: 100,
                 step: 1,
                 step: 1,
-                maxlength: null,
                 disabled: false,
                 disabled: false,
                 showLabel: true,
                 showLabel: true,
                 controls: true,
                 controls: true,

xjrsoft-vue3/src/views/chaiche/pybg/index.vue

@@ -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":"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);
     return filterButtonAuth(list);
   })
   })