update

src/common/api/axios.js

@@ -13,7 +13,7 @@ let api = ''
 let loading
 const whiteList = ['test', 'production']
 const allowList = [ // 文件请求路径数组
-  '/admin/export/export2Web'
+  '/export/export2Web'
 ]
 const fileUpload = ['/upload/uploadImg']
 
@@ -70,7 +70,8 @@ service.interceptors.response.use(
     let a = false
     return new Promise((resolve, reject) => {
       allowList.forEach(item => {
-        if (res.config.url === process.env.VUE_APP_API + item) {
+        console.log(res.config.url)
+        if (res.config.url === item) {
           // resolve(res.data)
           const content = res.data
           const blob = new Blob([content])

src/components/wangEnduit/wangEnduit.vue

@@ -77,7 +77,7 @@ export default {
         'strikeThrough', // 删除线
         'foreColor', // 文字颜色
         'backColor', // 背景颜色
-        'link', // 插入链接
+        // 'link', // 插入链接
         'list', // 列表
         'justify', // 对齐方式
         'quote', // 引用

src/views/candidateManage/candidateList.vue

@@ -348,6 +348,10 @@ export default {
         {
           label: '完成面试时间',
           props: 'confirmInterviewTime'
+        },
+        {
+          label: '邮件发送状态',
+          props: ''
         }
         ],
         width: 500,
@@ -434,6 +438,10 @@ export default {
         {
           label: '理由',
           props: 'rejectReason'
+        },
+        {
+          label: '邮件发送状态',
+          props: ''
         }
         ],
         width: 360,
@@ -502,6 +510,10 @@ export default {
         {
           label: '邮箱',
           props: 'delivererMail'
+        },
+        {
+          label: '邮件发送状态',
+          props: ''
         }
         ],
         width: 420,
@@ -623,14 +635,14 @@ export default {
             }
           })
           .then((res) => {
-            this.$alert(`${res.object.successTotal}条发送成功，${res.object.failTotal}条发送失败！`, '发送结果', {
+            this.$alert('系统正在发送邮件，请在面试管理-已通过候选人页查看邮件发送情况!', '发送结果', {
               confirmButtonText: '确定',
               callback: action => {
               }
             })
-            this.errorlist = res.object.sendMailFailList.map(item => {
-              return item.id
-            })
+            // this.errorlist = res.object.sendMailFailList.map(item => {
+            //   return item.id
+            // })
           })
         : this.$message({
           type: 'info',

src/views/candidateManage/resume.vue

@@ -46,8 +46,25 @@
             <el-button type="success" @click="through(1)">标记为通过</el-button>
           </div>
         </div>
-        <div class="right" v-if="info.filePath">
-          <iframe width="100%" height="100%" :src="$img + info.filePath"></iframe>
+        <div class="right">
+          <el-form label-width="140px" label-position="right" v-if="info.resumeFrom===3">
+            <el-form-item v-for="item in formConfig" :key="item" :label="item.configName">
+                <!-- {{item.type === 2 ? ['女', '男'][info[item.fieldName]] : item.type === 8 ? ['女', '男'][info[item.fieldName]] : info[item.fieldName]}} -->
+                <div v-if="item.type === 2">{{['女', '男'][form[item.fieldName]]}}</div>
+                <el-link type="primary" v-else-if="item.type === 8" @click="openNewPage($img + form[item.fieldName])" >{{item.configName + '文件'}}</el-link>
+                <div v-else>{{form[item.fieldName]}}</div>
+            </el-form-item>
+            <el-form-item label="意向职位">
+                <!-- {{['女', '男'][info.delivererSex]}} -->
+                {{form.desiredPositionName}}
+                <!-- <el-link type="primary" @click="openNewPage($img + info.filePath)">简历文件</el-link> -->
+            </el-form-item>
+            <el-form-item label="简历">
+                <!-- {{['女', '男'][info.delivererSex]}} -->
+                <el-link type="primary" @click="openNewPage($img + info.filePath)">简历文件</el-link>
+            </el-form-item>
+          </el-form>
+          <iframe v-else width="100%" height="100%" :src="$img + info.filePath"></iframe>
         </div>
       </div>
     </el-dialog>
@@ -59,7 +76,9 @@ export default {
   data () {
     return {
       remark: '',
-      active: 0
+      active: 0,
+      formConfig: [],
+      form: {}
     }
   },
   props: {
@@ -119,11 +138,29 @@ export default {
             message: '修改成功!'
           })
         })
+    },
+    details (id) {
+      this.$api
+        .post('/resumeInfo/queryResumeInfoDetail', {
+          reqdata: {
+            id
+          }
+        })
+        .then((res) => {
+          this.formConfig = JSON.parse(res.object.formConfig)
+          this.form = res.object
+        })
+    },
+    openNewPage (url) {
+      window.open(url)
     }
   },
   watch: {
     info () {
       this.remark = this.info.remark
+      if (this.info.resumeFrom === 3) {
+        this.details(this.info.id)
+      }
     }
   }
 }
@@ -173,6 +210,7 @@ export default {
   .right {
     overflow: scroll;
     width: 770px;
+    max-height: 770px;
     iframe {
       border: none;
       html {

src/views/candidateManage/resumeList.vue

@@ -86,7 +86,7 @@
             </el-form-item>
             <el-form-item label="意向职位">
                 <!-- {{['女', '男'][info.delivererSex]}} -->
-                {{info.desiredPositionId}}
+                {{info.desiredPositionName}}
                 <!-- <el-link type="primary" @click="openNewPage($img + info.filePath)">简历文件</el-link> -->
             </el-form-item>
             <el-form-item label="简历">
@@ -296,6 +296,10 @@ export default {
         {
           label: '邮箱',
           props: 'delivererMail'
+        },
+        {
+          label: '邮件发送状态',
+          props: ''
         }
         ],
         width: 500,
@@ -379,6 +383,10 @@ export default {
         {
           label: '邮箱',
           props: 'delivererMail'
+        },
+        {
+          label: '邮件发送状态',
+          props: ''
         }
         ],
         width: 360,
@@ -516,14 +524,14 @@ export default {
             }
           })
           .then((res) => {
-            this.$alert(`${res.object.successTotal}条发送成功，${res.object.failTotal}条发送失败！`, '发送结果', {
+            this.$alert('系统正在发送邮件，请在简历管理-通过页查看邮件发送情况!', '发送结果', {
               confirmButtonText: '确定',
               callback: action => {
               }
             })
-            this.errorlist = res.object.sendMailFailList.map(item => {
-              return item.id
-            })
+            // this.errorlist = res.object.sendMailFailList.map(item => {
+            //   return item.id
+            // })
           })
         : this.$message({
           type: 'info',

src/views/companyManage/formManage.vue

@@ -23,10 +23,11 @@
             </el-form-item>
             <el-form-item :label="state!==2?$t('message.selectTheRequiredFormItem'):$t('message.selectedFormItem')" prop="checkList">
                 <div v-if="state!==2">{{$t('message.longFormMessage')}}</div>
+                <div v-if="state!==2" style="font-size:12px;color:#999;">姓名，性别，工作年限，学历，联系电话，邮箱地址默认为已勾选项！</div>
                 <el-checkbox v-if="state!==2" :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">{{$t('button.selectAll')}}</el-checkbox>
                 <div v-if="state!==2" style="margin: 15px 0;"></div>
                 <el-checkbox-group v-if="state!==2" v-model="form.checkList" @change="handleCheckedCitiesChange">
-                    <div v-for="item in formConfigList" :key="item.id">
+                    <div v-for="item in formConfigList.filter(item => item.id !== 1 && item.id !== 25 && item.type !== 2 && item.type !== 9 && item.type !== 11 && item.type !== 12)" :key="item.id">
                         <el-checkbox :label="item.id">{{item.configName + ' ' + ( [0, 11, 12, 17].includes(item.type) ? $t('info.singleLineInputBox') : item.type === 1 ? $t('info.multiLineInputBox') : $t('info.dropDownSelectionBox'))}}</el-checkbox>
                     </div>
                 </el-checkbox-group>
@@ -62,6 +63,7 @@
                         <el-date-picker class="p10" v-else-if="item.type === 14" v-model="info[item.fieldName]" type="date" :placeholder="$t('message.pleaseChoose') + item.configName"></el-date-picker>
                         <el-date-picker class="p10" v-else-if="item.type === 15" v-model="info[item.fieldName]" type="date" :placeholder="$t('message.pleaseChoose') + item.configName"></el-date-picker>
                         <el-date-picker class="p10" v-else-if="item.type === 16" v-model="info[item.fieldName]" type="date" :placeholder="$t('message.pleaseChoose') + item.configName"></el-date-picker>
+                        <el-input class="p10" v-else-if="item.type === 17" v-model="info[item.fieldName]" :placeholder="$t('message.pleaseEnter') + item.configName"></el-input>
                     </div>
                 </div>
             </el-form-item>
@@ -268,6 +270,10 @@ export default {
       })
       if (!a) return
       let array = []
+      this.formConfigList.forEach(item => {
+        (item.id === 1 || item.id === 25 || item.type === 2 || item.type === 9 || item.type === 11 || item.type === 12) &&
+        array.push(item)
+      })
       this.form.checkList.forEach(item => {
         array.push(this.formConfigList.find(i => i.id === item))
       })

src/views/companyManage/procedureManage.vue

@@ -13,7 +13,7 @@
     <!-- :prop="'questionList.' + index + '.questionName'" -->
     <v-pager @page="callPage" :total="totalrecords"></v-pager>
     <el-dialog :visible.sync="dialogFormVisible" width="660px" :before-close="close" :close-on-click-modal="false">
-        <el-form :model="form" ref="form" label-width="140px" label-position="left">
+        <el-form :model="form" ref="form" label-width="120px" label-position="left">
             <el-form-item label="岗位名称" prop="processName" :rules="{
               required: true, message: '请输入岗位名称', trigger: 'blur'
             }">
@@ -25,7 +25,7 @@
             }">
                 <div v-if="state!=2">
                     <div class="flex">
-                        <el-input v-model.trim="item.questionName" placeholder="请输入面试问题" maxlength="128" show-word-limit></el-input>
+                        <el-input v-model="item.questionName" type="textarea" :rows="2" resize="none" placeholder="请输入面试问题" maxlength="128" show-word-limit></el-input>
                         <el-button v-if="index==0" @click="addDomain" type="success">新增</el-button>
                         <el-button type="danger" v-else @click.prevent="index === 0 || removeDomain(item)">删除</el-button>
                     </div>
@@ -35,8 +35,7 @@
                     </el-select>
                 </div>
                 <div v-else>
-                    <div>
-                        {{item.questionName}}
+                    <div v-html="item.questionName.replace(/\n/g,'<br/>')">
                     </div>
                     <video width="100%" v-if="item.videoIdList && item.videoIdList.length" :src="downList.some(i => i.id === item.videoIdList[item.active]) ? $img + downList.find(i => i.id === item.videoIdList[item.active]).videoPath : ''" controls></video>
                     <div class="flex">
@@ -48,7 +47,7 @@
               required: true, message: '请输入结束语', trigger: 'blur'
             }">
                 <div v-if="state!=2">
-                    <el-input v-model.trim="form.ending" placeholder="请输入结束语" autocomplete="off" style="padding-bottom: 5px" maxlength="128" show-word-limit></el-input>
+                    <el-input v-model="form.ending" type="textarea" :rows="2" resize="none" placeholder="请输入结束语" style="padding-bottom: 5px" maxlength="128" show-word-limit></el-input>
                 </div>
                 <div v-else>
                     <div>

src/views/companyManage/templateManage.vue

@@ -23,17 +23,17 @@
                 </el-select>
                 <div v-else>{{this.downList0.some(i => i.id === form.sceneId) ? this.downList0.find(i => i.id === form.sceneId).sceneName : ''}}</div>
             </el-form-item>
-            <el-form-item v-if="!form.sceneId||form.sceneId === 1" label="邮件内容" prop="templateIntroduce">
+            <el-form-item v-if="form.sceneId === 1||form.sceneId === 4" label="邮件内容" prop="templateIntroduce">
                 <el-input v-if="state !== 2" type="textarea" :rows="4" resize="none" placeholder="请输入邮件内容" v-model="form.templateIntroduce" maxlength="1024" show-word-limit></el-input>
                 <div v-else>{{form.templateIntroduce}}</div>
             </el-form-item>
-            <el-form-item v-if="!form.sceneId||form.sceneId !== 2" label="关联岗位" prop="processId">
+            <el-form-item v-if="form.sceneId == 1||form.sceneId == 3" label="关联岗位" prop="processId">
                 <el-select v-if="state !== 2" filterable clearable v-model="form.processId" placeholder="请选择关联岗位">
                     <el-option v-for="item in downList1" :key="item.id" :label="item.processName" :value="item.id"></el-option>
                 </el-select>
                 <div v-else>{{this.downList1.some(i => i.id === form.processId) ? this.downList1.find(i => i.id === form.processId).processName : ''}}</div>
             </el-form-item>
-            <el-form-item v-if="!form.sceneId||form.sceneId !== 1" label="关联表单" prop="formId">
+            <el-form-item v-if="form.sceneId == 2||form.sceneId == 3" label="关联表单" prop="formId">
                 <el-select v-if="state !== 2" filterable clearable v-model="form.formId" placeholder="请选择关联表单">
                     <el-option v-for="item in downList2" :key="item.id" :label="item.formName" :value="item.id"></el-option>
                 </el-select>
@@ -258,7 +258,7 @@ export default {
             item.sceneName = this.downList0.some(i => i.id === item.sceneId) ? this.downList0.find(i => i.id === item.sceneId).sceneName : ''
             item.processName = this.downList1.some(i => i.id === item.processId) ? this.downList1.find(i => i.id === item.processId).processName : ''
             item.formName = this.downList2.some(i => i.id === item.formId) ? this.downList2.find(i => i.id === item.formId).formName : ''
-            item.type = !(item.sceneId > 1)
+            item.type = !(item.sceneId !== 1 && item.sceneId !== 4)
             return item
           })
           this.restaurants = res.list.map(item => ({ value: item.templateName }))
@@ -345,7 +345,24 @@ export default {
         ? '/template/updateTemplate'
         : '/template/saveTemplate'
       let { id, templateName, sceneId, processId, formId, templateIntroduce, companyId } = this.form
-      let reqdata = sceneId === 1 ? { id, templateName, sceneId, companyId, templateIntroduce, processId } : sceneId === 2 ? { id, templateName, sceneId, companyId, formId } : { id, templateName, sceneId, companyId, processId, formId }
+      let reqdata
+      switch (sceneId) {
+        case 1:
+          reqdata = { id, templateName, sceneId, companyId, templateIntroduce, processId }
+          break
+        case 2:
+          reqdata = { id, templateName, sceneId, companyId, formId }
+          break
+        case 3:
+          reqdata = { id, templateName, sceneId, companyId, processId, formId }
+          break
+        case 4:
+          reqdata = { id, templateName, sceneId, companyId, templateIntroduce }
+          break
+        default:
+          reqdata = {}
+          break
+      }
       this.$api
         .post(url, {
           reqdata