yys 1.销售、采购关于发票的改成不必填 2.回款类型字典改-下 3.销售台账、采购台账可能不开票直接回款 4.销售台账要直接查产品名字 5.指标维...

maven

2025-11-18 636e2cae8b77fd62496ba4d2006965f6376668f2

 src/views/salesManagement/salesLedger/index.vue

@@ -22,6 +22,10 @@
          <el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
            placeholder="请选择" clearable @change="changeDaterange" />
        </el-form-item>
        <el-form-item label="产品大类：">
          <el-input v-model="searchForm.productCategory" placeholder="请输入" clearable prefix-icon="Search"
                    @change="handleQuery" />
        </el-form-item>
        <el-form-item>
          <el-button type="primary" @click="handleQuery"> 搜索 </el-button>
        </el-form-item>
@@ -152,6 +156,14 @@
              <el-input v-model="form.paymentMethod" placeholder="请输入" clearable :disabled="operationType === 'view'" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="是否开票" prop="isInvoice">
              <el-select v-model="form.isInvoice" placeholder="请选择" clearable>
                <el-option label="是" value="1" />
                <el-option label="否" value="2" />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-form-item label="产品信息：" prop="entryDate">
@@ -240,17 +252,19 @@
          </el-col>
               <el-col :span="12">
                  <el-form-item label="税率(%)：" prop="taxRate">
                     <el-select v-model="productForm.taxRate" placeholder="请选择" clearable @change="calculateFromTaxRate">
                        <el-option label="1" value="1" />
                        <el-option label="6" value="6" />
                        <el-option label="13" value="13" />
                     </el-select>
<!--                     <el-select v-model="productForm.taxRate" placeholder="请选择" clearable @change="calculateFromTaxRate">-->
<!--                        <el-option label="1" value="1" />-->
<!--                        <el-option label="6" value="6" />-->
<!--                        <el-option label="13" value="13" />-->
<!--                     </el-select>-->
              <el-input-number :step="1" :min="0" v-model="productForm.taxRate" style="width: 100%"
                               placeholder="请输入" clearable @change="calculateFromTaxRate" />
                  </el-form-item>
               </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="含税单价(元)：" prop="taxInclusiveUnitPrice">
            <el-form-item label="含税/不含税单价(元)：" prop="taxInclusiveUnitPrice">
              <el-input-number :step="0.01" :min="0" v-model="productForm.taxInclusiveUnitPrice" style="width: 100%"
                                              :precision="2"
                                              placeholder="请输入" clearable @change="calculateFromUnitPrice" />
@@ -320,7 +334,7 @@
                        <div class="company-name">鼎诚瑞实业有限责任公司</div>
                        <div class="document-title">零售发货单</div>
                     </div>
							

                     <div class="info-section">
                        <div class="info-row">
                           <div>
@@ -328,7 +342,7 @@
                              <span class="value">{{ formatDate(item.createTime) }}</span>
                           </div>
                           <div>
										

                              <span class="label">客户名称：</span>
                              <span class="value">{{ item.customerName || '张爱有' }}</span>
                           </div>
@@ -338,7 +352,7 @@
                           <span class="value">{{ item.salesContractNo }}</span>
                        </div>
                     </div>
							

                     <div class="table-section">
                        <table class="product-table">
                           <thead>
@@ -376,7 +390,7 @@
                           </tfoot>
                        </table>
                     </div>
							

                     <div class="footer-section">
                        <div class="footer-row">
                           <div class="footer-item">
@@ -504,6 +518,7 @@
    customerName: "", // 客户名称
    customerContractNo: "", // 客户合同编号
    salesContractNo: "", // 销售合同编号
    productCategory: "", // 产品大类
    projectName: "", // 项目名称
    entryDate: null, // 录入日期
    entryDateStart: undefined,
@@ -521,6 +536,7 @@
    productData: [],
    executionDate: "",
    paymentMethod: "",
    isInvoice:"",
  },
  rules: {
    salesman: [{ required: true, message: "请选择", trigger: "change" }],
@@ -532,7 +548,8 @@
    entryPerson: [{ required: true, message: "请选择", trigger: "change" }],
    entryDate: [{ required: true, message: "请选择", trigger: "change" }],
    executionDate: [{ required: true, message: "请选择", trigger: "change" }],
  },
    isInvoice: [{ required: true, message: "请选择", trigger: "change"}],
    },
});
const { form, rules } = toRefs(data);
const { form: searchForm } = useFormData(data.searchForm);
@@ -563,14 +580,14 @@
    taxInclusiveUnitPrice: [
      { required: true, message: "请输入", trigger: "blur" },
    ],
    taxRate: [{ required: true, message: "请选择", trigger: "change" }],
    // taxRate: [{ required: true, message: "请选择", trigger: "change" }],
    taxInclusiveTotalPrice: [
      { required: true, message: "请输入", trigger: "blur" },
    ],
    taxExclusiveTotalPrice: [
      { required: true, message: "请输入", trigger: "blur" },
    ],
    invoiceType: [{ required: true, message: "请选择", trigger: "change" }],
    // invoiceType: [{ required: true, message: "请选择", trigger: "change" }],
  },
});
const { productForm, productRules } = toRefs(productFormData);
@@ -975,25 +992,25 @@
      proxy.$modal.msgWarning("请选择要打印的数据");
      return;
   }
	

   // 显示加载状态
   proxy.$modal.loading("正在获取产品数据，请稍候...");
	

   try {
      // 为每个选中的销售台账记录查询对应的产品数据
      const printDataWithProducts = [];
		

      for (const row of selectedRows.value) {
         try {
            // 调用productList接口查询产品数据
            const productRes = await productList({ salesLedgerId: row.id, type: 1 });
				

            // 将产品数据整合到销售台账记录中
            const rowWithProducts = {
               ...row,
               products: productRes.data || []
            };
				

            printDataWithProducts.push(rowWithProducts);
         } catch (error) {
            console.error(`获取销售台账 ${row.id} 的产品数据失败:`, error);
@@ -1004,11 +1021,11 @@
            });
         }
      }
		

      printData.value = printDataWithProducts;
      console.log('打印数据（包含产品）:', printData.value);
      printPreviewVisible.value = true;
		

   } catch (error) {
      console.error('获取产品数据失败:', error);
      proxy.$modal.msgError("获取产品数据失败，请重试");
@@ -1020,10 +1037,10 @@
const executePrint = () => {
   console.log('开始执行打印，数据条数:', printData.value.length);
   console.log('打印数据:', printData.value);
	

   // 创建一个新的打印窗口
   const printWindow = window.open('', '_blank', 'width=800,height=600');
	

   // 构建打印内容
   let printContent = `
    <!DOCTYPE html>
@@ -1159,7 +1176,7 @@
    </head>
    <body>
  `;
	

   // 为每条数据生成打印页面
   printData.value.forEach((item, index) => {
      printContent += `
@@ -1169,7 +1186,7 @@
            <div class="company-name">鼎诚瑞实业有限责任公司</div>
            <div class="document-title">零售发货单</div>
          </div>
          

          <div class="info-section">
            <div class="info-row">
              <div>
@@ -1200,7 +1217,7 @@
                </tr>
              </thead>
              <tbody>
                ${item.products && item.products.length > 0 ? 
                ${item.products && item.products.length > 0 ?
                  item.products.map(product => `
                    <tr>
                      <td>${product.productCategory || ''}</td>
@@ -1210,7 +1227,7 @@
                      <td>${product.quantity || '0'}</td>
                      <td>${product.taxInclusiveTotalPrice || '0'}</td>
                    </tr>
                  `).join('') : 
                  `).join('') :
                  '<tr><td colspan="6" style="text-align: center; color: #999;">暂无产品数据</td></tr>'
                }
              </tbody>
@@ -1257,16 +1274,16 @@
      </div>
    `;
   });
	

   printContent += `
    </body>
    </html>
  `;
	

   // 写入内容到新窗口
   printWindow.document.write(printContent);
   printWindow.document.close();
	

   // 等待内容加载完成后打印
   printWindow.onload = () => {
      setTimeout(() => {
@@ -1366,148 +1383,169 @@
// 根据含税总价计算含税单价和数量
const calculateFromTotalPrice = () => {
  if (isCalculating.value) return;
  

  const totalPrice = parseFloat(productForm.value.taxInclusiveTotalPrice);
  const quantity = parseFloat(productForm.value.quantity);
  

  if (!totalPrice || !quantity || quantity <= 0) {
    return;
  }
  

  isCalculating.value = true;
  

  // 计算含税单价 = 含税总价 / 数量
  productForm.value.taxInclusiveUnitPrice = (totalPrice / quantity).toFixed(2);
  

  // 如果有税率，计算不含税总价
  if (productForm.value.taxRate) {
    productForm.value.taxExclusiveTotalPrice =
  // if (productForm.value.taxRate) {
  //   productForm.value.taxExclusiveTotalPrice =
  //     proxy.calculateTaxExclusiveTotalPrice(
  //       totalPrice,
  //       productForm.value.taxRate
  //     );
  // }
  productForm.value.taxExclusiveTotalPrice =
      proxy.calculateTaxExclusiveTotalPrice(
        totalPrice,
        productForm.value.taxRate
          totalPrice,
          productForm.value.taxRate
      );
  }
  

  isCalculating.value = false;
};

// 根据不含税总价计算含税单价和数量
const calculateFromExclusiveTotalPrice = () => {
   if (!productForm.value.taxRate) {
      proxy.$modal.msgWarning("请先选择税率");
      return;
   }
   // if (!productForm.value.taxRate) {
   //    proxy.$modal.msgWarning("请先选择税率");
   //    return;
   // }
  if (isCalculating.value) return;
  

  const exclusiveTotalPrice = parseFloat(productForm.value.taxExclusiveTotalPrice);
  const quantity = parseFloat(productForm.value.quantity);
  const taxRate = parseFloat(productForm.value.taxRate);
  
  if (!exclusiveTotalPrice || !quantity || quantity <= 0 || !taxRate) {
  const taxRate = productForm.value.taxRate?parseFloat(productForm.value.taxRate):0;

  // if (!exclusiveTotalPrice || !quantity || quantity <= 0 || !taxRate) {
  //   return;
  // }
  if (!exclusiveTotalPrice || !quantity || quantity <= 0) {
    return;
  }
  

  isCalculating.value = true;
  

  // 先计算含税总价 = 不含税总价 / (1 - 税率/100)
  const taxRateDecimal = taxRate / 100;
  const inclusiveTotalPrice = exclusiveTotalPrice / (1 - taxRateDecimal);
  productForm.value.taxInclusiveTotalPrice = inclusiveTotalPrice.toFixed(2);
  

  // 计算含税单价 = 含税总价 / 数量
  productForm.value.taxInclusiveUnitPrice = (inclusiveTotalPrice / quantity).toFixed(2);
  

  isCalculating.value = false;
};

// 根据数量变化计算总价
const calculateFromQuantity = () => {
   if (!productForm.value.taxRate) {
      proxy.$modal.msgWarning("请先选择税率");
      return;
   }
   // if (!productForm.value.taxRate) {
   //    proxy.$modal.msgWarning("请先选择税率");
   //    return;
   // }
  if (isCalculating.value) return;
  

  const quantity = parseFloat(productForm.value.quantity);
  const unitPrice = parseFloat(productForm.value.taxInclusiveUnitPrice);
  

  if (!quantity || quantity <= 0 || !unitPrice) {
    return;
  }
  

  isCalculating.value = true;
  

  // 计算含税总价
  productForm.value.taxInclusiveTotalPrice = (unitPrice * quantity).toFixed(2);
  

  // 如果有税率，计算不含税总价
  if (productForm.value.taxRate) {
    productForm.value.taxExclusiveTotalPrice =
  // if (productForm.value.taxRate) {
  //   productForm.value.taxExclusiveTotalPrice =
  //     proxy.calculateTaxExclusiveTotalPrice(
  //       productForm.value.taxInclusiveTotalPrice,
  //       productForm.value.taxRate
  //     );
  // }
  productForm.value.taxExclusiveTotalPrice =
      proxy.calculateTaxExclusiveTotalPrice(
        productForm.value.taxInclusiveTotalPrice,
        productForm.value.taxRate
          productForm.value.taxInclusiveTotalPrice,
          productForm.value.taxRate
      );
  }
  

  isCalculating.value = false;
};

// 根据含税单价变化计算总价
const calculateFromUnitPrice = () => {
   if (!productForm.value.taxRate) {
      proxy.$modal.msgWarning("请先选择税率");
      return;
   }
   // if (!productForm.value.taxRate) {
   //    proxy.$modal.msgWarning("请先选择税率");
   //    return;
   // }
  if (isCalculating.value) return;
  

  const quantity = parseFloat(productForm.value.quantity);
  const unitPrice = parseFloat(productForm.value.taxInclusiveUnitPrice);
  

  if (!quantity || quantity <= 0 || !unitPrice) {
    return;
  }
  

  isCalculating.value = true;
  

  // 计算含税总价
  productForm.value.taxInclusiveTotalPrice = (unitPrice * quantity).toFixed(2);
  

  // 如果有税率，计算不含税总价
  if (productForm.value.taxRate) {
    productForm.value.taxExclusiveTotalPrice =
  // if (productForm.value.taxRate) {
  //   productForm.value.taxExclusiveTotalPrice =
  //     proxy.calculateTaxExclusiveTotalPrice(
  //       productForm.value.taxInclusiveTotalPrice,
  //       productForm.value.taxRate
  //     );
  // }
  productForm.value.taxExclusiveTotalPrice =
      proxy.calculateTaxExclusiveTotalPrice(
        productForm.value.taxInclusiveTotalPrice,
        productForm.value.taxRate
          productForm.value.taxInclusiveTotalPrice,
          productForm.value.taxRate
      );
  }
  

  isCalculating.value = false;
};

// 根据税率变化计算不含税总价
const calculateFromTaxRate = () => {
   if (!productForm.value.taxRate) {
      proxy.$modal.msgWarning("请先选择税率");
      return;
   }
   // if (!productForm.value.taxRate) {
   //    proxy.$modal.msgWarning("请先选择税率");
   //    return;
   // }
  if (isCalculating.value) return;
  

  const inclusiveTotalPrice = parseFloat(productForm.value.taxInclusiveTotalPrice);
  const taxRate = parseFloat(productForm.value.taxRate);
  
  if (!inclusiveTotalPrice || !taxRate) {

  // if (!inclusiveTotalPrice || !taxRate) {
  //   return;
  // }
  if (!inclusiveTotalPrice) {
    return;
  }
  

  isCalculating.value = true;
  

  // 计算不含税总价
  productForm.value.taxExclusiveTotalPrice =
    proxy.calculateTaxExclusiveTotalPrice(
      inclusiveTotalPrice,
      taxRate
    );
  

  isCalculating.value = false;
};
/**
@@ -1592,12 +1630,12 @@
      padding: 15px;
      border-bottom: 1px solid #e4e7ed;
      text-align: center;
		

      .el-button {
         margin: 0 10px;
      }
   }
	

   .print-preview-content {
      padding: 20px;
      background-color: #f5f5f5;
@@ -1629,13 +1667,13 @@
.header {
   text-align: center;
   margin-bottom: 8px;
	

   .company-name {
      font-size: 18px;
      font-weight: bold;
      margin-bottom: 4px;
   }
	

   .document-title {
      font-size: 16px;
      font-weight: bold;
@@ -1647,16 +1685,16 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
	

   .info-row {
      line-height: 20px;
		

      .label {
         font-weight: bold;
         width: 60px;
         font-size: 14px;
      }
		

      .value {
         margin-right: 20px;
         min-width: 80px;
@@ -1668,12 +1706,12 @@
.table-section {
   margin-bottom: 4px;
   flex: 1;
	

   .product-table {
      width: 100%;
      border-collapse: collapse;
      border: 1px solid #000;
		

      th, td {
         border: 1px solid #000;
         padding: 6px;
@@ -1681,16 +1719,16 @@
         font-size: 14px;
         line-height: 1.4;
      }
		

      th {
         font-weight: bold;
      }
		

      .total-label {
         text-align: right;
         font-weight: bold;
      }
		

      .total-value {
         font-weight: bold;
      }
@@ -1703,22 +1741,22 @@
      margin-bottom: 3px;
      line-height: 20px;
      justify-content: space-between;
		

      .footer-item {
         display: flex;
         margin-right: 20px;
			

         .label {
            font-weight: bold;
            width: 80px;
            font-size: 14px;
         }
			

         .value {
            min-width: 80px;
            font-size: 14px;
         }
			

         &.address-item {
            .address-value {
               min-width: 200px;
@@ -1732,7 +1770,7 @@
   .app-container {
      display: none;
   }
	

   .print-page {
      box-shadow: none;
      margin: 0;