火狐2293/2304/2297/2295/bug修改

src/components/AddAssistCheck/Textarea/index.jsx

@@ -18,7 +18,8 @@ class Textarea extends Component {
   }
   handleInput(e){
     const {handleChangeAssistValue,idx,handlePush} = this.props;
-    const text = e.target.innerText || e.target.innerHTML;
+    const text = (e.target.innerHTML || e.target.innerText);
+    // e.target.innerHTML = e.target.textContent
     const stimer = this.state.timer;
     handleChangeAssistValue&&handleChangeAssistValue(text,idx);
     //右侧推送--延时推送

src/components/Emergency/index.less

@@ -49,6 +49,7 @@
     vertical-align: top;
     position: relative;
     padding-top: 57px;
+    padding-bottom:70px;
     .no-data{
       font-size: 18px;
       position: absolute;

src/components/HistoryCaseContainer/HistoryList/index.less

@@ -11,6 +11,7 @@
     height: 86%;
     background-color: #fff;
     overflow: hidden;
+    padding-bottom:20px;
     .close {
         position: absolute;
         top: 0;

src/components/Preview/index.less

@@ -23,6 +23,7 @@
     bottom: 7%;
     height: 86%;
     overflow: hidden;
+    padding-bottom: 20px;
     padding-top: 45px;
   }
   .close { 

src/components/PreviewBody/ItemPart/index.jsx

@@ -9,11 +9,8 @@ const ItemPart = (props) => {
       type === 2?
       <td className={style['patInfoSec']}>
         {
-          dataStr && dataStr != '' && dataStr.split(';').map((item) => {
-            // return <div className={style.checkAssist} dangerouslySetInnerHTML={{__html:item}}></div>
-            // return <pre className={style.checkAssist} dangerouslySetInnerHTML={{__html:item}}></pre>
-            // return <pre className={style.checkAssist}>{item}</pre>
-            return <div className={style.checkAssist}>{item}</div>
+          dataStr && dataStr != '' && dataStr.split('^;').map((item) => {
+            return <div className={style.checkAssist} dangerouslySetInnerHTML={{__html:item}}></div>
           })
         }
       </td>:

src/components/PreviewBody/index.less

@@ -5,7 +5,6 @@
   height: 100%;
   top:0px;
   width: 820px;
-  padding-bottom: 100px;
   box-sizing: border-box;
   .contents {
     position: relative;

src/components/PrintPreview/index.less

@@ -24,6 +24,7 @@
       height: 86%;
       overflow: hidden;
       padding-top: 45px;
+      padding-bottom: 20px;
     }
     .close { 
       padding:  0 15px;

src/components/RadioInpDrop/index.jsx

@@ -219,7 +219,7 @@ class InputComp extends Component{
   }
   handleBlur(e){
     e.stopPropagation();
-    const text = e.target.innerText;
+    const text = e.target.innerText||e.target.textContent;//单选输入预览拿不到值innerHTML会有空格
     const {handleInp,index,value} = this.props;
     e.target.innerText = '';
     handleInp(index,text);

src/components/TemplateItems/index.less

@@ -30,7 +30,7 @@
         cursor: pointer;
         .check-box {
             height: 18px;
-            width: 18px;
+            // width: 18px;
             margin-top: 10px;
             padding-right: 10px;
             

src/utils/tools.js

@@ -1351,7 +1351,7 @@ function getAllString(checkedListImport,assistLabel){
   let tempArr = tmpImportLis.concat(assistLabel)
   for (let i = 0; i < tempArr.length; i++) {
     let tmpVal = tempArr[i].value ? tempArr[i].value.trim() : tempArr[i].value;
-    tmpString += (tempArr[i].name + (tmpVal ? (':' + tmpVal) + ', ' : ': ') + (tempArr[i].time ? '报告日期:' + tempArr[i].time : '') + ';')
+    tmpString += (tempArr[i].name + (tmpVal ? (':' + tmpVal) + ', ' : ': ') + (tempArr[i].time ? '报告日期:' + tempArr[i].time : '') + '^;')
   }
   return tmpString;
 }