Merge branch 'weiqiao-vue3' of https://git.rokedata.com/jinmin/weiqiao-vue into weiqiao-vue3

8796a1bf · 董晓奇 · 005dcea9 · 5e483e54 · 8796a1bf · 8796a1bf
Commit 8796a1bf authored Mar 06, 2026 by 董晓奇
Show whitespace changes
Inline Side-by-side

Showing with 106 additions and 41 deletions

xjrsoft-vue3/src/views/ckgl/cgdh/components/config.ts
+100 -33

xjrsoft-vue3/src/views/ckgl/cgdh/components/workflowPermission.ts
+6 -8

No files found.
--- a/xjrsoft-vue3/src/views/ckgl/cgdh/components/config.ts
+++ b/xjrsoft-vue3/src/views/ckgl/cgdh/components/config.ts
@@ -28,7 +28,52 @@ export const searchFormSchema: FormSchema[] = [
    field: 'gys',
    label: '供应商',
    defaultValue: undefined,
-    component: 'Input',
+    component: 'XjrSelect',
+    componentProps: {
+      datasourceType: 'api',
+      apiConfig: {
+        path: '/jcxx/gysInfoList',
+        method: 'GET',
+        apiId: '9099e750be50417299aa85ac4f27608b',
+        apiParams: [
+          {
+            key: '1',
+            title: 'Query Params',
+            tableInfo: [
+              {
+                name: 'keyword',
+                value: null,
+                description: null,
+                required: false,
+                dataType: null,
+                type: null,
+                defaultValue: null,
+                validateType: null,
+                error: null,
+                expression: null,
+                children: null,
+                bindType: '',
+              },
+            ],
+          },
+          { key: '2', title: 'Header', tableInfo: [] },
+          { key: '3', title: 'Body' },
+        ],
+        script:
+          'var sql ="select *,id as value,name as label from roke_partner where delete_mark = 0 and customer=\'2\'"+\r\n\' ?{keyword, AND name LIKE CONCAT("%", #{keyword}, "%")}\';\r\nreturn db.select(sql);',
+        outputParams: [
+          { name: 'label', tableTitle: '名称', bindField: '', show: true, width: 150 },
+          { name: 'code', tableTitle: '编号', bindField: '', show: true, width: 150 },
+          { name: 'contacts', tableTitle: '联系人', bindField: '', show: true, width: 150 },
+          { name: 'address', tableTitle: '地址', bindField: '', show: true, width: 150 },
+        ],
+      },
+      labelField: 'label',
+      valueField: 'value',
+      mode: 'multiple',
+      showSearch: true,
+      getPopupContainer: () => document.body,
+    },
  },
  {
    field: 'zdr',
@@ -297,34 +342,24 @@ export const formProps: FormProps = {
          span: 8,
          list: [
            {
-              key: '2be7c2009d5d496fa83ebca7a699f656',
+              key: '8e8adb239db44a4ba19cd28a3d661f16',
              field: 'djh',
              label: '单据号',
-              type: 'input',
+              type: 'auto-code',
-              component: 'Input',
+              component: 'AutoCodeRule',
              colProps: { span: 24 },
-              defaultValue: '',
              componentProps: {
                width: '100%',
                span: 7,
-                defaultValue: '',
+                placeholder: '请输入单据号',
-                placeholder: '',
                prefix: '',
                suffix: '',
                addonBefore: '',
                addonAfter: '',
-                disabled: false,
-                allowClear: false,
                showLabel: true,
+                autoCodeRule: 'cgdhbh',
                required: false,
-                rules: [],
-                events: {},
-                listStyle: '',
-                isSave: false,
                isShow: true,
-                scan: false,
-                bordered: true,
-                isShowAi: false,
                tooltipConfig: { visible: false, title: '提示文本' },
                style: { width: '100%' },
              },
@@ -458,34 +493,66 @@ export const formProps: FormProps = {
          span: 8,
          list: [
            {
-              key: '9f64a605992b43cc9443c96669b33b3d',
+              key: '67205496b1c94fea99508f8b16520473',
              field: 'gys',
              label: '供应商',
-              type: 'input',
+              type: 'associate-popup',
-              component: 'Input',
+              component: 'MultiplePopup',
              colProps: { span: 24 },
-              defaultValue: '',
              componentProps: {
+                popupType: 'associate',
                width: '100%',
                span: 7,
-                defaultValue: '',
+                placeholder: '请选择供应商',
-                placeholder: '',
-                prefix: '',
-                suffix: '',
-                addonBefore: '',
-                addonAfter: '',
-                disabled: false,
-                allowClear: false,
                showLabel: true,
+                disabled: false,
+                datasourceType: 'api',
+                labelField: 'label',
+                valueField: 'value',
+                pageSize: 10,
+                assoTitle: '供应商信息',
+                apiConfig: {
+                  path: '/jcxx/gysInfoList',
+                  method: 'GET',
+                  apiId: '9099e750be50417299aa85ac4f27608b',
+                  apiParams: [
+                    {
+                      key: '1',
+                      title: 'Query Params',
+                      tableInfo: [
+                        {
+                          name: 'keyword',
+                          value: null,
+                          description: null,
+                          required: false,
+                          dataType: null,
+                          type: null,
+                          defaultValue: null,
+                          validateType: null,
+                          error: null,
+                          expression: null,
+                          children: null,
+                          bindType: '',
+                        },
+                      ],
+                    },
+                    { key: '2', title: 'Header', tableInfo: [] },
+                    { key: '3', title: 'Body' },
+                  ],
+                  script:
+                    'var sql ="select *,id as value,name as label from roke_partner where delete_mark = 0 and customer=\'2\'"+\r\n\' ?{keyword, AND name LIKE CONCAT("%", #{keyword}, "%")}\';\r\nreturn db.select(sql);',
+                  outputParams: [
+                    { name: 'label', tableTitle: '名称', show: true, width: 150 },
+                    { name: 'code', tableTitle: '编号', show: true, width: 150 },
+                    { name: 'contacts', tableTitle: '联系人', show: true, width: 150 },
+                    { name: 'address', tableTitle: '地址', show: true, width: 150 },
+                  ],
+                },
+                dicOptions: [],
                required: false,
                rules: [],
                events: {},
-                listStyle: '',
-                isSave: false,
                isShow: true,
-                scan: false,
-                bordered: true,
-                isShowAi: false,
                tooltipConfig: { visible: false, title: '提示文本' },
                style: { width: '100%' },
              },

--- a/xjrsoft-vue3/src/views/ckgl/cgdh/components/workflowPermission.ts
+++ b/xjrsoft-vue3/src/views/ckgl/cgdh/components/workflowPermission.ts
@@ -2,19 +2,18 @@ export const permissionList = [
  {
    required: false,
    view: true,
-    edit: true,
+    edit: false,
-    disabled: false,
+    disabled: true,
    isSaveTable: false,
    tableName: '',
    fieldName: '单据号',
    fieldId: 'djh',
    isSubTable: false,
    showChildren: true,
-    type: 'input',
+    type: 'auto-code',
-    key: '2be7c2009d5d496fa83ebca7a699f656',
+    key: '8e8adb239db44a4ba19cd28a3d661f16',
    children: [],
    options: {},
-    defaultValue: '',
  },
  {
    required: false,
@@ -77,11 +76,10 @@ export const permissionList = [
    fieldId: 'gys',
    isSubTable: false,
    showChildren: true,
-    type: 'input',
+    type: 'associate-popup',
-    key: '9f64a605992b43cc9443c96669b33b3d',
+    key: '67205496b1c94fea99508f8b16520473',
    children: [],
    options: {},
-    defaultValue: '',
  },
  {
    required: false,