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

xjrsoft-vue3/src/components/Form/src/components/SubForm.vue

@@ -199,8 +199,8 @@
                 >
                 >
               </template>
               </template>
               <template v-else-if="column.key !== 'index'">
               <template v-else-if="column.key !== 'index'">
+                  <!-- :key="subRefreshFieldObj[index][column.dataIndex]" -->
                 <component
                 <component
-                  :key="subRefreshFieldObj[index][column.dataIndex]"
                   :is="componentMap.get(column.componentType)"
                   :is="componentMap.get(column.componentType)"
                   :bordered="showComponentBorder"
                   :bordered="showComponentBorder"
                   v-bind="getComponentsProps(column, record, index)"
                   v-bind="getComponentsProps(column, record, index)"

xjrsoft-vue3/src/views/jcsj/gylx/components/config.ts

@@ -341,8 +341,8 @@ export const formProps: FormProps = {
                         columns: [
                         columns: [
                           {
                           {
                             key: 'bffa8112410f4112b3e5fcd32ac28f0e',
                             key: 'bffa8112410f4112b3e5fcd32ac28f0e',
-                            title: '名称',
-                            dataIndex: 'processName',
+                            title: '工序名称',
+                            dataIndex: 'name',
                             componentType: 'Input',
                             componentType: 'Input',
                             defaultValue: '',
                             defaultValue: '',
                             componentProps: {
                             componentProps: {

xjrsoft-vue3/src/views/jcsj/gylx/components/workflowPermission.ts

@@ -88,8 +88,8 @@ export const permissionList = [
         isSaveTable: false,
         isSaveTable: false,
         showChildren: false,
         showChildren: false,
         tableName: 'rokeRoutingProcessList',
         tableName: 'rokeRoutingProcessList',
-        fieldName: '名称',
-        fieldId: 'processName',
+        fieldName: '工序名称',
+        fieldId: 'name',
         type: 'Input',
         type: 'Input',
         key: 'bffa8112410f4112b3e5fcd32ac28f0e',
         key: 'bffa8112410f4112b3e5fcd32ac28f0e',
         children: [],
         children: [],

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

@@ -139,8 +139,8 @@ export const columns: BasicColumn[] = [
 
 
   {
   {
     resizable: true,
     resizable: true,
-    dataIndex: 'zt',
-    title: '状态',
+    dataIndex: 'kgzt',
+    title: '开工状态',
     componentType: 'select',
     componentType: 'select',
 
 
     fixed: false,
     fixed: false,
@@ -328,8 +328,8 @@ export const formProps: FormProps = {
             },
             },
             {
             {
               key: '4dfaf88607c04e358683b3f4afe7629f',
               key: '4dfaf88607c04e358683b3f4afe7629f',
-              field: 'sl',
-              label: '数量',
+              field: 'kbgsl',
+              label: '可报工数量',
               type: 'number',
               type: 'number',
               component: 'InputNumber',
               component: 'InputNumber',
               colProps: { span: 24 },
               colProps: { span: 24 },
@@ -340,7 +340,7 @@ export const formProps: FormProps = {
                 defaultValue: 0,
                 defaultValue: 0,
                 min: 0,
                 min: 0,
                 step: 1,
                 step: 1,
-                disabled: false,
+                disabled: true,
                 showLabel: true,
                 showLabel: true,
                 controls: true,
                 controls: true,
                 required: false,
                 required: false,
@@ -856,8 +856,8 @@ export const formProps: FormProps = {
             },
             },
             {
             {
               key: 'd74b7755d2b3467aba348c7b55a94fc6',
               key: 'd74b7755d2b3467aba348c7b55a94fc6',
-              field: 'zt',
-              label: '状态',
+              field: 'kgzt',
+              label: '开工状态',
               type: 'select',
               type: 'select',
               component: 'XjrSelect',
               component: 'XjrSelect',
               colProps: { span: 24 },
               colProps: { span: 24 },
@@ -897,7 +897,7 @@ export const formProps: FormProps = {
                 isShow: false,
                 isShow: false,
                 tooltipConfig: { visible: false, title: '提示文本' },
                 tooltipConfig: { visible: false, title: '提示文本' },
                 params: { itemId: '2011260635030495233' },
                 params: { itemId: '2011260635030495233' },
-                defaultSelect: '未开始',
+                defaultSelect: '草稿',
                 itemId: '2011260635030495233',
                 itemId: '2011260635030495233',
                 style: { width: '100%' },
                 style: { width: '100%' },
               },
               },

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

@@ -72,8 +72,8 @@ export const permissionList = [
     disabled: false,
     disabled: false,
     isSaveTable: false,
     isSaveTable: false,
     tableName: '',
     tableName: '',
-    fieldName: '数量',
-    fieldId: 'sl',
+    fieldName: '可报工数量',
+    fieldId: 'kbgsl',
     isSubTable: false,
     isSubTable: false,
     showChildren: true,
     showChildren: true,
     type: 'number',
     type: 'number',
@@ -285,8 +285,8 @@ export const permissionList = [
     disabled: false,
     disabled: false,
     isSaveTable: false,
     isSaveTable: false,
     tableName: '',
     tableName: '',
-    fieldName: '状态',
-    fieldId: 'zt',
+    fieldName: '开工状态',
+    fieldId: 'kgzt',
     isSubTable: false,
     isSubTable: false,
     showChildren: true,
     showChildren: true,
     type: 'select',
     type: 'select',