kts-components-document-access-point 1.1.22 → 1.1.26

package/src/DocumentsList/ui/PageHeader/index.tsx

@@ -22,7 +22,7 @@ export default () => {
     const ktsRef = useRef(null);
     useEffect(() => {
         (async () => {
-            const res = await DocumentsService.instance.service?.call({ url: '/dap/schema/config/getDefaultTypeList', data: {}, type: 'get' }) as any;
+            const res = await DocumentsService.instance.service?.call({ url: '/dap/web/schema/config/getDefaultTypeList', data: {}, type: 'get' }) as any;
             if (res.err) {
                 return false;
             } else {
@@ -60,62 +60,130 @@ export default () => {
         })()
     }, [controller]);
     useEffect(() => {
-        let obj: any = {
-            type: "object",
-            properties: {
-                // configNumber: {
-                //     type: "string",
-                //     title: "配置编号",
-                // },
-                configName: {
-                    type: "string",
-                    title: "配置名称",
-                },
-                attributionList: {
-                    type: "string",
-                    title: "发送对象",
-                    visible: type === 2 ? true : false
-                },
-                type: {
-                    type: "string",
-                    title: "单据大类",
-                    enum: billEnum,
-                },
-                profile: {
-                    type: "string",
-                    title: "单据子类",
-                    enum: profileEnum,
-                    visible: false
-                },
-                attribution: {
-                    type: "string",
-                    title: "单据类型",
-                    enum: [{
-                        "label": "发送方",
-                        "value": '1'
-                    }, {
-                        "label": "接收方",
-                        "value": '0'
-                    }],
-                    'x-props': {
-                        mode: "multiple"
-                    }
-                },
-                '[beginCreateTime,endCreateTime]': {
-                    key: "[beginCreateTime,endCreateTime",
-                    name: "[beginCreateTime,endCreateTime",
-                    type: "daterange",
-                    title: "创建时间",
-                },
-                '[beginSendTime,endSendTime]': {
-                    key: "[beginSendTime,endSendTime",
-                    name: "[beginSendTime,endSendTime",
-                    type: "daterange",
-                    title: "更新时间",
-                },
+        if (type === 1) {
+            let obj: any = {
+                type: "object",
+                properties: {
+                    configName: {
+                        type: "string",
+                        title: "配置名称",
+                    },
+                    attributionList: {
+                        type: "string",
+                        title: "发送对象",
+                        visible: false
+                    },
+                    type: {
+                        type: "string",
+                        title: "单据大类",
+                        enum: billEnum,
+                    },
+                    profile: {
+                        type: "string",
+                        title: "单据子类",
+                        enum: profileEnum,
+                        visible: false
+                    },
+                    attribution: {
+                        type: "string",
+                        title: "单据类型",
+                        enum: [{
+                            "label": "发送方",
+                            "value": '1'
+                        }, {
+                            "label": "接收方",
+                            "value": '0'
+                        }],
+                        'x-props': {
+                            mode: "multiple"
+                        }
+                    },
+                    '[beginCreateTime,endCreateTime]': {
+                        key: "[beginCreateTime,endCreateTime",
+                        name: "[beginCreateTime,endCreateTime",
+                        type: "daterange",
+                        title: "创建时间",
+                    },
+                    '[beginSendTime,endSendTime]': {
+                        key: "[beginSendTime,endSendTime",
+                        name: "[beginSendTime,endSendTime",
+                        type: "daterange",
+                        title: "更新时间",
+                    },
+                }
+            }
+            setSchema(obj);
+        }else if(type===2){
+            let obj: any = {
+                type: "object",
+                properties: {
+                    configName: {
+                        type: "string",
+                        title: "配置名称",
+                    },
+                    biaoshi: {
+                        type: "string",
+                        title: "标识",
+                    },
+                    attributionList: {
+                        type: "string",
+                        title: "发送对象",
+                        visible:  true 
+                    },
+                    did: {
+                        type: "string",
+                        title: "我司对应DID",
+                    },
+                    duixiang: {
+                        type: "string",
+                        title: "接受对象",
+                    },
+                    duixianggongsi: {
+                        type: "string",
+                        title: "接受对象所属公司",
+                    },
+                    type: {
+                        type: "string",
+                        title: "单据大类",
+                        enum: billEnum,
+                    },
+                    profile: {
+                        type: "string",
+                        title: "单据子类",
+                        enum: profileEnum,
+                        visible: false
+                    },
+                    attribution: {
+                        type: "string",
+                        title: "单据类型",
+                        enum: [{
+                            "label": "发送方",
+                            "value": '1'
+                        }, {
+                            "label": "接收方",
+                            "value": '0'
+                        }],
+                        'x-props': {
+                            mode: "multiple"
+                        }
+                    },
+                    '[beginCreateTime,endCreateTime]': {
+                        key: "[beginCreateTime,endCreateTime",
+                        name: "[beginCreateTime,endCreateTime",
+                        type: "daterange",
+                        title: "创建时间",
+                    },
+                    '[beginSendTime,endSendTime]': {
+                        key: "[beginSendTime,endSendTime",
+                        name: "[beginSendTime,endSendTime",
+                        type: "daterange",
+                        title: "更新时间",
+                    },
+                }
             }
+            setSchema(obj);
         }
-        setSchema(obj);
+        
     }, [billEnum, type, profileEnum])
     const onCreateType = useCallback((category, record?) => {
         history.push({ pathname: `/rule`, search: `?type=config&profile=${record && record.value || ''}&billtype=${category}` })
@@ -126,7 +194,7 @@ export default () => {
                 <div style={{ marginRight: 10 }}>
                     <Radio.Group value={type} onChange={switchType}>
                         <Radio.Button value={1}>单据校验规则配置</Radio.Button>
-                        <Radio.Button value={2}>发送记录</Radio.Button>
+                        <Radio.Button value={2}>发布记录</Radio.Button>
                     </Radio.Group>
                 </div>
                 <AdvancedSearch
@@ -144,13 +212,12 @@ export default () => {
                         labelAlign='left'
                         compact={true}
                         schema={schema}
-                        defaultValue={_.pick(params, ['configNumber', 'configName', 'type', 'profile', 'attributionList', 'attribution', '[beginCreateTime,endCreateTime]', '[beginSendTime,endSendTime]'])}
+                        defaultValue={_.pick(params, ['configName', 'type', 'profile', 'attributionList', 'attribution', '[beginCreateTime,endCreateTime]', '[beginSendTime,endSendTime]'])}
                         effects={($: any, actions: any) => {
                             $(LifeCycleTypes.ON_FIELD_VALUE_CHANGE, 'type',).subscribe((fieldState: any) => {
                                 if (fieldState.value) {
-                                    const value = fieldState.value;
-                                    const target: any = billEnum.find((item: any) => item.value === value);
-                                    if (target.profileList) {
+                                    const target: any = billEnum.find((item: any) => item.value === fieldState.value);
+                                    if (target && target.profileList) {
                                         actions.setFieldState('profile', (state: any) => {
                                             state.visible = true;
                                         });
@@ -178,9 +245,10 @@ export default () => {
                     >
                     </KtsForm>
                 </AdvancedSearch>
+
             </div>
         );
-    }, [type]);
+    }, [type, schema]);
     const menu = useMemo(() => {
         return (
             <Menu>
@@ -219,7 +287,7 @@ export default () => {
             <PageHeaderFoot
                 expandLeft={topExpand()}
                 expandRight={[
-                    type === 1 && <Button key="1" onClick={batchSend} style={{ marginRight: 10 }}>批量发送</Button>,
+                    type === 1 && <Button key="1" onClick={batchSend} style={{ marginRight: 10 }}>批量发布</Button>,
                     <Dropdown key="2" overlay={menu}>
                         <Button type="primary" >创建配置</Button>
                     </Dropdown>

package/src/DocumentsList/ui/RuleTable/index.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useState, useEffect, useMemo } from 'react';
 import { Table, AutoTableContainer, Pagination } from 'kts-xui';
-import PageUI from '../PageUi';
+import PageHeader from '../PageHeader'
 import moment from 'moment';
 import Main from '../../';
 import '../../index.less';
@@ -13,14 +13,14 @@ export default function validaterule(props: any) {
     const history = useHistory();
     const params = controller.useMemo(s => s.params, [])
     const [pageMeta, setpageMeta] = useState<{ pageSize: number, pageNum: number, total?: number }>({ pageSize: 10, pageNum: 1, total: 0, });
-    const [pageParams,setpageParams]=useState<{ pageSize: number, pageNum: number, total?: number }>();
+    const [pageParams, setpageParams] = useState<{ pageSize: number, pageNum: number, total?: number }>({ pageSize: 10, pageNum: 1 });
     const [list, setList] = useState([]);
     const [bill, setConfig] = useState<{ [key: string]: string }>({});
     const [billEnum, setBill] = useState<any[]>([]);
     useEffect(() => {
         (async () => {
             const res = await DocumentsService.instance.service?.call({
-                url: '/dap/schema/config/queryConfigSchemaPage', data: { ...params, ...pageParams }, type: 'post'
+                url: '/dap/web/schema/config/queryConfigSchemaPage', data: { ...params, ...pageParams }, type: 'post'
             }) as any;
 
             if (res.err) {
@@ -31,11 +31,11 @@ export default function validaterule(props: any) {
                 setpageMeta(res.res.pageMeta);
             }
         })()
-    }, [params,pageParams]);
+    }, [params, pageParams]);
     useEffect(() => {
         (async () => {
 
-            const res = await DocumentsService.instance.service?.call({ url: '/dap/schema/config/getDefaultTypeList', data: {}, type: 'get' }) as any;
+            const res = await DocumentsService.instance.service?.call({ url: '/dap/web/schema/config/getDefaultTypeList', data: {}, type: 'get' }) as any;
             if (res.err) {
                 return false;
             } else {
@@ -109,8 +109,8 @@ export default function validaterule(props: any) {
             render: (text: any, record: any) => (
                 <span>
                     <a className="tabel-action" onClick={() => { onBillView(record) }}>查看</a>
-                    <a className="tabel-action" onClick={() => { onSendCheck(record) }}>发送</a>
-                    <a className="tabel-action" onClick={() => { onBillSendList(record) }}>发送记录</a>
+                    <a className="tabel-action" onClick={() => { onSendCheck(record) }}>发布</a>
+                    {record.publishStatus === 1 && <a className="tabel-action" onClick={() => { onBillSendList(record) }}>发布记录</a>}
                 </span>
             )
         },
@@ -142,7 +142,7 @@ export default function validaterule(props: any) {
             controller.pipeline(async s => {
                 s.selectedRowKey = data;
             })()
-            const res = await DocumentsService.instance.service?.call({ url: '/dap/participant/listBySubjectId', data: {}, type: 'get' }) as any;
+            const res = await DocumentsService.instance.service?.call({ url: '/dap/web/participant/listBySubjectId', data: {}, type: 'get' }) as any;
             if (res.res) {
                 handleCancel(true);
             }
@@ -155,6 +155,7 @@ export default function validaterule(props: any) {
     }, [])
     return (
         <>
+            <PageHeader />
             <AutoTableContainer style={{ flex: 1, padding: '0 20px', backgroundColor: '#efefef' }} >
                 <Table columns={columns} rowKey="configNumber" rowSelection={rowSelection} dataSource={list} pagination={false} />
             </AutoTableContainer>

package/src/DocumentsList/ui/sendlist/index.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useState, useEffect, useMemo } from 'react';
 import { Table, AutoTableContainer, Pagination } from 'kts-xui';
-import PageUI from '../PageUi';
+import PageHeader from '../PageHeader'
 import Main from '../../';
 import { attributionEnum } from '../../util/ConfigEnum';
 import moment from 'moment';
@@ -12,12 +12,12 @@ export default function validaterule(props: any) {
     const params = controller.useMemo(s => s.params, [])
     const [billEnum, setBill] = useState([]);
     const [pageMeta, setpageMeta] = useState<{ pageSize: number, pageNum: number, total?: number }>({ pageSize: 10, pageNum: 1, total: 0, });
-    const [pageParams,setpageParams]=useState<{ pageSize: number, pageNum: number, total?: number }>();
+    const [pageParams, setpageParams] = useState<{ pageSize: number, pageNum: number, total?: number }>({ pageSize: 10, pageNum: 1, });
     const [list, setList] = useState([]);
     const [bill, setConfig] = useState<{ [key: string]: string }>({});
     useEffect(() => {
         (async () => {
-            const res = await DocumentsService.instance.service?.call({ url: '/dap/schema/config/querySendRecordPage', data: { ...params, ...pageParams }, type: 'post' }) as any;
+            const res = await DocumentsService.instance.service?.call({ url: '/dap/web/schema/config/querySendRecordPage', data: { ...params, ...pageParams }, type: 'post' }) as any;
             if (res.err) {
                 return false;
             }
@@ -26,10 +26,10 @@ export default function validaterule(props: any) {
                 setpageMeta(res.res.pageMeta);
             }
         })()
-    }, [params,pageParams]);
+    }, [params, pageParams]);
     useEffect(() => {
         (async () => {
-            const res = await DocumentsService.instance.service?.call({ url: '/dap/schema/config/getDefaultTypeList', data: {}, type: 'get' }) as any;
+            const res = await DocumentsService.instance.service?.call({ url: '/dap/web/schema/config/getDefaultTypeList', data: {}, type: 'get' }) as any;
             if (res.err) {
                 return false;
             } else {
@@ -59,7 +59,19 @@ export default function validaterule(props: any) {
             dataIndex: 'configName',
         },
         {
-            title: '单据大类',
+            title: '使用标识',
+            dataIndex: 'effectStatus',
+            render: (text: any) => {
+                if (text === 0) {
+                    return <span>未生效</span>
+                }
+                if (text === 1) {
+                    return <span>已生效</span>
+                }
+            }
+        },
+        {
+            title: '单据类型',
             dataIndex: 'type',
             render: (text: any) => {
                 return bill[text];
@@ -77,27 +89,48 @@ export default function validaterule(props: any) {
             }
         },
         {
-            title: '收发角色',
+            title: '我的收发角色',
             dataIndex: 'attribution',
             render: (text: any) => attributionEnum[text]
         },
-        // {
-        //     title: '发送对象',
-        //     dataIndex: 'sender',
-        //     render: (text: any, record: any) => {
-        //         return <a className="tabel-action" onClick={() => { onCompanyList(record); }}>查看</a>
-        //     }
-        // },
         {
-            title: '创建时间',
+            title: '我司对应DID',
+            dataIndex: 'senderParticipantId',
+            render: (text: any, record: any) => {
+                return <span>{record.senderParticipantNote}:{text}</span>
+            }
+        },
+        {
+            title: '接受对象',
+            dataIndex: 'receiverParticipantId',
+            render: (text: any, record: any) => {
+                if (text === '*') {
+                    return <span>公开发布</span>
+                } else if (text === '') {
+                    return '-';
+                } else {
+                    return <span>{record.receiverParticipantNote}:{text}</span>
+                }
+            }
+        },
+        {
+            title: '接受对象所属公司',
+            dataIndex: 'receiverCompany',
+        },
+        {
+            title: '发布时间',
             dataIndex: 'createAt',
             render: (text: any) => moment(text).format('YYYY-MM-DD hh:mm')
         },
         {
-            title: '最近更新时间',
-            dataIndex: 'updateAt',
-            render: (text: any) => moment(text).format('YYYY-MM-DD hh:mm')
+            title: '详细内容',
+            dataIndex: 'neirong',
         },
+        // {
+        //     title: '最近更新时间',
+        //     dataIndex: 'updateAt',
+        //     render: (text: any) => moment(text).format('YYYY-MM-DD hh:mm')
+        // },
         {
             title: '操作',
             dataIndex: 'console',
@@ -110,8 +143,9 @@ export default function validaterule(props: any) {
     ], [bill]);
     return (
         <>
+            <PageHeader />
             <AutoTableContainer style={{ flex: 1, padding: '0 20px', backgroundColor: '#efefef' }} >
-                <Table  columns={columns} rowKey="id" dataSource={list} pagination={false} />
+                <Table columns={columns} rowKey="id" dataSource={list} pagination={false} />
             </AutoTableContainer>
             {pageMeta && <Pagination onChange={onPageChange} style={{ padding: '16px 0', flex: 'none', background: 'white', textAlign: 'center' }} total={pageMeta.total} pageSize={pageMeta.pageSize} current={pageMeta.pageNum} showSizeChanger={true} />}
         </>);

package/src/DocumentsRule/ui/main/index.tsx

@@ -44,7 +44,7 @@ export default function Rule(props: any) {
             if (!id) {
                 return false;
             }
-            const url = type === 'config' ? '/dap/schema/config/getConfigOneById' : '/dap/schema/config/getRecordOneById'
+            const url = type === 'config' ? '/dap/web/schema/config/getConfigOneById' : '/dap/web/schema/config/getRecordOneById'
             const res = await DocumentsService.instance.service?.call({ url, data: { id }, type: 'get' }) as any;
             if (res.err) {
                 return false;
@@ -63,7 +63,7 @@ export default function Rule(props: any) {
             if (id) {
                 return false;
             }
-            const res = await DocumentsService.instance.service?.call({ url: '/dap/schema/config/getDefaultTypeTemplate', data: { type: queryType, profile }, type: 'get' }) as any;
+            const res = await DocumentsService.instance.service?.call({ url: '/dap/web/schema/config/getDefaultTypeTemplate', data: { type: queryType, profile }, type: 'get' }) as any;
             if (res.err) {
                 return false;
             } else {
@@ -74,7 +74,7 @@ export default function Rule(props: any) {
 
     useEffect(() => {
         (async () => {
-            const res = await DocumentsService.instance.service?.call({ url: '/dap/schema/config/getDefaultTypeList', data: null, type: 'get' }) as any;
+            const res = await DocumentsService.instance.service?.call({ url: '/dap/web/schema/config/getDefaultTypeList', data: null, type: 'get' }) as any;
             if (res.err) {
                 return false;
             } else {
@@ -91,11 +91,11 @@ export default function Rule(props: any) {
     }, [])
     const autoSave = useCallback(throttle(() => {
         (async () => {
-            let url = '/dap/schema/config/save';
+            let url = '/dap/web/schema/config/save';
             let data: any = { ...schema };
             const formValue = form.getFieldsValue();
             if (record && record.id) {
-                url = '/dap/schema/config/update';
+                url = '/dap/web/schema/config/update';
                 data = { ...record, schemaContent: JSON.stringify(data), ...formValue }
             } else {
                 data = { schemaContent: JSON.stringify(data), ...formValue }
@@ -123,7 +123,7 @@ export default function Rule(props: any) {
     }, []);
     const onSendCheck = useCallback(() => {
         (async () => {
-            const res = await DocumentsService.instance.service?.call({ url: '/dap/participant/listBySubjectId', data: null, type: 'get' }) as any;
+            const res = await DocumentsService.instance.service?.call({ url: '/dap/web/participant/listBySubjectId', data: null, type: 'get' }) as any;
             if (res.res) {
                 setVisible(true);
                 setList(res.res);
@@ -134,11 +134,11 @@ export default function Rule(props: any) {
         (async () => {
             const data = {
                 ...record,
-                sendPartitionId: targetId,
+                senderPartitionId: targetId,
                 privateList: [],
                 sendPublic: true
             }
-            const res = await DocumentsService.instance.service?.call({ url: '/dap/schema/config/batchSend', data: [data], type: 'post' }) as any;
+            const res = await DocumentsService.instance.service?.call({ url: '/dap/web/schema/config/batchSend', data: [data], type: 'post' }) as any;
             if (res.res) {
                 message.success('操作成功');
                 handleCancel()