Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

src/views/trials/trials-panel/setting/email-manage/components/DefaultQS.vue

@@ -90,6 +90,7 @@
         </template>
       </el-table-column>
       <el-table-column
+        v-if="$i18n.locale === 'zh'"
         prop="EmailTopicCN"
         :label="$t('trials:emailManageCfg:table:EmailTopicCN')"
         sortable="custom"
@@ -97,6 +98,7 @@
         width="160"
       />
       <el-table-column
+        v-else
         prop="EmailTopic"
         :label="$t('trials:emailManageCfg:table:EmailTopic')"
         sortable="custom"
@@ -166,14 +168,29 @@
       />
       <!-- 附件 -->
       <el-table-column
-        prop="FileName"
+        v-if="$i18n.locale === 'zh'"
+        prop="AttachNameCN"
         :label="$t('trials:emailManageCfg:title:fileName')"
         show-overflow-tooltip
         width="100"
       >
         <template slot-scope="scope">
-          <el-button v-if="scope.row.FilePath" type="text" @click="handlePreview(scope.row.FilePath)">
+          <el-button v-if="scope.row.AttachCNPath" type="text" @click="handlePreview(scope.row.AttachCNPath)">
-            {{ scope.row.FileName }}
+            {{ scope.row.AttachNameCN }}
+          </el-button>
+        </template>
+      </el-table-column>
+      <!-- 附件 -->
+      <el-table-column
+        v-else
+        prop="AttachName"
+        :label="$t('trials:emailManageCfg:title:fileName')"
+        show-overflow-tooltip
+        width="100"
+      >
+        <template slot-scope="scope">
+          <el-button v-if="scope.row.AttachPath" type="text" @click="handlePreview(scope.row.AttachPath)">
+            {{ scope.row.AttachName }}
           </el-button>
         </template>
       </el-table-column>

src/views/trials/trials-panel/setting/email-manage/components/EmailForm.vue

@@ -13,12 +13,12 @@
           <el-input style="width: 300px" disabled v-model="form.Code" />
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="12" v-if="$i18n.locale === 'zh'">
         <el-form-item :label="$t('trials:emailManageCfg:table:EmailTopicCN')" prop="EmailTopicCN">
           <el-input style="width: 300px" disabled v-model="form.EmailTopicCN" />
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="12" v-else>
         <el-form-item :label="$t('trials:emailManageCfg:table:EmailTopic')" prop="EmailTopic">
           <el-input style="width: 300px" disabled v-model="form.EmailTopic" />
         </el-form-item>
@@ -95,21 +95,21 @@
       <el-col :span="12">
         <el-form-item :label="$t('trials:emailManageCfg:title:isReturnRequired')" prop="IsReturnRequired">
           <el-radio-group v-model="form.IsReturnRequired">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
+            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsReturnRequired${item.value}`">{{ item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item :label="$t('trials:emailManageCfg:table:IsAutoSend')" prop="IsAutoSend">
           <el-radio-group v-model="form.IsAutoSend">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
+            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsAutoSend${item.value}`">{{ item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item :label="$t('trials:emailManageCfg:table:IsEnable')" prop="IsEnable">
           <el-radio-group v-model="form.IsEnable">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
+            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsEnable${item.value}`">{{ item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-col>
@@ -125,7 +125,7 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="12" v-if="$i18n.locale === 'zh'">
         <el-form-item :label="$t('trials:emailManageCfg:table:fileListCN')" prop="IsEnable">
           <el-upload
             class="upload-demo"
@@ -142,7 +142,7 @@
           </el-upload>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="12" v-else>
         <el-form-item :label="$t('trials:emailManageCfg:table:fileListEN')" prop="IsEnable">
           <el-upload
             class="upload-demo"

src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue

@@ -74,25 +74,27 @@
           </template>
         </el-table-column>
         <el-table-column
+          v-if="$i18n.locale === 'zh'"
           prop="EmailTopicCN"
           :label="$t('trials:emailManageCfg:table:EmailTopicCN')"
           sortable="custom"
           show-overflow-tooltip
-          min-width="150"
+          min-width="140"
         />
         <el-table-column
+          v-else
           prop="EmailTopic"
           :label="$t('trials:emailManageCfg:table:EmailTopic')"
           sortable="custom"
           show-overflow-tooltip
-          min-width="150"
+          min-width="140"
         />
         <el-table-column
           prop="BusinessModuleEnum"
           :label="$t('trials:emailManageCfg:table:BusinessModuleEnum')"
           sortable="custom"
           show-overflow-tooltip
-          width="100">
+          min-width="100">
           <template slot-scope="scope">
             {{ $fd('BusinessModule',scope.row.BusinessModuleEnum) }}
           </template>
@@ -102,7 +104,7 @@
           :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')"
           sortable="custom"
           show-overflow-tooltip
-          width="130"
+          min-width="100"
         >
           <template slot-scope="scope">
             {{ $fd('Email_BusinessScenario',scope.row.BusinessScenarioEnum) }}
@@ -113,7 +115,7 @@
           prop="ToUserTypeList"
           :label="$t('trials:emailManageCfg:title:toUserTypeList')"
           show-overflow-tooltip
-          width="100"
+          min-width="100"
         >
           <template slot-scope="scope">
             {{ scope.row.ToUserTypeNameList.length>0?scope.row.ToUserTypeNameList.join('、'):'' }}
@@ -124,7 +126,7 @@
           prop="CopyUserTypeList"
           :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
           show-overflow-tooltip
-          width="100"
+          min-width="100"
         >
           <template slot-scope="scope">
             {{ scope.row.CopyUserTypeNameList.length>0?scope.row.CopyUserTypeNameList.join('、'):'' }}
@@ -149,14 +151,28 @@
 <!--        />-->
         <!-- 附件 -->
         <el-table-column
-          prop="FileName"
+          v-if="$i18n.locale === 'zh'"
+          prop="AttachNameCN"
           :label="$t('trials:emailManageCfg:title:fileName')"
           show-overflow-tooltip
-          width="100"
+          min-width="140"
         >
           <template slot-scope="scope">
-            <el-button v-if="scope.row.FilePath" type="text" @click="handlePreview(scope.row.FilePath)">
+            <el-button v-if="scope.row.AttachCNPath" type="text" @click="handlePreview(scope.row.AttachCNPath)">
-              {{ scope.row.FileName }}
+              {{ scope.row.AttachNameCN }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-else
+          prop="AttachName"
+          :label="$t('trials:emailManageCfg:title:fileName')"
+          show-overflow-tooltip
+          min-width="140"
+        >
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.AttachPath" type="text" @click="handlePreview(scope.row.AttachPath)">
+              {{ scope.row.AttachName }}
             </el-button>
           </template>
         </el-table-column>
@@ -196,7 +212,7 @@
           :label="$t('trials:emailManageCfg:table:IsEnable')"
           show-overflow-tooltip
           sortable="custom"
-          width="120"
+          min-width="90"
         >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.IsEnable" type="danger">