品类库与后台联调

src/pages/supplier/category/CategoryLibraryManage/index.tsx

@@ -129,6 +129,20 @@ const CategoryLibraryManage: React.FC = () => {
     },
     {
       title: '创建单位',
+      dataIndex: 'applyOrgName',
+      key: 'applyOrgName',
+      align: 'center',
+      ellipsis: true,
+    },
+    {
+      title: '所属单位',
+      dataIndex: 'orgName',
+      key: 'orgName',
+      align: 'center',
+      ellipsis: true,
+    },
+    {
+      title: '所属部门',
       dataIndex: 'deptName',
       key: 'deptName',
       align: 'center',
@@ -198,9 +212,12 @@ const CategoryLibraryManage: React.FC = () => {
             <Form.Item name="name" label="品类库名称">
               <Input placeholder="请输入品类库名称" style={{ width: 180 }} allowClear />
             </Form.Item>
-            <Form.Item name="deptId" label="创建单位">
+            <Form.Item name="applyOrgId" label="创建单位">
               <AccessDepartmentSelect placeholder={'请选择创建单位'} />
             </Form.Item>
+            <Form.Item name="orgId" label="所属单位">
+              <AccessDepartmentSelect placeholder={'请选择所属单位'} />
+            </Form.Item>
 
             <Form.Item>
               <Button className="buttonSubmit" type="primary" htmlType="submit" icon={<SearchOutlined />} onClick={handleSearch} >

src/pages/supplier/category/CategoryLibraryReview/index.tsx

@@ -56,10 +56,10 @@ const CategoryLibraryManage: React.FC = () => {
     setLoading(true);
     try {
       const values = form.getFieldsValue();
-      const { name, deptNames, timeRange, approveStatus } = values;
+      const {   timeRange } = values;
       const startTime = timeRange ? moment(timeRange[0]).format('YYYY-MM-DD') : '';
       const endTime = timeRange ? moment(timeRange[1]).format('YYYY-MM-DD') : '';
-      const { code, data } = await getPage({ basePageRequest: { pageNo, pageSize }, name, startTime, endTime, deptNames, approveStatus });
+      const { code, data } = await getPage({ basePageRequest: { pageNo, pageSize }, ...values, startTime, endTime,   });
       if (code === 200) {
         setData(data.records);
         setPagination({ ...pagination, current: pageNo, pageSize, total: data.total });
@@ -150,8 +150,22 @@ const CategoryLibraryManage: React.FC = () => {
       ellipsis: true,
       render: (code: string) => areaMap[code] || code
     },
-    {
+     {
       title: '创建单位',
+      dataIndex: 'applyOrgName',
+      key: 'applyOrgName',
+      align: 'center',
+      ellipsis: true,
+    },
+    {
+      title: '所属单位',
+      dataIndex: 'orgName',
+      key: 'orgName',
+      align: 'center',
+      ellipsis: true,
+    },
+    {
+      title: '所属部门',
       dataIndex: 'deptName',
       key: 'deptName',
       align: 'center',
@@ -229,9 +243,12 @@ const CategoryLibraryManage: React.FC = () => {
             <Form.Item name="name" label="品类库名称">
               <Input placeholder="请输入品类库名称" style={{ width: 180 }} allowClear maxLength={50} />
             </Form.Item>
-            <Form.Item name="deptNames" label="创建单位">
+             <Form.Item name="applyOrgId" label="创建单位">
               <AccessDepartmentSelect placeholder={'请选择创建单位'} />
             </Form.Item>
+            <Form.Item name="orgId" label="所属单位">
+              <AccessDepartmentSelect placeholder={'请选择所属单位'} />
+            </Form.Item>
 
             <Form.Item name="timeRange" label="申请时间">
               <RangePicker

src/pages/supplier/category/SupplierEntryManage/index.tsx

@@ -129,6 +129,20 @@ const SupplierEntryManage: React.FC = () => {
     },
     {
       title: '创建单位',
+      dataIndex: 'applyOrgName',
+      key: 'applyOrgName',
+      align: 'center',
+      ellipsis: true,
+    },
+    {
+      title: '所属单位',
+      dataIndex: 'orgName',
+      key: 'orgName',
+      align: 'center',
+      ellipsis: true,
+    },
+    {
+      title: '所属部门',
       dataIndex: 'deptName',
       key: 'deptName',
       align: 'center',
@@ -185,9 +199,12 @@ const SupplierEntryManage: React.FC = () => {
             <Form.Item name="name" label="品类库名称">
               <Input placeholder="请输入品类库名称" style={{ width: 180 }} />
             </Form.Item>
-            <Form.Item name="unit" label="创建单位">
+             <Form.Item name="applyOrgId" label="创建单位">
               <AccessDepartmentSelect placeholder={'请选择创建单位'} />
             </Form.Item>
+            <Form.Item name="orgId" label="所属单位">
+              <AccessDepartmentSelect placeholder={'请选择所属单位'} />
+            </Form.Item>
 
             <Form.Item>
               <Button className="buttonSubmit" type="primary" htmlType="submit" icon={<SearchOutlined />} onClick={handleSearch} >

src/pages/supplier/category/SupplierEntryReview/index.tsx

@@ -54,10 +54,10 @@ const CategoryLibraryManage: React.FC = () => {
     setLoading(true);
     try {
       const values = form.getFieldsValue();
-      const { name, deptNames, timeRange, approveStatus } = values;
+      const { timeRange } = values;
       const startTime = timeRange ? moment(timeRange[0]).format('YYYY-MM-DD') : '';
       const endTime = timeRange ? moment(timeRange[1]).format('YYYY-MM-DD') : '';
-      const { code, data } = await getPage({ basePageRequest: { pageNo, pageSize }, name, startTime, endTime, deptNames, approveStatus });
+      const { code, data } = await getPage({ basePageRequest: { pageNo, pageSize }, ...values, startTime, endTime });
       if (code === 200) {
         setData(data.records);
         setPagination({ ...pagination, current: pageNo, pageSize, total: data.total });
@@ -225,9 +225,10 @@ const CategoryLibraryManage: React.FC = () => {
             <Form.Item name="name" label="品类库名称">
               <Input placeholder="请输入品类库名称" style={{ width: 180 }} allowClear maxLength={50} />
             </Form.Item>
-            <Form.Item name="deptNames" label="创建单位">
+             {/* <Form.Item name="applyOrgId" label="创建单位">
               <AccessDepartmentSelect placeholder={'请选择创建单位'} />
-            </Form.Item>
+            </Form.Item> */}
+      
 
             <Form.Item name="timeRange" label="申请时间">
               <RangePicker

src/pages/supplier/supplierBlacklist/blacklistAudit/index.tsx

@@ -34,10 +34,10 @@ const blacklistManage: React.FC = () => {
     setLoading(true);
     // 可传查询条件 
     const values = form.getFieldsValue();
-    const { exitTheme, time, deptId, approveStatus } = values;
+    const { time } = values;
     const startTime = time ? moment(time[0]).format('YYYY-MM-DD') : '';
     const endTime = time ? moment(time[1]).format('YYYY-MM-DD') : '';
-    const { code, data } = await getPage({ basePageRequest: { pageNo, pageSize }, exitTheme, deptId, approveStatus, startTime, endTime });
+    const { code, data } = await getPage({ basePageRequest: { pageNo, pageSize }, ...values, startTime, endTime });
 
     if (code === 200) {
       setData(data.records);
@@ -147,7 +147,7 @@ const blacklistManage: React.FC = () => {
             <Form.Item name="exitTheme" label="申请主题">
               <Input placeholder="请输入供应商名称关键字" style={{ width: 150 }} allowClear maxLength={50} />
             </Form.Item>
-            <Form.Item name="deptId" label="发起单位">
+            <Form.Item name="orgId" label="发起单位">
               <AccessDepartmentSelect placeholder={'请选择发起单位'} />
             </Form.Item>
             <Form.Item name="approveStatus" label="审批记录状态">

src/pages/supplier/supplierBlacklist/blacklistManage/index.tsx

@@ -48,10 +48,10 @@ const blacklistManage: React.FC = () => {
     setLoading(true);
     // 可传查询条件 
     const values = form.getFieldsValue();
-    const { exitTheme, time, deptId, approveStatus } = values;
+    const { time } = values;
     const startTime = time ? moment(time[0]).format('YYYY-MM-DD') : '';
     const endTime = time ? moment(time[1]).format('YYYY-MM-DD') : '';
-    const { code, data } = await getPage({ basePageRequest: { pageNo, pageSize }, exitTheme, deptId, approveStatus, startTime, endTime });
+    const { code, data } = await getPage({ basePageRequest: { pageNo, pageSize }, ...values, startTime, endTime });
 
     if (code === 200) {
       setData(data.records);
@@ -136,7 +136,7 @@ const blacklistManage: React.FC = () => {
             <Form.Item name="exitTheme" label="申请主题">
               <Input placeholder="请输入供应商名称关键字" style={{ width: 150 }} allowClear maxLength={50} />
             </Form.Item>
-            <Form.Item name="deptId" label="发起单位">
+            <Form.Item name="orgId" label="发起单位">
               <AccessDepartmentSelect placeholder={'请选择发起单位'} />
             </Form.Item>
             <Form.Item name="approveStatus" label="审批记录状态">