字段名修改

src/components/AddAssistCheck/index.jsx

@@ -289,7 +289,7 @@ class AddAssistCheck extends React.Component {
                           style={'#333'}
                           placeholder='时间'
                           autoComplete="off"
-                          value={item.referenceValue}
+                          value={item.finishDateValue}
                           onFocus={() => { this.handleFocus() }}
                           onInput={(e) => { this.handleInput(e, item, idx, 3, 1) }}
                         // onBlur={()=>{this.handleBlur()}}

src/components/AddInspect/SlidePic/index.jsx

@@ -161,7 +161,6 @@ class SlideSelect extends Component {
   }
   render() {
     const { item, idx, activeIdx, activeSign } = this.props;
-    console.log(item)
     const { canEdit, activeInd, activeName, value, style } = this.state;
     return (
       item.flg == 1 ? <li key={item.detailName + idx} className={`${styles.slideLi} clearfix`}>
@@ -198,7 +197,7 @@ class SlideSelect extends Component {
                     style={{ color: '#333' }}
                     placeholder='时间'
                     autoComplete="off"
-                    value={item.referenceValue}
+                    value={item.finishDateValue}
                     onInput={(e) => { this.handleInput(e, item, idx, 3) }}
                     onFocus={() => { this.handleFocus() }}
                   // onBlur={()=>{this.handleBlur()}}
@@ -256,7 +255,7 @@ class SlideSelect extends Component {
               style={{ color: '#333' }}
               placeholder='时间'
               autoComplete="off"
-              value={item.referenceValue}
+              value={item.finishDateValue}
               onInput={(e) => { this.handleInput(e, item, idx, 3) }}
               // onBlur={()=>{this.handleBlur()}}
               onFocus={() => { this.handleFocus() }}

src/components/PreviewBody/Inspect/index.jsx

@@ -35,7 +35,7 @@ const PreviewInspect = (props) => {
                     {/* <td className={style.assistTableTdFor}>{item.time == '' ? ('导入时间：' + dateTime) : '检验时间：' + toTime(item.time) */}
                   {/* <td className={style.assistTableTdFor}>{item.time == '' ?   dateTime  :  item.time}</td> */}
                   <td className={style.assistTableTdFor}><img className={style.imgCheck} src={report} title={'报告时间'} />{item.time }</td>
-                  <td className={style.assistTableTdFor}><img className={style.imgCheck} src={report} title={'报告时间'} />{item.referenceValue}</td>
+                  <td className={style.assistTableTdFor}><img className={style.imgCheck} src={report} title={'报告时间'} />{item.finishDateValue}</td>
                   </tr>
                 // </table>
               )

src/store/reducers/assistCheck.js

@@ -42,7 +42,7 @@ export default (state = initSearchList, action) => {
       if (action.idx == idx) {
         console.log(1)
         if (action.tip == 1) {
-          if (compareDate(action.val) > compareDate(item.referenceValue)) {
+          if (compareDate(action.val) > compareDate(item.finishDateValue)) {
             Notify.error("报告时间不能早于开单时间");
             return item
           }
@@ -58,7 +58,7 @@ export default (state = initSearchList, action) => {
             Notify.error("报告时间不能早于开单时间");
             return item
           }
-          item.referenceValue = action.val
+          item.finishDateValue = action.val
         }
       }
       return item
@@ -131,7 +131,7 @@ export default (state = initSearchList, action) => {
     let tempList = action.item
     tempList['dateValue'] = getCurrentDate(1)
     tempList['time'] = getCurrentDate(1)
-    tempList['referenceValue'] = getCurrentDate(1)
+    tempList['finishDateValue'] = getCurrentDate(1)
     tempArrs.push(tempList)
     let tmpObj = getAllString([],newState.assistLabel)
     newState.assistLabel = [...tempArrs]

src/store/reducers/inspect.js

@@ -106,7 +106,7 @@ export default (state = initSearchList, action) => {
             tempArr = tempArr.filter((item, idx) => {
                 if (action.sign == idx) {
                     if (action.tip == 1) {
-                        if (compareDate(action.value) > compareDate(item.referenceValue)) {
+                        if (compareDate(action.value) > compareDate(item.finishDateValue)) {
                             Notify.error("报告时间不能早于开单时间");
                             return item
                         }
@@ -121,7 +121,7 @@ export default (state = initSearchList, action) => {
                             Notify.error("报告时间不能早于开单时间");
                             return item
                         }
-                        item.referenceValue = action.value
+                        item.finishDateValue = action.value
                     }
                 }
                 return item
@@ -130,7 +130,7 @@ export default (state = initSearchList, action) => {
             tempArrs = tempArrs.filter((item, idx) => {
                 if (action.sign == idx) {
                     if (action.tip == 1) {//小项改时间
-                        if (compareDate(action.value) > compareDate(item.referenceValue)) {
+                        if (compareDate(action.value) > compareDate(item.finishDateValue)) {
                             Notify.error("报告时间不能早于开单时间");
                             return item
                         }
@@ -149,7 +149,7 @@ export default (state = initSearchList, action) => {
                             Notify.error("检验细项报告时间不能为空");
                             return item
                         }
-                        item.referenceValue = action.value
+                        item.finishDateValue = action.value
                     } else {//小项该数值
                         if (isNumber(action.value - 0)) {
                             item.value = action.value
@@ -179,7 +179,7 @@ export default (state = initSearchList, action) => {
         let tmpLis = action.list
         tmpLis['dateValue'] = getCurrentDate(1)
         tmpLis['time'] = getCurrentDate(1)
-        tmpLis['referenceValue'] = getCurrentDate(1)
+        tmpLis['finishDateValue'] = getCurrentDate(1)
         if (tmpLis.flg == 1) {//大项
             tempArr.push(tmpLis)
             newState.labelListBig = [...tempArr]

src/utils/tools.js

@@ -967,8 +967,9 @@ function getEMRParams(){
       return item
     }
   })
-  let tempLisOrder = inspect.totalOrder
+  let tempLisOrder = JSON.parse(JSON.stringify(inspect.totalOrder)) 
   tempLisOrder = tempLisOrder.filter((item)=>{
+    delete item.finishDateValue
     if(item.flg == 1){
       item.detailName = ""
     }
@@ -986,8 +987,9 @@ function getEMRParams(){
       return item
     }
   })
-  let tempPacOrder = assistCheck.totalOrder
+  let tempPacOrder = JSON.parse(JSON.stringify(assistCheck.totalOrder)) 
   tempPacOrder = tempPacOrder.filter((item)=>{
+    delete item.finishDateValue
     if(curHos.hosId != -1){
       item.uniqueName = ''
     }
@@ -1914,7 +1916,7 @@ function getAllString(checkedListImport,assistLabel,flg){
     }
     tmpArr.push(obj)
     // tmpString += (tempArr[i].name + (tmpVal ? ('：' + tmpVal) + ', ' : '：') + (tempArr[i].time ? '报告日期：' + tempArr[i].time : '') + '^;')
-    tmpString += (tempArr[i].name + (tmpVal ? ('：' + tmpVal) + ', ' : '：') + `<img style='margin:0 5px' src='/src/common/images/billing_time.png' alt=""/>` + (tempArr[i].time ? tempArr[i].time : '') + `<img style="margin:0 5px" src='/src/common/images/report_time.png' alt=""/>` + (tempArr[i].referenceValue ? tempArr[i].referenceValue : ''))
+    tmpString += (tempArr[i].name + (tmpVal ? ('：' + tmpVal) + ', ' : '：') + `<img style='margin:0 5px' src='/src/common/images/billing_time.png' alt=""/>` + (tempArr[i].time ? tempArr[i].time : '') + `<img style="margin:0 5px" src='/src/common/images/report_time.png' alt=""/>` + (tempArr[i].finishDateValue ? tempArr[i].finishDateValue : ''))
   }
   return tmpObj = {
     arr:tmpArr,