Merge branch 'master' of https://gitee.com/beiwu/cmanager

src/views/manage/works/count/index.vue

@@ -39,8 +39,8 @@
       <el-form size="small" label-position="right" :inline="true">
         <el-row :span="24" v-if="search.status === 1">
 
-          <el-form-item label="公司名称:">
+          <el-form-item label="社区街道名称:">
-            <el-input v-model="search.companyName" placeholder="公司名称"></el-input>
+            <el-input v-model="search.companyName" placeholder="社区街道名称"></el-input>
           </el-form-item>
 
           <el-form-item label="联系电话:">

src/views/manage/works/count/table/detail.vue

@@ -119,7 +119,7 @@ export default {
             display: false,
           },
           {
-            label: "公司名称",
+            label: "社区街道名称",
             prop: "companyName",
           },
           {

src/views/manage/works/count/table/gather.vue

@@ -76,7 +76,7 @@ export default {
         dialogClickModal: false,
         column: [
           {
-            label: "公司名称",
+            label: "社区街道名称",
             prop: "companyName",
           },
           {

src/views/manage/works/index.vue

@@ -8,10 +8,10 @@
       :inline="true"
     >
       <el-row :span="24">
-        <el-form-item label="公司名称:">
+        <el-form-item label="社区街道名称:">
           <el-input
             v-model="query.companyName"
-            placeholder="公司名称"
+            placeholder="社区街道名称"
             clearable
           ></el-input>
         </el-form-item>
@@ -29,14 +29,14 @@
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item>
+<!--        <el-form-item>-->
-          <el-select v-model="query.type" placeholder="请选择搜索时间类型">
+<!--          <el-select v-model="query.type" placeholder="请选择搜索时间类型">-->
-            <el-option label="岗位开始日期" :value="0"></el-option>
+<!--            <el-option label="岗位开始日期" :value="0"></el-option>-->
-            <el-option label="岗位结束日期" :value="2"></el-option>
+<!--            <el-option label="岗位结束日期" :value="2"></el-option>-->
-            <!-- <el-option label="报名截止日期" :value="3"></el-option> -->
+<!--            &lt;!&ndash; <el-option label="报名截止日期" :value="3"></el-option> &ndash;&gt;-->
-          </el-select>
+<!--          </el-select>-->
-        </el-form-item>
+<!--        </el-form-item>-->
-        <el-form-item>
+        <el-form-item label="日期范围:">
           <el-date-picker
             v-model="query.time"
             type="daterange"
@@ -47,7 +47,7 @@
           >
           </el-date-picker>
         </el-form-item>
-        <tool-tip></tool-tip>
+<!--        <tool-tip></tool-tip>-->
         <br>
         <el-form-item label="岗位状态：">
           <el-select v-model="query.jobStatus">
@@ -128,7 +128,7 @@
           size="small"
           @click.stop="rowZPView(row)"
           v-if="vaildData(permission.manage_mission_zpview, false)"
-          >招聘情况</el-button
+          >报名详情</el-button
         >
         <el-button
           v-if="row.jobStatus==2"
@@ -225,7 +225,7 @@ export default {
         mStatusList: companyPostState,
         column: [
           {
-            label: "公司名称",
+            label: "社区街道名称",
             prop: "companyName",
             display: false,
           },

src/views/manage/works/zpView.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-drawer title="招聘情况" :visible.sync="visible" size="60%" append-to-body>
+  <el-drawer title="报名详情" :visible.sync="visible" size="60%" append-to-body>
     <avue-crud
       :option="option"
       :table-loading="loading"
@@ -63,7 +63,7 @@ export default {
             label: "姓名",
             prop: "realName",
             search: true,
-            searchSpan: 4,
+            searchSpan: 7,
             searchLabelWidth: 50,
             display: false,
           },
@@ -72,12 +72,12 @@ export default {
             prop: "cardNumber",
             search: true,
             display: false,
-            searchLabelWidth: 86,
+            searchLabelWidth: 100,
             searchSpan: 7,
           },
           {
             type: "select",
-            label: "招聘情况",
+            label: "报名详情",
             prop: "status",
             display: false,
             search: true,

src/views/tenant/mission/Table/WaitingMission.vue

@@ -216,6 +216,11 @@ export default {
         delBtnText: "取消",
         dialogClickModal: false,
         column: [
+          {
+            label: "社区街道名称",
+            prop: "companyName",
+            display: false,
+          },
           {
             label: "任务名称",
             prop: "missionTitle",

src/views/tenant/works/Table/WaitingMission.vue

@@ -215,6 +215,11 @@ export default {
         delBtnText: "取消",
         dialogClickModal: false,
         column: [
+          {
+            label: "社区街道名称",
+            prop: "companyName",
+            display: false,
+          },
           {
             label: "岗位名称",
             prop: "jobName",

src/views/tenant/works/index.vue

@@ -59,6 +59,56 @@
         </div>
       </el-row>
     </el-form> -->
+    <el-form size="small" label-position="right" :inline="true" >
+      <el-row :span="24">
+        <el-form-item label="社区街道名称">
+        <el-input
+          v-model="search.companyName"
+          placeholder="社区街道名称"
+          style="width: 130px"
+          clearable
+        ></el-input>
+      </el-form-item>
+        <el-form-item label="岗位编号">
+          <el-input v-model="search.missionNo" placeholder="岗位编号" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="岗位名称">
+          <el-input v-model="search.jobName"  placeholder="岗位名称" clearable></el-input>
+        </el-form-item>
+<!--        <el-form-item>-->
+<!--          <el-select v-model="search.type" placeholder="请选择搜索时间类型">-->
+<!--            <el-option label="岗位开始日期" :value="0"></el-option>-->
+<!--            <el-option label="岗位结束日期" :value="2"></el-option>-->
+<!--            &lt;!&ndash; <el-option label="报名截止日期" :value="3"></el-option> &ndash;&gt;-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+        <el-form-item label="日期范围">
+          <el-date-picker
+            v-model="search.time"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="岗位状态">
+          <el-select v-model="search.jobStatus">
+            <el-option
+              v-for="(item, index) in mStatusList"
+              :key="index"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <div class="searchBtn">
+          <el-button type="primary" size="small" icon="el-icon-search" @click="handleSearch">搜 索</el-button>
+          <el-button size="small" icon="el-icon-delete" @click="handleClear">清 空</el-button>
+        </div>
+      </el-row>
+    </el-form>
     <!--/搜索栏-->
     <waiting-mission ref="waiting" v-if="search.status === 1" @refresh="handleClear"></waiting-mission>
     <ongoing-mission ref="onging" v-if="search.status === 2" @refresh="handleClear"></ongoing-mission>
@@ -93,6 +143,16 @@ export default {
         currentPage: 1,
         total: 0
       },
+      mStatusList: [
+        { value: 1, label: "招聘中" },
+        { value: 2, label: "任务中" },
+        { value: 3, label: "已完成" },
+        { value: 4, label: "已失效" },
+        {
+          label: "审核未通过",
+          value: 9,
+        },
+      ],
       search: {
         status: 1
       },
@@ -122,24 +182,30 @@ export default {
   },
   methods: {
     handleSearch() {
+      let params = { ...this.search }
+      if(this.search.time) {
+          params.stime = this.search.time[0],
+          params.etime = this.search.time[1]
+      }
       if (this.search.status === 1) {
         console.log("1111111");
-        this.$refs.waiting.onLoad(this.page, this.search);
+        this.$refs.waiting.onLoad(this.page, params);
       } else if (this.search.status === 2) {
         console.log("222222");
-        this.$refs.onging.onLoad(this.page, this.search);
+        this.$refs.onging.onLoad(this.page, params);
       } else if (this.search.status === 3) {
         console.log("3333333");
-        this.$refs.finished.onLoad(this.page, this.search);
+        this.$refs.finished.onLoad(this.page, params);
       } else if (this.search.status === 4) {
         console.log("444444444");
-        this.$refs.expired.onLoad(this.page, this.search);
+        this.$refs.expired.onLoad(this.page, params);
       }
     },
     date() {
       this.dateChange(this.timeValue)
     },
     dateChange(val) {
+      console.log(val)
       // if (val) {
       //   this.search.stime = val[0] + " 00:00:00";
       //   this.search.etime = val[1] + " 23:59:59";
@@ -171,7 +237,9 @@ export default {
         stimeEndTime: '',
         etimeBeninTime: '',
         etimeEndTime: '',
-
+        jobName: '',
+        companyName: '',
+        jobStatus: ''
       }
       this.timeValue = '';
       this.endDateRange = '';