Merge remote-tracking branch 'origin/master'

zss

2023-12-11 c880739ec4cd5ede33b31eb98ad5f7628ea288e5

 src/views/product/dutyrecord/index.vue

@@ -1022,7 +1022,6 @@
    salarySummaryList() {
      let r = JSON.parse(JSON.stringify(this.salarySummaryListRes))
      const Heji = this.getHeji_tab4(r)
      console.log(Heji)
      Heji.forEach((e) => {
        const idx = r.findLastIndex((x) => e.staffId === x.staffId)
        r = [...r.slice(0, idx + 1), e, ...r.slice(idx + 1)]