update

src/views/candidateManage/candidateAll.vue

@@ -4,7 +4,7 @@
  * @Autor: XuTongZhang
  * @Date: 2020-07-30 10:17:25
  * @LastEditors: XuTongZhang
- * @LastEditTime: 2020-08-12 17:59:30
+ * @LastEditTime: 2020-08-16 14:36:41
 -->
 <template>
   <div class="indexPage">
@@ -44,13 +44,19 @@ export default {
           type: 'select',
           placeholder: '性别',
           props: 'delivererSex',
-          options: [{ label: '男', value: 1 }, { label: '女', value: 0 }]
+          options: [{ label: '全部', value: null }, { label: '男', value: 1 }, { label: '女', value: 0 }]
         },
         {
           type: 'select',
           placeholder: '来源',
           props: 'resumeFrom',
-          options: [{ label: '51job', value: 0 }, { label: '智联', value: 1 }, { label: '58同城', value: 2 }]
+          options: [
+            { label: '全部', value: null },
+            { label: '51job', value: 0 },
+            { label: '智联', value: 1 },
+            { label: '58同城', value: 2 },
+            { label: '平台', value: 3 }
+          ]
         },
         {
           placeholder: '请输入投递职位',

src/views/candidateManage/candidateList.vue

@@ -4,7 +4,7 @@
  * @Autor: XuTongZhang
  * @Date: 2020-07-28 15:25:06
  * @LastEditors: XuTongZhang
- * @LastEditTime: 2020-08-13 23:39:52
+ * @LastEditTime: 2020-08-16 14:36:54
 -->
 <template>
   <div class="candidateList">
@@ -141,26 +141,21 @@ export default {
           type: 'select',
           placeholder: '性别',
           props: 'delivererSex',
-          options: [
-            { label: '男', value: 1 },
-            { label: '女', value: 0 }
-          ]
+          options: [{ label: '全部', value: null }, { label: '男', value: 1 }, { label: '女', value: 0 }]
         },
         {
           type: 'select',
           placeholder: '来源',
           props: 'resumeFrom',
           options: [
+            { label: '全部', value: null },
             { label: '51job', value: 0 },
             { label: '智联', value: 1 },
-            { label: '58同城', value: 2 }
+            { label: '58同城', value: 2 },
+            { label: '平台', value: 3 }
           ]
         },
         {
-          placeholder: '请输入投递职位',
-          props: 'positionApplied'
-        },
-        {
           type: 'select',
           placeholder: '应聘职位',
           props: 'desiredPositionId',
@@ -487,7 +482,7 @@ export default {
           reqdata: {}
         })
         .then((res) => {
-          this.list[4].options = res.list.map((item) => ({
+          this.list[3].options = res.list.map((item) => ({
             value: item.id,
             label: item.positionName
           }))

src/views/candidateManage/resume.vue

@@ -4,7 +4,7 @@
  * @Autor: XuTongZhang
  * @Date: 2020-07-30 10:32:00
  * @LastEditors: XuTongZhang
- * @LastEditTime: 2020-08-12 10:57:25
+ * @LastEditTime: 2020-08-16 14:49:21
 -->
 <template>
   <div>
@@ -110,8 +110,12 @@ export default {
           }
         })
         .then((res) => {
-          this.close()
-          this.queryData(this.searchForm)
+          // this.close()
+          // this.queryData(this.searchForm)
+          this.$message({
+            type: 'success',
+            message: '修改成功!'
+          })
         })
     }
   },

src/views/candidateManage/resumeList.vue

@@ -4,7 +4,7 @@
  * @Autor: XuTongZhang
  * @Date: 2020-07-30 09:53:19
  * @LastEditors: XuTongZhang
- * @LastEditTime: 2020-08-13 13:55:11
+ * @LastEditTime: 2020-08-16 14:34:44
 -->
 <template>
   <div class="indexPage">
@@ -111,24 +111,19 @@ export default {
           type: 'select',
           placeholder: '性别',
           props: 'delivererSex',
-          options: [
-            { label: '男', value: 1 },
-            { label: '女', value: 0 }
-          ]
+          options: [{ label: '全部', value: null }, { label: '男', value: 1 }, { label: '女', value: 0 }]
         },
         {
           type: 'select',
           placeholder: '来源',
           props: 'resumeFrom',
           options: [
+            { label: '全部', value: null },
             { label: '51job', value: 0 },
             { label: '智联', value: 1 },
-            { label: '58同城', value: 2 }
+            { label: '58同城', value: 2 },
+            { label: '平台', value: 3 }
           ]
-        },
-        {
-          placeholder: '请输入投递职位',
-          props: 'positionApplied'
         }
       ],
       btn: [

src/views/companyManage/templateManage.vue

@@ -4,7 +4,7 @@
  * @Autor: XuTongZhang
  * @Date: 2020-07-28 16:28:13
  * @LastEditors: XuTongZhang
- * @LastEditTime: 2020-08-13 15:43:02
+ * @LastEditTime: 2020-08-16 14:29:21
 -->
 <template>
   <div class="indexPage">
@@ -20,8 +20,8 @@
       @qrCode="qrCode"
     ></v-table>
     <v-pager @page="callPage" :total="totalrecords"></v-pager>
-    <el-dialog :visible.sync="dialogFormVisible" :before-close="close" :close-on-click-modal="false">
-      <el-form :model="form" ref="form" label-width="140px" :rules="rules" label-position="left">
+    <el-dialog :visible.sync="dialogFormVisible" :before-close="close" width="650px" :close-on-click-modal="false">
+      <el-form :model="form" ref="form" label-width="140px" :rules="rule" label-position="left">
         <el-form-item label="模板名称" prop="templateName">
           <el-input v-if="state !== 2" v-model="form.templateName" placeholder="请输入模板名称" autocomplete="off"></el-input>
           <div v-else>{{form.templateName}}</div>
@@ -38,7 +38,7 @@
           <div v-else>{{form.templateIntroduce}}</div>
         </el-form-item>
         <el-form-item label="关联场景" prop="sceneId">
-          <el-select v-if="state !== 2" v-model="form.sceneId" placeholder="请选择关联场景">
+          <el-select v-if="state !== 2" clearable v-model="form.sceneId" placeholder="请选择关联场景">
             <el-option
               v-for="item in downList0"
               :key="item.id"
@@ -132,8 +132,12 @@ export default {
       downList0: [],
       downList1: [],
       downList2: [],
+      rule: {
+        templateName: [{ required: true, message: '请输入模板名称', trigger: 'blur' }],
+        templateIntroduce: [{ required: true, message: '请输入模板内容', trigger: 'blur' }]
+      },
       rules: {
-        qrcodeName: [{ required: true, message: '请输入模板名称', trigger: 'blur' }],
+        qrcodeName: [{ required: true, message: '请输入二维码名称', trigger: 'blur' }],
         time: [{ required: true, message: '请输入时间区间', trigger: 'blur' }],
         status: [{ required: true, message: '请选择二维码状态', trigger: 'blur' }]
       },
@@ -188,7 +192,9 @@ export default {
           {
             title: '二维码',
             method: 'qrCode',
-            type: 'info'
+            type: 'info',
+            props: 'type',
+            key: false
           }
         ]
       },
@@ -239,6 +245,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.processId && item.sceneId)
             return item
           })
         })