修复第一周任务发现的bug

src/pages/platform/setting/departmentMana/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-03-09 15:55:52
+ * @LastEditTime: 2023-03-09 17:11:35
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -19,7 +19,7 @@ import { ProColumns } from '@ant-design/pro-table';
 import { message, Popconfirm } from 'antd';
 import FormItem from 'antd/lib/form/FormItem';
 import { useEffect, useState } from 'react'
-import { addData, delData, editData, getData, getDepartmentType, importDepartmentData } from './service';
+import { addData, delData, editData, getData, getDepartmentType, getRelaHosp, importDepartmentData } from './service';
 
 import './style.less';
 
@@ -102,7 +102,7 @@ export default function DepartmentMana() {
     }
 
     const delTableData = async (record: any) => {
-        const resp = await delData(record.dictId);
+        const resp = await delData(record.id);
         if (resp) {
             set_reload(true);
             // message.success('操作成功!');
@@ -169,10 +169,10 @@ export default function DepartmentMana() {
                     placeholder="请选择院区"
                     rules={[{ required: true, message: '院区不能为空!' }]}
                     request={async () => {
-                        const resp = await getAllHosp({ pageSize: 200, current: 1 });
+                        const resp = await getRelaHosp();
                         if (resp) {
-                            const data: any = resp.list?.map((a) => ({
-                                label: a.hospName,
+                            const data: any = resp?.map((a:any) => ({
+                                label: a.name,
                                 value: a.id
                             }));
 
@@ -218,7 +218,7 @@ export default function DepartmentMana() {
                     <span  key="3">导入</span>
                 }
                 onFinish={async (values) => {
-                    console.log({values});
+                
                     const { importFile: { fileList } } = values;
 
                     let formData = new FormData();
@@ -263,23 +263,7 @@ export default function DepartmentMana() {
             <div className='toolBar'>
                 <div className='filter'>
                     <div className='filterItem' style={{ marginRight: 16 }}>
-                        <span className='label'>科室：</span>
-                        <KCInput placeholder={'请输入科室名称'} style={{ width: 160 }} search allowClear
-                            onChange={(e) => {
-                                set_tableDataSearchKeywords(e.target.value);
-                                if (e.target.value.length == 0) {
-                                    set_tableDataFilterParams({
-                                        ...tableDataFilterParams,
-                                        departName: ''
-                                    });
-                                }
-                            }}
-                            onSearch={() => tableDataSearchHandle('departName')}
-
-                        />
-                    </div>
-                    <div className='filterItem'>
-                        <span className='label'>科室：</span>
+                        <span className='label'>类型：</span>
                         {
                             types.length > 0 && (
                                 <ProFormSelect
@@ -312,6 +296,22 @@ export default function DepartmentMana() {
                             )
                         }
                     </div>
+                    <div className='filterItem' >
+                        <span className='label'>检索：</span>
+                        <KCInput placeholder={'请输入科室名称'} style={{ width: 160 }} search allowClear
+                            onChange={(e) => {
+                                set_tableDataSearchKeywords(e.target.value);
+                                if (e.target.value.length == 0) {
+                                    set_tableDataFilterParams({
+                                        ...tableDataFilterParams,
+                                        departName: ''
+                                    });
+                                }
+                            }}
+                            onSearch={() => tableDataSearchHandle('departName')}
+
+                        />
+                    </div>
                 </div>
                 <div className='btnGroup'>
                     {importData('科室')}

src/pages/platform/setting/departmentMana/service.ts

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 16:31:27
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-03-09 15:54:24
+ * @LastEditTime: 2023-03-09 17:11:29
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/service.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -72,10 +72,10 @@ export const editData = (data:EditTableDataType) => {
 };
 
 //删除表格操作
-export const delData = (dictId:string) => {
+export const delData = (id:string) => {
   return request('/centerSys/sysdepartment/delete', {
     method: 'POST',
-    params:{dictId}
+    params:{id}
   });
 };
 
@@ -107,6 +107,16 @@ export const importDepartmentData = (data:any) => {
 
 
 
+//获取互通院区列表
+
+export const getRelaHosp = () => {
+    return request('/centerSys/hospital/currentAndShareHosp', {
+      method: 'GET',
+    });
+};
+
+
+
 
 
 

src/pages/platform/setting/paramsMana/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-03-08 17:53:25
+ * @LastEditTime: 2023-03-09 17:15:03
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -60,7 +60,8 @@ export default function ParamsMana() {
             title: '启用',
             dataIndex: 'status',
             render: (_: any, record: any) => {
-                return <span style={{ color: record == 1?'#00BF8F':'red' }}>{record == 1 ? '启用' : '禁用'}</span>
+                console.log({record});
+                return <span style={{ color: record.status == 1?'#00BF8F':'red' }}>{record.status == 1 ? '启用' : '禁用'}</span>
             }
         },
         {
@@ -153,7 +154,13 @@ export default function ParamsMana() {
                     placeholder="请输入"
                     rules={[{ required: true, message: '参数描述不能为空!' }]}
                 />
-                <ProFormDigit label="参数值" name="value" rules={[{ required: true, message: '参数值不能为空!' }]} />
+                <ProFormText
+                    name="value"
+                    label="参数值："
+                    placeholder="请输入"
+                    rules={[{ required: true, message: '参数值不能为空!' }]}
+                />
+                {/* <ProFormDigit label="参数值" name="value" rules={[{ required: true, message: '参数值不能为空!' }]} /> */}
                 <ProFormSelect
                     name="hospId"
                     label="院区："
@@ -167,7 +174,12 @@ export default function ParamsMana() {
                                 value: a.id
                             }));
 
-                            return data;
+                            return [
+                                {
+                                    label:'所有院区',
+                                    value:'0'
+                                },...data
+                            ];
                         }
                         return []
 
@@ -217,9 +229,6 @@ export default function ParamsMana() {
         )
     }
 
-    const editHandle = (record: any) => {
-
-    }
 
     const tableDataSearchHandle = (paramName: string) => {
 
@@ -286,7 +295,7 @@ export default function ParamsMana() {
                                     value: 'code'
                                 },
                                 onChange(value: any, option: any) {
-                                    set_tableDataFilterParams({ ...tableDataFilterParams, systemId: value ? value[0] : '' })
+                                    set_tableDataFilterParams({ ...tableDataFilterParams, systemId: value ? value[value.length - 1] : '' })
                                 },
                             }}
                         />

src/pages/platform/setting/pubDicMana/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-03-08 17:44:07
+ * @LastEditTime: 2023-03-09 17:21:45
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -132,7 +132,7 @@ const PubDicMana = () => {
             }
         }
         if (type == 'ADD') {
-            const resp = await addPubDicRelaTbaleData(formVal);
+            const resp = await addPubDicRelaTbaleData({...formVal,dictType:currentSelectedType?.dictType});
             if (resp) {
                 set_reload(true);
             }
@@ -255,18 +255,12 @@ const PubDicMana = () => {
     return (
         <div className='PubDicMana'>
             <div className='left'>
-                <KCInput placeholder={'请输入类型名称'} search allowClear
+                <KCInput placeholder={'请输入类目名称'} search allowClear
                     onChange={(e) => {
-                        set_tableDataSearchKeywords(e.target.value);
-                        if (e.target.value.length == 0) {
-                            set_tableDataFilterParams({
-                                ...tableDataFilterParams,
-                                typeName: ''
-                            });
-                        }
+                           const result = typeList.filter(item=>item.dictName.indexOf(e.target.value) != -1);
+                           set_showTypeListArr(result);
                     }}
-                    onSearch={() => tableDataSearchHandle('typeName')}
-
+                
                 />
                 <div className='wrap'>
                     {