CD配唱片
2025-04-24 f673939620847927a42e24629385e3b4cfcde299
提交钣金计划大表动态表格
已修改2个文件
已添加1个文件
386 ■■■■■ 文件已修改
src/api/ApsPlateProcessShopStat/ApsPlateProcessShopStat.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/mainPlan/apsPlatePlanList.js 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/platePlanList/index.vue 340 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/ApsPlateProcessShopStat/ApsPlateProcessShopStat.js
@@ -3,7 +3,7 @@
// æŸ¥è¯¢é’£é‡‘车间统计列表
export function listApsPlateProcessShopStat(query) {
  return request({
    url: '/plateProcessShopStat/list',
    url: '/aps/plateProcessShopStat/list',
    method: 'get',
    params: query
  })
src/api/mainPlan/apsPlatePlanList.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,44 @@
import request from '@/utils/request'
// æŸ¥è¯¢é’£é‡‘车间统计列表
export function listApsPlateProcessShopStat(query) {
  return request({
    url: '/aps/plateProcessShopStat/list',
    method: 'get',
    params: query
  })
}
// // æŸ¥è¯¢é’£é‡‘车间统计详细
// export function getApsPlateProcessShopStat(id) {
//   return request({
//     url: '/ApsPlateProcessShopStat/ApsPlateProcessShopStat/' + id,
//     method: 'get'
//   })
// }
// // æ–°å¢žé’£é‡‘车间统计
// export function addApsPlateProcessShopStat(data) {
//   return request({
//     url: '/ApsPlateProcessShopStat/ApsPlateProcessShopStat',
//     method: 'post',
//     data: data
//   })
// }
// // ä¿®æ”¹é’£é‡‘车间统计
// export function updateApsPlateProcessShopStat(data) {
//   return request({
//     url: '/ApsPlateProcessShopStat/ApsPlateProcessShopStat',
//     method: 'put',
//     data: data
//   })
// }
// // åˆ é™¤é’£é‡‘车间统计
// export function delApsPlateProcessShopStat(id) {
//   return request({
//     url: '/ApsPlateProcessShopStat/ApsPlateProcessShopStat/' + id,
//     method: 'delete'
//   })
// }
src/views/mainPlan/platePlanList/index.vue
@@ -2,21 +2,29 @@
  <div class="app-container">
    <el-row :gutter="20">
      <el-col>
        <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="90px">
        <el-form
          :model="queryParams"
          ref="queryRef"
          :inline="true"
          v-show="showSearch"
          label-width="90px"
        >
          <el-row :gutter="20">
            <el-col :span="12">
              <el-form-item label="工单号" prop="num">
                <el-input
                    v-model="queryParams.workOrderNo"
                    placeholder="请输入钣金计划工单号"
                    clearable
                    @keyup.enter="handleQuery"
                  v-model="queryParams.workOrderNo"
                  placeholder="请输入钣金计划工单号"
                  clearable
                  @keyup.enter="handleQuery"
                />
              </el-form-item>
            </el-col>
            <el-col  :span="12"  style="text-align: right;">
            <el-col :span="12" style="text-align: right">
              <el-form-item>
                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
                <el-button type="primary" icon="Search" @click="handleQuery"
                  >搜索</el-button
                >
                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
              </el-form-item>
            </el-col>
@@ -25,51 +33,68 @@
      </el-col>
    </el-row>
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
            type="warning"
            plain
            icon="Download"
            @click="handleExport"
            v-hasPermi="['apsPlateProcessStat:export']"
        >导出</el-button>
          type="warning"
          plain
          icon="Download"
          @click="handleExport"
          v-hasPermi="['apsPlateProcessStat:export']"
          >导出</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button
            type="success"
            plain
            icon="Edit"
            @click="handleUpdate"
            v-hasPermi="['apsPlateProcessStat:edit']"
        >更新</el-button>
          type="success"
          plain
          icon="Edit"
          @click="handleUpdate"
          v-hasPermi="['apsPlateProcessStat:edit']"
          >更新</el-button
        >
      </el-col>
      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
      <right-toolbar
        v-model:showSearch="showSearch"
        @queryTable="getList"
      ></right-toolbar>
    </el-row>
    <HxlhTable
        style="width: 100%"
        :columns="columns"
        :data="aps_plate_process_statList"
        :loading="loading"
        :height="height"
      style="width: 100%"
      ref="xGrid"
      :key="columnsVersion"
      :columns="columns"
      :data="aps_plate_process_statList"
      :loading="loading"
      :height="height"
    >
    </HxlhTable>
    <!-- æ·»åŠ æˆ–ä¿®æ”¹é’£é‡‘ç»Ÿè®¡å¯¹è¯æ¡† -->
    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
      <el-form ref="aps_plate_process_statRef" :model="form" :rules="rules" label-width="80px">
      <el-form
        ref="aps_plate_process_statRef"
        :model="form"
        :rules="rules"
        label-width="80px"
      >
        <el-form-item label="排序" prop="num">
          <el-input v-model="form.num" placeholder="请输入排序" />
        </el-form-item>
        <el-form-item label="生产数量" prop="productionQuantity">
          <el-input v-model="form.productionQuantity" placeholder="请输入生产数量" />
          <el-input
            v-model="form.productionQuantity"
            placeholder="请输入生产数量"
          />
        </el-form-item>
        <el-form-item label="标准工时" prop="standardTime">
          <el-input v-model="form.standardTime" placeholder="请输入标准工时" />
        </el-form-item>
        <el-form-item label="工序总工时" prop="processTotalTime">
          <el-input v-model="form.processTotalTime" placeholder="请输入工序总工时" />
          <el-input
            v-model="form.processTotalTime"
            placeholder="请输入工序总工时"
          />
        </el-form-item>
        <el-form-item label="设计工时" prop="designTimes">
          <el-input v-model="form.designTimes" placeholder="请输入设计工时" />
@@ -86,14 +111,17 @@
</template>
<script setup name="Aps_plate_process_stat">
import { listPlateStat,updateStat } from "@/api/mainPlan/plateProcessStat";
import { listPlateStat, updateStat } from "@/api/mainPlan/plateProcessStat";
import { listApsPlateProcessShopStat } from "@/api/mainPlan/apsPlatePlanList";
import HxlhTable from "@/components/HxlhTable/index.vue";
import { getToken } from "@/utils/auth";
import { ref } from "vue";
import {ElMessage} from "element-plus";
import { nextTick, onMounted, ref } from "vue";
import { ElMessage } from "element-plus";
const { proxy } = getCurrentInstance();
const aps_plate_process_statList = ref([]);
const dynamicList = ref([]);
const generateColumnList = ref([]);
const open = ref(false);
const loading = ref(true);
const showSearch = ref(true);
@@ -101,9 +129,8 @@
const multiple = ref(true);
const total = ref(0);
const title = ref("");
const height = ref(document.documentElement.clientHeight - 270 + "px;")
const height = ref(document.documentElement.clientHeight - 270 + "px;");
const columnsVersion = ref(0);
const data = reactive({
  form: {},
  queryParams: {
@@ -122,93 +149,161 @@
    designTimes: null,
    batchNumber: null,
  },
  rules: {
  }
  rules: {},
});
const xGrid = ref();
const { queryParams, form, rules } = toRefs(data);
// è¡¨æ ¼é…ç½®
const columns = ref([
/*  { type: 'seq', title: '序号', width: 60 },*/
  /*  { type: 'seq', title: '序号', width: 60 },*/
  {
    title: '工单号',
    field: 'workOrderNo',
    title: "主件料号",
    field: "mainPartNumber",
    width: 150,
  } ,
  {
    title: '工序名称',
    field: 'processName',
  },
  {
    title: '工序号',
    field: 'routeProcessNumberTxt',
    title: "业务类型",
    field: "businessType",
  },
  {
    title: "单据号",
    field: "documentNumber",
    width: 100,
  },
  {
    title: '当前工序号',
    field: 'currentProcessNumberTxt',
    title: "当前工序号",
    field: "currentProcessNumberTxt",
    width: 100,
  },
  {
    title: '生产数量',
    field: 'productionQuantity',
    title: "需求分类",
    field: "requirementType",
    width: 80,
  },
  {
    title: '标准工时',
    field: 'standardTime',
    title: "单据状态",
    field: "documentStatus",
    width: 80,
  },
  {
    title: '工序总工时',
    field: 'processTotalTime',
    title: "当前工序",
    field: "workCenter",
    width: 80,
  },
  {
    title: '计划开工日',
    field: 'processPlanStartDaytxt',
    title: "计划开工日",
    field: "processPlanStartDaytxt",
    width: 140,
    type:'html'
    type: "html",
  },
  {
    title: '计划完工日',
    field: 'processPlanEndDaytxt',
    title: "料号",
    field: "itemNumber",
    width: 140,
    type:'html'
    type: "html",
  },
  {
    title: '订单完工日',
    field: 'orderPlanEndDay',
    title: "图号",
    field: "drawingNo",
    width: 120,
    format: 'YYYY-MM-DD'
  }
    // format: 'YYYY-MM-DD'
  },
  {
    title: "版本号",
    field: "versionNumber",
    width: 140,
    type: "html",
  },
  {
    title: "生产数量",
    field: "productionQuantity",
    width: 140,
    type: "html",
  },
  {
    title: "计划完工日",
    field: "planEndDay",
    width: 140,
    format: "YYYY-MM-DD hh:mm:ss",
  },
]);
/** æŸ¥è¯¢é’£é‡‘统计列表 */
function getList() {
async function getList() {
  loading.value = true;
  listPlateStat(queryParams.value).then(response => {
    const listValue = response.rows;
    listValue.forEach(listItem => {
      listItem[`processPlanStartDaytxt`]= listItem.warning? `<font color="red">${listItem.processPlanStartDay}</font>`  :listItem.processPlanStartDay;
      listItem[`processPlanEndDaytxt`]= listItem.warning? `<font color="red">${listItem.processPlanEndDay}</font>`  :listItem.processPlanEndDay;
      listItem[`routeProcessNumberTxt`]= listItem.routeProcessNumber.toString().padStart(3, '0');
      listItem[`currentProcessNumberTxt`]= listItem.currentProcessNumber.toString().padStart(3, '0');
  const response = await listApsPlateProcessShopStat(queryParams.value);
  const listValue = response.data;
  const resData = listValue.map((item,index)=>{
    item.deptPlans.map((n, i) => {
        item[`${i}_startDate`] = n.planStartDate
        item[`${i}_endDate`] = n.planEndDate
    });
    aps_plate_process_statList.value =listValue
    debugger;
    total.value = response.total;
    loading.value = false;
  });
    return  {
      ...item
    }
  })
  console.log(resData,'resDataresDataresData')
  dynamicList.value = response.shopNames;
  aps_plate_process_statList.value = listValue;
  total.value = response.total;
  loading.value = false;
  await nextTick();
  const newArray = dynamicList.value.flatMap((item, index) => [
    {
      title: `${item}开始时间`,
      field:`${index}_startDate`,
      width: 140,
      formatter: ({ cellValue, row, column }) => {
        let dateStr = "";
        if (cellValue) {
          row.deptPlans.map((n, i) => {
            if (item === n.shopName) {
              // console.log(
              //   item,
              //   n.shopName,
              //   n.planStartDate,
              //   `${item}开始时间`,
              //   "planStartDate"
              // );
              dateStr =  n.planStartDate;
            }
          });
        }
        return dateStr
      },
    },
    {
      title: `${item}结束时间`,
      field:`${index}_endDate`,
      width: 140,
      formatter: ({ cellValue, row, column }) => {
        let dateStr = "";
        if (cellValue) {
          row.deptPlans.map((n, i) => {
            if (item === n.shopName) {
              // console.log(
              //   item,
              //   n.shopName,
              //   n.planStartDate,
              //   `${item}开始时间`,
              //   "planStartDate"
              // );
              dateStr =  n.planEndDate;
            }
          });
        }
        return dateStr
      },
    },
  ]);
  await nextTick();
  console.log(xGrid.value, "llll");
  columns.value = [...columns.value, ...newArray];              // å¼ºåˆ¶ç»„件重新渲染
}
function generateColumnDynamic() {}
// å–消按钮
function cancel() {
  open.value = false;
@@ -232,7 +327,7 @@
    designTimes: null,
    batchNumber: null,
    createBy: null,
    delFlag: null
    delFlag: null,
  };
  proxy.resetForm("aps_plate_process_statRef");
}
@@ -245,14 +340,14 @@
/** é‡ç½®æŒ‰é’®æ“ä½œ */
function resetQuery() {
  queryParams.value.workOrderNo ='';
  queryParams.value.workOrderNo = "";
  proxy.resetForm("queryRef");
  handleQuery();
}
// å¤šé€‰æ¡†é€‰ä¸­æ•°æ®
function handleSelectionChange(selection) {
  ids.value = selection.map(item => item.id);
  ids.value = selection.map((item) => item.id);
  single.value = selection.length != 1;
  multiple.value = !selection.length;
}
@@ -267,28 +362,28 @@
/** ä¿®æ”¹æŒ‰é’®æ“ä½œ */
function handleUpdate(row) {
  reset();
  updateStat().then(response => {
  updateStat().then((response) => {
    form.value = response.data;
    ElMessage({
      message: '数据更新成功',
      type: 'success',
    })
      message: "数据更新成功",
      type: "success",
    });
    getList();
  });
}
/** æäº¤æŒ‰é’® */
function submitForm() {
  proxy.$refs["aps_plate_process_statRef"].validate(valid => {
  proxy.$refs["aps_plate_process_statRef"].validate((valid) => {
    if (valid) {
      if (form.value.id != null) {
        updateAps_plate_process_stat(form.value).then(response => {
        updateAps_plate_process_stat(form.value).then((response) => {
          proxy.$modal.msgSuccess("修改成功");
          open.value = false;
          getList();
        });
      } else {
        addAps_plate_process_stat(form.value).then(response => {
        addAps_plate_process_stat(form.value).then((response) => {
          proxy.$modal.msgSuccess("新增成功");
          open.value = false;
          getList();
@@ -301,41 +396,54 @@
/** åˆ é™¤æŒ‰é’®æ“ä½œ */
function handleDelete(row) {
  const _ids = row.id || ids.value;
  proxy.$modal.confirm('是否确认删除钣金统计编号为"' + _ids + '"的数据项?').then(function() {
    return delAps_plate_process_stat(_ids);
  }).then(() => {
    getList();
    proxy.$modal.msgSuccess("删除成功");
  }).catch(() => {});
  proxy.$modal
    .confirm('是否确认删除钣金统计编号为"' + _ids + '"的数据项?')
    .then(function () {
      return delAps_plate_process_stat(_ids);
    })
    .then(() => {
      getList();
      proxy.$modal.msgSuccess("删除成功");
    })
    .catch(() => {});
}
/** å¯¼å‡ºæŒ‰é’®æ“ä½œ */
function handleExport() {
  proxy.download('/aps/plateProcessStat/export', {
    ...queryParams.value
  }, `aps_plate_process_stat_${new Date().getTime()}.xlsx`)
  proxy.download(
    "/aps/plateProcessStat/export",
    {
      ...queryParams.value,
    },
    `aps_plate_process_stat_${new Date().getTime()}.xlsx`
  );
}
const headerCellClassName = ({ column }) => {
  if (column.field === 'name') {
    return 'col-blue'
  if (column.field === "name") {
    return "col-blue";
  }
  return null
}
  return null;
};
const rowClassName = ({ rowIndex }) => {
  if ([2, 3, 5].includes(rowIndex)) {
    return 'row-green'
    return "row-green";
  }
  return null
}
  return null;
};
const cellClassName = ({ row, column }) => {
  if (column.field === 'processPlanStartDay'||column.field === 'processPlanEndDay') {
  if (
    column.field === "processPlanStartDay" ||
    column.field === "processPlanEndDay"
  ) {
    if (row.warning) {
      return 'col-orange'
      return "col-orange";
    }
  }
  return null
}
getList();
  return null;
};
onMounted(async () => {
  getList();
});
</script>
<style lang="scss" scoped>
::v-deep(.mytable-style.vxe-table .vxe-body--row.row-green) {
@@ -350,4 +458,4 @@
  background-color: red;
  color: #fff;
}
</style>
</style>