Merge remote-tracking branch 'origin/weiqiao-vue3' into weiqiao-vue3

xjrsoft-vue3/src/views/scgl/scrw/components/config.ts

@@ -157,7 +157,7 @@ export const columns: BasicColumn[] = [
 
     styleConfig: undefined,
     listStyle: undefined,
-  },
+  }
 ];
 //表头合并配置
 export const headerMergingData = [];
@@ -271,7 +271,7 @@ export const formProps: FormProps = {
               },
             },
             {
-              key: 'lkajsldjaljdla',
+              key: 'm7r1m6f9e6z4l0l7d4c7q8a2f3o2m7c4',
               field: 'ywzz',
               label: '业务组织',
               type: 'select',
@@ -488,7 +488,7 @@ export const formProps: FormProps = {
               },
             },
             {
-              key: '312djfjdjd',
+              key: 'i3r5y5h5u6w6v0m9i5v0z5w0i4f8b8m6',
               field: 'zt',
               label: '状态',
               type: 'input',
@@ -732,7 +732,7 @@ export const formProps: FormProps = {
           span: 6,
           list: [
             {
-              key: 'fsdfsdf',
+              key: 'u2r5o6w9o9l2w3k4z4g5f7x9w4b5b1a0',
               field: 'lch',
               label: '炉次号',
               type: 'input',
@@ -1186,7 +1186,7 @@ export const formProps: FormProps = {
         { span: 6,
           list: [
             {
-              key: 'fsfsdfsdfsfa',
+              key: 'v2n5h0j9v1k1b5n6n7i2a1d8t8y4x8s7',
               field: 'yxj',
               label: '优先级',
               type: 'select',

xjrsoft-vue3/src/views/scgl/scrw/components/workflowPermission.ts

 export const permissionList = [
-  {
-    required: true,
-    view: true,
-    edit: true,
-    disabled: false,
-    isSaveTable: false,
-    tableName: '',
-    fieldName: '业务组织',
-    fieldId: 'ywzz',
-    isSubTable: false,
-    showChildren: true,
-    type: 'select',
-    key: 'lkajsldjaljdla',
-    children: [],
-    options: {},
-  },
+
   {
     required: false,
     view: true,
@@ -38,23 +23,6 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '铸次号',
-    fieldId: 'zch',
-    isSubTable: false,
-    showChildren: true,
-    type: 'input',
-    key: 'b22f0a133613428f84ee08c70c61311b',
-    children: [],
-    options: {},
-    defaultValue: '',
-  },
-  {
-    required: false,
-    view: true,
-    edit: true,
-    disabled: false,
-    isSaveTable: false,
-    tableName: '',
     fieldName: '重量/KG',
     fieldId: 'zl',
     isSubTable: false,
@@ -182,6 +150,22 @@ export const permissionList = [
     options: {},
   },
   {
+    required: true,
+    view: true,
+    edit: true,
+    disabled: false,
+    isSaveTable: false,
+    tableName: '',
+    fieldName: '业务组织',
+    fieldId: 'ywzz',
+    isSubTable: false,
+    showChildren: true,
+    type: 'select',
+    key: 'm7r1m6f9e6z4l0l7d4c7q8a2f3o2m7c4',
+    children: [],
+    options: {},
+  },
+  {
     required: false,
     view: true,
     edit: true,
@@ -225,7 +209,7 @@ export const permissionList = [
     isSubTable: false,
     showChildren: true,
     type: 'input',
-    key: 'fsdfsdf',
+    key: 'u2r5o6w9o9l2w3k4z4g5f7x9w4b5b1a0',
     children: [],
     options: {},
     defaultValue: '',
@@ -242,7 +226,7 @@ export const permissionList = [
     isSubTable: false,
     showChildren: true,
     type: 'input',
-    key: '312djfjdjd',
+    key: 'i3r5y5h5u6w6v0m9i5v0z5w0i4f8b8m6',
     children: [],
     options: {},
     defaultValue: '',
@@ -259,7 +243,7 @@ export const permissionList = [
     isSubTable: false,
     showChildren: true,
     type: 'input',
-    key: 'fsfsdfsdfsfa',
+    key: 'v2n5h0j9v1k1b5n6n7i2a1d8t8y4x8s7',
     children: [],
     options: {},
     defaultValue: '',