11

src/components/AddAssistCheck/Textarea/index.less

@@ -4,7 +4,7 @@
   max-height: 100px;
   border-bottom: 1px dashed #333;
   box-sizing: border-box;
-  // min-height: 20px;
+  min-height: 21px;
   // width: 100%;
   outline: none;
   line-height: 20px;

src/components/AddInspect/index.jsx

@@ -86,7 +86,7 @@ class Inspect extends React.Component {
             }
             if(inspectFill){
                 if ( event.target.getAttribute('data-flg') != 'current' && inspectFill != event.target && !$.contains(inspectFill, event.target)) { // Mark 1
-                    this.setState({ showFill: false });
+                    this.setState({ showFill: false ,date:false});
                 }
             }
         });

src/store/async-actions/tabTemplate.js

@@ -43,6 +43,7 @@ export const saveTemplateDetail = (val) => { //保存为模板
   let jsonStr = getAllDataStringList(baseList);
   let whichSign = baseList.typeConfig.typeConfig;
   let state = baseList.patInfo.message;
+  console.log(state)
   let preview = {
     "chief": jsonStr.chief,
     "present": jsonStr.present,
@@ -61,7 +62,8 @@ export const saveTemplateDetail = (val) => { //保存为模板
       "dataJson": JSON.stringify(jsonData),
       "modeName": val,
       "modeType": whichSign,
-      "preview": idx ? JSON.stringify(preview):preview
+      "preview": idx ? JSON.stringify(preview):preview,
+      "sex":state.sex
     }
     return tmpObj;
   }

src/store/reducers/assistCheck.js

@@ -39,7 +39,7 @@ export default (state = initSearchList, action) => {
             }
         }
         for (let j = 0; j < tempArrs.length; j++) {
-            tmpString += (tempArrs[j].name+(tempArrs[j].value?(':'+tempArrs[j].value):'')+(tempArrs[j].time?', 报告日期:'+tempArrs[j].time:'')+';')
+            tmpString += (tempArrs[j].name+(tempArrs[j].value?(':'+tempArrs[j].value)+', ':': ')+(tempArrs[j].time?'报告日期:'+tempArrs[j].time:'')+';')
         }
         newState.dataString = tmpString
         return newState;
@@ -54,7 +54,7 @@ export default (state = initSearchList, action) => {
             return
         }
         for (let i = 0; i < tempArr.length; i++) {
-            tmpString += (tempArr[i].name+(tempArr[i].value?(':'+tempArr[i].value):'')+(tempArr[i].time?', 报告日期:'+tempArr[i].time:'')+';')
+            tmpString += (tempArr[i].name+(tempArr[i].value?(':'+tempArr[i].value)+', ':': ')+(tempArr[i].time?'报告日期:'+tempArr[i].time:'')+';')
         }
         newState.assistLabel = [...tempArr]
         newState.dataString = tmpString
@@ -69,7 +69,7 @@ export default (state = initSearchList, action) => {
                 tempArr[i].value = action.val
                 newState.assistLabel = [...tempArr]
             }
-            tmpString += (tempArr[i].name+(tempArr[i].value?(':'+tempArr[i].value):'')+(tempArr[i].time?', 报告日期:'+tempArr[i].time:'')+';')
+            tmpString += (tempArr[i].name+(tempArr[i].value?(':'+tempArr[i].value)+', ':': ')+(tempArr[i].time?'报告日期:'+tempArr[i].time:'')+';')
         }
         newState.dataString = tmpString
         return newState;
@@ -83,7 +83,7 @@ export default (state = initSearchList, action) => {
                 tempArr[i].time = action.date
                 newState.assistLabel = [...tempArr]
             }
-            tmpString += (tempArr[i].name+(tempArr[i].value?(':'+tempArr[i].value):'')+(tempArr[i].time?', 报告日期:'+tempArr[i].time:'')+';')
+            tmpString += (tempArr[i].name+(tempArr[i].value?(':'+tempArr[i].value)+', ':': ')+(tempArr[i].time?'报告日期:'+tempArr[i].time:'')+';')
         }
         newState.dataString = tmpString
         return newState;

src/utils/tools.js

@@ -508,7 +508,7 @@ function filterDataArr(arrTmp){   //数据处理
             }
         }
     }
-    return (tmpArr.join('')).replace(/^,+/,"").replace(/,+$/,"").replace(/，+$/,"").replace(/，+$/,"");
+    return (tmpArr.join('')).replace(/^,+/,"").replace(/,+$/,"").replace(/^，+$/,"").replace(/，+$/,"");
 }
 // 取消默认行为
 function preventDefault(event) {