提交钣金计划大表等;

chengxiangling

2025-05-14 63f27f3c60e8c608f6bf9586444fa20f4ef16b42

提交钣金计划大表等;

 .env.development

@@ -10,4 +10,4 @@
# 配合后端服务
# VITE_APP_LOCAL = 'int'
# VITE_APP_LOCAL = 'zhl'
VITE_APP_LOCAL = 'hjy'
VITE_APP_LOCAL = 'lhj'

 dist.zip

Binary files differ

 src/utils/i18n/locales/plan/index.js

@@ -89,6 +89,7 @@
    uploadErrorParseWeldSeamData: "焊缝工单数据已解析失败",
  },
  table: {
    mainPartCustomer:"主件客户",
    mainPartNumber: "主件料号",
    businessType: "业务类型",
    documentNumber: "单据号",
@@ -97,10 +98,10 @@
    documentStatus: "单据状态",
    updateBy: "审核时间",
    workCenter: "当前工序",
    department: "当前工序负责人",
    department: "当前工序负责部门",
    opStatus: "当前工序状态",
    nextOpName: "下一工序",
    nextProcessDeparment: "下一工序负责人",
    nextProcessDeparment: "下一工序负责部门",
    itemNumber: "料号",
    drawingNo: "图号",
    versionNumber: "版本号",
@@ -141,7 +142,7 @@
    salesOrder: "销售订单号",
    salesOrderLine: "销售订单行",
    goodProductsQuantity: "良品数量",
    processNumber: "工序序号",
    processNumber: "工序号",
    factoryCenter: "工作中心",
    dependencyDepartment: "所属部门",
    planStartDay: "计划开工日",
@@ -202,6 +203,8 @@
    subItemPartNumber: "子件料号",
    mismatchedProductionQuantity: "未匹配生产数量",
    workorderCreationTime: "工单创建时间",
    workOrderReviewTime:"工单审核时间",
    workOrderStartTime: "工单开工时间",
    delayRiskIdentification: "延迟风险标识",
    startDateOfDemandPlan: "需求计划开工日",
    requirementPlanCompletionDate: "需求计划完工日",
@@ -314,6 +317,7 @@
    uploadErrorParseWeldSeamData: "Failed to parse weld work order data",
  },
  table: {
    mainPartCustomer: "Main part customer",
    mainPartNumber: "Main part number",
    businessType: "Business type",
    documentNumber: "Document number",
@@ -322,10 +326,10 @@
    documentStatus: "Document Status",
    updateBy: "Audit time",
    workCenter: "Current process",
    department: "Current process leader",
    department: "Current process deparment",
    opStatus: "Current process status",
    nextOpName: "Next process",
    nextProcessDeparment: "Next Process Manager",
    nextProcessDeparment: "Next process deparment",
    itemNumber: "Item number",
    drawingNo: "Drawing No",
    versionNumber: "Version number",
@@ -427,6 +431,8 @@
    subItemPartNumber: "Sub Item Part Number",
    mismatchedProductionQuantity: "Mismatched Production Quantity",
    workorderCreationTime: "Work order creation time",
    workOrderReviewTime:"Work order review time",
    workOrderStartTime: "Work order start time",
    delayRiskIdentification: "Delay risk identification",
    startDateOfDemandPlan: "Start date of demand plan",
    requirementPlanCompletionDate: "Requirement plan completion date",

 src/views/mainPlan/platePlan/index.vue

@@ -275,15 +275,9 @@
const { proxy } = getCurrentInstance();
const { t, locale } = useI18n();
const {
  aps_is_suspended,
  aps_document_status,
  aps_account,
  aps_business_type,
} = proxy.useDict(
  "aps_is_suspended",
  "aps_document_status",
  "aps_account",
  "aps_business_type"
  "aps_account"
);
const exampleList = ref([]);
const planList = ref([]);
@@ -541,6 +535,7 @@
        width: 60,
        align: "center",
        slots: { content: "expandContent" },
        fixed:"left",
      },
      { type: "checkbox", width: 60, align: "center" },
      { type: "seq", title: t("plan.table.seq"), width: 60 },
@@ -579,11 +574,11 @@
      //   field: 'mainPartDrawingNumber',
      //   width: 150,
      // },
      // {
      //   title: '客户名称',
      //   field: 'customer',
      //   width: 200,
      // },
      {
        title: t('plan.table.customer'),
        field: 'customer',
        width: 200,
      },
      {
        title: t("plan.table.businessType"),
        field: "businessType",
@@ -684,11 +679,21 @@
      //   field: 'isOutsourcing',
      //   width: 100,
      // },
      // {
      //   title: '账套',
      //   field: 'account',
      //   width: 100,
      // },
      {
        title: t('plan.table.account'),
        field: 'account',
        width: 100,
        // formatter: ({ cellValue, row, column }) => {
        //   if (cellValue) {
        //     console.log(cellValue,aps_account.value,"llll")
        //     for (let i = 0; i < aps_account.value.length; i++) {
        //       if (cellValue === aps_account.value[i].value) {
        //         return aps_account.value[i].label;
        //       }
        //     }
        //   }
        // },
      },
      // {
      //   title: '上阶物料',
      //   field: 'advancedMaterials',
@@ -726,12 +731,12 @@
      // },
    ];
    subGridOptions.value.columns = [
      {
        title: t("plan.table.itemNumber"),
        field: "itemNo",
        width: 150,
        align: "center",
      },
      // {
      //   title: t("plan.table.itemNumber"),
      //   field: "itemNo",
      //   width: 150,
      //   align: "center",
      // },
      {
        title: t("plan.table.workOrderNo"),
        field: "workOrderNo",
@@ -780,18 +785,18 @@
      //   width: 90,
      //   align:"center",
      // },
      {
        title: t("plan.table.standardTime"),
        field: "standardTime",
        width: 90,
        align: "center",
      },
      {
        title: t("plan.table.processOrder"),
        field: "processOrder",
        width: 90,
        align: "center",
      },
      // {
      //   title: t("plan.table.standardTime"),
      //   field: "standardTime",
      //   width: 90,
      //   align: "center",
      // },
      // {
      //   title: t("plan.table.processOrder"),
      //   field: "processOrder",
      //   width: 90,
      //   align: "center",
      // },
      {
        title: t("plan.table.integrationDay"),
        field: "integrationDay",

 src/views/mainPlan/platePlanList/index.vue

@@ -164,21 +164,27 @@
  columns.value = [
    /*  { type: 'seq', title: '序号', width: 60 },*/
    {
      title: t("plan.table.mainPartCustomer"),
      field: "customer",
      width: 150,
      fixed: "left",
    },
    {
      title: t("plan.table.mainPartNumber"),
      field: "mainPartNumber",
      width: 150,
      width: 120,
      fixed: "left",
    },
    {
      title: t("plan.table.businessType"),
      field: "businessType",
      width: 120,
      width: 90,
      fixed: "left",
    },
    {
      title: t("plan.table.documentNumber"),
      field: "documentNumber",
      width: 160,
      width: 140,
      fixed: "left",
    },
    {
@@ -190,7 +196,7 @@
    {
      title: t("plan.table.documentStatus"),
      field: "documentStatus",
      width: 100,
      width: 70,
      fixed: "left",
    },
    {
@@ -253,10 +259,25 @@
      type: "html",
    },
    {
      title: t("plan.table.planworkOrderTime"),
      field: "planworkOrderTime",
      title: t("plan.table.workorderCreationTime"),
      field: "orderCreateTime",
      width: 200,
    },
    {
      title: t("plan.table.workOrderReviewTime"),
      field: "approveOn",
      width: 200,
    },
    {
      title: t("plan.table.workOrderStartTime"),
      field: "startWorkDate",
      width: 200,
    },
    // {
    //   title: t("plan.table.planworkOrderTime"),
    //   field: "planworkOrderTime",
    //   width: 200,
    // },
    {
      title: t("plan.table.planEndDay"),
      field: "planEndDay",
@@ -272,6 +293,7 @@
  let listValue = response.data;
  dynamicList.value = response.shopNames;
  aps_plate_process_statList.value = listValue;
  console.log(aps_plate_process_statList.value,"aps_plate_process_statList")
  total.value = response.total;
  loading.value = false;
  await nextTick();
@@ -335,17 +357,18 @@
      },
    },
  ]);
  newArray.splice(2, 0, {
    title: "焊接件齐套开始时间",
    field: "hanjie_startDate",
    width: 140,
  });
  // newArray.splice(2, 0, {
  //   title: "焊接件齐套开始时间",
  //   field: "hanjie_startDate",
  //   width: 140,
  // });
  columns.value = [
    ...columns.value,
    ...newArray.filter(
      (item) => !columns.value.some((col) => col.field === item.field)
    ),
  ];
  
  // columns.value = columns.value
}


 src/views/mainPlan/sheetMetalOrderManage/index.vue

@@ -852,7 +852,7 @@
  loadingSubUpAndDown.value = true;
  metalOrderManageUpAndDownList({requireId: row.requireId}).then((res) => {
    console.log(res,"metalOrderManageUpAndDownList");
    subUpAndDownList.value = res;
    subUpAndDownList.value = res.rows;
    loadingSubUpAndDown.value = false;
  }).catch(() => {
    loadingSubUpAndDown.value = false;