提交计划大表字段冲突解决

CD配唱片

2025-04-25 d71aa3a053f94e8e462609a255f92bf1a60b3109

提交计划大表字段冲突解决

 src/views/mainPlan/platePlanList/index.vue

@@ -49,7 +49,7 @@
          plain
          icon="Edit"
          @click="handleUpdate"
          v-hasPermi="['apsPlateProcessStat:edit']"
          v-hasPermi="['plateProcessShopStat:update']"
          >更新</el-button
        >
      </el-col>
@@ -171,11 +171,19 @@
    field: "documentNumber",
    width: 200,
  },
<<<<<<< HEAD
  {
    title: "当前工序号",
    field: "currentProcessNumberTxt",
    width: 150,
  },
=======
  // {
  //   title: "当前工序号",
  //   field: "processNumber",
  //   width: 150,
  // },
>>>>>>> 8c613f17337c8e7fc68a12d02cafa05d0dca81ba
  {
    title: "需求分类",
    field: "requirementType",
@@ -192,10 +200,14 @@
    width: 200,
  },
  {
    title: "计划开工日",
    field: "processPlanStartDaytxt",
    title: "当前工序负责人",
    field: "department",
    width: 200,
    type: "html",
  },
  {
    title: "下一工序工序负责人",
    field: "nextProcessDeparment",
    width: 200,
  },
  {
    title: "料号",
@@ -222,7 +234,7 @@
    type: "html",
  },
  {
    title: "计划完工日",
    title: "系统完工时间",
    field: "planEndDay",
    width: 150,
    format: "YYYY-MM-DD hh:mm:ss",