发邮件，变量管理对接

src/views/ComposeEmail.vue

@@ -408,19 +408,18 @@ const variableNextfix = '}}'
 
 
 // 通过变量模版查询变量列表
 // 通过变量模版查询变量列表
 const applyVariableTemplate = () => {
 const applyVariableTemplate = () => {
+  variableApi
+    .getEmailVariableList({
+      isGeneral: 1,
+    })
+    .then((res) => {
+      variables.value = res.data?.records || []
+    })
   if (selectedVariableTemplate.value?.variableGroupBizId) {
   if (selectedVariableTemplate.value?.variableGroupBizId) {
     variableGroupApi
     variableGroupApi
       .getEmailVariableGroupDetail(selectedVariableTemplate.value.variableGroupBizId)
       .getEmailVariableGroupDetail(selectedVariableTemplate.value.variableGroupBizId)
       .then((res) => {
       .then((res) => {
-        variables.value = res.data?.emailVariableDtoList || []
-      })
-  } else {
-    variableApi
-      .getEmailVariableList({
-        isGeneral: 1,
-      })
-      .then((res) => {
-        variables.value = res.data?.records || []
+        variables.value = res.data?.emailVariableDtoList.concat(variables.value) || []
       })
       })
   }
   }
 }
 }

src/views/VariableManagement.vue

@@ -167,7 +167,10 @@
                 {{ variablePrefix }}{{ variable.variableNameEn }}{{ variableNextfix }}
                 {{ variablePrefix }}{{ variable.variableNameEn }}{{ variableNextfix }}
               </td>
               </td>
               <td class="px-6 py-4">{{ variable.description || '-' }}</td>
               <td class="px-6 py-4">{{ variable.description || '-' }}</td>
-              <td class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
+              <td
+                class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium"
+                v-if="variable.isGeneral !== 1"
+              >
                 <button
                 <button
                   @click="editVariable(variable)"
                   @click="editVariable(variable)"
                   class="text-blue-600 hover:text-blue-900 mr-3"
                   class="text-blue-600 hover:text-blue-900 mr-3"