瀏覽代碼

辅检横向滚动

Luolei 6 年之前
父節點
當前提交
1dd6c92d11

+ 4 - 2
src/components/AddAssistCheck/Textarea/index.less

@@ -1,11 +1,13 @@
 .divTextarea {
   overflow-y: auto;
+  overflow-x: hidden;
   border-bottom: 1px dashed #333;
   box-sizing: border-box;
-  min-height: 18px;
+  min-height: 20px;
   width: 100%;
   outline: none;
-  line-height: 17px;
+  line-height: 20px;
   resize: none;
   font-family: inherit;
+  max-height: 100px;
 }

+ 3 - 3
src/components/AddAssistCheck/index.less

@@ -96,9 +96,9 @@
         }
         span {
             display: inline-block;
-            height: 18px;
-            line-height: 18px;
-            border-bottom: 1px solid #333;
+            height: 20px;
+            line-height: 20px;
+            // border-bottom: 1px solid #333;
             box-sizing: border-box;
             // margin-right: 8px;
         }

+ 13 - 24
src/components/PrintPreview/index.jsx

@@ -78,31 +78,20 @@ class PrintPreview extends Component {
         this.props.onClose()
     }
     surePrint(jsonData,jsonStr,whichSign){
-        if(whichSign == 0){
-            if(jsonData.chief.length < 1){
-                Notify.info('主诉不能为空');
-                return;
-            }else if(jsonData.diag.length < 1){
-                Notify.info('诊断不能为空');
-                return;
-            }else{
-                this.onPrint();
-                this.props.save(true)
-            }
+        console.log(jsonData)
+        console.log(jsonStr)
+        if(JSON.parse(jsonStr.chief).length == 1 && JSON.parse(jsonStr.chief)[0].trim() ==''){
+          Notify.info('主诉不能为空');
+            return false;
+        }else if(jsonStr.chief && JSON.parse(jsonStr.chief).length < 1){
+            Notify.info('主诉不能为空');
+            return false;
+        }else if(!jsonStr.diag || jsonStr.diag.trim().length < 1){
+            Notify.info('诊断不能为空');
+            return false;
         }else{
-            if(JSON.parse(jsonStr.chief).length == 1 && JSON.parse(jsonStr.chief)[0] ==''){
-                Notify.info('主诉不能为空');
-                return;
-            }else if(JSON.parse(jsonStr.chief).length < 1){
-                Notify.info('主诉不能为空');
-                return;
-            }else if(jsonStr.diag.trim().length < 1){
-                Notify.info('诊断不能为空');
-                return;
-            }else{
-                this.onPrint();
-                this.props.save(true)
-            }
+          this.onPrint();
+          this.props.save(true)
         }
     }
     render() {