Compare commits
	
		
			No commits in common. "feb8db52229111bb241897466b4a0d79920b38d2" and "9e21e76d16e174783ffd12457c4f07c2a2507099" have entirely different histories.
		
	
	
		
			feb8db5222
			...
			9e21e76d16
		
	
		|  | @ -11,7 +11,7 @@ | ||||||
|   <meta charset="utf-8"> |   <meta charset="utf-8"> | ||||||
|   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> |   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> | ||||||
|   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> |   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> | ||||||
|   <link rel="icon" href="<%= BASE_URL %>logo.png"> |   <link rel="icon" href="<%= BASE_URL %>fave.png"> | ||||||
|   <title> |   <title> | ||||||
|     <%= webpackConfig.name %> |     <%= webpackConfig.name %> | ||||||
|   </title> |   </title> | ||||||
|  |  | ||||||
							
								
								
									
										
											BIN
										
									
								
								public/logo.png
								
								
								
								
							
							
						
						
									
										
											BIN
										
									
								
								public/logo.png
								
								
								
								
							
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 4.3 KiB | 
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 4.3 KiB | 
|  | @ -64,7 +64,7 @@ | ||||||
|           <el-col :span="4"> |           <el-col :span="4"> | ||||||
|             <el-form-item :label="'结算等级'" prop="pkMaxAwards"> |             <el-form-item :label="'结算等级'" prop="pkMaxAwards"> | ||||||
|               <el-select |               <el-select | ||||||
|                 v-model="queryParams.pkgettleGrade" |                 v-model="queryParams.pkMaxAwards" | ||||||
|                 clearable |                 clearable | ||||||
|                 :placeholder="'请选择'" |                 :placeholder="'请选择'" | ||||||
|               > |               > | ||||||
|  | @ -466,9 +466,9 @@ | ||||||
|             width="180" |             width="180" | ||||||
|           /> |           /> | ||||||
|           <el-table-column |           <el-table-column | ||||||
|             v-if="menuList[4].checked == true && allTxt.pkgettleGradeval" |             v-if="menuList[4].checked == true && allTxt.pkMaxAwardsVal" | ||||||
|             align="center" |             align="center" | ||||||
|             prop="pkgettleGradeval" |             prop="pkMaxAwardsVal" | ||||||
|             :label="'结算等级'" |             :label="'结算等级'" | ||||||
|             width="180" |             width="180" | ||||||
|           /> |           /> | ||||||
|  | @ -775,7 +775,7 @@ export default { | ||||||
|           id: 4, |           id: 4, | ||||||
|           text: '结算等级', |           text: '结算等级', | ||||||
|           checked: true, |           checked: true, | ||||||
|           prop: 'pkgettleGradeval' |           prop: 'pkMaxAwardsVal' | ||||||
|         }, |         }, | ||||||
|         { |         { | ||||||
|           id: 5, |           id: 5, | ||||||
|  | @ -869,7 +869,7 @@ export default { | ||||||
|         phone: '', // 联系方式 |         phone: '', // 联系方式 | ||||||
|         changeNumber: '', // 变更次数 |         changeNumber: '', // 变更次数 | ||||||
|         pkRegisterGrade: '', // 注册等级 |         pkRegisterGrade: '', // 注册等级 | ||||||
|         pkgettleGrade: '', // 结算等级 |         pkMaxAwards: '', // 结算等级 | ||||||
|         pkAwards: '', // 真实奖衔 |         pkAwards: '', // 真实奖衔 | ||||||
|         vertexId: '', // 隶属体系 |         vertexId: '', // 隶属体系 | ||||||
|         teamId: '', // 隶属团队 |         teamId: '', // 隶属团队 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue