Merge remote-tracking branch 'origin/hongshun' into hongshun

xjrsoft-vue3/src/api/chaiche/ccbg/model/CcbgModel.ts

@@ -4,25 +4,25 @@ import { BasicPageParams, BasicFetchResult } from '/@/api/model/baseModel';
  * @description: MesCheliangBg分页参数 模型
  */
 export interface MesCheliangBgPageParams extends BasicPageParams {
-  banzu: string;
-
   cphm: string;
 
   clys: string;
 
-  gzjssj: string;
-
   gzr: string;
 
+  gzkssj: string;
+
   cllx: string;
 
-  wlzt: string;
+  clls: string;
 
   gzxm: string;
 
-  clppxh: string;
+  gzjssj: string;
 
-  gzkssj: string;
+  wlzt: string;
+
+  clppxh: string;
 }
 
 /**
@@ -56,8 +56,6 @@ export interface MesCheliangBgPageModel {
   gzsc: string;
 
   wlzt: string;
-
-  banzu: string;
 }
 
 /**

xjrsoft-vue3/src/views/chaiche/ccbg/components/CcbgModal.vue

@@ -135,3 +135,4 @@
   
 </script>
 
+  
\ No newline at end of file

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

@@ -23,22 +23,6 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '班组',
-    fieldId: 'banzu',
-    isSubTable: false,
-    showChildren: true,
-    type: 'radio',
-    key: 'fdb254d1c2dc4370a1905ffd85148370',
-    children: [],
-    options: {},
-  },
-  {
-    required: false,
-    view: true,
-    edit: true,
-    disabled: false,
-    isSaveTable: false,
-    tableName: '',
     fieldName: '车牌号码',
     fieldId: 'cphm',
     isSubTable: false,
@@ -72,12 +56,12 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '工作结束时间',
-    fieldId: 'gzjssj',
+    fieldName: '工作人',
+    fieldId: 'gzr',
     isSubTable: false,
     showChildren: true,
-    type: 'date',
-    key: 'a349e957579e47cb90727cdfa8c9d21f',
+    type: 'user',
+    key: '21906e99fb08459ea4318c04707797ca',
     children: [],
     options: {},
     defaultValue: '',
@@ -89,12 +73,12 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '车辆id',
-    fieldId: 'cheliangId',
+    fieldName: '工作开始时间',
+    fieldId: 'gzkssj',
     isSubTable: false,
     showChildren: true,
-    type: 'input',
-    key: 'e1221f5840d7486588dd2c1e086af59d',
+    type: 'date',
+    key: '4da55e5ac2c04a2dacd2cd58470b6820',
     children: [],
     options: {},
     defaultValue: '',
@@ -106,12 +90,12 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '工作人',
-    fieldId: 'gzr',
+    fieldName: '车辆id',
+    fieldId: 'cheliangId',
     isSubTable: false,
     showChildren: true,
-    type: 'user',
-    key: '21906e99fb08459ea4318c04707797ca',
+    type: 'input',
+    key: 'e1221f5840d7486588dd2c1e086af59d',
     children: [],
     options: {},
     defaultValue: '',
@@ -156,15 +140,14 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '磅单数量',
-    fieldId: 'bdsl',
+    fieldName: '工作项目',
+    fieldId: 'gzxm',
     isSubTable: false,
     showChildren: true,
-    type: 'number',
-    key: '5bd116e5f35344cb8780f747370cee8d',
+    type: 'associate-popup',
+    key: '0d265387754f487886c4b77058fd49a0',
     children: [],
     options: {},
-    defaultValue: '',
   },
   {
     required: false,
@@ -173,12 +156,12 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '工作时长(h)',
-    fieldId: 'gzsc',
+    fieldName: '工作结束时间',
+    fieldId: 'gzjssj',
     isSubTable: false,
     showChildren: true,
-    type: 'number',
-    key: 'ae4a15e58ffe4710b337560f7d3b0703',
+    type: 'date',
+    key: 'a349e957579e47cb90727cdfa8c9d21f',
     children: [],
     options: {},
     defaultValue: '',
@@ -206,14 +189,15 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '工作项目',
-    fieldId: 'gzxm',
+    fieldName: '车辆重量(kg)',
+    fieldId: 'clzl',
     isSubTable: false,
     showChildren: true,
-    type: 'associate-popup',
-    key: '0d265387754f487886c4b77058fd49a0',
+    type: 'number',
+    key: '059de967d74b44bba170351aff279c63',
     children: [],
     options: {},
+    defaultValue: '',
   },
   {
     required: false,
@@ -222,12 +206,12 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '车辆重量(kg)',
-    fieldId: 'clzl',
+    fieldName: '车辆品牌型号',
+    fieldId: 'clppxh',
     isSubTable: false,
     showChildren: true,
-    type: 'number',
-    key: '059de967d74b44bba170351aff279c63',
+    type: 'input',
+    key: '45b440505abc47e2a61e9a0a459c67b2',
     children: [],
     options: {},
     defaultValue: '',
@@ -239,12 +223,12 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '车辆品牌型号',
-    fieldId: 'clppxh',
+    fieldName: '磅单数量',
+    fieldId: 'bdsl',
     isSubTable: false,
     showChildren: true,
-    type: 'input',
-    key: '45b440505abc47e2a61e9a0a459c67b2',
+    type: 'number',
+    key: '5bd116e5f35344cb8780f747370cee8d',
     children: [],
     options: {},
     defaultValue: '',
@@ -256,12 +240,12 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '工作开始时间',
-    fieldId: 'gzkssj',
+    fieldName: '工作时长(h)',
+    fieldId: 'gzsc',
     isSubTable: false,
     showChildren: true,
-    type: 'date',
-    key: '4da55e5ac2c04a2dacd2cd58470b6820',
+    type: 'number',
+    key: 'ae4a15e58ffe4710b337560f7d3b0703',
     children: [],
     options: {},
     defaultValue: '',

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

@@ -182,8 +182,8 @@
     formConfig: {
       labelWidth: 100,
       schemas: searchFormSchema,
-      fieldMapToTime: [['gzjssj', ['gzjssjStart', 'gzjssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],
-['gzkssj', ['gzkssjStart', 'gzkssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],],
+      fieldMapToTime: [['gzkssj', ['gzkssjStart', 'gzkssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],
+['gzjssj', ['gzjssjStart', 'gzjssjEnd'], 'YYYY-MM-DD HH:mm:ss ', true],],
       showResetButton: false,
     },
      bordered:false,