From 38dff69b2c218ae53b4cc79257368139a2803ebc Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期二, 15 八月 2023 18:18:19 +0800
Subject: [PATCH] 08.15
---
web_standard/src/views/ext/userSalary.vue | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/web_standard/src/views/ext/userSalary.vue b/web_standard/src/views/ext/userSalary.vue
index cd82995..9564fda 100644
--- a/web_standard/src/views/ext/userSalary.vue
+++ b/web_standard/src/views/ext/userSalary.vue
@@ -12,8 +12,8 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鐗╂枡缂栫爜" prop="mmodelCode">
- <el-input v-model="searchForm.mmodelCode" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="鐗╂枡淇℃伅" prop="materialName">
+ <el-input v-model="searchForm.materialName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�/缂栫爜" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="宸ュ簭" prop="procedureId">
<el-select v-model="searchForm.procedureId" filterable clearable placeholder="璇烽�夋嫨">
@@ -53,7 +53,7 @@
stripe
border
>
- <el-table-column prop="id" label="搴忓彿" fixed="left" min-width="80px"></el-table-column>
+ <el-table-column type="index" :index="customIndex" label="搴忓彿" fixed="left" min-width="80px"></el-table-column>
<el-table-column prop="userInfo.userName" label="鐢熶骇浜哄憳" min-width="100px"></el-table-column>
<el-table-column prop="userInfo.departName" label="閮ㄩ棬" min-width="100px"> </el-table-column>
<el-table-column prop="materialName" label="鐗╂枡鍚嶇О" min-width="100px"></el-table-column>
@@ -62,8 +62,16 @@
<el-table-column prop="workorderCode" label="宸ュ崟缂栫爜" min-width="150px"></el-table-column>
<el-table-column prop="unitName" label="鍗曚綅" min-width="100px"></el-table-column>
<el-table-column prop="num" label="鎶ュ伐鏁�" min-width="100px"></el-table-column>
- <el-table-column prop="qualifiedNum" label="鑹搧鏁�" min-width="100px"></el-table-column>
- <el-table-column prop="unQualifiedNum" label="涓嶈壇鍝佹暟" min-width="100px"></el-table-column>
+ <el-table-column prop="qualifiedNum" label="鑹搧鏁�" min-width="100px">
+ <template slot-scope="{row}">
+ {{ row.qualifiedNum || 0 }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="unQualifiedNum" label="涓嶈壇鍝佹暟" min-width="100px">
+ <template slot-scope="{row}">
+ {{ row.unQualifiedNum || 0 }}
+ </template>
+ </el-table-column>
<el-table-column prop="rate" label="鍚堟牸鐜�(%)" min-width="100px"></el-table-column>
</el-table>
<pagination
@@ -95,7 +103,7 @@
userId: '',
startDate: '',
endDate: '',
- materialId: '',
+ materialName: '',
},
procedures: [
],
@@ -123,7 +131,13 @@
'field.main': 'name',
sorts: [{ direction: 'DESC', property: 'CREATE_TIME' }]
})
-
+ let tempDate = new Date()
+ let year = tempDate.getFullYear()
+ let month = tempDate.getMonth() + 1
+ let day = tempDate.getDate()
+ this.searchForm.startDate = `${year}-${month}-01`
+ this.searchForm.endDate = `${year}-${month}-${day}`
+ this.planDate = [this.searchForm.startDate, this.searchForm.endDate]
this.search()
},
activated() {
@@ -194,6 +208,10 @@
}
});
return sums
+ },
+ customIndex(index) {
+ console.log();
+ return (this.tableData.pagination.pageIndex-1) * this.tableData.pagination.pageSize + index + 1
}
}
}
--
Gitblit v1.9.3