|
@@ -30,7 +30,7 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-form>
|
|
</el-form>
|
|
</el-col>
|
|
</el-col>
|
|
- <el-button @click="getCustomColumn()">测试</el-button>
|
|
|
|
|
|
+
|
|
<!--列表-->
|
|
<!--列表-->
|
|
<!-- 222 -->
|
|
<!-- 222 -->
|
|
<el-table :data="list" highlight-current-row v-loading="listLoading"
|
|
<el-table :data="list" highlight-current-row v-loading="listLoading"
|
|
@@ -65,9 +65,6 @@
|
|
<el-table-column prop="field2" :label="customCols.field2" ></el-table-column>
|
|
<el-table-column prop="field2" :label="customCols.field2" ></el-table-column>
|
|
<el-table-column prop="field3" :label="customCols.field3" ></el-table-column> -->
|
|
<el-table-column prop="field3" :label="customCols.field3" ></el-table-column> -->
|
|
|
|
|
|
- <!-- <el-table-column v-for="(item,index) in customFieldList" :prop="item.prop" :label="item.label" :key="index">
|
|
|
|
-
|
|
|
|
- </el-table-column> -->
|
|
|
|
<!-- <el-table-column prop="others" label="其他" ></el-table-column> -->
|
|
<!-- <el-table-column prop="others" label="其他" ></el-table-column> -->
|
|
<!-- <el-table-column :label="item.fieldName" v-for="(item, index) in customCols" :key="item.id" :prop="index==0?'customField1':(index==1?'customField2':(index==2?'customField3':''))">
|
|
<!-- <el-table-column :label="item.fieldName" v-for="(item, index) in customCols" :key="item.id" :prop="index==0?'customField1':(index==1?'customField2':(index==2?'customField3':''))">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
@@ -337,12 +334,8 @@
|
|
myChart: null,
|
|
myChart: null,
|
|
params: null,
|
|
params: null,
|
|
totalPercent:0,
|
|
totalPercent:0,
|
|
- // 111
|
|
|
|
- aaaaa:[
|
|
|
|
- {label: "工资1"},
|
|
|
|
- {label: "工资2"},
|
|
|
|
- {label: "工资3"},
|
|
|
|
- ]
|
|
|
|
|
|
+
|
|
|
|
+
|
|
};
|
|
};
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
@@ -636,21 +629,7 @@
|
|
}});
|
|
}});
|
|
|
|
|
|
},
|
|
},
|
|
- // 222
|
|
|
|
- // dynamicTable(){
|
|
|
|
- // this.customFieldList = [
|
|
|
|
- // {label : this.customCols.monthCost,prop : "monthCost"},
|
|
|
|
- // {label : this.customCols.bonus,prop:"bonus"},
|
|
|
|
- // {label : this.customCols.allowance,prop:"allowance"},
|
|
|
|
- // {label : this.customCols.insuranceOld,prop:"insuranceOld"},
|
|
|
|
- // {label : this.customCols.insuranceMedical,prop:"insuranceMedical"},
|
|
|
|
- // {label : this.customCols.insuranceLosejob,prop:"insuranceLosejob"},
|
|
|
|
- // {label : this.customCols.insuranceInjury,prop:"insuranceInjury"},
|
|
|
|
- // {label : this.customCols.houseFund,prop:"houseFund"},
|
|
|
|
- // {label : this.customCols.field1,prop:"field1"},
|
|
|
|
- // {label : this.customCols.field2,prop:"field2"},
|
|
|
|
- // {label : this.customCols.field3,prop:"field3"},
|
|
|
|
- // ]
|
|
|
|
|
|
+
|
|
|
|
|
|
// },
|
|
// },
|
|
// getProjects() {
|
|
// getProjects() {
|