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

src/components/qualityControl/AddQualityControlTemp.vue

@@ -15,14 +15,14 @@
                             <el-option v-for="item in moduleList" :key="item.id" :label="item.name" :value="item.val"></el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="模板名称：" prop="tempName" class="formItem widthLarge">
+                        <el-input v-model="form.tempName"  placeholder="请输入模板名称"></el-input>
+                    </el-form-item>
                     <el-form-item label="模块类型：" prop="moduleTypes" class="formItem widthLarge">
                     </el-form-item>
                     <QCTypePour :hospital="form.hospital"
                                 :moduleName="form.moduleName"
                                 @changeActionData="moduleTypeChange" :selectedTag="form.recordAnalyzeList"></QCTypePour>
-                    <el-form-item label="模板名称：" prop="tempName" class="formItem widthLarge">
-                        <el-input v-model="form.tempName"  placeholder="请输入模板名称"></el-input>
-                    </el-form-item>
                     <el-form-item label="模块内容：" prop="moduleInfo" class="formItem addCon">
                         <div class="moduleInfoItem" v-for="(item,index) in moduleInfoList">
                             <div class="orderBox">
@@ -124,7 +124,6 @@ export default {
                 this.title ="模板维护-复制"
                 this.form.tempName = ""
                 this.form.moduleTypes=[];
-                this.form.recordAnalyzeList = data.recordAnalyzeList;
                  //this.form.example=""
             }
             const moduleDetail = data.moduleDetail
@@ -194,13 +193,22 @@ export default {
              this.form.moduleTypes = []
         },
         addUnit(){
-            if(!this.form.hospital){
+          const {hospital,moduleName,tempName,moduleTypes}=this.form;
+            if(!hospital){
                 this.warning("请先选择所属医院")
                 return
             }
-            if(!this.form.tempName){
-                this.warning("请先选择模块")
-                return
+            if(!moduleName){
+              this.warning("请选择所属模块");
+              return
+            }
+            if(!tempName.trim()){
+              this.warning("请输入模块名称");
+              return
+            }
+            if(!moduleTypes.length){
+              this.warning("请先选择模块类型");
+              return
             }
             this.moduleInfoList.push({   
                         searchName:"",
@@ -315,14 +323,14 @@ export default {
                         this.warning("请选择所属模块");
                         return
                     }
+                    if(!tempName){
+                      this.warning("请输入模块名称");
+                      return
+                    }
                     if(!moduleTypes.length){
                         this.warning("请选择模块类型");
                         return
                     }
-                    if(!tempName){
-                        this.warning("请输入模块名称");
-                        return
-                    }
                    
                     
                     if(moduleDetail.length === 0){