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

src/main.js

@@ -15,7 +15,7 @@ import '@/styles/index.scss' // global css
 import App from './App'
 import store from './store'
 import router from './router'
-
+import WHITELIST from "./utils/whiteList"
 import '@/icons' // icon
 import '@/permission' // permission control
 import md5 from 'js-md5'
@@ -324,7 +324,7 @@ async function VueInit() {
   if (eval(process.env.VUE_APP_LOGIN_FOR_PERMISSION)) {
     setInterval(() => {
       var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
-      if (_vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+      if (WHITELIST.includes(_vm.$route.path)) {
         return
       }
       if (_vm.$store.state.user.userId !== zzSessionStorage.getItem('userId')) {
@@ -388,7 +388,7 @@ async function VueInit() {
   // window.VUE_APP_COMPANY_NAME = process.env.VUE_APP_COMPANY_NAME;
   waitOperate(eval(process.env.VUE_APP_LOGOUT_FOR_PERMISSION) ? () => {
     var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
-    if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+    if (_vm.$store.state.trials.unlock || WHITELIST.includes(_vm.$route.path)) {
       count = 0;
       localStorage.setItem('count', '0')
       return
@@ -417,7 +417,7 @@ async function VueInit() {
   } : () => { }, process.env.VUE_APP_LOGOUT_FOR_TIME,
     eval(process.env.VUE_APP_LOCK_FOR_PERMISSION) ? () => {
       var lang = zzSessionStorage.getItem('lang') ? zzSessionStorage.getItem('lang') : 'zh'
-      if (_vm.$store.state.trials.unlock || _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchDetail_m' || _vm.$route.path === '/researchLogin_m' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
+      if (_vm.$store.state.trials.unlock || WHITELIST.includes(_vm.$route.path)) {
         count = 0;
         localStorage.setItem('count', '0')
         if (_vm.$route.path === '/login') {

src/views/dictionary/template/email/components/EmailForm.vue

@@ -284,6 +284,7 @@
 </template>
 <script>
 import { Upload, addOrUpdateEmailNoticeConfigList } from '@/api/dictionary'
+import vcrontab from 'vcrontab'
 export default {
   props: {
     data: {
@@ -299,6 +300,7 @@ export default {
       },
     },
   },
+  components: { vcrontab },
   data() {
     return {
       expression: '',

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

@@ -14,18 +14,32 @@
         </el-form-item>
       </el-col>
       <el-col :span="12" v-if="$i18n.locale === 'zh'">
-        <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-form-item>
       </el-col>
       <el-col :span="12" v-else>
-        <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-form-item>
       </el-col>
       <el-col :span="24">
-        <el-form-item :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')" prop="BusinessScenarioEnum">
-          <el-select v-model="form.BusinessScenarioEnum" disabled clearable class="mr">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')"
+          prop="BusinessScenarioEnum"
+        >
+          <el-select
+            v-model="form.BusinessScenarioEnum"
+            disabled
+            clearable
+            class="mr"
+          >
             <el-option
               v-for="item of $d.Email_BusinessScenario"
               :key="`BusinessScenarioEnum${item.label}`"
@@ -36,8 +50,17 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:table:ToUserTypeList')" prop="ToUserTypeList">
-          <el-select v-model="form.ToUserTypeList" disabled clearable multiple class="mr">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:ToUserTypeList')"
+          prop="ToUserTypeList"
+        >
+          <el-select
+            v-model="form.ToUserTypeList"
+            disabled
+            clearable
+            multiple
+            class="mr"
+          >
             <el-option
               v-for="item of $d.UserType"
               :key="`ToUserTypeList${item.label}`"
@@ -48,8 +71,17 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:table:CopyUserTypeList')" prop="CopyUserTypeList">
-          <el-select v-model="form.CopyUserTypeList" disabled clearable multiple class="mr">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:CopyUserTypeList')"
+          prop="CopyUserTypeList"
+        >
+          <el-select
+            v-model="form.CopyUserTypeList"
+            disabled
+            clearable
+            multiple
+            class="mr"
+          >
             <el-option
               v-for="item of $d.UserType"
               :key="`CopyUserTypeList${item.label}`"
@@ -60,8 +92,16 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:table:blackUserIdList')" prop="blackUserIdList">
-          <el-select v-model="form.blackUserIdList" clearable multiple class="mr">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:blackUserIdList')"
+          prop="blackUserIdList"
+        >
+          <el-select
+            v-model="form.blackUserIdList"
+            clearable
+            multiple
+            class="mr"
+          >
             <el-option
               v-for="item of UserList"
               :key="`blackUserIdList${item.UserName}`"
@@ -73,8 +113,16 @@
       </el-col>
       <el-col :span="24">
         <el-col :span="12">
-          <el-form-item :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')" prop="EmailUrgentEnum">
-            <el-select v-model="form.EmailUrgentEnum" disabled clearable class="mr">
+          <el-form-item
+            :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')"
+            prop="EmailUrgentEnum"
+          >
+            <el-select
+              v-model="form.EmailUrgentEnum"
+              disabled
+              clearable
+              class="mr"
+            >
               <el-option
                 v-for="item of $d.EmailUrgent"
                 :key="`EmailUrgent${item.label}`"
@@ -85,37 +133,79 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item :label="$t('trials:emailManageCfg:table:EmailCron')" v-if="form.EmailUrgentEnum !== 1 && IntervalShow" prop="EmailCron">
-            <el-input-number v-model="Interval" @change="handleIntervalChange" :min="1" :max="365"></el-input-number>
+          <el-form-item
+            :label="$t('trials:emailManageCfg:table:EmailCron')"
+            v-if="form.EmailUrgentEnum !== 1 && IntervalShow"
+            prop="EmailCron"
+          >
+            <el-input-number
+              v-model="Interval"
+              @change="handleIntervalChange"
+              :min="1"
+              :max="365"
+            ></el-input-number>
             <!--            <el-input style="width: 300px" readonly v-model="form.EmailCron" />-->
             <!--            <el-button type="primary" @click="showDialog">生成 cron</el-button>-->
           </el-form-item>
         </el-col>
       </el-col>
       <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 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"
+              :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-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" :key="`IsAutoSend${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-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" :key="`IsEnable${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>
       <el-col :span="24">
-        <el-form-item :label="$t('trials:emailManageCfg:table:CriterionTypeEnum')" v-if="form.CriterionTypeEnum && form.CriterionTypeEnum.length > 0" prop="CriterionTypeEnum">
-          <el-select disabled v-model="form.CriterionTypeEnum" clearable class="mr">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:CriterionTypeEnum')"
+          v-if="form.CriterionTypeEnum && form.CriterionTypeEnum.length > 0"
+          prop="CriterionTypeEnum"
+        >
+          <el-select
+            disabled
+            v-model="form.CriterionTypeEnum"
+            clearable
+            class="mr"
+          >
             <el-option
               v-for="item of $d.CriterionType"
               :key="`CriterionType${item.label}`"
@@ -126,7 +216,10 @@
         </el-form-item>
       </el-col>
       <el-col :span="12" v-if="$i18n.locale === 'zh'">
-        <el-form-item :label="$t('trials:emailManageCfg:table:fileListCN')" prop="IsEnable">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:fileListCN')"
+          prop="IsEnable"
+        >
           <el-upload
             class="upload-demo"
             action
@@ -143,7 +236,10 @@
         </el-form-item>
       </el-col>
       <el-col :span="12" v-else>
-        <el-form-item :label="$t('trials:emailManageCfg:table:fileListEN')" prop="IsEnable">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:fileListEN')"
+          prop="IsEnable"
+        >
           <el-upload
             class="upload-demo"
             action
@@ -176,25 +272,46 @@
     <!--        :autosize="{ minRows: 8, maxRows: 8}"-->
     <!--      />-->
     <!--    </el-form-item>-->
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;padding-bottom: 10px">
-      <el-form-item style="text-align:right;">
-        <el-button size="small" type="primary" @click="handleSave"> {{ $t('common:button:save') }}</el-button>
+    <div
+      class="base-dialog-footer"
+      style="text-align: right; margin-top: 10px; padding-bottom: 10px"
+    >
+      <el-form-item style="text-align: right">
+        <el-button size="small" type="primary" @click="handleSave">
+          {{ $t('common:button:save') }}</el-button
+        >
       </el-form-item>
     </div>
-    <el-dialog append-to-body :title="$t('trials:emailManageCfg:button:generate')" :visible.sync="showCron">
-      <vcrontab @hide="showCron=false" @fill="crontabFill" :expression="expression"></vcrontab>
+    <el-dialog
+      append-to-body
+      :title="$t('trials:emailManageCfg:button:generate')"
+      :visible.sync="showCron"
+    >
+      <vcrontab
+        @hide="showCron = false"
+        @fill="crontabFill"
+        :expression="expression"
+      ></vcrontab>
     </el-dialog>
   </el-form>
 </template>
 <script>
-import { Upload, addOrUpdateTrialEmailNoticeConfig, getTrialUserIdSelectList } from '@/api/dictionary'
+import {
+  Upload,
+  addOrUpdateTrialEmailNoticeConfig,
+  getTrialUserIdSelectList,
+} from '@/api/dictionary'
+import vcrontab from 'vcrontab'
 export default {
   props: {
     data: {
       type: Object,
-      default() { return {} }
-    }
+      default() {
+        return {}
       },
+    },
+  },
+  components: { vcrontab },
   data() {
     return {
       expression: '',
@@ -232,14 +349,30 @@ export default {
       },
       rules: {
         Code: [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        BusinessScenarioEnum: [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        EmailTopicCN:  [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        EmailTopic:  [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        BusinessLevelEnum:  [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        ToUserTypeList: [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        EmailCron: [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        EmailHtmlContentCN: [{ required: true, message: 'Please select', trigger: ['blur'] }],
-        EmailHtmlContent: [{ required: true, message: 'Please select', trigger: ['blur'] }],
+        BusinessScenarioEnum: [
+          { required: true, message: 'Please select', trigger: ['blur'] },
+        ],
+        EmailTopicCN: [
+          { required: true, message: 'Please select', trigger: ['blur'] },
+        ],
+        EmailTopic: [
+          { required: true, message: 'Please select', trigger: ['blur'] },
+        ],
+        BusinessLevelEnum: [
+          { required: true, message: 'Please select', trigger: ['blur'] },
+        ],
+        ToUserTypeList: [
+          { required: true, message: 'Please select', trigger: ['blur'] },
+        ],
+        EmailCron: [
+          { required: true, message: 'Please select', trigger: ['blur'] },
+        ],
+        EmailHtmlContentCN: [
+          { required: true, message: 'Please select', trigger: ['blur'] },
+        ],
+        EmailHtmlContent: [
+          { required: true, message: 'Please select', trigger: ['blur'] },
+        ],
       },
       scenarioOption: [],
       fileListCN: [],
@@ -248,7 +381,7 @@ export default {
       trialId: this.$route.query.trialId,
       UserList: [],
       Interval: 1,
-      IntervalShow: true
+      IntervalShow: true,
     }
   },
   mounted() {
@@ -265,11 +398,11 @@ export default {
       this.form.EmailCron = text
     },
     showDialog() {
-      this.expression = this.form.EmailCron;//传入的 cron 表达式，可以反解析到 UI 上
-      this.showCron = true;
+      this.expression = this.form.EmailCron //传入的 cron 表达式，可以反解析到 UI 上
+      this.showCron = true
     },
     crontabFill(value) {
-      this.form.EmailCron = value;
+      this.form.EmailCron = value
     },
     handleRemoveFileCN() {
       this.form.AttachNameCN = null
@@ -292,10 +425,14 @@ export default {
       const formData = new FormData()
       formData.append('file', param.file)
       this.form.AttachNameCN = param.file.name
-      Upload(formData, 3).then(res => {
+      Upload(formData, 3).then((res) => {
         this.form.AttachCNPath = res.Result.FilePath
         this.btnLoading = false
-        this.fileListCN[0] = { name: param.file.name, path: res.Result.FilePath, fullPath: res.Result.FullFilePath }
+        this.fileListCN[0] = {
+          name: param.file.name,
+          path: res.Result.FilePath,
+          fullPath: res.Result.FullFilePath,
+        }
       })
     },
     handleUploadFileEN(param) {
@@ -303,10 +440,14 @@ export default {
       const formData = new FormData()
       formData.append('file', param.file)
       this.form.AttachName = param.file.name
-      Upload(formData, 3).then(res => {
+      Upload(formData, 3).then((res) => {
         this.form.AttachPath = res.Result.FilePath
         this.btnLoading = false
-        this.fileListEN[0] = { name: param.file.name, path: res.Result.FilePath, fullPath: res.Result.FullFilePath }
+        this.fileListEN[0] = {
+          name: param.file.name,
+          path: res.Result.FilePath,
+          fullPath: res.Result.FullFilePath,
+        }
       })
     },
     handleRemoveFileEN() {
@@ -333,10 +474,20 @@ export default {
           this.form[k] = this.data[k]
         }
         if (k === 'AttachPath' && this.form[k]) {
-          this.fileListEN.push({ name: this.data.AttachName, path: this.data.AttachPath, fullPath: this.data.AttachPath, url: this.data.AttachPath })
+          this.fileListEN.push({
+            name: this.data.AttachName,
+            path: this.data.AttachPath,
+            fullPath: this.data.AttachPath,
+            url: this.data.AttachPath,
+          })
         }
         if (k === 'AttachCNPath' && this.form[k]) {
-          this.fileListCN.push({ name: this.data.AttachNameCN, path: this.data.AttachCNPath, fullPath: this.data.AttachCNPath, url: this.data.AttachCNPath })
+          this.fileListCN.push({
+            name: this.data.AttachNameCN,
+            path: this.data.AttachCNPath,
+            fullPath: this.data.AttachCNPath,
+            url: this.data.AttachCNPath,
+          })
         }
         if (k === 'EmailCron' && this.form[k]) {
           let a = this.form[k].split(' ')
@@ -347,7 +498,7 @@ export default {
           }
         }
       }
-      getTrialUserIdSelectList(this.form.Id).then(res => {
+      getTrialUserIdSelectList(this.form.Id).then((res) => {
         this.UserList = res.Result
       })
       console.log(this.fileListEN, this.fileListCN)
@@ -356,20 +507,22 @@ export default {
 
     // 保存
     handleSave() {
-      this.$refs.emailForm.validate(valid => {
+      this.$refs.emailForm.validate((valid) => {
         if (!valid) return
         this.loading = true
         this.form.TrialId = this.trialId
-        addOrUpdateTrialEmailNoticeConfig(this.form).then(res => {
+        addOrUpdateTrialEmailNoticeConfig(this.form)
+          .then((res) => {
             this.loading = false
             this.$emit('closeDialog')
             this.$emit('getList')
             this.$message.success(this.$t('common:message:savedSuccessfully'))
-        }).catch(() => {
+          })
+          .catch(() => {
             this.loading = false
           })
       })
-    }
-  }
+    },
+  },
 }
 </script>