Merge branch 'addTime0817' into testNew

src/components/PreviewBody/Inspect/index.jsx

@@ -18,7 +18,6 @@ const PreviewInspect = (props) => {
         
         {
           dataJson && dataJson.labelListSmall && dataJson.labelListSmall.map((item) => {
-            // console.log(item, item,'=====');
             return (
               <tr className={style.assistTableTrSec}>
                 <td className={style.assistTableTdFst} title={item.detailName}>{item.detailName}</td>
@@ -40,11 +39,15 @@ const PreviewInspect = (props) => {
                 <td className={style.assistTableTdFor}><img className={style.imgCheck} src={billing} title={'开单时间'} />{item.time}</td>
                 <td className={style.assistTableTdFor}>
                   {
-                    item.finishDateValue ? (
-                      <img className={style.imgCheck} src={report} title={'报告时间'} />
-                    ) : null
+                    item.check ? (
+                      null
+                    ) : <img className={style.imgCheck} src={report} title={'报告时间'} />
+                  }
+                  {
+                    item.check ? (
+                      null
+                    ) : item.finishDateValue
                   }
-                  {item.finishDateValue}
                 </td>
               </tr>
               // </table>
@@ -65,11 +68,16 @@ const PreviewInspect = (props) => {
                 <td className={style.assistTableTdFor}><img className={style.imgCheck} src={billing} title={'开单时间'} />{item.time == '' ? dateTime : toTime(item.time)}</td>
                 <td className={style.assistTableTdFor}>
                   {
-                    item.finishDateValue ? (
-                      <img className={style.imgCheck} src={report} title={'报告时间'} />
-                    ) : null
+                    item.check ? (
+                      null
+                    ) : <img className={style.imgCheck} src={report} title={'报告时间'} />
+                  }
+                  {
+                    item.check ? (
+                      null
+                    ) :  item.finishDateValue 
                   }
-                  {item.finishDateValue}
+                  
                 </td>
               </tr>
               // </table>

src/utils/tools.js

@@ -1933,8 +1933,8 @@ function getAllString(checkedListImport, assistLabel, flg) {
       `<div style="font-size:12px">`
       + `<div style="display:flex;justify-content: space-between;">`
       + `<span style="font-size:12px">` + tempArr[i].name + `</span>`
-    + `<div style="display:flex;font-size:12px"><img style='margin:0 3px;width:16px;height:18px' title="开单时间" src='${billing}'/>`
-    + (tempArr[i].time ? tempArr[i].time : '') + (tempArr[i].check || tempArr[i].finishDateValue == '' ? '<span style="width:140px"></span>' : `<img style="margin:0 3px;width:16px;height:18px" title="报告时间" src='${report}'/>`)
+      + `<div style="display:flex;font-size:12px"><img style='margin:0 3px;width:16px;height:18px' title="开单时间" src='${billing}'/>`
+    + (tempArr[i].time ? tempArr[i].time : '') + (tempArr[i].check ? '<span style="width:140px"></span>' : !tempArr[i].check && tempArr[i].finishDateValue == '' ? `<img style="margin:0 3px;width:16px;height:18px" title="报告时间" src='${report}'/><span style="width:118px"></span>` : `<img style="margin:0 3px;width:16px;height:18px" title="报告时间" src='${report}'/>`) 
       + (tempArr[i].check ? '' : tempArr[i].finishDateValue)
       + '</div>'
       + `</div>`