diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 8b4ecd2b..b5fa1f03 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -48,7 +48,7 @@
"dayjs": "^1.11.9",
"diagram-js": "^11.4.1",
"echarts": "5.4.0",
- "element-ui": "^2.15.13",
+ "element-ui": "^2.15.14",
"file-saver": "2.0.5",
"fuse.js": "6.4.3",
"highlight.js": "9.18.5",
diff --git a/ruoyi-ui/public/images/empty.svg b/ruoyi-ui/public/images/empty.svg
new file mode 100644
index 00000000..05cf618b
--- /dev/null
+++ b/ruoyi-ui/public/images/empty.svg
@@ -0,0 +1 @@
+
diff --git a/ruoyi-ui/src/views/project/unitpay/dayPay.vue b/ruoyi-ui/src/views/project/unitpay/dayPay.vue
index f9b77a2c..409cd7aa 100644
--- a/ruoyi-ui/src/views/project/unitpay/dayPay.vue
+++ b/ruoyi-ui/src/views/project/unitpay/dayPay.vue
@@ -1,10 +1,12 @@
+
请选择日期:
搜索
+
@@ -27,6 +29,9 @@
{{(row.pay/100.0).toFixed(2)}}
+
+
+
{
this.cfgList = response.data || [];
this.doQuery();
@@ -82,17 +93,21 @@ export default {
this.loading = true;
let postData = {};
if (this.queryParams.attendanceTime) {
- postData.attendanceTime = this.$dt(this.queryParams.attendanceTime).format(
- "YYYY-MM-DD"
- );
+ postData.attendanceTime = this.$dt(this.queryParams.attendanceTime).format("YYYY-MM-DD");
}
let prj=this.getPrjInfo();
- let tmps = this.cfgList.filter(
- (d) =>
- d.projectId == prj.id &&
- d.subDeptId == prj.deptId
- );
- postData.cfgid = tmps.length > 0?tmps[0].id:0;
+ if(this.type=="index"){
+ postData.projectId=prj.projectId;
+ postData.deptId=prj.deptId||'';
+ postData.attendanceTime=this.$dt(prj.attendanceTime).format( "YYYY-MM-DD");
+ }else{
+ let tmps = this.cfgList.filter(
+ (d) =>
+ d.projectId == prj.id &&
+ d.subDeptId == prj.deptId
+ );
+ postData.cfgid = tmps.length > 0?tmps[0].id:0;
+ }
postData.pageNum = this.queryParams.pageNum;
postData.pageSize = this.queryParams.pageSize;
if (this.queryParams.workerName) {
@@ -125,6 +140,7 @@ export default {
});
this.total = response.total;
this.loading = false;
+ this.$emit("update",this.total,this.attendanceList)
});
}
}
diff --git a/ruoyi-ui/src/views/project/unitpay/index.vue b/ruoyi-ui/src/views/project/unitpay/index.vue
index ecf9f8ef..73aa201b 100644
--- a/ruoyi-ui/src/views/project/unitpay/index.vue
+++ b/ruoyi-ui/src/views/project/unitpay/index.vue
@@ -1,298 +1,157 @@
-
-
-
+
+
+
+
+
+
-
-
+
+
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
搜索
- 重置
+ 导出
-
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 修改
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+