Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2

cloudroam

2024-09-14 7f177f5915a1dbdf8ad6cd840b4d7408b9f3598f

Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2

 components/order/print-list.vue

@@ -34,7 +34,7 @@
        </el-row>
        <el-table-print
          :data="item.items"
          :summary-method="getSummaries"
          :summary-method="getSummaries.bind(this, item.totalAmount)"
          show-summary
          border
          style="width: 100%"
@@ -107,17 +107,15 @@
        }
      }
    },
    getSummaries(param) {
    getSummaries(totalAmount, param) {
      const { columns, data } = param
      const sums = []
      columns.forEach((column, index) => {
        if (index === 0) {
          sums[index] =
            '总扎数合计：' +
            data.reduce((total, current) => {
          sums[index] = `总扎数合计：${data.reduce((total, current) => {
              total += current.num
              return total
            }, 0)
          }, 0)}                总金额：¥${totalAmount}`
        } else {
          sums[index] = ''
        }

 pages/marketing/coupon/activity/index.vue

@@ -57,6 +57,7 @@
          { label: '已领取总数', prop: 'getNum', minWidth: 150 },
          { label: '剩余未领取总数', prop: 'unGetNum', minWidth: 150 },
          { label: '状态', prop: 'statusName', minWidth: 120 },
          { label: '领取渠道', prop: 'getTypeName', minWidth: 120 },
          { label: '操作人', prop: 'createByName', minWidth: 120 },
        ],
        // 页面上要到分，后端要传到秒

 pages/marketing/point-mall/goods.vue

@@ -126,7 +126,7 @@
        extraButtons: [
          {
            text: '上架',
            show: (row) => row.status === 'I',
            show: (row) => row.status === 'I' && row.stock>0,
            atClick: async (row) => {
              try {
                await this.$elBusUtil.confirm('确定要上架吗？')

 pages/order/list/_id.vue

@@ -113,10 +113,25 @@
        min-width="120"
      ></el-table-column>
      <el-table-column
        label="质检扣款(元)"
        label="质检退款(元)"
        prop="deductAmount"
        min-width="120"
      ></el-table-column>
      <el-table-column
        label="补货扣款(元)"
        prop="replaceFee"
        min-width="120"
      ></el-table-column>
      <el-table-column
        label="降级扣款(元)"
        prop="checkFee"
        min-width="120"
      ></el-table-column>
      <el-table-column
        label="缺货扣款(元)"
        prop="lackFeeSupplier"
        min-width="120"
      ></el-table-column>
      <el-table-column label="质检审核" width="220" fixed="right">
        <template #default="{ row }">
          <el-button

 pages/order/list/index.vue

@@ -200,7 +200,7 @@
                        for (const tr of trs) {
                          const tds = tr.querySelectorAll('td')
                          if (tds && tds.length > 0) {
                            tds[0].colSpan = 7
                            tds[0].colSpan = 8
                            tds[0].style.textAlign = 'center'
                          }
                        }

 static/print/custom.css

@@ -18,6 +18,10 @@
  font-weight: bold;
}

.el-table__footer-wrapper td .cell {
  white-space: pre-wrap;
}

.area-text {
  text-align: center;
  font-size: 18px;