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

yaowanxin

2 天以前 e3847238a8ee1cf2e013a85d98b4b48fd5f4c3ec

 src/views/salesManagement/invoiceRegistration/index.vue

@@ -555,12 +555,12 @@
      const allProductData = [];
      results.forEach((result, index) => {
         const contract = selectedRows.value[index];
         const contractId = contract.id;
         // const contractId = contract.id;
         if (result.productData) {
            result.productData.forEach(item => {
               allProductData.push({
                  ...item,
                  id: contractId, // 明确设置合同ID
                  // id: contractId, // 明确设置合同ID
                  salesContractNo: contract.salesContractNo, // 添加销售合同号
                  customerName: contract.customerName, // 添加客户名称
                  customerContractNo: contract.customerContractNo // 添加客户合同号