chengxiangling
2025-05-13 7e9e0bff3ef15366693648f25810723ec557ed62
提交修改查询样式,工单计划管理等
已修改12个文件
1877 ■■■■■ 文件已修改
src/api/system/dict/type.js 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/index.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/abnormalPartNumberReport/index.vue 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/gasPiping/index.vue 917 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/gasPlanning/index.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/gasProduceStatics/index.vue 140 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/pipeProduceStatics/index.vue 94 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/sheetMetalOrderManage/index.vue 122 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/sheetMetalRedundantReport/index.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/sheetMetalSupplyGap/index.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/dict/data.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/dict/index.vue 491 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/system/dict/type.js
@@ -1,60 +1,67 @@
import request from '@/utils/request'
import request from "@/utils/request";
// 查询字典类型列表
export function listType(query) {
  return request({
    url: '/system/dict/type/list',
    method: 'get',
    params: query
  })
    url: "/system/dict/type/list",
    method: "get",
    params: query,
  });
}
// 查询字典类型详细
export function getType(dictId) {
  return request({
    url: '/system/dict/type/' + dictId,
    method: 'get'
  })
    url: "/system/dict/type/" + dictId,
    method: "get",
  });
}
// 新增字典类型
export function addType(data) {
  return request({
    url: '/system/dict/type',
    method: 'post',
    data: data
  })
    url: "/system/dict/type",
    method: "post",
    data: data,
  });
}
// 修改字典类型
export function updateType(data) {
  return request({
    url: '/system/dict/type',
    method: 'put',
    data: data
  })
    url: "/system/dict/type",
    method: "put",
    data: data,
  });
}
// 删除字典类型
export function delType(dictId) {
  return request({
    url: '/system/dict/type/' + dictId,
    method: 'delete'
  })
    url: "/system/dict/type/" + dictId,
    method: "delete",
  });
}
// 刷新字典缓存
export function refreshCache() {
  return request({
    url: '/system/dict/type/refreshCache',
    method: 'delete'
  })
    url: "/system/dict/type/refreshCache",
    method: "delete",
  });
}
// 获取字典选择框列表
export function optionselect() {
  return request({
    url: '/system/dict/type/optionselect',
    method: 'get'
  })
    url: "/system/dict/type/optionselect",
    method: "get",
  });
}
// 更新排产区域 /system/dict/data/apsArea
export function refreshApsArea() {
  return request({
    url: "/system/dict/data/apsArea",
    method: "post",
  });
}
src/router/index.js
@@ -126,7 +126,7 @@
        path: 'index/:dictId(\\d+)',
        component: () => import('@/views/system/dict/data'),
        name: 'Data',
        meta: { title: '字典数据', activeMenu: '/system/dict' }
        meta: { title: '字典数据', activeMenu: '/system/dict', noCache: true }
      }
    ]
  },
src/views/mainPlan/abnormalPartNumberReport/index.vue
@@ -6,13 +6,13 @@
      ref="queryRef"
      :inline="true"
      v-show="showSearch"
      :label-width="locale === 'zh' ? '90px' : '200px'"
      label-position="left"
    >
      <el-row type="flex" justify="left">
        <el-col :span="locale === 'zh' ? 5 : 8">
          <el-form-item :label="$t('plan.query.itemNumber')" prop="itemNum">
        <el-col :span="locale === 'zh' ?6 : 8">
          <el-form-item :label-width="locale === 'zh' ? '48px' : '100px'" :label="$t('plan.query.itemNumber')" prop="itemNum">
            <el-input
              :style="{ width: locale === 'zh' ? '140px' : '240px' }"
              :style="{ width: locale === 'zh' ? '180px' : '210px' }"
              v-model="queryParams.itemNum"
              :placeholder="`${$t('common.common.placeholder')}${$t('plan.query.itemNumber')}`"
              clearable
@@ -20,13 +20,14 @@
            />
          </el-form-item>
        </el-col>
        <el-col :span="locale === 'zh' ? 8 :10">
        <el-col :span="locale === 'zh' ? 6:10">
          <el-form-item
            :label-width="locale === 'zh' ? '68px' : '160px'"
            :label="$t('plan.query.workOrderNo')"
            prop="docNum"
          >
            <el-input
              :style="{ width: locale === 'zh' ? '140px' : '260px' }"
              :style="{ width: locale === 'zh' ? '220px' : '250px' }"
              v-model="queryParams.docNum"
              :placeholder="`${$t('common.common.placeholder')}${$t(
                'plan.query.workOrderNo'
@@ -36,7 +37,7 @@
            />
          </el-form-item>
        </el-col>
        <el-col :span="locale === 'zh' ? 11 : 6" style="text-align: right">
        <el-col :span="locale === 'zh' ? 12 : 6" style="text-align: right">
          <el-form-item class="column-with-margin">
            <el-button type="primary" icon="Search" @click="handleQuery">{{
              $t("common.common.query")
src/views/mainPlan/gasPiping/index.vue
@@ -1,79 +1,81 @@
<template>
  <div class="app-container">
    <el-row :gutter="10" class="mb8">
      <el-form
        :model="queryParams"
        ref="queryRef"
        :inline="true"
        v-show="showSearch"
        :label-width="locale === 'zh' ? '90px' : '180px'"
        label-position="left"
      >
        <!-- <el-row :gutter="20">
        <el-col :span="6"> -->
        <el-form-item :label="$t('plan.query.daterangePlanStartDay')">
          <el-date-picker
            style="width: 240px"
            v-model="daterangePlanStartDay"
            value-format="YYYY-MM-DD"
            type="daterange"
            range-separator="-"
            :start-placeholder="$t('plan.placeholder.startDate')"
            :end-placeholder="$t('plan.placeholder.endDate')"
          ></el-date-picker>
        </el-form-item>
        <!-- </el-col>
        <el-col :span="6"> -->
        <el-form-item :label="$t('plan.query.daterangePlanEndDay')">
          <el-date-picker
            style="width: 240px"
            v-model="daterangePlanEndDay"
            value-format="YYYY-MM-DD"
            type="daterange"
            range-separator="-"
            :start-placeholder="$t('plan.placeholder.startDate')"
            :end-placeholder="$t('plan.placeholder.endDate')"
          ></el-date-picker>
        </el-form-item>
        <!-- </el-col>
        <el-col :span="6"> -->
        <el-form-item
          :label="$t('plan.query.documentNumber')"
          prop="documentNumber"
        >
          <el-input
            style="width: 240px"
            v-model="queryParams.documentNumber"
            :placeholder="$t('plan.placeholder.documentNumber')"
            clearable
            @keyup.enter="handleQuery"
          />
        </el-form-item>
        <!-- </el-col>
        <el-col :span="6"> -->
        <el-form-item :label="$t('plan.query.customer')" prop="customer">
          <el-input
            style="width: 240px"
            v-model="queryParams.customer"
            :placeholder="$t('plan.placeholder.customer')"
            clearable
            @keyup.enter="handleQuery"
          />
        </el-form-item>
        <!-- </el-col>
        <el-col  :span="24"  style="text-align: right;"> -->
        <el-form-item>
          <el-button type="primary" icon="Search" @click="handleQuery">{{
            $t("common.common.query")
          }}</el-button>
          <el-button icon="Refresh" @click="resetQuery">{{
            $t("common.common.reset")
          }}</el-button>
        </el-form-item>
        <!-- </el-col> -->
        <!-- </el-row> -->
      </el-form>
    </el-row>
    <el-form
      :model="queryParams"
      ref="queryRef"
      :inline="true"
      v-show="showSearch"
      :label-width="locale === 'zh' ? '90px' : '140px'"
      label-position="left"
    >
      <el-row :gutter="20">
        <el-col :span="locale === 'zh' ? 12 : 12">
          <el-form-item :label="$t('plan.query.daterangePlanStartDay')">
            <el-date-picker
              :style="{ width: locale === 'zh' ? '220px' : '240px' }"
              v-model="daterangePlanStartDay"
              value-format="YYYY-MM-DD"
              type="daterange"
              range-separator="-"
              :start-placeholder="$t('plan.placeholder.startDate')"
              :end-placeholder="$t('plan.placeholder.endDate')"
            ></el-date-picker>
          </el-form-item>
        </el-col>
        <el-col :span="locale === 'zh' ? 12 : 12">
          <el-form-item :label="$t('plan.query.daterangePlanEndDay')">
            <el-date-picker
              :style="{ width: locale === 'zh' ? '220px' : '240px' }"
              v-model="daterangePlanEndDay"
              value-format="YYYY-MM-DD"
              type="daterange"
              range-separator="-"
              :start-placeholder="$t('plan.placeholder.startDate')"
              :end-placeholder="$t('plan.placeholder.endDate')"
            ></el-date-picker>
          </el-form-item>
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="locale === 'zh' ? 12 : 12">
          <el-form-item
            :label="$t('plan.query.documentNumber')"
            prop="documentNumber"
          >
            <el-input
              :style="{ width: locale === 'zh' ? '220px' : '240px' }"
              v-model="queryParams.documentNumber"
              :placeholder="$t('plan.placeholder.documentNumber')"
              clearable
              @keyup.enter="handleQuery"
            />
          </el-form-item>
        </el-col>
        <el-col :span="locale === 'zh' ? 12 : 12">
          <el-form-item :label="$t('plan.query.customer')" prop="customer">
            <el-input
              :style="{ width: locale === 'zh' ? '220px' : '240px' }"
              v-model="queryParams.customer"
              :placeholder="$t('plan.placeholder.customer')"
              clearable
              @keyup.enter="handleQuery"
            />
          </el-form-item>
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="24" style="text-align: right">
          <el-form-item class="column-with-margin">
            <el-button type="primary" icon="Search" @click="handleQuery">{{
              $t("common.common.query")
            }}</el-button>
            <el-button icon="Refresh" @click="resetQuery">{{
              $t("common.common.reset")
            }}</el-button>
          </el-form-item>
        </el-col>
      </el-row>
    </el-form>
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
@@ -208,7 +210,7 @@
      <el-row v-show="isVisible">
        <el-col>
          <div>
            <h2>{{$t("plan.upload.dataPreview")}}</h2>
            <h2>{{ $t("plan.upload.dataPreview") }}</h2>
          </div>
          <HxlhTable
            style="width: 100%"
@@ -223,8 +225,9 @@
        <el-col>
          <div style="text-align: right">
            <h4>
              {{$t("plan.upload.totalUpload")}}<span style="color: blue">{{ total }}</span
              >{{$t("plan.upload.itemUpload")}}
              {{ $t("plan.upload.totalUpload")
              }}<span style="color: blue">{{ total }}</span
              >{{ $t("plan.upload.itemUpload") }}
            </h4>
          </div>
        </el-col>
@@ -238,10 +241,12 @@
            :disabled="planned"
            @click="uploadParse"
            v-hasPermi="['gasPiping:confirm']"
            >{{$t('plan.upload.confirmUpload')}}</el-button
            >{{ $t("plan.upload.confirmUpload") }}</el-button
          >
          <!-- <el-button type="primary" @click="submitFileForm">确 定</el-button> -->
          <el-button @click="dialogCancel">{{$t('plan.upload.cancel')}}</el-button>
          <el-button @click="dialogCancel">{{
            $t("plan.upload.cancel")
          }}</el-button>
        </div>
      </template>
    </el-dialog>
@@ -321,380 +326,390 @@
    documentNumber: null,
  },
  rules: {
    id: [{ required: true, message:t("plan.message.idNotBeEmpty"), trigger: "blur" }],
    id: [
      {
        required: true,
        message: t("plan.message.idNotBeEmpty"),
        trigger: "blur",
      },
    ],
  },
});
const { queryParams } = toRefs(data);
watch(locale, (newLocale) => {
  exampleColumns.value = [
    { type: "seq", title: t("plan.table.seq"), width: 60 },
    {
      title: t("plan.table.masterPlanner"),
      field: "masterPlanner",
      width: 100,
    },
    {
      title: t("plan.table.weekDay"),
      field: "weekDay",
      width: 100,
      formatter: ({ cellValue, row, column }) => {
        if (cellValue) {
          const weekDay = new Date(cellValue);
          const year = weekDay.getFullYear();
          const month = String(weekDay.getMonth() + 1).padStart(2, "0");
          const day = String(weekDay.getDate()).padStart(2, "0");
          return `${month}-${day}`;
        }
        return "";
watch(
  locale,
  (newLocale) => {
    exampleColumns.value = [
      { type: "seq", title: t("plan.table.seq"), width: 60 },
      {
        title: t("plan.table.masterPlanner"),
        field: "masterPlanner",
        width: 100,
      },
    },
    {
      title: t("plan.table.weekCycle"),
      field: "weekCycle",
      width: 80,
    },
    {
      title: t("plan.table.mainPartNumber"),
      field: "mainPartNumber",
      width: 150,
    },
    {
      title: t("plan.table.mainPartDrawingNumber"),
      field: "mainPartDrawingNumber",
      width: 150,
    },
    {
      title: t("plan.table.customer"),
      field: "customer",
      width: 200,
    },
    {
      title: t("plan.table.businessType"),
      field: "businessType",
      width: 150,
    },
    {
      title: t("plan.table.documentNumber"),
      field: "documentNumber",
      width: 150,
    },
    {
      title: t("plan.table.requirementType"),
      field: "requirementType",
      width: 150,
    },
    {
      title: t("plan.table.documentStatus"),
      field: "documentStatus",
      width: 100,
    },
    {
      title: t("plan.table.itemNumber"),
      field: "itemNumber",
      width: 150,
    },
    {
      title: t("plan.table.drawingNo"),
      field: "drawingNo",
      width: 150,
    },
    {
      title: t("plan.table.versionNumber"),
      field: "versionNumber",
      width: 100,
    },
    {
      title: t("plan.table.productionQuantity"),
      field: "productionQuantity",
      width: 100,
    },
    {
      title: t("plan.table.goodProductsQuantity"),
      field: "goodProductsQuantity",
      width: 100,
    },
    {
      title: t("plan.table.processNumber"),
      field: "processNumber",
      width: 150,
    },
    {
      title: t("plan.table.factoryCenter"),
      field: "workCenter",
      width: 150,
    },
    {
      title: t("plan.table.dependencyDepartment"),
      field: "department",
      width: 100,
    },
    {
      title: t("plan.table.planStartDay"),
      field: "planStartDay",
      width: 100,
    },
    {
      title: t("plan.table.planEndDayDate"),
      field: "planEndDay",
      width: 100,
    },
    {
      title: t("plan.table.standbyNumber"),
      field: "standbyNumber",
      width: 100,
    },
    {
      title: t("plan.table.standbyName"),
      field: "standbyName",
      width: 200,
    },
    {
      title: t("plan.table.standbyStock"),
      field: "standbyStock",
      width: 100,
    },
    {
      title: t("plan.table.departmentToNextProcessBelongs"),
      field: "nextProcessDeparment",
      width: 150,
    },
    {
      title: t("plan.table.isSuspended"),
      field: "isSuspended",
      width: 100,
    },
    {
      title: t("plan.table.isOutsourcing"),
      field: "isOutsourcing",
      width: 100,
    },
    {
      title: t("plan.table.account"),
      field: "account",
      width: 100,
    },
    // {
    //   title: '上阶物料',
    //   field: 'advancedMaterials',
    //   width: 100,
    // },
    // {
    //   title: '上阶单据号',
    //   field: 'advancedDocumentNumber',
    //   width: 100,
    // },
    // {
    //   title: '上阶需求日期',
    //   field: 'advancedRequirementDay',
    //   width: 150,
    // },
    // {
    //   title: '计划齐套',
    //   field: 'isPlanComplete',
    //   width: 100,
    // },
    // {
    //   title: '库存齐套',
    //   field: 'isStockComplete',
    //   width: 100,
    // },
    // {
    //   title: '是否有折返工序',
    //   field: 'hasTurnback',
    //   width: 150,
    // },
    // {
    //   title: '风险标识',
    //   field: 'hasRisk',
    //   width: 100,
    // },
  ];
  columns.value = [
    { type: "checkbox", width: 60, align: "center" },
    { type: "seq", title: t("plan.table.seq"), width: 60 },
    {
      title:  t("plan.table.masterPlanner"),
      field: "masterPlanner",
      width: 100,
    },
    {
      title: t("plan.table.weekDay"),
      field: "weekDay",
      width: 100,
      formatter: ({ cellValue, row, column }) => {
        if (cellValue) {
          const weekDay = new Date(cellValue);
          const year = weekDay.getFullYear();
          const month = String(weekDay.getMonth() + 1).padStart(2, "0");
          const day = String(weekDay.getDate()).padStart(2, "0");
          return `${month}-${day}`;
        }
        return "";
      {
        title: t("plan.table.weekDay"),
        field: "weekDay",
        width: 100,
        formatter: ({ cellValue, row, column }) => {
          if (cellValue) {
            const weekDay = new Date(cellValue);
            const year = weekDay.getFullYear();
            const month = String(weekDay.getMonth() + 1).padStart(2, "0");
            const day = String(weekDay.getDate()).padStart(2, "0");
            return `${month}-${day}`;
          }
          return "";
        },
      },
    },
    {
      title: t("plan.table.weekCycle"),
      field: "weekCycle",
      width: 80,
    },
    {
      title: t("plan.table.mainPartNumber"),
      field: "mainPartNumber",
      width: 150,
    },
    {
      title: t("plan.table.mainPartDrawingNumber"),
      field: "mainPartDrawingNumber",
      width: 150,
    },
    {
      title: t("plan.table.customer"),
      field: "customer",
      width: 200,
    },
    {
      title: t("plan.table.businessType"),
      field: "businessType",
      width: 100,
    },
    {
      title: t("plan.table.documentNumber"),
      field: "documentNumber",
      width: 100,
    },
    {
      title: t("plan.table.requirementType"),
      field: "requirementType",
      width: 100,
    },
    {
      title: t("plan.table.documentStatus"),
      field: "documentStatus",
      width: 100,
    },
    {
      title: t("plan.table.itemNumber"),
      field: "itemNumber",
      width: 100,
    },
    {
      title: t("plan.table.drawingNo"),
      field: "drawingNo",
      width: 100,
    },
    {
      title: t("plan.table.versionNumber"),
      field: "versionNumber",
      width: 100,
    },
    {
      title: t("plan.table.productionQuantity"),
      field: "productionQuantity",
      width: 100,
    },
    {
      title: t("plan.table.goodProductsQuantity"),
      field: "goodProductsQuantity",
      width: 100,
    },
    {
      title: t("plan.table.processNumber"),
      field: "processNumber",
      width: 100,
    },
    {
      title: t("plan.table.factoryCenter"),
      field: "workCenter",
      width: 100,
    },
    {
      title: t("plan.table.dependencyDepartment"),
      field: "department",
      width: 100,
    },
    {
      title: t("plan.table.planStartDay"),
      field: "planStartDay",
      width: 100,
    },
    {
      title: t("plan.table.planEndDayDate"),
      field: "planEndDay",
      width: 100,
    },
    {
      title: t("plan.table.standbyNumber"),
      field: "standbyNumber",
      width: 100,
    },
    {
      title: t("plan.table.standbyName"),
      field: "standbyName",
      width: 100,
    },
    {
      title: t("plan.table.standbyStock"),
      field: "standbyStock",
      width: 100,
    },
    {
      title: t("plan.table.departmentToNextProcessBelongs"),
      field: "nextProcessDeparment",
      width: 100,
    },
    {
      title: t("plan.table.isSuspended"),
      field: "isSuspended",
      width: 100,
    },
    {
      title: t("plan.table.isOutsourcing"),
      field: "isOutsourcing",
      width: 100,
    },
    {
      title: t("plan.table.account"),
      field: "account",
      width: 100,
    },
    {
      title: t("plan.table.advancedMaterials"),
      field: "advancedMaterials",
      width: 100,
    },
    {
      title: t("plan.table.advancedDocumentNumber"),
      field: "advancedDocumentNumber",
      width: 100,
    },
    {
      title: t("plan.table.advancedRequirementDay"),
      field: "advancedRequirementDay",
      width: 100,
    },
    {
      title: t("plan.table.isPlanComplete"),
      field: "isPlanComplete",
      width: 100,
    },
    {
      title: t("plan.table.isStockComplete"),
      field: "isStockComplete",
      width: 100,
    },
    {
      title: t("plan.table.hasTurnback"),
      field: "hasTurnback",
      width: 100,
    },
    {
      title: t("plan.table.hasRisk"),
      field: "hasRisk",
      width: 100,
    },
  ];
},{ immediate: true, deep: true });
      {
        title: t("plan.table.weekCycle"),
        field: "weekCycle",
        width: 80,
      },
      {
        title: t("plan.table.mainPartNumber"),
        field: "mainPartNumber",
        width: 150,
      },
      {
        title: t("plan.table.mainPartDrawingNumber"),
        field: "mainPartDrawingNumber",
        width: 150,
      },
      {
        title: t("plan.table.customer"),
        field: "customer",
        width: 200,
      },
      {
        title: t("plan.table.businessType"),
        field: "businessType",
        width: 150,
      },
      {
        title: t("plan.table.documentNumber"),
        field: "documentNumber",
        width: 150,
      },
      {
        title: t("plan.table.requirementType"),
        field: "requirementType",
        width: 150,
      },
      {
        title: t("plan.table.documentStatus"),
        field: "documentStatus",
        width: 100,
      },
      {
        title: t("plan.table.itemNumber"),
        field: "itemNumber",
        width: 150,
      },
      {
        title: t("plan.table.drawingNo"),
        field: "drawingNo",
        width: 150,
      },
      {
        title: t("plan.table.versionNumber"),
        field: "versionNumber",
        width: 100,
      },
      {
        title: t("plan.table.productionQuantity"),
        field: "productionQuantity",
        width: 100,
      },
      {
        title: t("plan.table.goodProductsQuantity"),
        field: "goodProductsQuantity",
        width: 100,
      },
      {
        title: t("plan.table.processNumber"),
        field: "processNumber",
        width: 150,
      },
      {
        title: t("plan.table.factoryCenter"),
        field: "workCenter",
        width: 150,
      },
      {
        title: t("plan.table.dependencyDepartment"),
        field: "department",
        width: 100,
      },
      {
        title: t("plan.table.planStartDay"),
        field: "planStartDay",
        width: 100,
      },
      {
        title: t("plan.table.planEndDayDate"),
        field: "planEndDay",
        width: 100,
      },
      {
        title: t("plan.table.standbyNumber"),
        field: "standbyNumber",
        width: 100,
      },
      {
        title: t("plan.table.standbyName"),
        field: "standbyName",
        width: 200,
      },
      {
        title: t("plan.table.standbyStock"),
        field: "standbyStock",
        width: 100,
      },
      {
        title: t("plan.table.departmentToNextProcessBelongs"),
        field: "nextProcessDeparment",
        width: 150,
      },
      {
        title: t("plan.table.isSuspended"),
        field: "isSuspended",
        width: 100,
      },
      {
        title: t("plan.table.isOutsourcing"),
        field: "isOutsourcing",
        width: 100,
      },
      {
        title: t("plan.table.account"),
        field: "account",
        width: 100,
      },
      // {
      //   title: '上阶物料',
      //   field: 'advancedMaterials',
      //   width: 100,
      // },
      // {
      //   title: '上阶单据号',
      //   field: 'advancedDocumentNumber',
      //   width: 100,
      // },
      // {
      //   title: '上阶需求日期',
      //   field: 'advancedRequirementDay',
      //   width: 150,
      // },
      // {
      //   title: '计划齐套',
      //   field: 'isPlanComplete',
      //   width: 100,
      // },
      // {
      //   title: '库存齐套',
      //   field: 'isStockComplete',
      //   width: 100,
      // },
      // {
      //   title: '是否有折返工序',
      //   field: 'hasTurnback',
      //   width: 150,
      // },
      // {
      //   title: '风险标识',
      //   field: 'hasRisk',
      //   width: 100,
      // },
    ];
    columns.value = [
      { type: "checkbox", width: 60, align: "center" },
      { type: "seq", title: t("plan.table.seq"), width: 60 },
      {
        title: t("plan.table.masterPlanner"),
        field: "masterPlanner",
        width: 100,
      },
      {
        title: t("plan.table.weekDay"),
        field: "weekDay",
        width: 100,
        formatter: ({ cellValue, row, column }) => {
          if (cellValue) {
            const weekDay = new Date(cellValue);
            const year = weekDay.getFullYear();
            const month = String(weekDay.getMonth() + 1).padStart(2, "0");
            const day = String(weekDay.getDate()).padStart(2, "0");
            return `${month}-${day}`;
          }
          return "";
        },
      },
      {
        title: t("plan.table.weekCycle"),
        field: "weekCycle",
        width: 80,
      },
      {
        title: t("plan.table.mainPartNumber"),
        field: "mainPartNumber",
        width: 150,
      },
      {
        title: t("plan.table.mainPartDrawingNumber"),
        field: "mainPartDrawingNumber",
        width: 150,
      },
      {
        title: t("plan.table.customer"),
        field: "customer",
        width: 200,
      },
      {
        title: t("plan.table.businessType"),
        field: "businessType",
        width: 100,
      },
      {
        title: t("plan.table.documentNumber"),
        field: "documentNumber",
        width: 100,
      },
      {
        title: t("plan.table.requirementType"),
        field: "requirementType",
        width: 100,
      },
      {
        title: t("plan.table.documentStatus"),
        field: "documentStatus",
        width: 100,
      },
      {
        title: t("plan.table.itemNumber"),
        field: "itemNumber",
        width: 100,
      },
      {
        title: t("plan.table.drawingNo"),
        field: "drawingNo",
        width: 100,
      },
      {
        title: t("plan.table.versionNumber"),
        field: "versionNumber",
        width: 100,
      },
      {
        title: t("plan.table.productionQuantity"),
        field: "productionQuantity",
        width: 100,
      },
      {
        title: t("plan.table.goodProductsQuantity"),
        field: "goodProductsQuantity",
        width: 100,
      },
      {
        title: t("plan.table.processNumber"),
        field: "processNumber",
        width: 100,
      },
      {
        title: t("plan.table.factoryCenter"),
        field: "workCenter",
        width: 100,
      },
      {
        title: t("plan.table.dependencyDepartment"),
        field: "department",
        width: 100,
      },
      {
        title: t("plan.table.planStartDay"),
        field: "planStartDay",
        width: 100,
      },
      {
        title: t("plan.table.planEndDayDate"),
        field: "planEndDay",
        width: 100,
      },
      {
        title: t("plan.table.standbyNumber"),
        field: "standbyNumber",
        width: 100,
      },
      {
        title: t("plan.table.standbyName"),
        field: "standbyName",
        width: 100,
      },
      {
        title: t("plan.table.standbyStock"),
        field: "standbyStock",
        width: 100,
      },
      {
        title: t("plan.table.departmentToNextProcessBelongs"),
        field: "nextProcessDeparment",
        width: 100,
      },
      {
        title: t("plan.table.isSuspended"),
        field: "isSuspended",
        width: 100,
      },
      {
        title: t("plan.table.isOutsourcing"),
        field: "isOutsourcing",
        width: 100,
      },
      {
        title: t("plan.table.account"),
        field: "account",
        width: 100,
      },
      {
        title: t("plan.table.advancedMaterials"),
        field: "advancedMaterials",
        width: 100,
      },
      {
        title: t("plan.table.advancedDocumentNumber"),
        field: "advancedDocumentNumber",
        width: 100,
      },
      {
        title: t("plan.table.advancedRequirementDay"),
        field: "advancedRequirementDay",
        width: 100,
      },
      {
        title: t("plan.table.isPlanComplete"),
        field: "isPlanComplete",
        width: 100,
      },
      {
        title: t("plan.table.isStockComplete"),
        field: "isStockComplete",
        width: 100,
      },
      {
        title: t("plan.table.hasTurnback"),
        field: "hasTurnback",
        width: 100,
      },
      {
        title: t("plan.table.hasRisk"),
        field: "hasRisk",
        width: 100,
      },
    ];
  },
  { immediate: true, deep: true }
);
/** 查询钣金计划临时管理列表 */
function getExampleList() {
  loading.value = true;
@@ -803,10 +818,11 @@
        response.msg +
        "</div>",
      t("plan.upload.errorResult"),
      { dangerouslyUseHTMLString: true,
      {
        dangerouslyUseHTMLString: true,
        confirmButtonText: t("plan.btns.confirm"),
        cancelButtonText: t("plan.btns.cancel"),
       }
      }
    );
  }
  proxy.$refs["uploadRef"].handleRemove(file);
@@ -847,6 +863,9 @@
getList();
</script>
<style lang="css" scoped>
.column-with-margin {
  margin-right: 0px;
}
h4 {
  font-weight: bold;
}
src/views/mainPlan/gasPlanning/index.vue
@@ -5,13 +5,14 @@
      :model="queryParams"
      ref="queryRef"
      :inline="true"
      label-width="100px"
      :label-width="locale === 'zh' ? '68px' : '100px'"
      label-position="left"
    >
      <el-row type="flex" justify="left">
        <el-col :span="6">
        <el-col :span="locale === 'zh' ? 4 : 5">
          <el-form-item :label="$t('plan.query.selectMonth')" prop="description">
            <el-date-picker
              :style="{ width: locale === 'zh' ? '200px' : '220px' }"
              clearable
              v-model="queryParams.date"
              type="month"
@@ -21,7 +22,7 @@
            </el-date-picker>
          </el-form-item>
        </el-col>
        <el-col :span="18" style="text-align: right">
        <el-col :span="locale === 'zh' ? 20 : 19" style="text-align: right">
          <el-form-item class="column-with-margin">
            <el-button type="primary" icon="Search" @click="handleQuery"
              >{{$t("common.common.query")}}</el-button
@@ -907,6 +908,9 @@
// }
</script>
<style lang="scss" scoped>
.column-with-margin {
  margin-right: 0px;
}
.box_container {
  width: 100%;
  margin: 20px auto;
src/views/mainPlan/gasProduceStatics/index.vue
@@ -9,48 +9,55 @@
      :label-width="locale === 'zh' ? '68px' : '134px'"
    >
      <el-row type="flex" justify="left">
        <el-form-item :label="$t('plan.query.statistical')">
          <el-select
            v-model="queryParams.searchType"
            style="width: 200px"
            placeholder="Select"
            @change="handleChangeSelectType"
          >
            <el-option
              v-for="item in options"
              :key="item.value"
              :label="item.label"
              :value="item.value"
            />
          </el-select>
        </el-form-item>
        <el-form-item :label="$t('plan.query.selectDateRange')">
          <div v-if="!dayCom">
            <el-date-picker
              v-model="queryParams.monthRange"
              type="monthrange"
              :range-separator="$t('plan.placeholder.to')"
              :start-placeholder="$t('plan.placeholder.startMonth')"
              :end-placeholder="$t('plan.placeholder.endMonth')"
            />
          </div>
          <div v-else>
            <el-date-picker
              v-model="queryParams.monthDays"
              type="month"
              :placeholder="$t('plan.placeholder.selectMonth')"
            />
          </div>
        </el-form-item>
        <el-form-item class="column-with-margin">
          <el-button type="primary" icon="Search" @click="handleQuery">{{
            $t("common.common.query")
          }}</el-button>
          <el-button icon="Refresh" @click="resetQuery">{{
            $t("common.common.reset")
          }}</el-button>
        </el-form-item>
        <el-col :span="locale === 'zh' ? 5: 7">
          <el-form-item :label="$t('plan.query.statistical')">
            <el-select
              v-model="queryParams.searchType"
              :style="{ width: locale === 'zh' ? '120px' : '160px' }"
              placeholder="Select"
              @change="handleChangeSelectType"
            >
              <el-option
                v-for="item in options"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              />
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="locale === 'zh' ? 5: 8">
          <el-form-item :label="$t('plan.query.selectDateRange')">
            <div v-if="!dayCom">
              <el-date-picker
                :style="{ width: locale === 'zh' ? '200px' : '220px' }"
                v-model="queryParams.monthRange"
                type="monthrange"
                :range-separator="$t('plan.placeholder.to')"
                :start-placeholder="$t('plan.placeholder.startMonth')"
                :end-placeholder="$t('plan.placeholder.endMonth')"
              />
            </div>
            <div v-else>
              <el-date-picker
                :style="{ width: locale === 'zh' ? '200px' : '220px' }"
                v-model="queryParams.monthDays"
                type="month"
                :placeholder="$t('plan.placeholder.selectMonth')"
              />
            </div>
          </el-form-item>
        </el-col>
        <el-col :span="locale === 'zh' ? 14: 9" style="text-align:right;">
          <el-form-item class="column-with-margin">
            <el-button type="primary" icon="Search" @click="handleQuery">{{
              $t("common.common.query")
            }}</el-button>
            <el-button icon="Refresh" @click="resetQuery">{{
              $t("common.common.reset")
            }}</el-button>
          </el-form-item>
        </el-col>
      </el-row>
    </el-form>
    <el-row :gutter="10" class="mb8">
@@ -136,27 +143,31 @@
let tableColumn = [];
let tableData = [];
let merges = [];
watch(locale, (newLocale) => {
  options.value = [
    {
      value: "month",
      label: t("plan.options.monthlyStatic"),
    },
    {
      value: "day",
      label: t("plan.options.dailyStatic"),
    },
  ];
  queryParams.value.searchType = t("plan.options.monthlyStatic");
  if (
    (!queryParams.value.monthRange && dayCom.value == false) ||
    (!queryParams.value.monthDays && dayCom.value == true)
  ) {
    return;
  }
  // queryParams.value.pageNum = 1;
  getGasList();
},{ immediate: true, deep: true });
watch(
  locale,
  (newLocale) => {
    options.value = [
      {
        value: "month",
        label: t("plan.options.monthlyStatic"),
      },
      {
        value: "day",
        label: t("plan.options.dailyStatic"),
      },
    ];
    queryParams.value.searchType = t("plan.options.monthlyStatic");
    if (
      (!queryParams.value.monthRange && dayCom.value == false) ||
      (!queryParams.value.monthDays && dayCom.value == true)
    ) {
      return;
    }
    // queryParams.value.pageNum = 1;
    getGasList();
  },
  { immediate: true, deep: true }
);
function handleChangeSelectType(e) {
  searchTypeValue.value = e;
  if (e === "day") {
@@ -429,6 +440,9 @@
// getList();
</script>
<style lang="scss" scoped>
.column-with-margin {
  margin-right: 0px;
}
.box_container {
  width: 100%;
  margin: 20px auto;
src/views/mainPlan/pipeProduceStatics/index.vue
@@ -9,48 +9,55 @@
      :label-width="locale === 'zh' ? '68px' : '134px'"
    >
      <el-row type="flex" justify="left">
        <el-form-item :label="$t('plan.query.statistical')">
          <el-select
            v-model="queryParams.searchType"
            style="width: 200px"
            placeholder="Select"
            @change="handleChangeSelectType"
          >
            <el-option
              v-for="item in options"
              :key="item.value"
              :label="item.label"
              :value="item.value"
            />
          </el-select>
        </el-form-item>
        <el-form-item :label="$t('plan.query.selectDateRange')">
          <div v-if="!dayCom">
            <el-date-picker
              v-model="queryParams.monthRange"
              type="monthrange"
              :range-separator="$t('plan.placeholder.to')"
              :start-placeholder="$t('plan.placeholder.startMonth')"
              :end-placeholder="$t('plan.placeholder.endMonth')"
            />
          </div>
          <div v-else>
            <el-date-picker
              v-model="queryParams.monthDays"
              type="month"
              :placeholder="$t('plan.placeholder.selectMonth')"
            />
          </div>
        </el-form-item>
        <el-form-item class="column-with-margin">
          <el-button type="primary" icon="Search" @click="handleQuery">{{
            $t("common.common.query")
          }}</el-button>
          <el-button icon="Refresh" @click="resetQuery">{{
            $t("common.common.reset")
          }}</el-button>
        </el-form-item>
        <el-col :span="locale === 'zh' ? 5 : 7">
          <el-form-item :label="$t('plan.query.statistical')">
            <el-select
              v-model="queryParams.searchType"
              :style="{ width: locale === 'zh' ? '120px' : '160px' }"
              placeholder="Select"
              @change="handleChangeSelectType"
            >
              <el-option
                v-for="item in options"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              />
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="locale === 'zh' ? 5 : 8">
          <el-form-item :label="$t('plan.query.selectDateRange')">
            <div v-if="!dayCom">
              <el-date-picker
                :style="{ width: locale === 'zh' ? '200px' : '220px' }"
                v-model="queryParams.monthRange"
                type="monthrange"
                :range-separator="$t('plan.placeholder.to')"
                :start-placeholder="$t('plan.placeholder.startMonth')"
                :end-placeholder="$t('plan.placeholder.endMonth')"
              />
            </div>
            <div v-else>
              <el-date-picker
                :style="{ width: locale === 'zh' ? '200px' : '220px' }"
                v-model="queryParams.monthDays"
                type="month"
                :placeholder="$t('plan.placeholder.selectMonth')"
              />
            </div>
          </el-form-item>
        </el-col>
        <el-col :span="locale === 'zh' ? 14 : 9" style="text-align: right">
          <el-form-item class="column-with-margin">
            <el-button type="primary" icon="Search" @click="handleQuery">{{
              $t("common.common.query")
            }}</el-button>
            <el-button icon="Refresh" @click="resetQuery">{{
              $t("common.common.reset")
            }}</el-button>
          </el-form-item>
        </el-col>
      </el-row>
    </el-form>
    <el-row :gutter="10" class="mb8">
@@ -442,6 +449,9 @@
// getList();
</script>
<style lang="scss" scoped>
.column-with-margin {
  margin-right: 0px;
}
.box_container {
  width: 100%;
  margin: 20px auto;
src/views/mainPlan/sheetMetalOrderManage/index.vue
@@ -6,11 +6,12 @@
      ref="queryRef"
      :inline="true"
      v-show="showSearch"
      :label-width="locale == 'zh' ? '110px' : '200px'"
      label-position="left"
    >
      <el-row type="flex" justify="left">
        <el-col :span="12">
          <el-form-item
            :label-width="locale == 'zh' ? '80px' : '160px'"
            :label="$t('plan.query.workOrderNo')"
            prop="workOrderNo"
          >
@@ -27,6 +28,7 @@
        </el-col>
        <el-col :span="12">
          <el-form-item
            :label-width="locale == 'zh' ? '100px' : '200px'"
            :label="$t('plan.query.requireTraceID')"
            prop="requireTrackId"
          >
@@ -45,6 +47,7 @@
      <el-row type="flex" justify="left">
        <el-col :span="12">
          <el-form-item
            :label-width="locale == 'zh' ? '80px' : '160px'"
            :label="$t('plan.query.itemNumber')"
            prop="mainPartNumber"
          >
@@ -61,6 +64,7 @@
        </el-col>
        <el-col :span="12">
          <el-form-item
            :label-width="locale == 'zh' ? '100px' : '200px'"
            :label="$t('plan.table.delayRiskIdentification')"
            prop="hasDelayRisk"
          >
@@ -156,15 +160,15 @@
          link
          @click="handleCheckView(row)"
          v-hasPermi="['ApsPlatOrderPlanManager:requirement:list']"
          >{{ $t("plan.btns.viewRequirement") }}</el-button
          >{{ $t("plan.btns.viewRequirement") }}({{row.requireNum}})</el-button
        >
      </template>
    </HxlhTable>
    <el-dialog
      :title="$t('plan.title.viewAssociatedRequirements')"
      v-model="openDialog"
      width="900px"
      style="height: 400px; overflow: hidden"
      width="85%"
      style="height:90vh; overflow: hidden"
      append-to-body
    >
      <HxlhTable
@@ -172,7 +176,7 @@
        :columns="subGridOptions"
        :data="subList"
        :loading="loadingSub"
        :height="'280px'"
        :height="heightSub"
      >
      </HxlhTable>
      <template #footer>
@@ -186,8 +190,8 @@
    <el-dialog
      :title="$t('plan.btns.batchUpdateOrderDate')"
      v-model="openBatchDialog"
      width="900px"
      style="min-height: 400px; overflow: hidden"
      width="85%"
      style="min-height:90vh; overflow: hidden"
      append-to-body
    >
      <div class="mode_box">
@@ -223,7 +227,7 @@
        :columns="subUpdateGridOptions"
        :data="subUpdateList"
        :loading="loading"
        :height="'210px'"
        :height="heightSubUpdate"
      >
      </HxlhTable>
      <HxlhTable
@@ -232,7 +236,7 @@
        :columns="subUpdateCustomGridOptions"
        :data="subUpdateList"
        :loading="loading"
        :height="'210px'"
        :height="heightSubUpdate"
      >
      </HxlhTable>
      <template #footer>
@@ -269,6 +273,9 @@
const { t, locale } = useI18n();
const basicStore = useBasicStore();
const { proxy } = getCurrentInstance();
const { aps_work_order_type } = proxy.useDict("aps_work_order_type");
const { aps_factory   } = proxy.useDict("aps_factory");
const { aps_has_risk   } = proxy.useDict("aps_has_risk");
const delayRiskOptions = ref([]);
const radio = ref(1);
const customicDate = ref("");
@@ -310,6 +317,8 @@
const allShopList = ref([]);
const processList = ref([]);
const height = ref(document.documentElement.clientHeight - 320 + "px;");
const heightSub = ref(document.documentElement.clientHeight - 200 + "px;");
const heightSubUpdate = ref(document.documentElement.clientHeight - 270 + "px;");
// 表格配置-列表
const columns = ref([]);
// 分页属性
@@ -333,12 +342,12 @@
    ];
    columns.value = [
      { type: "checkbox", width: 60, align: "center", fixed: "left" },
      {
        title: t("basic.table.requirementID"),
        field: "requireId",
        width: 150,
        align: "center",
      },
      // {
      //   title: t("basic.table.requirementID"),
      //   field: "requireId",
      //   width: 150,
      //   align: "center",
      // },
      {
        title: t("basic.table.requirementTraceabilityID"),
        field: "requireTrackId",
@@ -362,6 +371,15 @@
        field: "workOrderType",
        width: 200,
        align: "center",
        formatter: ({ cellValue, row, column }) => {
          if (cellValue) {
            for (let i = 0; i < aps_work_order_type.value.length; i++) {
              if (cellValue === aps_work_order_type.value[i].value) {
                return aps_work_order_type.value[i].label;
              }
            }
          }
        },
      },
      {
        title: t("plan.table.itemNumber"),
@@ -394,9 +412,9 @@
        align: "center",
        formatter: ({ cellValue, row, column }) => {
          if (cellValue) {
            for (let i = 0; i < plantList.value.length; i++) {
              if (cellValue === plantList.value[i].plantCode) {
                return plantList.value[i].plantName;
            for (let i = 0; i < aps_factory.value.length; i++) {
              if (cellValue === aps_factory.value[i].value) {
                return aps_factory.value[i].label;
              }
            }
          }
@@ -439,16 +457,16 @@
        align: "center",
        formatter: ({ cellValue, row, column }) => {
          if (cellValue) {
            for (let i = 0; i < delayRiskOptions.value.length; i++) {
              if (cellValue === delayRiskOptions.value[i].value) {
                return delayRiskOptions.value[i].label;
            for (let i = 0; i < aps_has_risk.value.length; i++) {
              if (cellValue === aps_has_risk.value[i].value) {
                return aps_has_risk.value[i].label;
              }
            }
          }
        },
      },
      {
        title: t("common.common.operate"),
        title: t("common.common.require"),
        width: 150,
        fixed: "right",
        slots: { default: "buttons" },
@@ -462,12 +480,12 @@
        width: 150,
        align: "center",
      },
      {
        title: t("basic.table.requirementTraceabilityID"),
        field: "requireId",
        width: 200,
        align: "center",
      },
      // {
      //   title: t("basic.table.requirementTraceabilityID"),
      //   field: "requireId",
      //   width: 200,
      //   align: "center",
      // },
      {
        title: t("plan.table.itemNumber"),
        field: "bomLineCode",
@@ -571,9 +589,9 @@
        align: "center",
        formatter: ({ cellValue, row, column }) => {
          if (cellValue) {
            for (let i = 0; i < delayRiskOptions.value.length; i++) {
              if (cellValue === delayRiskOptions.value[i].value) {
                return delayRiskOptions.value[i].label;
            for (let i = 0; i < aps_has_risk.value.length; i++) {
              if (cellValue === aps_has_risk.value[i].value) {
                return aps_has_risk.value[i].label;
              }
            }
          }
@@ -581,12 +599,12 @@
      },
    ];
    subUpdateGridOptions.value = [
      {
        title: t("basic.table.requirementID"),
        field: "requireId",
        width: 150,
        align: "center",
      },
      // {
      //   title: t("basic.table.requirementID"),
      //   field: "requireId",
      //   width: 150,
      //   align: "center",
      // },
      {
        title: t("basic.table.requirementTraceabilityID"),
        field: "requireTrackId",
@@ -610,6 +628,15 @@
        field: "workOrderType",
        width: 200,
        align: "center",
        formatter: ({ cellValue, row, column }) => {
          if (cellValue) {
            for (let i = 0; i < aps_work_order_type.value.length; i++) {
              if (cellValue === aps_work_order_type.value[i].value) {
                return aps_work_order_type.value[i].label;
              }
            }
          }
        },
      },
      {
        title: t("plan.table.itemNumber"),
@@ -643,12 +670,12 @@
      },
    ];
    subUpdateCustomGridOptions.value = [
      {
        title: t("basic.table.requirementID"),
        field: "requireId",
        width: 150,
        align: "center",
      },
      // {
      //   title: t("basic.table.requirementID"),
      //   field: "requireId",
      //   width: 150,
      //   align: "center",
      // },
      {
        title: t("basic.table.requirementTraceabilityID"),
        field: "requireTrackId",
@@ -672,6 +699,15 @@
        field: "workOrderType",
        width: 200,
        align: "center",
        formatter: ({ cellValue, row, column }) => {
          if (cellValue) {
            for (let i = 0; i < aps_work_order_type.value.length; i++) {
              if (cellValue === aps_work_order_type.value[i].value) {
                return aps_work_order_type.value[i].label;
              }
            }
          }
        },
      },
      {
        title: t("plan.table.itemNumber"),
src/views/mainPlan/sheetMetalRedundantReport/index.vue
@@ -6,13 +6,13 @@
      ref="queryRef"
      :inline="true"
      v-show="showSearch"
      :label-width="locale === 'zh' ? '90px' : '200px'"
      label-position="left"
    >
      <el-row type="flex" justify="left">
        <el-col :span="9" style="text-align:left;">
          <el-form-item :label="$t('plan.query.itemNumber')" prop="itemNumber">
        <el-col :span="locale === 'zh' ? 5 : 8">
          <el-form-item :label-width="locale === 'zh' ? '48px' : '100px'" :label="$t('plan.query.itemNumber')" prop="itemNumber">
            <el-input
              style="width:240px;"
             :style="{ width: locale === 'zh' ? '140px' : '210px' }"
              v-model="queryParams.itemNumber"
              :placeholder="`${$t('common.common.placeholder')}${$t(
                'plan.query.itemNumber'
@@ -22,13 +22,13 @@
            />
          </el-form-item>
        </el-col>
        <el-col :span="9">
        <el-col :span="locale === 'zh' ? 9 : 8">
          <el-form-item
            :label="$t('plan.query.workOrderNo')"
            prop="documentNumber"
          >
            <el-input
              style="width:240px"
              :style="{ width: locale === 'zh' ? '140px' : '330px' }"
              v-model="queryParams.documentNumber"
              :placeholder="`${$t('common.common.placeholder')}${$t(
                'plan.query.workOrderNo'
@@ -38,7 +38,7 @@
            />
          </el-form-item>
        </el-col>
        <el-col :span="6" style="text-align: right">
        <el-col :span="locale === 'zh' ? 10 : 8" style="text-align: right">
          <el-form-item class="column-with-margin">
            <el-button type="primary" icon="Search" @click="handleQuery">{{
              $t("common.common.query")
src/views/mainPlan/sheetMetalSupplyGap/index.vue
@@ -6,16 +6,17 @@
      ref="queryRef"
      :inline="true"
      v-show="showSearch"
      :label-width="locale === 'zh' ? '90px' : '200px'"
      label-position="left"
    >
      <el-row type="flex" justify="left">
        <el-col :span="locale === 'zh' ? 5 : 10">
        <el-col :span="locale === 'zh' ?6 :9">
          <el-form-item
            :label-width="locale === 'zh' ? '90px' : '200px'"
            :label="$t('plan.query.requireTraceID')"
            prop="requireTrackId"
          >
            <el-input
              :style="{ width: locale === 'zh' ? '140px' : '300px' }"
              :style="{ width: locale === 'zh' ? '140px' : '200px' }"
              v-model="queryParams.requireTrackId"
              :placeholder="`${$t('plan.placeholder.requireTraceID')}`"
              clearable
@@ -24,7 +25,7 @@
          </el-form-item>
        </el-col>
        <el-col :span="locale === 'zh' ? 8 : 9">
          <el-form-item :label="$t('plan.query.itemNumber')" prop="bomLineCode">
          <el-form-item :label-width="locale === 'zh' ? '48px' : '200px'" :label="$t('plan.query.itemNumber')" prop="bomLineCode">
            <el-input
              :style="{ width: locale === 'zh' ? '140px' : '210px' }"
              v-model="queryParams.bomLineCode"
@@ -36,7 +37,7 @@
            />
          </el-form-item>
        </el-col>
        <el-col :span="locale === 'zh' ? 11 : 5" style="text-align: right">
        <el-col :span="locale === 'zh' ? 10:6" style="text-align: right">
          <el-form-item class="column-with-margin">
            <el-button type="primary" icon="Search" @click="handleQuery">{{
              $t("common.common.query")
src/views/system/dict/data.vue
@@ -179,6 +179,7 @@
import useDictStore from '@/store/modules/dict'
import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
import { onMounted } from 'vue';
const { proxy } = getCurrentInstance();
const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
@@ -359,4 +360,7 @@
getTypes(route.params && route.params.dictId);
getTypeList();
onMounted(()=>{
   getList();
});
</script>
src/views/system/dict/index.vue
@@ -1,179 +1,264 @@
<template>
   <div class="app-container">
      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="字典名称" prop="dictName">
            <el-input
               v-model="queryParams.dictName"
               placeholder="请输入字典名称"
               clearable
               style="width: 240px"
               @keyup.enter="handleQuery"
            />
         </el-form-item>
         <el-form-item label="字典类型" prop="dictType">
            <el-input
               v-model="queryParams.dictType"
               placeholder="请输入字典类型"
               clearable
               style="width: 240px"
               @keyup.enter="handleQuery"
            />
         </el-form-item>
         <el-form-item label="状态" prop="status">
            <el-select
               v-model="queryParams.status"
               placeholder="字典状态"
               clearable
               style="width: 240px"
            >
               <el-option
                  v-for="dict in sys_normal_disable"
                  :key="dict.value"
                  :label="dict.label"
                  :value="dict.value"
               />
            </el-select>
         </el-form-item>
         <el-form-item label="创建时间" style="width: 308px">
            <el-date-picker
               v-model="dateRange"
               value-format="YYYY-MM-DD"
               type="daterange"
               range-separator="-"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
            ></el-date-picker>
         </el-form-item>
         <el-form-item>
            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
         </el-form-item>
      </el-form>
  <div class="app-container">
    <el-form
      :model="queryParams"
      ref="queryRef"
      :inline="true"
      v-show="showSearch"
      label-width="68px"
    >
      <el-form-item label="字典名称" prop="dictName">
        <el-input
          v-model="queryParams.dictName"
          placeholder="请输入字典名称"
          clearable
          style="width: 240px"
          @keyup.enter="handleQuery"
        />
      </el-form-item>
      <el-form-item label="字典类型" prop="dictType">
        <el-input
          v-model="queryParams.dictType"
          placeholder="请输入字典类型"
          clearable
          style="width: 240px"
          @keyup.enter="handleQuery"
        />
      </el-form-item>
      <el-form-item label="状态" prop="status">
        <el-select
          v-model="queryParams.status"
          placeholder="字典状态"
          clearable
          style="width: 240px"
        >
          <el-option
            v-for="dict in sys_normal_disable"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="创建时间" style="width: 308px">
        <el-date-picker
          v-model="dateRange"
          value-format="YYYY-MM-DD"
          type="daterange"
          range-separator="-"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
        ></el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="Search" @click="handleQuery"
          >搜索</el-button
        >
        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
      <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
            <el-button
               type="primary"
               plain
               icon="Plus"
               @click="handleAdd"
               v-hasPermi="['system:dict:add']"
            >新增</el-button>
         </el-col>
         <el-col :span="1.5">
            <el-button
               type="success"
               plain
               icon="Edit"
               :disabled="single"
               @click="handleUpdate"
               v-hasPermi="['system:dict:edit']"
            >修改</el-button>
         </el-col>
         <el-col :span="1.5">
            <el-button
               type="danger"
               plain
               icon="Delete"
               :disabled="multiple"
               @click="handleDelete"
               v-hasPermi="['system:dict:remove']"
            >删除</el-button>
         </el-col>
         <el-col :span="1.5">
            <el-button
               type="warning"
               plain
               icon="Download"
               @click="handleExport"
               v-hasPermi="['system:dict:export']"
            >导出</el-button>
         </el-col>
         <el-col :span="1.5">
            <el-button
               type="danger"
               plain
               icon="Refresh"
               @click="handleRefreshCache"
               v-hasPermi="['system:dict:remove']"
            >刷新缓存</el-button>
         </el-col>
         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
      </el-row>
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="Plus"
          @click="handleAdd"
          v-hasPermi="['system:dict:add']"
          >新增</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="success"
          plain
          icon="Edit"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['system:dict:edit']"
          >修改</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          icon="Delete"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['system:dict:remove']"
          >删除</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="Download"
          @click="handleExport"
          v-hasPermi="['system:dict:export']"
          >导出</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          icon="Refresh"
          @click="handleRefreshCache"
          v-hasPermi="['system:dict:remove']"
          >刷新缓存</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="success"
          plain
          icon="Refresh"
          :disabled="loading"
          @click="handleRefreshArea"
          v-hasPermi="['system:dict:remove']"
          >更新排产区域</el-button
        >
      </el-col>
      <right-toolbar
        v-model:showSearch="showSearch"
        @queryTable="getList"
      ></right-toolbar>
    </el-row>
      <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="字典编号" align="center" prop="dictId" />
         <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true"/>
         <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
            <template #default="scope">
               <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
                  <span>{{ scope.row.dictType }}</span>
               </router-link>
            </template>
         </el-table-column>
         <el-table-column label="状态" align="center" prop="status">
            <template #default="scope">
               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
            </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
            <template #default="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
            </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
            <template #default="scope">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dict:edit']">修改</el-button>
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']">删除</el-button>
            </template>
         </el-table-column>
      </el-table>
      <pagination
         v-show="total > 0"
         :total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
         @pagination="getList"
    <el-table
      v-loading="loading"
      :data="typeList"
      @selection-change="handleSelectionChange"
    >
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="字典编号" align="center" prop="dictId" />
      <el-table-column
        label="字典名称"
        align="center"
        prop="dictName"
        :show-overflow-tooltip="true"
      />
      <el-table-column
        label="字典类型"
        align="center"
        :show-overflow-tooltip="true"
      >
        <template #default="scope">
          <router-link
            :to="'/system/dict-data/index/' + scope.row.dictId"
            class="link-type"
          >
            <span>{{ scope.row.dictType }}</span>
          </router-link>
        </template>
      </el-table-column>
      <el-table-column label="状态" align="center" prop="status">
        <template #default="scope">
          <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
        </template>
      </el-table-column>
      <el-table-column
        label="备注"
        align="center"
        prop="remark"
        :show-overflow-tooltip="true"
      />
      <el-table-column
        label="创建时间"
        align="center"
        prop="createTime"
        width="180"
      >
        <template #default="scope">
          <span>{{ parseTime(scope.row.createTime) }}</span>
        </template>
      </el-table-column>
      <el-table-column
        label="操作"
        align="center"
        width="160"
        class-name="small-padding fixed-width"
      >
        <template #default="scope">
          <el-button
            link
            type="primary"
            icon="Edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['system:dict:edit']"
            >修改</el-button
          >
          <el-button
            link
            type="primary"
            icon="Delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:dict:remove']"
            >删除</el-button
          >
        </template>
      </el-table-column>
    </el-table>
      <!-- 添加或修改参数配置对话框 -->
      <el-dialog :title="title" v-model="open" width="500px" append-to-body>
         <el-form ref="dictRef" :model="form" :rules="rules" label-width="80px">
            <el-form-item label="字典名称" prop="dictName">
               <el-input v-model="form.dictName" placeholder="请输入字典名称" />
            </el-form-item>
            <el-form-item label="字典类型" prop="dictType">
               <el-input v-model="form.dictType" placeholder="请输入字典类型" />
            </el-form-item>
            <el-form-item label="状态" prop="status">
               <el-radio-group v-model="form.status">
                  <el-radio
                     v-for="dict in sys_normal_disable"
                     :key="dict.value"
                     :value="dict.value"
                  >{{ dict.label }}</el-radio>
               </el-radio-group>
            </el-form-item>
            <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
            </el-form-item>
         </el-form>
         <template #footer>
            <div class="dialog-footer">
               <el-button type="primary" @click="submitForm">确 定</el-button>
               <el-button @click="cancel">取 消</el-button>
            </div>
         </template>
      </el-dialog>
   </div>
    <pagination
      v-show="total > 0"
      :total="total"
      v-model:page="queryParams.pageNum"
      v-model:limit="queryParams.pageSize"
      @pagination="getList"
    />
    <!-- 添加或修改参数配置对话框 -->
    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
      <el-form ref="dictRef" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="字典名称" prop="dictName">
          <el-input v-model="form.dictName" placeholder="请输入字典名称" />
        </el-form-item>
        <el-form-item label="字典类型" prop="dictType">
          <el-input v-model="form.dictType" placeholder="请输入字典类型" />
        </el-form-item>
        <el-form-item label="状态" prop="status">
          <el-radio-group v-model="form.status">
            <el-radio
              v-for="dict in sys_normal_disable"
              :key="dict.value"
              :value="dict.value"
              >{{ dict.label }}</el-radio
            >
          </el-radio-group>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input
            v-model="form.remark"
            type="textarea"
            placeholder="请输入内容"
          ></el-input>
        </el-form-item>
      </el-form>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitForm">确 定</el-button>
          <el-button @click="cancel">取 消</el-button>
        </div>
      </template>
    </el-dialog>
  </div>
</template>
<script setup name="Dict">
import useDictStore from '@/store/modules/dict'
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
import useDictStore from "@/store/modules/dict";
import {
  listType,
  getType,
  delType,
  addType,
  updateType,
  refreshCache,
  refreshApsArea
} from "@/api/system/dict/type";
const { proxy } = getCurrentInstance();
const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
@@ -196,11 +281,15 @@
    pageSize: 10,
    dictName: undefined,
    dictType: undefined,
    status: undefined
    status: undefined,
  },
  rules: {
    dictName: [{ required: true, message: "字典名称不能为空", trigger: "blur" }],
    dictType: [{ required: true, message: "字典类型不能为空", trigger: "blur" }]
    dictName: [
      { required: true, message: "字典名称不能为空", trigger: "blur" },
    ],
    dictType: [
      { required: true, message: "字典类型不能为空", trigger: "blur" },
    ],
  },
});
@@ -209,11 +298,13 @@
/** 查询字典类型列表 */
function getList() {
  loading.value = true;
  listType(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
    typeList.value = response.rows;
    total.value = response.total;
    loading.value = false;
  });
  listType(proxy.addDateRange(queryParams.value, dateRange.value)).then(
    (response) => {
      typeList.value = response.rows;
      total.value = response.total;
      loading.value = false;
    }
  );
}
/** 取消按钮 */
@@ -229,7 +320,7 @@
    dictName: undefined,
    dictType: undefined,
    status: "0",
    remark: undefined
    remark: undefined,
  };
  proxy.resetForm("dictRef");
}
@@ -256,7 +347,7 @@
/** 多选框选中数据 */
function handleSelectionChange(selection) {
  ids.value = selection.map(item => item.dictId);
  ids.value = selection.map((item) => item.dictId);
  single.value = selection.length != 1;
  multiple.value = !selection.length;
}
@@ -265,7 +356,7 @@
function handleUpdate(row) {
  reset();
  const dictId = row.dictId || ids.value;
  getType(dictId).then(response => {
  getType(dictId).then((response) => {
    form.value = response.data;
    open.value = true;
    title.value = "修改字典类型";
@@ -274,16 +365,16 @@
/** 提交按钮 */
function submitForm() {
  proxy.$refs["dictRef"].validate(valid => {
  proxy.$refs["dictRef"].validate((valid) => {
    if (valid) {
      if (form.value.dictId != undefined) {
        updateType(form.value).then(response => {
        updateType(form.value).then((response) => {
          proxy.$modal.msgSuccess("修改成功");
          open.value = false;
          getList();
        });
      } else {
        addType(form.value).then(response => {
        addType(form.value).then((response) => {
          proxy.$modal.msgSuccess("新增成功");
          open.value = false;
          getList();
@@ -296,19 +387,27 @@
/** 删除按钮操作 */
function handleDelete(row) {
  const dictIds = row.dictId || ids.value;
  proxy.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项?').then(function() {
    return delType(dictIds);
  }).then(() => {
    getList();
    proxy.$modal.msgSuccess("删除成功");
  }).catch(() => {});
  proxy.$modal
    .confirm('是否确认删除字典编号为"' + dictIds + '"的数据项?')
    .then(function () {
      return delType(dictIds);
    })
    .then(() => {
      getList();
      proxy.$modal.msgSuccess("删除成功");
    })
    .catch(() => {});
}
/** 导出按钮操作 */
function handleExport() {
  proxy.download("system/dict/type/export", {
    ...queryParams.value
  }, `dict_${new Date().getTime()}.xlsx`);
  proxy.download(
    "system/dict/type/export",
    {
      ...queryParams.value,
    },
    `dict_${new Date().getTime()}.xlsx`
  );
}
/** 刷新缓存按钮操作 */
@@ -318,6 +417,14 @@
    useDictStore().cleanDict();
  });
}
function handleRefreshArea() {
   loading.value = true;
   refreshApsArea().then(() => {
    proxy.$modal.msgSuccess("更新成功");
   //  useDictStore().cleanDict();
    loading.value = false;
  });
  handleQuery();
}
getList();
</script>