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

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

@@ -139,8 +139,8 @@ export const columns: BasicColumn[] = [
 
 
   {
   {
     resizable: true,
     resizable: true,
-    dataIndex: 'kgzt',
-    title: '开工状态',
+    dataIndex: 'zt',
+    title: '状态',
     componentType: 'select',
     componentType: 'select',
 
 
     fixed: false,
     fixed: false,
@@ -856,8 +856,8 @@ export const formProps: FormProps = {
             },
             },
             {
             {
               key: 'd74b7755d2b3467aba348c7b55a94fc6',
               key: 'd74b7755d2b3467aba348c7b55a94fc6',
-              field: 'kgzt',
-              label: '开工状态',
+              field: 'zt',
+              label: '状态',
               type: 'select',
               type: 'select',
               component: 'XjrSelect',
               component: 'XjrSelect',
               colProps: { span: 24 },
               colProps: { span: 24 },

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

@@ -285,8 +285,8 @@ export const permissionList = [
     disabled: false,
     disabled: false,
     isSaveTable: false,
     isSaveTable: false,
     tableName: '',
     tableName: '',
-    fieldName: '开工状态',
-    fieldId: 'kgzt',
+    fieldName: '状态',
+    fieldId: 'zt',
     isSubTable: false,
     isSubTable: false,
     showChildren: true,
     showChildren: true,
     type: 'select',
     type: 'select',