Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/mes/qualityform/index.vue

@@ -52,7 +52,8 @@
 
   <!-- 详情 -->
   <Detail ref="detailRef" 
-          :isBasic="false" 
+          :isBasic="false"
+          :isBasicMes="true"
           :allSchemas="Qualityform.allSchemas"
           :detailAllSchemas="QualityformDetail.allSchemas"
           :detailAllSchemasRules="QualityformDetailRules"
@@ -77,7 +78,7 @@ import * as QualityformApi from '@/api/mes/qualityform'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as QualityformDetailApi from '@/api/mes/qualityformdetail'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
-import Detail from '@/components/Detail/src/Detail.vue'
+import Detail from '../components/Detail.vue'
 
 defineOptions({ name: 'QmsQualityform' })
 

src/views/system/notify/template/NotifyTemplateForm.vue

@@ -18,7 +18,7 @@
       </el-form-item>
       <el-form-item label="角色" prop="roleIds">
         <el-select v-model="formData.roleIds" multiple placeholder="请选择角色">
-          <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id" />
+          <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id"
           /></el-select> 
       </el-form-item>
       <el-form-item label="模板内容" prop="content">