修改化验明细项详情显示名称

src/components/AddInspect/SlideSelect/index.jsx

@@ -156,7 +156,7 @@ class SlideSelect extends Component {
                                     <td style={{width:'30%'}}>
                                       <span className={styles.tagSpan}>
                                         {val.name}
-                                        <span className={styles.imgInfo1} title='点击i图标可查看详细说明' onClick={()=>getInfomation({name:val.uniqueName || '', position: 1, type: 12})}></span>                                        
+                                        <span className={styles.imgInfo1} title='点击i图标可查看详细说明' onClick={()=>getInfomation({name:val.uniqueName || '', position: 1, type: 12,showName:item.name+'('+val.name+')'})}></span>                                        
                                       </span>
                                     </td>
                                     {showDetails(val)}
@@ -174,7 +174,7 @@ class SlideSelect extends Component {
                                     <td style={{width:'30%'}}>
                                       <span className={styles.tagSpan}>
                                         {val.name}
-                                        <span className={styles.imgInfo1} title='点击i图标可查看详细说明' onClick={()=>getInfomation({name:val.uniqueName || '', position: 1, type: 12})}></span>
+                                        <span className={styles.imgInfo1} title='点击i图标可查看详细说明' onClick={()=>getInfomation({name:val.uniqueName || '', position: 1, type: 12,showName:item.name+'('+val.name+')'})}></span>
                                       </span>
                                     </td>
                                     {showDetails(val)}

src/components/MedicalInfo/index.jsx

@@ -31,7 +31,7 @@ class MedicalInfo extends Component {
         return searchResult && searchResult.map((item) => {
           return <li key={item.conceptId}
                      title='点击查看详情'
-                     onClick={() => getAllConceptDetail({name: item.name, type: item.type, uname: item.uniqueName,position:0})}>
+                     onClick={() => getAllConceptDetail({name: item.name, type: item.type, uname: item.uniqueName,position:0,showName:item.name})}>
             <span>{item.name}</span>
             <i>( {item.libTypeName} )</i>
             {item.retrievalName?<p>• {item.retrievalName}</p>:''}

src/components/PushItems/DetailsModal/index.jsx

@@ -52,13 +52,13 @@ class DetailsModal extends Component {
     }
     
     render() {
-        const {showTipsDetails, tipsDetails} = this.props;
+        const {showTipsDetails, tipsDetails,showAllName} = this.props;
         const { currentIndex } = this.state
       return <NewPortal visible = {showTipsDetails}>
 
                 <div className={styles['details-wrapper']}>
                     <div className={styles['details-content-wrapper']} id="detailsContentWrap">
-                        <h1 id="detailsContentTitle" className={`${styles['details-content-name']} drag-title`} >{tipsDetails && tipsDetails.name} <img className={styles['details-close']} onClick={this.hideTips} src={close} /></h1>
+                        <h1 id="detailsContentTitle" className={`${styles['details-content-name']} drag-title`} >{tipsDetails && showAllName ? showAllName : tipsDetails &&tipsDetails.name} <img className={styles['details-close']} onClick={this.hideTips} src={close} /></h1>
                         <div className={styles['details-content']} id= 'detailsContent' onScroll={this.handleScrollModal.bind(this, tipsDetails)}>
                             {tipsDetails && tipsDetails.details && tipsDetails.details.map((item, index) => {
                                 return (<div id={item.title}>

src/components/PushItems/TipsMsg/index.jsx

@@ -17,7 +17,7 @@ class TipsMsg extends Component {
     }
 
     render() {
-        const { tips, showTips, tipsDiscalimer, tipsImg, tmpFlg} = this.props;
+        const { tips, showTips, tipsDiscalimer, tipsImg, tmpFlg,showPartName} = this.props;
         return <div id="tipsMsg" className={style["tips"]}>
         <h1>
           <img src={tipsImg} />
@@ -27,7 +27,7 @@ class TipsMsg extends Component {
           {tips && tips.details ? (
             <div>
               <div className={style["title"]}>
-                {tips.name}
+                {showPartName ? showPartName : tips.name}
                 <span
                   className={style["tips-details"]}
                   onClick={() => showTips()}

src/components/PushItems/index.jsx

@@ -127,7 +127,7 @@ class PushItems extends Component {
 
   showTips() {
     const { getTipsDetails, showTipsDetailsModal, clickDiag } = this.props;
-    getTipsDetails && getTipsDetails({name: clickDiag.name, type: clickDiag.type,position:0});
+    getTipsDetails && getTipsDetails({name: clickDiag.name, type: clickDiag.type,position:0,showName:clickDiag.showName });
     //showTipsDetailsModal && showTipsDetailsModal()
   }
   hideTips() {
@@ -162,6 +162,8 @@ class PushItems extends Component {
       showTipsDetails,
       tipsDetails,
       tmpFlg,
+      showPartName,
+      showAllName
     } = this.props.pushMessage;
     const { tipsDiscalimer,chronicPushItems,wholeIndexs,setPushEmergencyIdx,sysConfig,windowHeight,hideAllDrop} = this.props;
     const {
@@ -271,6 +273,7 @@ class PushItems extends Component {
               tips = {tips}
               showTips = {showTips}
               tipsDiscalimer = {tipsDiscalimer}
+              showPartName = {showPartName}
             ></TipsMsg>
           </div>
          {tipsDiscalimer.data && <div  className={style['disTips']} dangerouslySetInnerHTML={{__html: tipsDiscalimer.data.data &&tipsDiscalimer.data.data.find(item => item.disclaimerCode == '2')&&tipsDiscalimer.data.data.find(item => item.disclaimerCode == '2').description}}></div>}
@@ -278,6 +281,7 @@ class PushItems extends Component {
         {showTipsDetails && <DetailsModal  
             showTipsDetails = {showTipsDetails}
             hideTips = {this.hideTips}
+            showAllName = {showAllName}
             tipsDetails = {tipsDetails}/>}
             
             {

src/store/actions/pushMessage.js

@@ -182,6 +182,7 @@ export const setTips = (state, action) => {
   const res = Object.assign({}, state)
   res.tips = action.tips;
   res.tmpFlg = action.tmpFlg
+  res.showPartName = action.showPartName
   return res;
 }
 
@@ -189,6 +190,7 @@ export const setTips = (state, action) => {
 export const setTipsDetails = (state, action) => {
   const res = Object.assign({}, state)
   res.tipsDetails = action.tipsDetails;
+  res.showAllName = action.showAllName
   return res;
 }
 

src/store/async-actions/pushMessage.js

@@ -144,7 +144,8 @@ export const getConceptDetail = (item,noTips,noDetails,noNotify) => {
                         dispatch({
                             type: SET_TIPS,
                             tips: res.data.data,
-                            tmpFlg:'midPart'
+                            tmpFlg:'midPart',
+                            showPartName: item.showName
                         })
                     } else {
                         dispatch({
@@ -161,7 +162,8 @@ export const getConceptDetail = (item,noTips,noDetails,noNotify) => {
                     if(!noDetails) {
                       dispatch({
                         type: SET_TIPS_DETAILS,
-                        tipsDetails: res.data.data
+                        tipsDetails: res.data.data,
+                        showAllName: item.showName
                       })
                       dispatch({
                         type: SHOW_TIPS_DETAILS
@@ -190,6 +192,8 @@ export const getConceptDetail = (item,noTips,noDetails,noNotify) => {
 }
 
 export const getAllConceptDetail = (item) => {
+  console.log('item11',item)
+
     return(dispatch, getState) => {
         const state = getState();
       let params = {
@@ -215,7 +219,8 @@ export const getAllConceptDetail = (item) => {
               }
               dispatch({
                 type: SET_TIPS_DETAILS,
-                tipsDetails: res.data.data
+                tipsDetails: res.data.data,
+                showAllName: item.showName
               })
             } else {
                 Notify.info('提示信息未维护');