Merge branch 'feature_0521' of http://git.51jingcheng.com/zhenghuang/bsdgy-front into feature_0521

src/pages/recruit/CheckList.vue

@@ -5,85 +5,200 @@
         <Row class="search-row">
           <i-col span="24" class="search-col">
             <Row class="row-style">
-                            <i-input placeholder="请输入推广员姓名或手机号" class="search-select" v-model="searchShop"/>
+              <i-input placeholder="请输入推广员姓名或手机号" class="search-select" v-model="searchShop" />
               <span class="search-span">选择日期</span>
-                            <DatePicker :value="selectDate" type="daterange" split-panels placeholder="请选择日期"
+              <DatePicker
+                :value="selectDate"
+                type="daterange"
+                split-panels
+                placeholder="请选择日期"
                 @on-change="onChangeDateLister"
-                                class="date-picker"></DatePicker>
+                class="date-picker"
+              ></DatePicker>
               <span class="search-span">零售公司</span>
-                            <Select v-model="companyId" filterable class="search-select" @on-change="companySelect">
+              <Select
-                                <Option v-for="(item,index) in companyList" :value="item.id" :key="index + item.id">{{ item.name }}</Option>
+                v-model="companyId"
+                filterable
+                class="search-select"
+                @on-change="companySelect"
+              >
+                <Option
+                  v-for="(item,index) in companyList"
+                  :value="item.id"
+                  :key="index + item.id"
+                >{{ item.name }}</Option>
               </Select>
               <span class="search-span">店铺</span>
               <Select v-model="selectedStore" filterable class="search-select">
-                                <Option v-for="(item,index) in shopList" :value="item.id" :key="index + item.id">{{ item.name }}</Option>
+                <Option
+                  v-for="(item,index) in shopList"
+                  :value="item.id"
+                  :key="index + item.id"
+                >{{ item.name }}</Option>
               </Select>
               <Button type="primary" @click="searchCustomerDataBtnClick" class="search-btn">查询</Button>
-
             </Row>
           </i-col>
         </Row>
-                <Table ref="table" :loading="loading" :columns="columns1" :data="data1" class="table-store" size="small"                       @on-row-dblclick="onDblClickRowLister">
+        <Table
-                   
+          ref="table"
+          :loading="loading"
+          :columns="columns1"
+          :data="data1"
+          class="table-store"
+          size="small"
+          @on-row-dblclick="onDblClickRowLister"
+        >
           <template slot="action" slot-scope="{row}">
             <i-col span="12">
-                            <Button type="success" class="router-btn" 
+              <Button type="success" class="router-btn" @click="() => {passShow(row)}">审核通过</Button>
-                                    @click="() => {passShow(row)}">审核通过</Button>
             </i-col>
             <i-col span="12">
-                            <Button type="error" class="router-btn"
+              <Button type="error" class="router-btn" @click="() => {refuseShow(row)}">审核不通过</Button>
-                                    @click="() => {refuseShow(row)}">审核不通过</Button>
             </i-col>
           </template>
-                    
         </Table>
       </Tab-pane>
       <Tab-pane label="通过审核" key="key2">
         <Row class="search-row">
           <i-col span="24" class="search-col">
             <Row class="row-style">
-                            <i-input placeholder="请输入推广员姓名或手机号" class="search-select" v-model="searchShop"/>
+              <i-input placeholder="请输入推广员姓名或手机号" class="search-select" v-model="searchShop" />
               <span class="search-span">选择日期</span>
-                            <DatePicker v-model="date" class="left-15 date-picker" type="date"
+              <DatePicker
+                v-model="date"
+                class="left-15 date-picker"
+                type="date"
                 placement="bottom-start"
-                                split-panels placeholder="请选择日期">
+                split-panels
-                            </DatePicker>
+                placeholder="请选择日期"
+              ></DatePicker>
               <span class="search-span">零售公司</span>
-                            <Select v-model="companyId" filterable class="search-select" @on-change="companySelect">
+              <Select
-                                <Option v-for="(item,index) in companyList" :value="item.id" :key="index + item.id">{{ item.name }}</Option>
+                v-model="companyId"
+                filterable
+                class="search-select"
+                @on-change="companySelect"
+              >
+                <Option
+                  v-for="(item,index) in companyList"
+                  :value="item.id"
+                  :key="index + item.id"
+                >{{ item.name }}</Option>
               </Select>
               <span class="search-span">店铺</span>
               <Select v-model="selectedStore" filterable class="search-select">
-                                <Option v-for="(item,index) in shopList" :value="item.id" :key="index + item.id">{{ item.name }}</Option>
+                <Option
+                  v-for="(item,index) in shopList"
+                  :value="item.id"
+                  :key="index + item.id"
+                >{{ item.name }}</Option>
               </Select>
               <Button type="primary" @click="searchCustomerDataBtnClick" class="search-btn">查询</Button>
-
             </Row>
           </i-col>
         </Row>
-            <Table ref="table" :loading="loading" :columns="columns2" :data="data2" class="table-store" size="small"                          @on-row-dblclick="onDblClickRowLister">
+        <Table
-                    
+          ref="table"
-                </Table>
+          :loading="loading"
+          :columns="columns2"
+          :data="data2"
+          class="table-store"
+          size="small"
+          @on-row-dblclick="onDblClickRowLister"
+        ></Table>
       </Tab-pane>
       <Tab-pane label="审核未通过" key="key3">
         <Row class="search-row">
           <i-col span="24" class="search-col">
             <Row class="row-style">
-                            <i-input placeholder="请输入推广员姓名或手机号" class="search-select" v-model="searchShop"/>
+              <i-input placeholder="请输入推广员姓名或手机号" class="search-select" v-model="searchShop" />
               <span class="search-span">选择日期</span>
-                            <DatePicker v-model="date" class="left-15 date-picker" type="date"
+              <DatePicker
+                v-model="date"
+                class="left-15 date-picker"
+                type="date"
                 placement="bottom-start"
-                                split-panels placeholder="请选择日期">
+                split-panels
-                            </DatePicker>
+                placeholder="请选择日期"
+              ></DatePicker>
               <span class="search-span">零售公司</span>
-                            <Select v-model="companyId" filterable class="search-select" @on-change="companySelect">
+              <Select
-                                <Option v-for="(item,index) in companyList" :value="item.id" :key="index + item.id">{{ item.name }}</Option>
+                v-model="companyId"
+                filterable
+                class="search-select"
+                @on-change="companySelect"
+              >
+                <Option
+                  v-for="(item,index) in companyList"
+                  :value="item.id"
+                  :key="index + item.id"
+                >{{ item.name }}</Option>
               </Select>
               <span class="search-span">店铺</span>
               <Select v-model="selectedStore" filterable class="search-select">
-                                <Option v-for="(item,index) in shopList" :value="item.id" :key="index + item.id">{{ item.name }}</Option>
+                <Option
+                  v-for="(item,index) in shopList"
+                  :value="item.id"
+                  :key="index + item.id"
+                >{{ item.name }}</Option>
               </Select>
               <Button type="primary" @click="searchCustomerDataBtnClick" class="search-btn">查询</Button>
+            </Row>
+          </i-col>
+        </Row>
+        <Table
+          ref="table"
+          :loading="loading"
+          :columns="columns3"
+          :data="data3"
+          class="table-store"
+          size="small"
+          @on-row-dblclick="onDblClickRowLister"
+        ></Table>
+      </Tab-pane>
+    </Tabs>
+
+    <!-- 拒绝 -->
+    <Modal
+      v-model="refuseIsShow"
+      :title="showStoreName"
+      :footer-hide="true"
+      width="600"
+      class-name="vertical-center-modal"
+      @on-ok="ok"
+    >
+      <div slot="header">
+        <p>审核不通过原因</p>
+      </div>
+      <div>
+        <i-input type="textarea" :rows="4" placeholder="请填写审核不通过原因"></i-input>
+      </div>
+      <div style="margin-top:20px;text-align: center;">
+        <Button ghost type="primary" @click="refuse(rowData)">确定</Button>
+      </div>
+    </Modal>
+
+    <!-- 升级 -->
+    <Modal
+      v-model="passIsShow"
+      :title="showStoreName"
+      :footer-hide="true"
+      width="600"
+      class-name="vertical-center-modal"
+      @on-ok="ok"
+    >
+      <div slot="header">
+        <p style="text-align: center;">确认审核</p>
+      </div>
+      <div style="text-align:center;min-height:100px">
+        <span style="line-height:100px">确认通过审核吗?</span>
+      </div>
+      <div style="margin-top:20px;text-align: center;">
+        <Button @click="cancel(rowData)">取消</Button>
+        <Button style="margin-left:20px" type="primary" @click="confirm(rowData)">确定</Button>
+      </div>
+    </Modal>
 
                         </Row>
                     </i-col>
@@ -595,18 +710,48 @@
                 });
             }
         }
+      );
+    },
+    onTabClick(e) {
+      this.tabIndex = e;
+      console.log("tabIndex", this.tabIndex);
+    },
+    ok() {
+      this.refuseIsShow = false;
+    },
+    // 拒绝审核
+    refuse(index) {
+      console.log(123);
+      this.refuseIsShow = false;
+    },
+    refuseShow(index) {
+      this.refuseIsShow = true;
+      this.rowData = index;
+    },
+    passShow(index) {
+      this.passIsShow = true;
+      this.rowData = index;
+    },
+    cancel() {
+      this.passIsShow = false;
+    },
+    //确认通过审核
+    confirm(index) {
+      console.log("确认通过审核");
+      this.passIsShow = false;
+    }
   }
+};
 </script>
 
 <style scoped>
-
+.table-store {
-    .table-store {
   margin-top: 20px;
-    }
+}
-    .search-btn{
+.search-btn {
   margin-left: 40px;
-    }
+}
-    .ivu-tabs{
+.ivu-tabs {
-        overflow :inherit;
+  overflow: inherit;
-    }
+}
 </style>

src/services/recruit/CheckList.js

@@ -0,0 +1,10 @@
+import http from "../CommonHttp";
+import axios from "axios";
+
+export function getList(params, call) {
+  return http.get("/fission/recruit/list", params).then(call);
+}
+
+export default {
+  getList,
+};

vue.config.js

@@ -6,11 +6,11 @@ module.exports = {
   // publicPath: process.env.NODE_ENV === 'production' ? '/public/' : './',
 
   /* history模式 */
-  publicPath: process.env.NODE_ENV === 'production' ? '/dist/' : '/',
+  publicPath: process.env.NODE_ENV === "production" ? "/dist/" : "/",
   /* 输出文件目录：在npm run build时，生成文件的目录名称 */
-  outputDir: 'dist',
+  outputDir: "dist",
   /* 放置生成的静态资源 (js、css、img、fonts) 的 (相对于 outputDir 的) 目录 */
-  assetsDir: 'assets',
+  assetsDir: "assets",
   /* 是否在构建生产包时生成 sourceMap 文件，false将提高构建速度 */
   productionSourceMap: false,
   /* 默认情况下，生成的静态资源在它们的文件名中包含了 hash 以便更好的控制缓存，你可以通过将这个选项设为 false 来关闭文件名哈希。(false的时候就是让原来的文件名不改变) */
@@ -22,7 +22,7 @@ module.exports = {
     /* 自动打开浏览器 */
     open: true,
     /* 设置为0.0.0.0则所有的地址均能访问 */
-    host: '0.0.0.0',
+    host: "0.0.0.0",
     port: 8311,
     https: false,
     hotOnly: false,
@@ -33,4 +33,4 @@ module.exports = {
     proxy: 'http://111.231.218.44:8080/',
     // proxy: 'http://jdxdev.vipgz4.idcfengye.com/'
   },
-}
+};