Merge branch 'hongshun' into hongshun-sun

xjrsoft-vue3/src/api/chaiche/pybg/model/PybgModel.ts

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

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

@@ -39,14 +39,15 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '班组',
-    fieldId: 'banzu',
+    fieldName: '排液人',
+    fieldId: 'gzr',
     isSubTable: false,
     showChildren: true,
-    type: 'radio',
-    key: '362f762c817749469f47af55832b3363',
+    type: 'user',
+    key: 'b8e63f39708d46cdb64fd9b5e9079dd4',
     children: [],
     options: {},
+    defaultValue: '',
   },
   {
     required: false,
@@ -105,15 +106,14 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '排液人',
-    fieldId: 'gzr',
+    fieldName: '工作项目',
+    fieldId: 'gzxm',
     isSubTable: false,
     showChildren: true,
-    type: 'user',
-    key: 'b8e63f39708d46cdb64fd9b5e9079dd4',
+    type: 'associate-popup',
+    key: '16549fa420014b3f871e74e4274df5b3',
     children: [],
     options: {},
-    defaultValue: '',
   },
   {
     required: false,
@@ -156,22 +156,6 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '工作项目',
-    fieldId: 'gzxm',
-    isSubTable: false,
-    showChildren: true,
-    type: 'associate-popup',
-    key: '16549fa420014b3f871e74e4274df5b3',
-    children: [],
-    options: {},
-  },
-  {
-    required: false,
-    view: true,
-    edit: true,
-    disabled: false,
-    isSaveTable: false,
-    tableName: '',
     fieldName: '处理辆数',
     fieldId: 'clls',
     isSubTable: false,