Compare commits

..

No commits in common. "a0ec36ac28d2c160aeba898d743846ca8b5ada72" and "6fd5caf8cbfff6626b1b0c93a0e2a3ba31f48219" have entirely different histories.

3 changed files with 21 additions and 54 deletions

View File

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

View File

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

View File

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