From 7dc6b6cf2906b2fd744951d7d45403842efee840 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 19 Apr 2024 09:06:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=AB=99=E5=86=85?=
 =?UTF-8?q?=E4=BF=A1=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=20=20=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/notify/template/NotifyTemplateForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/notify/template/NotifyTemplateForm.vue b/src/views/system/notify/template/NotifyTemplateForm.vue
index 30399a481..142d25a67 100644
--- a/src/views/system/notify/template/NotifyTemplateForm.vue
+++ b/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">

From 4db469e37a55dbb7ec161bc7cd490875fde6f69a Mon Sep 17 00:00:00 2001
From: gaojs <js.gao@ccwin-in.com>
Date: Fri, 19 Apr 2024 09:10:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E4=B8=BB=E4=BB=8E=E6=98=8E=E7=BB=86=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/qualityform/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/mes/qualityform/index.vue b/src/views/mes/qualityform/index.vue
index 27052503c..c3a6fce37 100644
--- a/src/views/mes/qualityform/index.vue
+++ b/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' })