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

src/components/qualityControl/AddQualityControlTemp.vue

@@ -16,7 +16,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="模板名称：" prop="tempName" class="formItem widthLarge">
-                        <el-input v-model="form.tempName"  placeholder="请输入模板名称"></el-input>
+                        <el-input v-model.trim="form.tempName"  placeholder="请输入模板名称"></el-input>
                     </el-form-item>
                     <el-form-item label="模块类型：" prop="moduleTypes" class="formItem widthLarge">
                     </el-form-item>

src/components/qualityControl/QualityControlTemp.vue

@@ -90,6 +90,7 @@
 <script>
     import api from '@api/qualityControl.js';
   import config from '@api/config.js';
+  import utils from '@api/utils.js'
   export default {
     name: 'QualityControlTemp',
     data: function() {