Merge remote-tracking branch 'origin/0605' into 0605

src/pages/recruit/BulletinIndex.vue

@@ -7,7 +7,7 @@
             <p class="" style="font-size: 13px;line-height: 32px;margin-left: 20px;margin-right: 20px;">便于门店进行推广员招募</p>
         </i-col>
         <i-col span="8">
-            <span class="">使用范围：26家零售公司，785家店铺</span>
+            <span class="">使用范围：{{welcome.company.length || 0}}家零售公司，{{welcome.stores.length || 0}}家店铺</span>
             <span class="" style="border: 0px; color: rgb(52, 150, 235); margin-left: 15px; cursor: pointer;"  @click="showStores">修改</span>
         </i-col>
         <i-col span="8">
@@ -54,7 +54,6 @@ import bulletinService from '../../services/recruit/Bulletin'
 import http from '../../services/CommonHttp';
 import axios from "axios";
 export default {
-  inject:['reload'],
   components: {
     selectStoreStep,
   },
@@ -72,7 +71,8 @@ export default {
       btnStr:'编辑',
       imgUrl:'',
       onWitch:false,
-      uploadUrl:""
+      uploadUrl:"",
+      oldImg:""
     };
   },
   mounted: function() {
@@ -81,6 +81,7 @@ export default {
   created() {
     this.initData();
   },
+  inject: ['reload'],
   methods: {
     witchChange(status) {
       this.onWitch = status;
@@ -91,6 +92,7 @@ export default {
         console.log(data);
         if(data.data.results.scheduleVO.params.length>0){
           that.imgUrl = http.getBaseUrl() + data.data.results.scheduleVO.params[0].defaultVal;
+          that.oldImg = http.getBaseUrl() + data.data.results.scheduleVO.params[0].defaultVal;
         }
         that.initData = data.data.results;
 
@@ -142,6 +144,9 @@ export default {
         let that = this;
         bulletinService.dosave(this.initData, function (data) {
           console.log(data);
+          that.$Message.info("保存成功");
+          that.btnStr = '编辑'
+          that.showUpload = false; 
           that.reload();
         }, function (err) {
             that.$Message.error("网络异常，请重试");
@@ -151,6 +156,7 @@ export default {
     },
     onCancel(){
       this.showUpload = false; 
+      this.imgUrl = this.oldImg;
       this.btnStr = '编辑'
     },
     uploadImgSuccess (res, file) {

src/pages/recruit/CheckList.vue

@@ -29,7 +29,7 @@
                     <template slot="action" slot-scope="{row}">
                         <i-col span="12">
                             <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"
@@ -564,4 +564,7 @@
     .search-btn{
         margin-left: 40px;
     }
+    .ivu-tabs{
+        overflow :inherit;
+    }
 </style>