1008

src/components/DataManager/AddData.js

@@ -16,7 +16,6 @@ const { Step } = Steps;
 const { TabPane } = Tabs;
 function AddData(props) {
   useEffect(() => {
-    getCreateRoles()
     getHospitalTree()
     getOrgList()
     if (type == 3) {
@@ -36,6 +35,7 @@ function AddData(props) {
   const [selectedKeys, setSelectedKeys] = useState([]);
   const [orgList, setOrgList] = useState([]);
   const [selectedRowKeys, setSelectedRowKeys] = useState([]);
+  const [softwareId, setSoftwareId] = useState([]);
   const [autoExpandParent, setAutoExpandParent] = useState(true);
   const { save, formData, type, val, tag } = useContext(DataContext);
   const staticInfo = useSelector(state => {
@@ -60,9 +60,9 @@ function AddData(props) {
     }
   };
   //获取当前用于所属角色
-  function getCreateRoles() {
+  function getCreateRoles(softwareId) {
     const params = {
-      softwareId: ''
+      softwareId: softwareId
     }
     xPost(api.getCreateRoles, params).then((res) => {
       if (res.data.code === 200) {
@@ -123,6 +123,7 @@ function AddData(props) {
         const { software } = data;
         setOrgList(software);
         setKey(software[0].id)
+        getCreateRoles(software[0].id)
         if (type == 3) {
           setTags(tag)
         } else {
@@ -194,6 +195,7 @@ function AddData(props) {
   function callback(key) {
     setKey(key.split('-')[0])
     setIndex(key.split('-')[1])
+    getCreateRoles(key.split('-')[0])
   }
   function treeChange(value) {
     const formData = form.getFieldsValue();

src/components/DataManager/index.js

@@ -170,6 +170,12 @@ function DataManager() {
   function addData(formData) {
     let url = api.addAuth;
     delete formData.roles
+    const arr = formData.softwareVOS.filter((it) => {
+      if (Object.keys(it).length && it.id ) {
+        return it;
+      }
+    });
+    formData.softwareVOS = arr;
     let param = {
       addDataAuthVO: formData,
     }

src/components/FuncManager/index.js

@@ -82,7 +82,7 @@ function OrgManager() {
     setId(id)
     if (flag == 2) {
       getMenuById(id)
-    }else if(flag == 1){
+    } else if (flag == 1) {
       setFuncDetail({
         status: 1,
         parentId: 0,
@@ -139,15 +139,7 @@ function OrgManager() {
   function RenderTable() {
     const columns = [
       { title: '组织机构层级', dataIndex: 'name', key: 'name' },
-      {
-        title: '类型', key: 'type', render: (row) => {
-          if (row.children) {
-            return '-'
-          } else {
-            return row.name;
-          }
-        }
-      },
+      { title: '类型', dataIndex: 'typeName', key: 'type', },
       {
         title: '链接地址', key: 'type', render: (row) => {
           if (row.children) {

src/components/OrgManager/AddSubOrg.js

@@ -290,13 +290,13 @@ function StepContent(props) {
                     type="password"
                     hidden={current !== 1}
                     name={['addHospitalUserVO', 'password']}
-                    rules={[{ required: true }, {
+                    rules={type != 2 ? [{ required: true }, {
                         min: 8,
                         message: '密码不能少于8个字符',
                     }, {
                         max: 12,
                         message: '密码不能大于12个字符',
-                    }]}>
+                    }] : null}>
                     <Input placeholder='8-12位大小写字母、数字、特殊字符' autoComplete='off' disabled={type == 2 ? true : false} />
                 </Form.Item>
                 <Form.Item

src/components/OrgManager/index.js

@@ -179,12 +179,18 @@ function OrgManager() {
     function addSubOrg(formData) {
         const param = formData;
         let url = api.addHospital
+        const arr = formData.softwares.filter((it) => {
+            if (Object.keys(it).length && it.softwareMenuIds && it.softwareMenuIds.length) {
+                return it;
+            }
+        });
         if (type == 2) {
             url = api.updateHospital
             param.id = operId
-            delete param.addHospitalUserVO
-            delete param.confirmPsd      
+            // delete param.addHospitalUserVO
+            // delete param.confirmPsd      
         }
+        formData.softwares = arr;
         post(url, param).then((res) => {
             if (res.data.code === 200) {
                 getTableData();

src/components/RoleManager/index.js

@@ -136,8 +136,6 @@ function RoleManager(){
 
     //保存
     function addRole(formData){
-        console.log(formData);
-        
         let url = api.addRole;
         const arr = formData.softwares.filter((it)=>{
             if(Object.keys(it).length&&it.softwareMenuIds&&it.softwareMenuIds.length){