Merge remote-tracking branch 'origin/master'

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessInfo.java

@@ -114,7 +114,7 @@ public class BusinessInfo extends BaseEntity
     private String customerId;
 
     /** 项目状态 */
-    @Excel(name = "项目状态")
+    @Excel(name = "项目状态(0.储备中1.跟进中2.已合作)")
     private Integer status;
 
     /** 评标办法 */

dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

@@ -144,12 +144,12 @@
 		</div>
 	  	<div class=" table-item-jf" v-if="tableData.length>0">
 	  	  <el-table :data="tableData" :header-cell-style="{ background:'#F0F3FA'}"  element-loading-text="Loading" border  highlight-current-row>
-	  			<el-table-column type="index" label="序号" width="60">
+	  			<el-table-column type="index" label="序号" fixed width="60">
 	  			 <template slot-scope="scope">
 	  			 	<span>{{(pageNum - 1) *20 + scope.$index + 1}}</span>
 	  			 </template>
 	  			</el-table-column>
-	  			<el-table-column  label="公司名称" width="430" >
+	  			<el-table-column  label="公司名称" fixed width="430" >
 	  						 <template slot-scope="scope">
 								 <div class="renling">
 									 <router-link  :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="list-titel-a" v-html="scope.row.companyName" ></router-link>
@@ -825,7 +825,7 @@ export default {
 	    delete params.provinceIds
 	  }
 	  if(data.cityIds.length>0){
-	   params['cityIds'] = data.provinceIds;
+	   params['cityIds'] = data.cityIds;
 	  }else{
 	    delete params.cityIds
 	  }

dsk-operate-ui/src/views/system/user/profile/resetPwd.vue

@@ -57,12 +57,14 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
-            this.$modal.msgSuccess("修改成功");
+            this.$modal.msgSuccess("修改成功")
             store.commit('SET_TOKEN', '')
             store.commit('SET_ROLES', [])
             store.commit('SET_PERMISSIONS', [])
             removeToken()
-            location.href = '/index'
+            setTimeout(function() {
+              location.href = '/index'
+            }, 2000)
           });
         }
       });

dsk-operate-ui/src/views/system/user/profile/userAvatar.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="user-info-head" @click="editCropper()">
       <img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" v-if="options.img" />
-      <span v-else class="userInfo-avatar" v-else>{{ options.name&&options.name.slice(0, 1).toUpperCase() }}</span>
+      <span class="userInfo-avatar" v-else>{{ options.name&&options.name.slice(0, 1).toUpperCase() }}</span>
     </div>
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"  @close="closeDialog">
       <el-row>

dsk-system/src/main/java/com/dsk/system/domain/vo/BusinessBrowseVo.java

@@ -32,6 +32,11 @@ public class BusinessBrowseVo {
      */
     private String projectCategory;
 
+    /**
+     * 项目状态(0.储备中1.跟进中2.已合作)
+     */
+    private Integer status;
+
     /**
      * 投资估算
      */