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

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

@@ -829,7 +829,7 @@ export const formProps: FormProps = {
               controls: true,
               required: false,
               subTotal: false,
-              isShow: true,
+              isShow: false,
               rules: [],
               events: {},
               tooltipConfig: { visible: false, title: '提示文本' },
@@ -904,7 +904,7 @@ export const formProps: FormProps = {
               showLabel: true,
               disabled: false,
               events: {},
-              isShow: true,
+              isShow: false,
               tooltipConfig: { visible: false, title: '提示文本' },
               prestrainField: '',
             },

xjrsoft-vue3/src/views/zlgl/cgzjd/components/config.ts

@@ -770,7 +770,7 @@ export const formProps: FormProps = {
             {
               key: '9ac1e63ebbcd433bb4b2ec76621ab12d',
               field: 'lch',
-              label: '炉批号',
+              label: '炉次号',
               type: 'input',
               component: 'Input',
               colProps: { span: 24 },

xjrsoft-vue3/src/views/zlgl/cgzjd/components/workflowPermission.ts

@@ -205,7 +205,7 @@ export const permissionList = [
     disabled: false,
     isSaveTable: false,
     tableName: '',
-    fieldName: '炉批号',
+    fieldName: '炉次号',
     fieldId: 'lch',
     isSubTable: false,
     showChildren: true,