Merge branch 'TPE/Daniel' of http://163.228.141.122:3000/TEAMMODEL/TEAMModelOS into TPE/Daniel

TEAMModelBI/ClientApp/src/view/systemConfig/NewMsg/index.vue

@@ -57,7 +57,7 @@
             <Active_Test active="active" @update-active="updateActive" />
         </div>
 
-        <span style="display: in; font-size: 10px; line-height: 1.2; text-align: left;">
+        <span style="display: none; font-size: 10px; line-height: 1.2; text-align: left;">
             <el-button @click="mytest">測試</el-button>
         </span>
 

TEAMModelBI/ClientApp/src/view/systemConfig/NewMsg/new_msg_EditEmail.vue

@@ -7,10 +7,10 @@
 
         <div style="text-align: left; padding-left: 20px; display: flex; flex-direction: column; align-items: flex-start;">
             <el-radio-group v-model="template" size="large">
-                <el-radio-button label="d-f1c5abd8218736783">
+                <el-radio-button label="d-f1c5abd8247f4be79ceaecdd327e9a68">
                     模版一
                 </el-radio-button>
-                <el-radio-button label="template2">
+                <el-radio-button label="template2" v-if="false">
                     模版二
                 </el-radio-button>
             </el-radio-group>
@@ -153,7 +153,7 @@
     let { proxy } = getCurrentInstance()
 
     // 模版 ID
-    const template = ref('d-f1c5abd8218736783')
+    const template = ref('d-f1c5abd8247f4be79ceaecdd327e9a68')
 
     //標題和內容
     const new_msg_title = inject('new_msg_title');
@@ -175,7 +175,7 @@
 
     onMounted(() => {
                 
-        UseFakeData();  // 使用 Fake Data
+        //UseFakeData();  // 使用 Fake Data
     });
 
     // 上一步的逻辑：将 active 设置为 1
@@ -582,15 +582,10 @@
 
     // 發送訊息 (新)
     const sendMessage = async () => {
-    //const sendMessage =  () => {
+    
 
         //填入資料
-
-        //testvar = "mytest";
-
-        //usbdata = "123-456";
-
-
+              
         // // 發送類型  type : "notify", //發送類型 mail:郵件、notify:端外、sms:簡訊
         requestData.value.type = notifyType.value;
 
@@ -687,8 +682,8 @@
                 listUnit.push(item.id);
             }
 
-            // 醍摩豆ID: tmid
             if (item.receiveType === 5) {
+            // 醍摩豆ID: tmid
 
                 // 實作中
                 //listTmid.push(item.id);