zhangxc 5 роки тому
батько
коміт
3be8610602
1 змінених файлів з 37 додано та 10 видалено
  1. 37 10
      src/components/diagBase/AddDiagBase.vue

+ 37 - 10
src/components/diagBase/AddDiagBase.vue

@@ -75,7 +75,7 @@
                     </td>
                     <td class="FeatureRelate">
                         <el-tooltip :disabled="!item.verifyRelation&&!item.relationNull"  class="item" effect="dark" :content="item.verifyRelation||item.relationNull" placement="top">
-                            <el-input class="groupTextarea"  
+                            <el-input class="groupTextarea" 
                                 type="textarea"
                                 :autosize="{ minRows: 1}"
                                 :class="{borderRed:item.verifyRelation|| item.relationNull}" 
@@ -88,7 +88,8 @@
                     </td>
                      <td class="FeatureuniqueName">
                         <el-tooltip :disabled="!item.verifyUnique"  class="item" effect="dark" :content="item.verifyUnique" placement="top">
-                            <el-input class="groupTextarea inpDisabled"  
+                            <!-- <el-input class="groupTextarea inpDisabled"  
+                                ref="textarea"
                                 type="textarea"
                                 :readonly = true
                                 :autosize="{ minRows: 1}"
@@ -96,7 +97,8 @@
                                 :title="item.uniqueName" 
                                 v-model.trim="item.uniqueName" 
                                 >
-                            </el-input>
+                            </el-input> -->
+                            <div class="disableDiv" :class="{borderRed:item.uniqueName===null ||item.verifyUnique}" :title="item.uniqueName" >{{item.uniqueName}}</div> 
                         </el-tooltip> 
                         <!-- <div>{{item.uniqueName}}</div> -->
                     </td>
@@ -112,6 +114,14 @@
                                 @input="handleInp(index,$event,'FeatureResult')"
                                 @focus="clickItem(index,'FeatureResult')">
                             </el-input>
+                            <!-- <div :class="{borderRed:item.verifyResult, disableDiv:item.type!=3}"  
+                                 :contenteditable="item.type==3"   
+                                 :title="item.midResult" 
+                                 @input="handleInp(index,$event,'FeatureResult')"
+                                 @focus="clickItem(index,'FeatureResult')"
+                                 >
+                                {{item.midResult}}
+                            </div> -->
                         </el-tooltip> 
                     </td>
                     <td class="FeatureOpera">
@@ -121,7 +131,7 @@
                 </tr>
             </table>
             <p class="moduleTitle">诊断公式:</p>
-            <p class="inpTips">可输入数字(0~9);可输入规定汉字:任、一、二、三、四、五、六、七、八、九、十,其余汉字不可输入可输入的符号:“.”、“/”、“()”  “+”;确诊还可输入“拟、诊”二字;鉴别诊断的序号不可输入公式中,数据放入后该条件无效;</p>
+            <p class="inpTips">可输入数字(0~9);可输入规定汉字:任、一、二、三、四、五、六、七、八、九、十,其余汉字不可输入可输入的符号:“.”、“/”、“()”  “+”;确诊还可输入“拟、诊”二字;鉴别诊断的序号不可输入公式中,数据放入后该条件无效;</p>
             <table class="diagTable">
                 <tr class="tableTitle"> 
                     <td class="FormulaSort">排序</td> 
@@ -139,6 +149,7 @@
                     <td class="FormulaNumber">
                         <el-tooltip :disabled="!item.verifyFormula"  class="item" effect="dark" :content="item.verifyFormula" placement="top">
                             <el-input class="groupTextarea"
+                                ref="textarea"
                                 type="textarea"  
                                 :readonly="!item.type"
                                 :autosize="{ minRows: 1}"
@@ -266,6 +277,7 @@
             
         }
     },
+   
     watch: {
         // searchTagVal(newVal, preVal) {
         //     if(newVal.trim() == ''){
@@ -458,7 +470,6 @@
             // })
         },
         exportDiagnosticAll(){
-            
             this.submitForm('export').then(() => {
                 if(this.hasQuestion == 0) {
                         const param = {
@@ -531,7 +542,7 @@
                 this.isReady = true
             }
             if(labArr.length > 0) {
-                this.labVerifyData(labArr, loading,type).then(() =>{
+                return this.labVerifyData(labArr, loading,type).then(() =>{
                     if(this.hasNoUniqueName) {
                         loading.close()
                         return
@@ -819,7 +830,7 @@
         },
        
         handleInp(index,e,type,itemType){ //分组不能输入负数
-            const value = e;
+            const value = e
             if(type === 'FeatureNumber') { //序号只能输入数字和.
                 this.$nextTick(() => {
                     this.disFeatureList[index].code = value.replace(/[^\d.]/g,'')
@@ -921,6 +932,10 @@
 <style lang="less">
     @import '../../less/common.less';
     .AddDiagBaseWrapper {
+        font-size: 14px;
+        table,tr,td {
+            list-style: none;
+        }
         color: #606266;
         .topBack {
             top: 0;
@@ -984,7 +999,7 @@
         .symptomList {
             position: relative;
             background-color: #fff;
-             padding: 20px 20px 100px 20px;
+             padding: 0px 20px 100px 20px;
              margin: 0px 20px 40px 20px;
              min-height: 400px;
         }
@@ -995,6 +1010,7 @@
             margin-bottom: 20px;
             tr {
                 td {
+                    position: relative;
                     border: 1px solid #a9a9a9;
                     text-align: center;
                 }
@@ -1053,6 +1069,7 @@
         }
         .tableTitle{
             background: rgba(239,243,249,1);
+            height: 40px;
         }
         .require::after{
             content:"*";
@@ -1076,10 +1093,10 @@
             width: 8%;
         }
         .FeatureStand {
-            width: 25%;
+            width: 20%;
         }
         .FeatureRelate {
-            width: 25%;
+            width: 30%;
         }
         .FeatureuniqueName {
             width: 10%;
@@ -1130,6 +1147,7 @@
         }
         .moduleTitle {
             margin: 0 0 10px 0;
+            font-weight: 600;
         }
         .inpDisabled{
             textarea {
@@ -1149,6 +1167,15 @@
         #upFile{
             display: none
         }
+        .disableDiv {
+            background: rgb(236, 236, 236);
+            box-sizing: border-box;
+            cursor: not-allowed;
+            font-size: 14px;
+            line-height: 20px;
+            padding: 5px 0;
+            min-height: 30px;
+        }
     }
     
 </style>