Merge remote-tracking branch 'origin/TCM0513' into testNew

src/common/components/BlockInp/index.less

@@ -3,7 +3,7 @@
 .box{
   margin: 2px 20px;
   .title{
-    width: 65px;
+    width: 76px;
     float: left;
     text-align: right;
     padding-right: 5px;
@@ -18,7 +18,7 @@
     // height:120px;
     min-height: 38px;
     line-height: 24px;
-    margin-left: 60px;
+    margin-left: 68px;
     position: relative;
     padding:5px;
     outline: none;

src/common/components/ItemBox/index.less

@@ -4,7 +4,7 @@
   margin: 2px 20px;
   word-break: break-word;
   .title{
-    width: 65px;
+    width: 76px;
     float: left;
     text-align: right;
     padding-right: 5px;
@@ -18,7 +18,7 @@
   .content{
     // height:120px;
     min-height: 38px;
-    margin:0 0 0 60px;
+    margin:0 0 0 68px;
     position: relative;
     padding:5px 12px 5px 5px;
     outline: none;

src/components/AssistCheck/index.less

@@ -6,7 +6,7 @@
     position: relative;
     margin: 20px 490px -21px 20px;
     span {
-        margin-left: 60px;
+        margin-left: 68px;
         border: 1px dashed @part-border-color;
         border-bottom: 1px solid #fff;
         display: inline-block;

src/components/Inspect/index.less

@@ -7,7 +7,7 @@
     position: relative;
     margin: 20px 20px -21px 20px;
     span {
-        margin-left: 60px;
+        margin-left: 68px;
         border: 1px dashed @part-border-color;
         border-bottom: 1px solid #fff;
         display: inline-block;

src/store/actions/diagnosticList.js

@@ -264,7 +264,9 @@ export function reDiagData(state, action) {
     res.diagnosticStrNoType = action.params[10].contentJson;
     res.diseaseName = action.params[10].diseaseName;
     //中医数据
-    res.tcmList =action.params[12].contentValue;
-    res.otherIndex = action.params[12].diseaseName;
+    if(action.params[12]){
+        res.tcmList =action.params[12].contentValue;
+        res.otherIndex = action.params[12].diseaseName;
+    }
     return res;
 }

src/store/reducers/diagnosticList.js

@@ -117,6 +117,11 @@ export default function (state=initState, action) {
         newState.diseaseName = {};
         newState.diagnosticStrNoType = '';
         return newState;
+      case 'CLEARTCMDIAGDATA':
+          let newSt = Object.assign({}, state);
+          newSt.otherIndex={};
+          newSt.tcmList=[];
+          return newSt;
       default:
         return state;
     }

src/utils/tools.js

@@ -347,6 +347,9 @@ const delHistoryDataList = () =>{
   store.dispatch({
     type: CLEARDIAGDATA,
   });
+  store.dispatch({
+      type: 'CLEARTCMDIAGDATA',
+  });
   store.dispatch({
     type: CLEARNEWADVICEDATA,
   });