bug2775,2771

src/common/less/base.less

@@ -116,7 +116,6 @@ html,body {
 }
 :global(.titleWidth){
     width: 78px !important;
-    margin-top: 8px !important;
     #mainSuit {
         margin-left: 78px;
     }

src/components/AddInspect/InspectName/index.jsx

@@ -53,7 +53,7 @@ class InspectName extends Component {
           <span className={styles.imgInfo1} title='点击i图标可查看详细说明' onClick={()=>getInfomation({name:item.uniqueName || '', position: 1, type: 12})}></span>
         </span>
         {
-          item.inpValue||this.state.isEdit?<div className={styles.iptTipWrap} onClick={this.handleEdit}>
+          item.inpValue||this.state.isEdit?<div title={this.state.value} className={styles.iptTipWrap} onClick={this.handleEdit}>
             <input 
             ref="iptTip"
             onBlur={this.handleBlur}

src/components/AddInspect/InspectName/index.less

@@ -215,7 +215,7 @@
       }
 }
 .iptValue {
-    width: 50px;
+    width: 100px;
     color: #3B9ED0;
     font-size: 12px;
     margin-left: 10px;

src/components/PreviewBody/Inspect/index.jsx

@@ -3,6 +3,7 @@ import { normalVal,getStatusImg } from '@utils/tools';
 
 const PreviewInspect = (props) => {
   const { dataJson, toTime ,dateTime,showDetails  } = props;
+  console.log(dataJson)
     return <tr className={style['patInfoFst']}>
       <td className={style['patInfoSec']}>化验：</td>
       <td className={style['patInfoSec']}>
@@ -35,7 +36,15 @@ const PreviewInspect = (props) => {
           dataJson&&dataJson.labelList && dataJson.labelList.map((item, idx) => {
             return <table style={{ margin: '8px 0', width: '100%' }}>
               {
-                item.show?<tr className={style.assistTableTrFst}><td><span> {item.name} </span></td></tr>:
+                item.show?<tr className={style.assistTableTrFst}>
+                  <td>
+                    <span> {item.name} </span> 
+                    <p>
+                      {item.inpValue}
+                      <i></i>
+                    </p>
+                    </td>
+                </tr>:
                 <tr className={style.assistTableTrFstExcel}><td><span>「{item.name}」</span></td></tr>
               }
               {

src/components/PreviewBody/index.less

@@ -85,6 +85,15 @@ table{
   span {
     border-bottom: 1px solid #666666;
   }
+  p {
+    display: inline-block;
+    margin-left: 10px;   
+    color: #3B9ED0;
+    font-size: 12px;
+    margin-left: 10px;
+    background-color: #EDF8FF;
+    padding: 0 5px;
+  }
 }
 .assistTableTdFst {
   width: 32%;

src/store/reducers/inspect.js

@@ -185,6 +185,10 @@ export default (state = initSearchList, action) => {
                 tempArr[i].inpValue=action.value
             }
         }
+        let tmpArr = newState.getExcelDataList;
+        newState.pushItem = getPushList(tmpArr,tempArr);
+        newState.pushItems = getPushLists(tmpArr,tempArr);
+        newState.inspectStrPlus = getStringPlus(newState.pushItems)
         return newState;
     }
     return state;

src/utils/tools.js

@@ -1219,10 +1219,10 @@ function getStringPlus(dataList){
   let strPlus = '';
   dataList && dataList.map((item)=>{
     if(item.detailName){
-      let strTmp = item.name + ',' + item.detailName + ',' + (item.otherValue ? item.otherValue : (item.value + item.units)) +';'
+      let strTmp = item.name + ','+(item.inpValue?(item.inpValue+','):'') + item.detailName + ',' + (item.otherValue ? item.otherValue : (item.value + item.units)) +';'
       strPlus += strTmp;
     }else{
-      let strTmp = item.name+';'
+      let strTmp = item.name+ (item.inpValue?(','+item.inpValue):';')
       strPlus += strTmp;
     }
   })
@@ -1278,6 +1278,7 @@ function getPushList(data1,data2){     //推送数据
     return totalTmpArr;
 }
 function getPushLists(data1,data2){     //推送数据
+  console.log(data1,data2)
     let tmpArr1 = [];
     let tmpArr2 = [];
     let totalTmpArr = [];
@@ -1304,6 +1305,7 @@ function getPushLists(data1,data2){     //推送数据
             if(val.value != undefined && val.value != ''){
                 let tmpObj = {};
                 tmpObj.name = item.name || '';
+                tmpObj.inpValue = item.inpValue || '';//套餐名
                 tmpObj.detailName = val.name || '';
                 tmpObj.uniqueName = val.uniqueName || '';//公表名称
                 tmpObj.source = '0';     //数据来源
@@ -1318,6 +1320,7 @@ function getPushLists(data1,data2){     //推送数据
       }else{
         let tmpObj = {};
         tmpObj.name = item.name;
+        tmpObj.inpValue = item.inpValue;
         tmpArr2.push(tmpObj);
       }
     })