Merge branch 'addTime0817' into testNew

src/utils/tools.js

@@ -37,7 +37,8 @@ import up from '@images/up.png';
 import down from '@images/down.png';
 import $ from 'jquery';
 import { CLEAR_SEARCH_PARAM } from "../store/types/print";
-
+import report from '@images/report2_time.png';
+import billing from '@images/billing2_time.png';
 // import { embedPush } from '@store/async-actions/pushMessage'
 /***
  * 工具函数
@@ -1927,14 +1928,13 @@ function getAllString(checkedListImport, assistLabel, flg) {
       "result": tempArr[i].value || "",
     }
     tmpArr.push(obj)
-    console.log(tempArr)
     // tmpString += (tempArr[i].name + (tmpVal ? ('：' + tmpVal) + ', ' : '：') + (tempArr[i].time ? '报告日期：' + tempArr[i].time : '') + '^;')
     tmpString +=
       `<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 5px' title="开单时间" src='/src/common/images/billing2_time.png' alt=""/>`
-      + (tempArr[i].time ? tempArr[i].time : '') + (tempArr[i].check || tempArr[i].finishDateValue == '' ? '' : `<img style="margin:0 5px" title="报告时间" src='/src/common/images/report2_time.png' alt=""/>`)
+    + `<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}'/>`)
       + (tempArr[i].check ? '' : tempArr[i].finishDateValue)
       + '</div>'
       + `</div>`