Merge branch 'test'

src/api/index.js

@@ -3,7 +3,7 @@ import config from './config.js';
 
 axios.default.timeout = 5000;
 axios.defaults.headers.post['Content-Type'] = "application/json;charset=utf-8";
-//axios.defaults.baseURL = 'http://192.168.2.236';
+// axios.defaults.baseURL = 'http://192.168.2.236';
 // axios.defaults.baseURL = 'http://192.168.3.117:5050';
 
 const urls = config.urls;

src/components/qualityControl/ItemDataTypeRelation.vue

@@ -341,10 +341,10 @@ export default {
                       this.warning("请输入条目名称：");
                       return
                     }
-                    if(!moduleTypes.length){
-                        this.warning("请选择质控类型");
-                        return
-                    }
+                    // if(!moduleTypes.length){
+                    //     this.warning("请选择质控类型");
+                    //     return
+                    // }
                    
                     
                     // if(moduleDetail.length === 0){

src/components/recordInput/AddRecordItem.vue

@@ -74,8 +74,11 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="备注：" prop="remark">
+                    <!-- <el-form-item label="备注：" prop="remark">
                          <el-input v-model="form.remark" maxlength="200" placeholder="请输入备注"></el-input>
+                    </el-form-item> -->
+                    <el-form-item label="备注：" prop="remark">
+                         <el-input v-model="form.remark" maxlength="500" type="textarea" :autosize="{ minRows: 2, maxRows: 4}" placeholder="请输入备注"></el-input>
                     </el-form-item>
                      <el-form-item label="前置条件：" prop="remark" class="procent">
                          <el-input v-model="form.precond" maxlength="200" placeholder="请输入前置条件"></el-input>
@@ -517,6 +520,11 @@
                 width: 800px;
               }
             }
+            /deep/.el-textarea__inner{
+              border: 1px solid #333;
+              resize: none;
+              width: 800px;
+            }
             /deep/.el-form-item{
               margin: 20px 0 0 0;
 

src/routes.js

@@ -134,13 +134,10 @@ import AddQcType from '@components/qualityControl/AddQcType.vue';
 import StandardRecord from '@components/qualityControl/StandardRecord.vue';
 import AddStandardRecord from '@components/qualityControl/AddStandardRecord.vue';
 import ItemDataType from '@components/qualityControl/ItemDataType.vue';
+import ItemDataTypeRelation from '@components/qualityControl/ItemDataTypeRelation.vue';
 import AutoTestList from '@components/qualityControl/AutoTestList.vue';
 import AutoTestTask from '@components/qualityControl/AutoTestTask.vue';
 import TaskDetail from '@components/qualityControl/TaskDetail';
-import ItemDataTypeRelation from '@components/qualityControl/ItemDataTypeRelation.vue';
-
-
-
 
 //病历录入
 import RecordInput from '@components/recordInput/RecordList.vue';