Pārlūkot izejas kodu

通知科室bug修改

zhouna 3 gadi atpakaļ
vecāks
revīzija
50f9025f30

+ 7 - 5
src/components/MsgManage/AddNewMsg.js

@@ -103,7 +103,9 @@ function AddNewMsg(props) {
     function onReceiveTypeChange(e){
         const val = e.target.value;
         setShowCustom(val===1);
-        setReceiverError(val===1);
+        //是否自定义选中者为空
+        const isCusEmpty = val===1&&(checkedUser.length+checkedDepts.length)===0;
+        setReceiverError(isCusEmpty);
     }
     //切换tab
     function handleTabChange(){
@@ -206,7 +208,7 @@ function AddNewMsg(props) {
             setCheckedUserIds(checkedIdsArr);
             form.setFieldsValue({sendUsers:checkedIdsArr});
             //校验状态更新--在判断外面不好判断,直接放里面
-            setReceiverError(checkedIdsArr.length===0);
+            setReceiverError(checkedIdsArr.length+checkedDepts.length===0);
         }else if(type===2){
             //删除树结构中对应的选中状态
             const ikey = checkedDepts[idx].key;
@@ -227,7 +229,7 @@ function AddNewMsg(props) {
             setCheckedDeptIds(checkedDeptIdsArr);
             form.setFieldsValue({sendUsers:checkedUserIds,sendDepts:checkedDeptIdsArr,sendHospitals:checkedHosIdsArr});
             //校验状态更新--在判断外面不好判断,直接放里面
-            setReceiverError(checkedDeptsArr.length===0);
+            setReceiverError(checkedUserIds.length+checkedDeptsArr.length===0);
         }
         //校验状态更新
         //setReceiverError(checkedUserIds.length+);
@@ -305,7 +307,7 @@ function AddNewMsg(props) {
                     <Input autoComplete='off'/>
                 </Form.Item>
             </Form>
-            {showCustom?<div className="receive-container">
+            <div className="receive-container" style={{display:showCustom?'block':'none'}}>
                 <SelectedTag userData={checkedUser} deptData={checkedDepts} delTag={handleTagDel}></SelectedTag>
                 <div className="user-type-box">
                     <Tabs defaultActiveKey="1" onChange={handleTabChange}>
@@ -317,7 +319,7 @@ function AddNewMsg(props) {
                         </TabPane>
                     </Tabs>
                 </div>
-            </div>:""}
+            </div>
             <div className="button-box">
                 <Button onClick={goBack}>取消</Button>
                 <Button onClick={validateForm} type='primary'>发送</Button>

+ 0 - 2
src/components/MyMessage/index.js

@@ -4,8 +4,6 @@ import { Table, Modal, message, Menu, Breadcrumb, Dropdown, Space, Form, Input,
 import { DownOutlined, PlusOutlined } from '@ant-design/icons';
 import './index.less';
 import apiObj from '@api/index';
-import utils from '@utils/index'
-const { pickCheckedTreeIds } = utils;
 const { post, api, xPost } = apiObj;
 const { Option } = Select;
 function MyMessage() {