Merge remote-tracking branch 'origin/AIControl' into AIControl

src/components/qualityControl/AddCombineFeild.vue

@@ -31,10 +31,10 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="备注：" prop="tagName">
-                        <el-input type="text" placeholder="请输入备注" v-model="form.tagName"></el-input>
+                        <el-input type="text" placeholder="请输入备注" v-model.trim="form.tagName"></el-input>
                     </el-form-item>
                     <el-form-item label="显示名称：" prop="name">
-                        <el-input type="text" placeholder="请输入显示名称" v-model="form.name"></el-input>
+                        <el-input type="text" placeholder="请输入显示名称" v-model.trim="form.name"></el-input>
                     </el-form-item>
                     
                     <el-form-item label="组合内容：" prop="moduleInfo" class="formItem isRequired">
@@ -45,7 +45,7 @@
                                 <ul v-if="searchIndex == index &&  item.searchResult.length > 0" class="searchResultBox">
                                     <li class="searchItem" 
                                         v-for="searchItem in item.searchResult" 
-                                        :title="searchItem.name"
+                                        :title="searchItem.tagName"
                                         @click="selectSearchFiled(searchItem,index)"
                                     >
                                         {{searchItem.tagName}}
@@ -251,8 +251,21 @@
           });
           return
         }*/
-        this.$refs[form].validate((valid) => {
-          if (valid) {
+         const {hospitalId,modeId,tagName} = this.form
+        if(!hospitalId){
+          this.warning("请选择所属医院");
+          return
+        }
+         if(!modeId){
+          this.warning("请选择所属模块");
+          return
+        }
+         if(!tagName){
+          this.warning("请输入备注");
+          return
+        }
+        // this.$refs[form].validate((valid) => {
+          // if (valid) {
             let questionMappings = []
             const combineInfoList = this.combineInfoList
             for(let i = 0; i < combineInfoList.length; i++){
@@ -309,10 +322,10 @@
                 this.saveDisable = false
               })
             }
-          } else {
-            return false;
-          }
-        });
+          // } else {
+          //   return false;
+          // }
+        // });
       },
       warning(msg, type,time) {
           this.$message({
@@ -350,12 +363,12 @@
       position: relative;
     }
     .searchBox{
-      width: 200px;
+      width: 500px;
       position: relative;
     }
     .searchResultBox{
     position: absolute;
-    width: 200px;
+    width: 500px;
     box-sizing: border-box;
     max-height: 200px;
     overflow-y: auto;
@@ -425,7 +438,8 @@
     margin-right: 4px;
     float: left;
    line-height: 36px;
-   font-size: 16px;
-   font-weight: bold;
+   font-size: 14px;
+   position: relative;
+   top: 2px;
 }
 </style>

src/components/qualityControl/AddQualityControlTemp.vue

@@ -241,7 +241,7 @@ export default {
                 this.warning("请先选择所属医院")
                 return
             }
-            if(!this.form.moduleName){
+            if(!this.form.tempName){
                 this.warning("请先选择模块")
                 return
             }
@@ -336,8 +336,8 @@ export default {
              this.moduleInfoList.splice(index,1)
         },
         confirm(form){
-            this.$refs[form].validate((valid) => {
-                if (valid) {
+            // this.$refs[form].validate((valid) => {
+            //     if (valid) {
                     const {tempName,hospital,moduleName,moduleType} = this.form
                     let moduleDetail = [], moduleInfoList = this.moduleInfoList
                     for(let i = 0; i < moduleInfoList.length; i++){
@@ -350,6 +350,24 @@ export default {
                        }
                         
                     }
+                    if(!hospital){
+                        this.warning("请选择所属医院");
+                        return
+                    }
+                    if(!moduleName){
+                        this.warning("请选择所属模块");
+                        return
+                    }
+                    if(!moduleType){
+                        this.warning("请选择模块类型");
+                        return
+                    }
+                    if(!tempName){
+                        this.warning("请输入模块名称");
+                        return
+                    }
+                   
+                    
                     if(moduleDetail.length === 0){
                         this.warning('请添加模块内容')
                         return
@@ -405,10 +423,10 @@ export default {
                             this.saveDisable = false
                         })
                     }
-                } else {
-                    return false;
-                }
-            }); 
+            //     } else {
+            //         return false;
+            //     }
+            // }); 
         },
         warning(msg, type,time) {
             this.$message({
@@ -440,7 +458,7 @@ export default {
 /deep/.el-input__inner {
     height: 30px;
     line-height: 30px;
-    width: 200px;
+    // width: 200px;
 }
 /deep/.widthLarge .el-input__inner {
     width: 350px;
@@ -486,12 +504,12 @@ export default {
 }
 
 .searchBox{
-    width: 200px;
+    width: 500px;
     position: relative;
 }
 .searchResultBox{
     position: absolute;
-    width: 200px;
+    width: 500px;
     box-sizing: border-box;
     max-height: 200px;
     overflow-y: auto;

src/components/qualityControl/CombineFeildList.vue

@@ -25,12 +25,12 @@
             <el-table :data="list"
                       border
                       style="width: 100%">
-                <!--<el-table-column
+                <el-table-column
                         type="index"
                         :index="indexMethod"
                         label="编号"
                         width="60">
-                </el-table-column>-->
+                </el-table-column>
                 <el-table-column
                         prop="hospitalId"
                         label="所属医院"

src/components/qualityControl/FieldMatch.vue

@@ -31,13 +31,13 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="备注：" prop="tagName">
-                    <el-input type="text" placeholder="请输入备注" v-model="form.tagName"></el-input>
+                    <el-input type="text" placeholder="请输入备注" v-model.trim="form.tagName"></el-input>
                 </el-form-item>
                 <el-form-item label="显示名称：" prop="name">
-                    <el-input type="text" placeholder="请输入显示名称" v-model="form.name"></el-input>
+                    <el-input type="text" placeholder="请输入显示名称" v-model.trim="form.name"></el-input>
                 </el-form-item>
                 <el-form-item label="取值字段：" prop="value">
-                    <el-input type="text" placeholder="请输入取值字段" v-model="form.val"></el-input>
+                    <el-input type="text" placeholder="请输入取值字段" v-model.trim="form.val"></el-input>
                     
                 </el-form-item>
                 <el-form-item label="关联缺陷条目：" prop="casesEntryIds">
@@ -237,8 +237,21 @@
           });
           return
         }*/
-        this.$refs[form].validate((valid) => {
-          if (valid) {
+        const {hospitalId,modeId,tagName} = this.form
+        if(!hospitalId){
+          this.warning("请选择所属医院");
+          return
+        }
+         if(!modeId){
+          this.warning("请选择所属模块");
+          return
+        }
+         if(!tagName){
+          this.warning("请输入备注");
+          return
+        }
+        // this.$refs[form].validate((valid) => {
+          // if (valid) {
             const { val } = this.form
             let regex = /(?<=【)(.+?)(?=】)/g;
              let regex2 = /[^\u4e00-\u9fa5|a-zA-Z0-9]+/
@@ -295,10 +308,10 @@
                 this.saveDisable = false
               })
             }
-          } else {
-            return false;
-          }
-        });
+          // } else {
+          //   return false;
+          // }
+        // });
       },
       warning(msg, type,time) {
           this.$message({
@@ -330,6 +343,12 @@
             display: inline-block;
         }
     }
+    /deep/.el-input{
+              .el-input__inner{
+                    height: 30px;
+                    line-height: 30px;
+              }
+            }
     .el-form-item{
         width: 600px;
     }

src/components/recordInput/AddRecord.vue

@@ -261,10 +261,10 @@
             width: 100%;
           }
         }
-        .el-form-item__label{
-           font-weight: bold;
-           font-size: 16px;
-        }
+        // .el-form-item__label{
+        //    font-weight: bold;
+        //    font-size: 16px;
+        // }
         .title{
           font-size: 16px;
           color: #606266;

src/components/recordInput/AddRecordItem.vue

@@ -444,6 +444,8 @@
               .el-input__inner{
                     border: 1px solid #333;
                     color: #000;
+                    height: 30px;
+                    line-height: 30px;
               }
             }
             .procent{
@@ -455,9 +457,9 @@
               margin: 20px 0 0 0;
 
             }
-            /deep/.el-checkbox__inner{
-                  border: 1px solid #333;
-            }
+            // /deep/.el-checkbox__inner{
+            //       border: 1px solid #333;
+            // }
             /deep/.el-table{
               min-width: 0;
             }