Merge branch 'master' of http://47.92.161.104:10080/shuzhan/jp-employment-portal

src/views/base/company-list.vue

@@ -31,9 +31,9 @@
         >
           <el-option
             v-for="scale in scaleResult"
-            :key="scale.value"
+            :key="scale.id"
             :label="scale.name"
-            :value="scale.value"
+            :value="scale.id"
           ></el-option>
         </el-select>
       </el-form-item>
@@ -46,9 +46,9 @@
         >
           <el-option
             v-for="industry in industryResult"
-            :key="industry.value"
+            :key="industry.id"
             :label="industry.name"
-            :value="industry.value"
+            :value="industry.id"
           ></el-option>
         </el-select>
       </el-form-item>

src/views/base/messageNotice-list.vue

@@ -28,11 +28,11 @@
             <el-option label="已审核" :value="true"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="通知分类" prop="classify">
+        <!-- <el-form-item label="通知分类" prop="classify">
           <el-select v-model="queryModel.classify" filterable placeholder="请选择" size="mini">
             <el-option v-for="classify in classifyResult" :key="classify.id" :label="classify.name" :value="classify.value"></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="消息类型" prop="type">
           <el-select v-model="queryModel.type" filterable placeholder="请选择" size="mini">
             <el-option label="站内通告" value="1"></el-option>
@@ -46,17 +46,17 @@
     </el-form>
     <el-divider></el-divider>
     <el-row class="button-group">
-      <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">新增</el-button>
+      <el-button type="primary" size="small" plain icon="el-icon-circle-plus" @click="handleAdd">发送站内消息</el-button>
       <el-button type="primary" size="small" plain icon="el-icon-circle-plus" :disabled="multipleSelection.length == 0" @click="handleBatchDelete">删除选中项</el-button>
     </el-row>
     <el-table :data="tableData" style="min-height: 400px" v-loading="loading" stripe @sort-change="sortChange" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column prop="title" label="标题" width="180"></el-table-column>
-      <el-table-column prop="recipientId" label="收件人" width="180"></el-table-column>
-      <el-table-column prop="status" label="审核状态" width="180"></el-table-column>
-      <el-table-column prop="classify" label="通知分类" width="180"></el-table-column>
-      <el-table-column prop="type" label="消息类型" width="180"></el-table-column>
-      <el-table-column prop="sendWechat" label="微信消息" width="180"></el-table-column>
+      <!-- <el-table-column prop="recipientId" label="收件人" width="180"></el-table-column> -->
+      <el-table-column prop="statusName" label="审核状态" width="180"></el-table-column>
+      <el-table-column prop="classifyName" label="通知分类" width="180"></el-table-column>
+      <el-table-column prop="typeName" label="消息类型" width="180"></el-table-column>
+      <!-- <el-table-column prop="sendWechat" label="微信消息" width="180"></el-table-column> -->
       <el-table-column label="操作">
         <template slot-scope="{row}">
           <el-button size="mini" type="warning" @click="handleEdit(row)">编辑</el-button>

src/views/job/recruitment-list.vue

@@ -39,21 +39,8 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button
-          type="primary"
-          size="mini"
-          icon="ios-search"
-          @click="changePage(1)"
-          :loading="loading"
-          >查询</el-button
-        >&nbsp;
-        <el-button
-          type="info"
-          size="mini"
-          style="margin-left: 8px"
-          @click="handleReset('queryForm')"
-          >重置</el-button
-        >&nbsp;
+        <el-button type="primary" size="mini" icon="ios-search" @click="changePage(1)" :loading="loading">查询</el-button>&nbsp;
+        <el-button type="info" size="mini" style="margin-left: 8px" @click="handleReset('queryForm')">重置</el-button>&nbsp;
       </el-form-item>
     </el-form>
     <el-divider></el-divider>
@@ -263,6 +250,9 @@ export default {
     },
     handleReset(name) {
       this.$refs[name].resetFields();
+      this.queryModel.companyId = "";
+      this.queryModel.area = "";
+      this.queryModel.position = "";
     },
     handleDetail(record) {
       this.modalTitle = "编辑";

src/views/job/recruitmentApprove-list.vue

@@ -44,25 +44,6 @@
       </el-form-item>
     </el-form>
     <el-divider></el-divider>
-    <el-row class="button-group">
-      <el-button
-        type="primary"
-        size="small"
-        plain
-        icon="el-icon-circle-plus"
-        @click="handleAdd"
-        >新增</el-button
-      >
-      <el-button
-        type="primary"
-        size="small"
-        plain
-        icon="el-icon-circle-plus"
-        :disabled="multipleSelection.length == 0"
-        @click="handleBatchDelete"
-        >删除选中项</el-button
-      >
-    </el-row>
     <el-table
       :data="tableData"
       style="min-height: 400px"