From 481d82ebd4504501b408c458f3d87d912692588e Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期二, 16 七月 2024 11:32:06 +0800
Subject: [PATCH] fix:修复纤度登记表，检验表切换
---
src/views/employeeSalary/salaryPlan/index.vue | 146 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 107 insertions(+), 39 deletions(-)
diff --git a/src/views/employeeSalary/salaryPlan/index.vue b/src/views/employeeSalary/salaryPlan/index.vue
index 732c3c1..733a436 100644
--- a/src/views/employeeSalary/salaryPlan/index.vue
+++ b/src/views/employeeSalary/salaryPlan/index.vue
@@ -12,27 +12,24 @@
<TableCommonView
:table-list="tableList"
@selTableCol="selTableCol"
- @handleShow="handleShow"
- @tableRowClick="tableRowClick"
>
<template slot="tableButton">
- <el-table-column label="鎿嶄綔" width="180">
+ <el-table-column label="鎿嶄綔" width="110">
<template slot-scope="scope">
- <el-button @click.stop="handleClick(scope.row, '鏌ョ湅')" type="text" size="small">鏌ョ湅</el-button>
- <el-button @click.stop="handleClick(scope.row, '淇敼')" type="text" size="small">淇敼</el-button>
- <el-button @click.stop="handleClick(scope.row, '鍒犻櫎')" type="text" size="small">鍒犻櫎</el-button>
+ <el-button @click.stop="handleClick(scope.row)" type="text" size="small">淇敼</el-button>
+ <el-button @click.stop="delClick(scope.row)" type="text" size="small">鍒犻櫎</el-button>
</template>
</el-table-column>
</template>
</TableCommonView>
</div>
- <AddDialog
- :editDiaConfig="editConfig"
- />
<div class="btn-pager">
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
+ <AddDialog
+ ref="add" :editRow="editRow" @refresh="refresh"
+ />
</div>
</div>
</template>
@@ -40,6 +37,7 @@
<script>
import AddDialog from "@/views/employeeSalary/salaryPlan/components/addDialog.vue"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
+import { getSalaryPlanList, deleteSalaryPlanInfo } from "@/api/employeeSalary/salaryPlan.js"
export default {
name: "salaryPlan",
props: {},
@@ -51,29 +49,21 @@
tableList: {},
showCol: ["鏂规鍚嶇О", "宸ョ", "钖祫绫诲瀷", "璁¤垂鍛ㄦ湡", "璁¤垂鍏紡瀹氫箟", "娣诲姞鏃堕棿", "娣诲姞浜�"],
tableColumn: [
- // { label: "杞﹂棿", prop: "workshopNumber",iconRight:"el-icon-setting"},
- { label: "鏂规鍚嶇О", prop: "workshopNumber",},
- { label: "宸ョ", prop: "groupNumber", },
- { label: "钖祫绫诲瀷", prop: "startCarNumber" },
- { label: "璁¤垂鍛ㄦ湡", prop: "endCarNumber" },
- { label: "璁¤垂鍏紡瀹氫箟", prop: "carFlag", },
- { label: "娣诲姞鏃堕棿", prop: "notes", },
- { label: "娣诲姞浜�", prop: "notes", },
+ { label: "鏂规鍚嶇О", prop: "name",min:110},
+ { label: "宸ョ", prop: "workTypeNames",min:100 },
+ { label: "钖祫绫诲瀷", prop: "salaryTypeName",min:110 },
+ { label: "璁¤垂鍛ㄦ湡", prop: "cycle",min:110 },
+ { label: "璁¤垂鍏紡瀹氫箟", prop: "salaryFormulaValue",min:140 },
+ { label: "娣诲姞鏃堕棿", prop: "createTime",min:130 },
+ { label: "娣诲姞浜�", prop: "addPeople",min:110 },
],
- editConfig:{
- visible:false,
- infomitton:{
- TabsIndex:0,
- workshopId:null,
- }
- },
- getDataParams: {
- keyWord: '',
- },
+ keyword: '',
+ editRow:{},
}
},
created() {
this.setTable()
+ this.getData(this.keyword)
},
methods: {
setTable() {
@@ -108,25 +98,103 @@
this.showcol = val
this.tableList.tableColumn = this.setColumnVisible(val, this.tableColumn)
},
+ // 璇锋眰鏁版嵁
+ async getData() {
+ this.loading = true
+ await getSalaryPlanList({
+ keyword: this.keyword,
+ page: this.pagerOptions.currPage,
+ pageSize: this.pagerOptions.pageSize
+ })
+ .then((res) => {
+ if (res.code === 200) {
+ if (res.data) {
+ const list = res.data.map(item=>{
+ let workTypeNames=''
+ if(item.workTypes){
+ for(let i in item.workTypes){
+ workTypeNames=item.workTypes[i].workName+','+workTypeNames
+ }
+ }
+ let salaryFormulaValue=''
+ salaryFormulaValue=item.salaryFormula?item.salaryFormula.split(",").join(''):[]
+ return {
+ ...item,
+ workTypeNames:workTypeNames,
+ salaryFormulaValue:salaryFormulaValue,
+ salaryTypeName:item.salaryType?item.salaryType.name:''
+ }
+ })
+ this.tableList.tableInfomation = list || []
+ this.pagerOptions.totalCount = res.total
+ } else {
+ this.tableList.tableInfomation = []
+ }
+ } else {
+ this.tableList.tableInfomation = []
+ }
+ this.loading = false
+ })
+ .catch((err) => {
+ console.log(err)
+ this.tableList.tableInfomation = []
+ this.loading = false
+ })
+ },
// 鏂板
addBtnClick() {
- this.editConfig.infomitton={}
- this.editConfig.dialogTitle="鏂板"
- this.editConfig.visible=true
+ this.editRow = { title:'鏂板缓',type: 'add' }
+ this.$refs.add.islook = true;
},
// 鎼滅储
onFilterSearch(searchText) {
- this.getDataParams.keyWord = searchText,
- this.getData()
+ this.keyword= searchText,
+ this.pagerOptions.currPage = 1
+ this.getData()
},
- // 缁勫埆
- handleShow() {
+ refresh(){
+ this.getData()
+ },
+ // 缂栬緫
+ handleClick(row) {
+ let config=JSON.parse(JSON.stringify(row));
+ let arr=config.workTypes?config.workTypes:[]
+ let workTypes=[]
+ if(arr&&arr.length>0){
+ for(let i in arr){
+ workTypes.push({
+ value:arr[i].ID,
+ label: arr[i].workName
+ })
+ }
+ }
+ this.editRow = {
+ ...config,
+ title:'缂栬緫',
+ type:'edit',
+ id:config.ID,
+ workTypes:workTypes
+ }
+ this.$refs.add.islook = true;
+ },
+ // 鍒犻櫎
+ delClick(row) {
+ this.$confirm("鏄惁纭鍒犻櫎?", "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ deleteSalaryPlanInfo({ id: row.ID }).then((response) => {
+ if (response.code === 200) {
+ this.$message.success("鍒犻櫎鎴愬姛")
+ this.getData()
+ }
+ })
+ })
+ .catch(() => {})
+ },
- },
- // 琛ㄦ牸琛岀偣鍑�
- tableRowClick(row) {
- console.log(row, "row")
- },
}
}
</script>
--
Gitblit v1.8.0