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

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

@@ -807,6 +807,59 @@ export const formProps: FormProps = {
             },
             },
           ],
           ],
         },
         },
+        {
+          span: 6,
+          list: [
+            {
+              key: 'lkajsldjaljdla',
+              field: 'ywzz',
+              label: '业务组织',
+              type: 'select',
+              component: 'XjrSelect',
+              colProps: { span: 24 },
+              componentProps: {
+                width: '100%',
+                span: 7,
+                placeholder: '请选择下拉选择业务组织',
+                showLabel: true,
+                showSearch: false,
+                isMultiple: false,
+                clearable: false,
+                disabled: false,
+                staticOptions: [
+                  { key: 1, label: 'Option 1', value: 'Option 1' },
+                  { key: 2, label: 'Option 2', value: 'Option 2' },
+                  { key: 3, label: 'Option 3', value: 'Option 3' },
+                ],
+                defaultSelect: null,
+                datasourceType: 'dic',
+                labelField: 'name',
+                valueField: 'value',
+                apiConfig: {
+                  path: '/bmxx/getCompanyList',
+                  method: 'GET',
+                  apiId: 'copy1765431632890d13798',
+                  apiParams: [
+                    { key: '1', title: 'Query Params', tableInfo: [] },
+                    { key: '2', title: 'Header', tableInfo: [] },
+                    { key: '3', title: 'Body' },
+                  ],
+                  script:
+                    'var sql="select id as value,name as label from res_company";\r\nreturn db.select(sql);',
+                },
+                dicOptions: [],
+                required: true,
+                rules: [],
+                events: {},
+                isShow: true,
+                tooltipConfig: { visible: false, title: '提示文本' },
+                params: { itemId: '2015724355955159041' },
+                itemId: '2015724355955159041',
+                style: { width: '100%' },
+              },
+            },
+          ],
+        },
       ],
       ],
       componentProps: {
       componentProps: {
         gutter: 0,
         gutter: 0,
@@ -991,59 +1044,7 @@ export const formProps: FormProps = {
             },
             },
           ],
           ],
         },
         },
-        {
-          span: 8,
-          list: [
-            {
-              key: 'lkajsldjaljdla',
-              field: 'ywzz',
-              label: '业务组织',
-              type: 'select',
-              component: 'XjrSelect',
-              colProps: { span: 24 },
-              componentProps: {
-                width: '100%',
-                span: 7,
-                placeholder: '请选择下拉选择业务组织',
-                showLabel: true,
-                showSearch: false,
-                isMultiple: false,
-                clearable: false,
-                disabled: false,
-                staticOptions: [
-                  { key: 1, label: 'Option 1', value: 'Option 1' },
-                  { key: 2, label: 'Option 2', value: 'Option 2' },
-                  { key: 3, label: 'Option 3', value: 'Option 3' },
-                ],
-                defaultSelect: null,
-                datasourceType: 'dic',
-                labelField: 'name',
-                valueField: 'value',
-                apiConfig: {
-                  path: '/bmxx/getCompanyList',
-                  method: 'GET',
-                  apiId: 'copy1765431632890d13798',
-                  apiParams: [
-                    { key: '1', title: 'Query Params', tableInfo: [] },
-                    { key: '2', title: 'Header', tableInfo: [] },
-                    { key: '3', title: 'Body' },
-                  ],
-                  script:
-                    'var sql="select id as value,name as label from res_company";\r\nreturn db.select(sql);',
-                },
-                dicOptions: [],
-                required: true,
-                rules: [],
-                events: {},
-                isShow: true,
-                tooltipConfig: { visible: false, title: '提示文本' },
-                params: { itemId: '2015724355955159041' },
-                itemId: '2015724355955159041',
-                style: { width: '100%' },
-              },
-            },
-          ],
-        },
+
       ],
       ],
       componentProps: {
       componentProps: {
         gutter: 16,
         gutter: 16,