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

云

8 天以前 2f3c83ce4a9962d6027aeac580d314ec322b2073

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

 src/api/financialManagement/revenueManagement.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,78 @@
import request from "@/utils/request";

// æŸ¥è¯¢åˆ—表
export const listPage = (params) => {
  return request({
    url: "/account/accountIncome/listPage",
    method: "get",
    params,
  });
};

// æ–°å¢ž
export function add(data) {
  return request({
    url: "/account/accountIncome/add",
    method: "post",
    data: data,
  });
}

// ç¼–辑
export function update(data) {
  return request({
    url: "/account/accountIncome/update",
    method: "post",
    data: data,
  });
}

//导出
export const exportAccountIncome = (query) => {
  return request({
    url: "/account/accountIncome/export",
    method: "post",
    data: query,
    responseType: "blob",
  });
};

export const delAccountIncome = (query) => {
  return request({
    url: `account/accountIncome/del`,
    method: "delete",
    data: query,
  });
};

export const getAccountIncome = (id) => {
  return request({
    url: `/account/accountIncome/${id}`,
    method: "get",
  });
};

// æŸ¥è¯¢é™„件列表
export function fileListPage(query) {
  return request({
    url: "/account/accountFile/listPage",
    method: "get",
    params: query,
  });
}
// ä¿å­˜é™„件列表
export function fileAdd(query) {
  return request({
    url: "/account/accountFile/add",
    method: "post",
    data: query,
  });
}
// åˆ é™¤é™„件列表
export function fileDel(query) {
  return request({
    url: "/account/accountFile/del",
    method: "delete",
    data: query,
  });
}

 src/views/procurementManagement/qualityInspection/index.vue

@@ -205,6 +205,26 @@
}

const handleSubmit = () => {
  if (!formData.products || formData.products.length === 0) {
    ElMessage.error('请至少添加一条质检商品')
    return
  }

  for (let i = 0; i < formData.products.length; i++) {
    const product = formData.products[i]
    if (product.qualifiedQuantity === null || product.qualifiedQuantity === undefined) {
      ElMessage.error(`第${i + 1}条商品的合格数量不能为空`)
      return
    }
    if (product.unqualifiedQuantity === null || product.unqualifiedQuantity === undefined) {
      ElMessage.error(`第${i + 1}条商品的不合格数量不能为空`)
      return
    }
  }

  const totalQualified = formData.products.reduce((sum, p) => sum + (p.qualifiedQuantity || 0), 0)
  const totalUnqualified = formData.products.reduce((sum, p) => sum + (p.unqualifiedQuantity || 0), 0)

  if (dialogType.value === 'add') {
    const newInspection = {
      id: Date.now(),
@@ -212,8 +232,8 @@
      arrivalNo: formData.arrivalNo,
      supplierName: formData.supplierName,
      status: 'pending',
      qualifiedQuantity: 0,
      unqualifiedQuantity: 0,
      qualifiedQuantity: totalQualified,
      unqualifiedQuantity: totalUnqualified,
      inspectionTime: new Date().toLocaleString(),
      inspector: formData.inspector,
      remark: formData.remark

 src/views/reportAnalysis/dataDashboard/index0.vue

@@ -322,8 +322,6 @@
import {getRepairPage} from "@/api/equipmentManagement/repair.js";
import {getUpkeepPage} from "@/api/equipmentManagement/upkeep.js";
import {measuringInstrumentListPage} from "@/api/equipmentManagement/measurementEquipment.js";
import {listPageAnalysis} from "@/api/financialManagement/expenseManagement.js";
import {productOrderListPage} from "@/api/productionManagement/productionOrder.js";

// å…¨å±ç›¸å…³çŠ¶æ€
const isFullscreen = ref(false);