From 87c90c3fbf5fcd8c0ecddef76e96df9d1e0f79d1 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Mon, 29 Sep 2025 14:48:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E8=A1=A8=E4=B8=80=E5=86=8C=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E8=AF=95=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/favicon.ico-1 | Bin 4182 -> 0 bytes public/favicon.ico-old | Bin 5561 -> 0 bytes src/api/common.js | 11 ++ src/api/synthesize-query/three-and-one.js | 9 ++ src/utils/bonus.js | 1 + .../personPresence/components/item-pie.vue | 5 +- .../detail/components/three-one-table.vue | 7 +- .../month-detail/components/att-details.vue | 10 +- .../month-detail/components/header-info.vue | 101 ++++++++++++--- .../month-detail/components/nameList.vue | 10 +- .../month-detail/components/wage-info.vue | 11 +- .../month-detail/components/wage-pay.vue | 119 ++++++++++++++---- 12 files changed, 228 insertions(+), 56 deletions(-) delete mode 100644 public/favicon.ico-1 delete mode 100644 public/favicon.ico-old diff --git a/public/favicon.ico-1 b/public/favicon.ico-1 deleted file mode 100644 index d65eb21e06135131ae4501e6f82988941d90c6f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4182 zcmd6rc{CJm+s9|7kujQ#F_L{OjWuLn`Y|KRj3OcX7RFL`Y3ydkF3TWW)*m8EWGg#G zC|e2<*;S&5F!pDj-*e9U*Za@&&wJiK?)y6Dy6$tI>)hA9d_Q-bp@A+8$^``g05CjG z%ZP6K|J@*G>HRbF>U_EZ`WfkJ0;-33RsjGw9Iu5n39$W{7f!Vy1om}~H0KmHI5iWM zmW0#U>w^^|3rJfJ(ab?OIQ z!J;^M&)nMx5VAx#(K&k*Vn}tJQLYrG`|(^uvc;^0sL>`LQ#{?DD*u?EBZR>g`7BkX z!V6KC+~fxmbV&bg0@tBN_X0MMucDy2WnEOjJwR3B3#3a51`XjcoOfg0udTRh!bFK- z@oe0a%$TZ#8u1ozQJW|1FizLedJYI-I0x|6m8Y{5mHpuG*7nmef~^2<{7Z0cp)X_M z+S0o?A3Q1ooPW-e*1xWJNY4DaD~r9G*si2m#Vwn4)mV_M1p!l-o!539MJ}j`;pVc4 zPsD%e2{TJ+g0e56bS;&)4z3M156Qd<#2)nRJ!7)$3y0XF>I3DjAaF@tW+8oHr+6%F zLR@9bT8tlT;#6Y6&z1RuW>V8YDcD?_4v|l?Ksj+EdI4y6^$BNufZDrL|kBZN&I9*L|IImQK>b1)D#-xnw@BCefuvPfIa=^tF zULiP|2Z0R}Qyi0r*r&vnu3j! z0cRb>onw6RNm2SIvAlemwolFc-M0jv+Gbvu_Js&eCS%m+lh22041Y1c7ocW*G<+gM z;>Sd6sz^r#l$(38&Hr?}U>txod0r->y!+yt&fHNro>ZL}sD$xxMBMX9q%k2a;SA`U zB#*x2-zyT4Ud>g|j7(||yrO|Sd^y__AwvAuAOmgz$xL#2_n`l0&g5{vN zn?nTVTf0;7@?=EYsQhYHdPtV83m7UI>%OZS(=o;w9iaP(Yc>-#iQEuR;A12^FbQtK zI@SODQpWhR)jybCegct?8@a}a%=(W0Bss+1KSj#Vb2f-VXqnVJ=HxxGevIL;YE@L+ zhnR#5CC$8cS+yW14ZHJ(i6+t9daGK}GJ!!40oUA?Z;4_-*}+Th$GM?yBx}#1inZfL zKzPSYljv!|N=xzB_Fccbu#Ip5+|j*5L8dLCx!Mt>arj4{17ZLN_yV5-uNgVqO?8*O zbjkU$t^eR*r05BHwJlz_-zB841MNo2t1|Oz-%Ms2S#>htc9gRtaw|xxm3$2fhs@^_ z7`gZiFJevR<=1wz?x^c@zxnNvq3PwJ+C80!e*DUQymyRIn-YFQwQ&&wYHwRTClc0Y zAp)yxW-9T66L{^d4p6_Zc^&S*`@`jcR=}VbhQcK5bL)6+?`&qH4q)E$9bfm(!{vhvuvzSnxyK39cuD97re{)py<)h`a-Rc1aJ&#MZqC7n*r!{l zOnJ0-EhwZlBIOnjR_{PTde6HJ3>AWa3wGCb8-FkUkO~^wIbrU~X?^&53Xc#?LQ!=? zT)tn%zg}~C_Ss`L2R01Op|Jl9vdV&e&TT`z=MONyynBs!!K`{&wT#{a_`xEIduwz zrK-Fdt!TrVj2NRDJ3mN`u{(vGflBSH?S@)>PEa5^@KBQpVr5Bwqx0y>ZwXYDHnEwzIidF25Qp%<3c;Z9u?KZOn@2J_`j!64_XCp=Zi6-DPnyuJ#ohVQ;?k=N>^;c0?r#SNE+nza@F%*II)RpVaPz33e3}rkXnOe)`?#(4Y`@ z)7{*^D=G`kX+YERe(u6o45Ubb_;v*Y@g>59;D5-90q7brXS`Ew`iU4IFwgc^J;h>Z2Rdd zVkiRucd+od25n&Z{9u65K8IE^gjkk)M0igorhh#Uef z+P>*)Lw#M_nbYc=v|&4{^z!Z!Gt1lzB)hZj&q{T4s&K9Z_H|h^$T#>SXG^>2@oJ}k zkcXj)DPzNVQjt?tZ8N+i)*-irCFo0>KYQVMZC=46`vTTmvX^n3J<9(4e-zNeOg$9? zui2yQxXUEOwqT#MMt zsAKj(e(Bt9mZKEcvjCOL5*K(JVlilNt+>PlI`nI$Kv-N%dCTm1pbnc|QwejabU!qA z#m-|xTI>`@Fiyoy3hL`wQT001Q!jXqF9riknMIuiCW$Yn9p>~*Ii zifbWvj#bS5K-a|=pc=s|7=2oF`C(|^$(Mk4_9nL4i&JOfY_L748rhtjEfV>%7ZrrN zDr5IUsZ>NxSQ5aCPxdm%0~;^31ZT#e3r0`K9Wsd=X| zPW7MA&knh^H`bpM8ZMG6*7Tt=I8A4WurQ?hH}9dGvyt7yri0?u>TorMSs z#m*abdd|6^?4r%1G4!kSSCr80noFW`U<9i$B&p!9)*bzu+4$^R86A`x)(rhF__ycC zTHx}b1%kUu@9Xjp52g7lP#7EW%#`-3Rka;ls*GaWsU6Hzvw!? zC185oee>R5eMu+C_a8I)hgg5YaX9$;p6<{3&-hr!BDSYVf#JgO(pt$~+4R!rzyVn1 z%t6ok?&)j$@o|{(oep$YumjZY-Sapm5J~C!o2EAxW^Mn{U|T{wIhR+0BAr!APxVD; zTV-g{)ywsCw?rofF*b_{O9&lF;2ut_K6H`mlR}u$q$5X^tI)&PhjhkyD7kcjLT4H+ zZVN4II;&VaalVApt-$Ag!9_s~c2RJkDT*$ep`$t%SUKnr#9`5U8BB+sSjD>7COXVC z^~-t+(5+@eigu4SiPEE;;lqq2QIJK6l7doneJxd&VD(?5potATYwuyrEF;CVoYe)S z9~4iZ)SwURjXbb}Kw($0kw*ZGRk^mRt5BHgMVJ2nutApyVx=`@Q2jheJm-n3`nbfi zd66R?1mm6F!7Jp|3#Ojb=OjzVjYRlbG!IAj7`{ss$j<3D5!3sPVU>UGCEAtuRDc95 zu9UgRw4C-2n}lZ_w4oL%y#`y2*oiCke9royQb>Qwg`~C_iB zr%bgRPsVW>*kTQiuKf=|ZCi`_iIC4TUFB@pOffE?>_V{yVd!kN76u2KA+MLJJ%bA> zLWRlKp0x&>S`syacUoKw^iOUxs9bsaDYU|JbZH~<`-T`iY^5>!^>WqejXe_(BQn5} zw1J1usMY%)zs%HZC_y=02N6Ut*moUg%uiFnq7WqrlO%ohy@RO$h6O$p*%ch{{{>{{ bPl0cjFns4(t3J~|3IKR*1FdRJd&<864f%je diff --git a/public/favicon.ico-old b/public/favicon.ico-old deleted file mode 100644 index 121ffe20b5bb79e0f1144d63c256330f384a1b56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5561 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 A-~a#s diff --git a/src/api/common.js b/src/api/common.js index 864a3c5..16a363f 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -92,3 +92,14 @@ export const getTeamSelectListByConditionAPI = (data) => { data, }) } + +// 删除附件 +export const deleteFileAPI = (id) => { + return request({ + url: '/bmw/pmProject/updateRefundFileById/' + id, + method: 'POST', + data: { + id: id, + }, + }) +} diff --git a/src/api/synthesize-query/three-and-one.js b/src/api/synthesize-query/three-and-one.js index 8ee542e..59f5d67 100644 --- a/src/api/synthesize-query/three-and-one.js +++ b/src/api/synthesize-query/three-and-one.js @@ -90,3 +90,12 @@ export const uploadProMonthTableRefundAPI = (data) => { data, }) } + +// 综合查询 三表一册 农名工工资支付表 保存操作 +export const saveThreeAndOneMonthlyWagePaymentAPI = (data) => { + return request({ + url: '/bmw/pmProject/updateSalary', + method: 'POST', + data, + }) +} diff --git a/src/utils/bonus.js b/src/utils/bonus.js index 23024bf..f1fe388 100644 --- a/src/utils/bonus.js +++ b/src/utils/bonus.js @@ -246,6 +246,7 @@ export function tansParams(params, isEncrypt = false) { // result = result.slice(0, -1) result = encryptWithSM4(result) } + return result } diff --git a/src/views/home-index/components/personPresence/components/item-pie.vue b/src/views/home-index/components/personPresence/components/item-pie.vue index 20ca998..75f69c2 100644 --- a/src/views/home-index/components/personPresence/components/item-pie.vue +++ b/src/views/home-index/components/personPresence/components/item-pie.vue @@ -75,8 +75,9 @@ export default { 0, ) const percent = ( - (dataItem.value / total) * - 100 + isNaN((dataItem.value / total) * 100) + ? 0 + : (dataItem.value / total) * 100 ).toFixed(1) if (data.showAfter) { diff --git a/src/views/synthesize-query/three-and-one/detail/components/three-one-table.vue b/src/views/synthesize-query/three-and-one/detail/components/three-one-table.vue index b1042eb..3581d05 100644 --- a/src/views/synthesize-query/three-and-one/detail/components/three-one-table.vue +++ b/src/views/synthesize-query/three-and-one/detail/components/three-one-table.vue @@ -265,7 +265,7 @@ export default { return { fontSize: '14px', color: '#606266', - padding: '12px 8px', + padding: '12px 0', } }, @@ -307,6 +307,11 @@ export default { // 下载文件 onHandleDownloadFile(row) { console.log('row', row) + this.download( + '/bmw/pmProject/exportThreeAndOne', + {}, + '三表一册.xlsx', + ) }, // 获取三表一册每月数据 diff --git a/src/views/synthesize-query/three-and-one/month-detail/components/att-details.vue b/src/views/synthesize-query/three-and-one/month-detail/components/att-details.vue index 0487b25..e1e6e45 100644 --- a/src/views/synthesize-query/three-and-one/month-detail/components/att-details.vue +++ b/src/views/synthesize-query/three-and-one/month-detail/components/att-details.vue @@ -11,14 +11,16 @@ > @@ -53,8 +55,8 @@ - 出勤:1 - 缺勤:0 + 出勤:1    + 缺勤:0    无对应日期:空白 diff --git a/src/views/synthesize-query/three-and-one/month-detail/components/header-info.vue b/src/views/synthesize-query/three-and-one/month-detail/components/header-info.vue index 545c806..fd9b1ac 100644 --- a/src/views/synthesize-query/three-and-one/month-detail/components/header-info.vue +++ b/src/views/synthesize-query/three-and-one/month-detail/components/header-info.vue @@ -12,7 +12,7 @@ size="mini" type="danger" @click="onHandlePack" - :disabled="monthlyData.refundStatus == 1" + :disabled="monthlyData.status == 2" > 封档 @@ -32,9 +32,9 @@
{{ item.label }}: @@ -60,18 +60,14 @@ 待封档 已封档 @@ -88,7 +84,6 @@ @@ -149,6 +162,7 @@ import { updateProMonthTableAPI, uploadProMonthTableRefundAPI, } from '@/api/synthesize-query/three-and-one' +import { deleteFileAPI } from '@/api/common' import DialogModel from '@/components/DialogModel/index.vue' export default { name: 'HeaderInfo', @@ -169,12 +183,23 @@ export default { default: '', }, }, + + computed: { + fileCount() { + if (this.monthlyData.contractFile) { + return 3 - this.monthlyData.contractFile.length + } + return 3 + }, + }, data() { return { uploadVisible: false, fileSize: 10, fileList: [], - monthlyData: {}, + monthlyData: { + contractFile: [], + }, dialogConfig: { outerTitle: '银行回单查看', outerWidth: '40%', @@ -197,7 +222,7 @@ export default { }, { label: '封档时间', - valueKey: 'refundTime', + valueKey: 'blockTime', }, { label: '回单附件', @@ -236,12 +261,14 @@ export default { const res = await updateProMonthTableAPI({ id: this.id, - refundStatus: 2, + status: 2, }) if (res.code == 200) { this.$modal.msgSuccess('封档成功') this.getMonthlyData() + this.uploadVisible = false + this.fileList = [] } }) .catch(() => { @@ -270,6 +297,9 @@ export default { if (this.fileList.length > 0) { // this.uploadVisible = false const formData = new FormData() + const params = { + id: this.id, + } const fileMsg = [] this.fileList.forEach((item) => { formData.append('files', item.raw) @@ -279,10 +309,14 @@ export default { }) }) + formData.append('fileMsg', JSON.stringify(fileMsg)) + formData.append('params', JSON.stringify(params)) const res = await uploadProMonthTableRefundAPI(formData) if (res.code == 200) { this.$modal.msgSuccess('回单上传成功') this.getMonthlyData() + this.uploadVisible = false + this.fileList = [] } } else { this.$modal.msgError('请上传文件') @@ -345,13 +379,42 @@ export default { // 查看附件 handleClickContractFile() { console.log('查看附件') - this.dialogConfig.outerVisible = true + if (this.monthlyData.contractFile.length > 0) { + this.dialogConfig.outerVisible = true + } else { + this.$modal.msgError('暂无附件') + } }, // 关闭弹框 handleCloseDialogOuter() { this.dialogConfig.outerVisible = false }, + + // 删除附件 + onHandleDeleteFile(row) { + console.log('删除附件', row) + + this.$confirm('是否确定删除附件?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }) + .then(async () => { + const res = await deleteFileAPI(row.id) + if (res.code == 200) { + this.$modal.msgSuccess('删除成功') + this.getMonthlyData() + } + }) + .catch(() => { + // console.log('取消') + }) + }, + // 下载附件 + onHandleDownloadFile(row) { + window.open(row.lsUrl, '_blank') + }, }, } diff --git a/src/views/synthesize-query/three-and-one/month-detail/components/nameList.vue b/src/views/synthesize-query/three-and-one/month-detail/components/nameList.vue index 703d6f1..164f6f0 100644 --- a/src/views/synthesize-query/three-and-one/month-detail/components/nameList.vue +++ b/src/views/synthesize-query/three-and-one/month-detail/components/nameList.vue @@ -11,29 +11,29 @@ > @@ -128,7 +128,7 @@ export default { }, data() { return { - total: 100, + total: 0, nameListQueryParams: { monthId: this.id, onDuty: '', diff --git a/src/views/synthesize-query/three-and-one/month-detail/components/wage-info.vue b/src/views/synthesize-query/three-and-one/month-detail/components/wage-info.vue index 2472462..c6649df 100644 --- a/src/views/synthesize-query/three-and-one/month-detail/components/wage-info.vue +++ b/src/views/synthesize-query/three-and-one/month-detail/components/wage-info.vue @@ -11,20 +11,23 @@ > @@ -61,8 +64,8 @@ stripe style="width: 100%" :data="wageInfoListData" - :header-cell-style="tableHeaderStyle" :cell-style="tableCellStyle" + :header-cell-style="tableHeaderStyle" > @@ -86,9 +88,19 @@ @@ -111,7 +123,10 @@