Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

5 天以前 10d4c82e729694bd49a29f589d607690dc4b71f8

Merge remote-tracking branch 'origin/dev' into dev

 src/views/salesManagement/invoiceRegistration/index.vue

@@ -334,7 +334,7 @@
  // 计算本次开票金额
  row.currentInvoiceAmount = row.currentInvoiceNum * row.taxInclusiveUnitPrice
  // 计算未开票数
  row.noInvoiceNum = row.noInvoiceNum - row.currentInvoiceNum
  row.noInvoiceNum = row.originalNoInvoiceNum - row.currentInvoiceNum
  // 计算未开票金额
  row.noInvoiceAmount = row.noInvoiceNum * row.taxInclusiveUnitPrice
}

 src/views/salesManagement/salesLedger/index.vue

@@ -467,7 +467,7 @@
      productList({salesLedgerId: row.id, type: 1}).then(res => {
      const index = tableData.value.findIndex(item => item.id === row.id);
      if (index > -1) {
        tableData.value[index].children = res.rows;
        tableData.value[index].children = res;
      }
      expandedRowKeys.value.push(row.id)
    })
@@ -689,7 +689,7 @@
    }).catch(() => {
      proxy.$modal.msg("已取消")
    })
    

  }
}
// 关闭产品弹框
@@ -753,4 +753,4 @@

<style scoped lang="scss">

</style>
</style>