From 00a5d715d57b1cab9c464004c678b08fe54f0207 Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123456 <zxx19900626>
Date: 星期三, 27 四月 2022 17:17:58 +0800
Subject: [PATCH] 人才绿卡补贴接口对接
---
src/api/personnelTalents.js | 5 +
src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue | 138 ++++++++++++++++-----------------------------
2 files changed, 55 insertions(+), 88 deletions(-)
diff --git a/src/api/personnelTalents.js b/src/api/personnelTalents.js
index 491f0f6..e2a24bc 100644
--- a/src/api/personnelTalents.js
+++ b/src/api/personnelTalents.js
@@ -4,3 +4,8 @@
export const getPersonTable = (params) => {
return postRequest('/ybg/webservice/app/personnel/getPersonTable.do',params)
}
+
+//30.鏌ヨ浜烘墠缁垮崱璐埧琛ヨ创琛ㄦ牸鏁版嵁鎺ュ彛
+export const getPersonCardTable = (params) => {
+ return postRequest('/ybg/webservice/app/personnel/getPersonCardTable.do',params)
+}
diff --git a/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue b/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue
index fee2fb3..f81b457 100644
--- a/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue
+++ b/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue
@@ -7,38 +7,38 @@
border
style="width: 100%" :cell-style="updataCellStyle" :span-method="mergeColumnTableCell">
<el-table-column
- prop="nianfen"
+ prop="jyear"
label="骞翠唤">
</el-table-column>
<el-table-column
label="A鍗�">
<el-table-column
- prop="chikazongrenshu"
+ prop="acardNums"
label="鎸佸崱鎬讳汉鏁� 锛堜汉锛�">
</el-table-column>
<el-table-column
- prop="butiezongfafang"
+ prop="asubsidy"
label="琛ヨ创鎬诲彂鏀� 锛堜竾鍏冿級">
</el-table-column>
<el-table-column
label="璐埧">
<el-table-column
- prop="chikarenshu"
+ prop="apurchaseNums"
label="鎸佸崱浜烘暟 锛堜汉锛�">
</el-table-column>
<el-table-column
- prop="gourfangbutie"
+ prop="apurSubsidy"
label="璐埧琛ヨ创 锛堜竾鍏冿級">
</el-table-column>
</el-table-column>
<el-table-column
label="绉熸埧">
<el-table-column
- prop="chikfarenshu"
+ prop="arentNums"
label="鎸佸崱浜烘暟 锛堜汉锛�">
</el-table-column>
<el-table-column
- prop="zufangbutie"
+ prop="arentSubsidy"
label="绉熸埧琛ヨ创 锛堜竾鍏冿級">
</el-table-column>
</el-table-column>
@@ -46,133 +46,95 @@
<el-table-column
label="B鍗�">
<el-table-column
- prop="chikazongrenshu1"
+ prop="bcardNums"
label="鎸佸崱鎬讳汉鏁� 锛堜汉锛�">
</el-table-column>
<el-table-column
- prop="butiezongfafang1"
+ prop="bsubsidy"
label="琛ヨ创鎬诲彂鏀� 锛堜竾鍏冿級">
</el-table-column>
<el-table-column
label="璐埧">
<el-table-column
- prop="chikarenshu1"
+ prop="bpurchaseNums"
label="鎸佸崱浜烘暟 锛堜汉锛�">
</el-table-column>
<el-table-column
- prop="gourfangbutie1"
+ prop="bpurSubsidy"
label="璐埧琛ヨ创 锛堜竾鍏冿級">
</el-table-column>
</el-table-column>
<el-table-column
label="绉熸埧">
<el-table-column
- prop="chikfarenshu1"
+ prop="brentNums"
label="鎸佸崱浜烘暟 锛堜汉锛�">
</el-table-column>
<el-table-column
- prop="zufangbutie1"
+ prop="brentSubsidy"
label="绉熸埧琛ヨ创 锛堜竾鍏冿級">
</el-table-column>
</el-table-column>
</el-table-column>
</el-table>
- <div class="PT--Echarts"></div>
</div>
</div>
</template>
<script>
+ import {getPersonCardTable} from '@/api/personnelTalents'
export default {
name: "PersonnelTalents_GreenCard",
data() {
return {
- tableData: [
- {
- nianfen:'2021骞� 1鈥斺��3鏈�',
- chikazongrenshu:'鈥斺��',
- butiezongfafang:'鈥斺��',
- chikarenshu:'鈥斺��',
- gourfangbutie:'鈥斺��',
- chikfarenshu:'鈥斺��',
- zufangbutie:'鈥斺��',
- chikazongrenshu1:'9938',
- butiezongfafang1:'2914.8',
- chikarenshu1:'鈥斺��',
- gourfangbutie1:'鈥斺��',
- chikfarenshu1:'6321',
- zufangbutie1:'2914.8'
- },
- {
- nianfen:'2021骞� 4鈥斺��6鏈�',
- chikazongrenshu:'鈥斺��',
- butiezongfafang:'鈥斺��',
- chikarenshu:'鈥斺��',
- gourfangbutie:'鈥斺��',
- chikfarenshu:'鈥斺��',
- zufangbutie:'鈥斺��',
- chikazongrenshu1:'9938',
- butiezongfafang1:'9456.7',
- chikarenshu1:'754',
- gourfangbutie1:'6654.5',
- chikfarenshu1:'6072',
- zufangbutie1:'2802.2'
- },
- {
- nianfen:'2021骞� 7鈥斺��9鏈�',
- chikazongrenshu:'鈥斺��',
- butiezongfafang:'鈥斺��',
- chikarenshu:'鈥斺��',
- gourfangbutie:'鈥斺��',
- chikfarenshu:'鈥斺��',
- zufangbutie:'鈥斺��',
- chikazongrenshu1:'9938',
- butiezongfafang1:'9456.7',
- chikarenshu1:'754',
- gourfangbutie1:'6654.5',
- chikfarenshu1:'6072',
- zufangbutie1:'2802.2'
- },
- {
- nianfen:'2021骞� 10鈥斺��12鏈�',
- chikazongrenshu:'915',
- butiezongfafang:'72.56',
- chikarenshu:'5',
- gourfangbutie:'68',
- chikfarenshu:'3',
- zufangbutie:'4.56',
- chikazongrenshu1:'10600',
- butiezongfafang1:'9456.7',
- chikarenshu1:'754',
- gourfangbutie1:'6654.5',
- chikfarenshu1:'6072',
- zufangbutie1:'2802.2'
- }
- ]
+ tableData: [],
+ spanArr: [], //spanArr鐢ㄤ簬瀛樻斁姣忎竴琛岃褰曠殑鍚堝苟鏁�
}
},
+ mounted() {
+ this.getPersonCardTable()
+ },
methods:{
+ getPersonCardTable() {
+ getPersonCardTable().then(res => {
+ if(res.code == 1000) {
+ this.tableData = res.list
+ this.rowspan()
+ }
+ })
+ },
// 淇敼鍗曚釜琛ㄦ牸鏍峰紡
updataCellStyle({ rowIndex, columnIndex}){
- if(rowIndex===0&&columnIndex===0){
+ if(columnIndex===0){
return {background:'#51D2FF'}
- }else if(rowIndex===1&&columnIndex===0){
- return{background:'#51D2FF'}
- }else if(rowIndex===2&&columnIndex===0){
- return{background:'#51D2FF'}
- }else if(rowIndex===3&&columnIndex===0){
- return{background:'#51D2FF'}
}
+ },
+ rowspan() {
+ let position = 0 //鐢ㄤ簬瀛樺偍鐩稿悓椤圭殑寮�濮媔ndex
+ this.tableData.forEach((item,index) => {
+ console.log('item--',item)
+ if(index === 0) {
+ this.spanArr.push(1)
+ }else {
+ if(item.acardNums == this.tableData[index - 1].acardNums) {
+ this.spanArr[position] += 1
+ this.spanArr.push(0)
+ }else {
+ position = index
+ this.spanArr.push(1)
+ }
+ }
+ })
},
// 鍚堝苟鍗曞厓鏍�
mergeColumnTableCell({rowIndex,columnIndex}){
- if(columnIndex === 7){
- if(rowIndex === 0){
+ if(columnIndex == 1 || columnIndex == 7) {
+ const _row = this.spanArr[rowIndex]
+ const _col = _row>0 ? 1 : 0
return {
- rowspan:3,
- colspan:1
+ rowspan: _row,
+ colspan: _col
}
- }
}
}
}
--
Gitblit v1.9.1