提交高度修改;

chengxiangling

2025-05-16 af1c9e588f1de0240390648f9bb56aa486870aff

 src/views/mainPlan/sheetMetalOrderManage/index.vue

@@ -6,86 +6,77 @@
      ref="queryRef"
      :inline="true"
      v-show="showSearch"
      :label-width="locale == 'zh' ? '110px' : '200px'"
      label-position="left"
    >
      <el-form-item :label="$t('plan.query.workOrderNo')" prop="workOrderNo">
        <el-input
          :style="{ width: locale == 'zh' ? '200px' : '280px' }"
          v-model="queryParams.workOrderNo"
          :placeholder="`${$t('common.common.placeholder')}${$t(
            'plan.query.workOrderNo'
          )}`"
          clearable
          @keyup.enter="handleQuery"
        />
      </el-form-item>
      <!-- <el-row type="flex" justify="left">
        <el-col :span="5"> -->
      <el-form-item
        :label="$t('plan.query.requireTraceID')"
        prop="requireTrackId"
      >
        <el-input
          :style="{ width: locale == 'zh' ? '200px' : '280px' }"
          v-model="queryParams.requireTrackId"
          :placeholder="`${$t('common.common.placeholder')}${$t(
            'plan.query.requireTraceID'
          )}`"
          clearable
          @keyup.enter="handleQuery"
        />
      </el-form-item>
      <!-- </el-col>
        <el-col :span="5"> -->
      <el-form-item :label="$t('plan.query.itemNumber')" prop="mainPartNumber">
        <el-input
          :style="{ width: locale == 'zh' ? '200px' : '280px' }"
          v-model="queryParams.mainPartNumber"
          :placeholder="`${$t('common.common.placeholder')}${$t(
            'plan.query.itemNumber'
          )}`"
          clearable
          @keyup.enter="handleQuery"
        />
      </el-form-item>
      <el-form-item
        :label="$t('plan.table.delayRiskIdentification')"
        prop="hasDelayRisk"
      >
        <!-- <el-input
          :style="{ width: locale == 'zh' ? '200px' : '280px' }"
          v-model="queryParams.hasDelayRisk"
          :placeholder="`${$t('common.common.placeholder')}${$t(
            'plan.table.delayRiskIdentification'
          )}`"
          clearable
          @keyup.enter="handleQuery"
        /> -->
        <el-select
          clearable
          v-model="queryParams.hasDelayRisk"
          style="width: 140px"
        >
          <el-option
            v-for="item in delayRiskOptions"
            :key="item.value"
            :label="item.label"
            :value="item.value"
          />
        </el-select>
      </el-form-item>
      <!-- </el-col>
        <el-col :span="14" 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-row :gutter="20">
        <el-col :span="6">
          <el-form-item
            :style="{ width: '100%'  }"
            :label="$t('plan.query.workOrderNo')"
            prop="workOrderNo"
          >
            <el-input
              v-model="queryParams.workOrderNo"
              :placeholder="`${$t('common.common.placeholder')}${$t(
                'plan.query.workOrderNo'
              )}`"
              clearable
              @keyup.enter="handleQuery"
            />
          </el-form-item>
        </el-col>
        <el-col :span="6">
          <el-form-item
            :style="{ width: '100%'  }"
            :label="$t('plan.query.requireTraceID')"
            prop="requireTrackId"
          >
            <el-input
              v-model="queryParams.requireTrackId"
              :placeholder="`${$t('common.common.placeholder')}${$t(
                'plan.query.requireTraceID'
              )}`"
              clearable
              @keyup.enter="handleQuery"
            />
          </el-form-item>
        </el-col>
        <el-col :span="6">
          <el-form-item
            :style="{ width: '100%'  }"
            :label="$t('plan.query.itemNumber')"
            prop="mainPartNumber"
          >
            <el-input
              v-model="queryParams.mainPartNumber"
              :placeholder="`${$t('common.common.placeholder')}${$t(
                'plan.query.itemNumber'
              )}`"
              clearable
              @keyup.enter="handleQuery"
            />
          </el-form-item>
        </el-col>
        <el-col :span="6">
          <el-form-item
            :style="{ width: '100%'  }"
            :label="$t('plan.table.delayRiskIdentification')"
            prop="hasDelayRisk"
          >
            <el-select
              clearable
              v-model="queryParams.hasDelayRisk"
            >
              <el-option
                v-for="item in delayRiskOptions"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              />
            </el-select>
          </el-form-item>
        </el-col>
      </el-row>
    </el-form>

    <el-row :gutter="10" class="mb8">
@@ -93,7 +84,7 @@
        <el-button
          type="primary"
          plain
          icon="Plus"
          icon="Refresh"
          :disabled="multiple"
          @click="handleBatchUpdatePlanDate"
          v-hasPermi="['ApsPlatOrderPlanManager:requirement:list']"
@@ -113,7 +104,8 @@
      </el-col>
      <right-toolbar
        v-model:showSearch="showSearch"
        @queryTable="getList"
        @queryTable="handleQuery"
        @resetTable="resetQuery"
      ></right-toolbar>
    </el-row>
    <HxlhTable
@@ -132,17 +124,24 @@
        <el-button
          type="primary"
          link
          @click="handleCheckLevels(row)"
          v-hasPermi="['ApsPlatOrderPlanManager:requirement:list']"
          >{{ $t("plan.btns.viewUpperLowerLevels") }}</el-button
        >
        <el-button
          type="primary"
          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
@@ -150,7 +149,7 @@
        :columns="subGridOptions"
        :data="subList"
        :loading="loadingSub"
        :height="'280px'"
        :height="heightSub"
      >
      </HxlhTable>
      <template #footer>
@@ -164,8 +163,8 @@
    <el-dialog
      :title="$t('plan.btns.batchUpdateOrderDate')"
      v-model="openBatchDialog"
      width="900px"
      style="height: 400px; overflow: hidden"
      width="85%"
      style="min-height:90vh; overflow: hidden"
      append-to-body
    >
      <div class="mode_box">
@@ -174,12 +173,13 @@
          <el-radio :label="1">{{
            $t("plan.btns.batchUpdateOrderDate")
          }}</el-radio>
          <el-radio :label="2">{{
          <!-- <el-radio :label="2">{{
            $t("plan.title.CustomizePlannedCompletionDate")
          }}</el-radio>
          }}</el-radio> -->
        </el-radio-group>
      </div>
      <div class="red_color">{{ $t("plan.title.tipsBugSheetMetal") }}</div>
      <div class="red_color" v-if="radio === 1">{{ $t("plan.title.tipsBugSheetMetal") }}</div>
      <div class="red_color" v-if="radio === 2">{{ $t("plan.title.tipsBugSheetMetal2") }}</div>
      <div class="mode_box" v-if="radio === 2">
        <span>{{ $t("plan.title.CustomizePlannedCompletionDate") }}</span>
        <!-- <el-date-picker
@@ -201,7 +201,7 @@
        :columns="subUpdateGridOptions"
        :data="subUpdateList"
        :loading="loading"
        :height="'200px'"
        :height="heightSubUpdate"
      >
      </HxlhTable>
      <HxlhTable
@@ -210,7 +210,7 @@
        :columns="subUpdateCustomGridOptions"
        :data="subUpdateList"
        :loading="loading"
        :height="'200px'"
        :height="heightSubUpdate"
      >
      </HxlhTable>
      <template #footer>
@@ -228,10 +228,34 @@
        </span>
      </template>
    </el-dialog>
    <!-- 查看上下阶 -->
    <el-dialog
      :title="$t('plan.title.viewUpperLowerLevels')"
      v-model="openUpperLowerDialog"
      width="85%"
      style="height:90vh; overflow: hidden"
      append-to-body
    >
      <HxlhTable
        style="width: 100%"
        :columns="subUpAndDownGridOptions"
        :data="subUpAndDownList"
        :loading="loadingSubUpAndDown"
        :height="heightSub"
      >
      </HxlhTable>
      <template #footer>
        <span class="dialog-footer">
          <el-button @click="openUpperLowerDialog = false">{{
            $t("common.common.close")
          }}</el-button>
        </span>
      </template>
    </el-dialog>
  </div>
</template>

<script setup name="Calendar">
<script setup name="SheetMetalOrderManage">
import HxlhTable from "@/components/HxlhTable";
import { parseTime } from "@/utils/ruoyi.js";
import useBasicStore from "@/store/modules/request/basic/page";
@@ -239,6 +263,7 @@
import {
  metalOrderManageList,
  metalOrderManageSubList,
  metalOrderManageUpAndDownList,
  generatorPlanList,
  planDateList,
} from "@/api/mainPlan/metalOrderManage.js";
@@ -247,23 +272,20 @@
const { t, locale } = useI18n();
const basicStore = useBasicStore();
const { proxy } = getCurrentInstance();
const delayRiskOptions = ref([
  {
    label: "有风险",
    value: "1",
  },
  {
    label: "无风险",
    value: "0",
  },
]);
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("");
const openDialog = ref(false);
const openUpperLowerDialog = ref(false);
const openBatchDialog = ref(false);
const subGridOptions = ref([]);
const subUpAndDownGridOptions = ref([]);
const subUpdateGridOptions = ref([]);
const subUpdateCustomGridOptions = ref([]);
const subUpAndDownList = ref([]);
const subList = ref([]);
const subUpdateList = ref([]);
// const tableRef = ref();
@@ -271,6 +293,7 @@
const loading = ref(false);
const loadingUpdateDate = ref(false);
const loadingGenerateList = ref(false);
const loadingSubUpAndDown = ref(false);
const loadingSub = ref(false);
const showSearch = ref(true);
const ids = ref([]);
@@ -296,7 +319,9 @@
const shopList = ref([]);
const allShopList = ref([]);
const processList = ref([]);
const height = ref(document.documentElement.clientHeight - 270 + "px;");
const height = ref(document.documentElement.clientHeight - 220 + "px;");
const heightSub = ref(document.documentElement.clientHeight - 200 + "px;");
const heightSubUpdate = ref(document.documentElement.clientHeight - 270 + "px;");
// 表格配置-列表
const columns = ref([]);
// 分页属性
@@ -308,72 +333,91 @@
watch(
  locale,
  (newLocale) => {
    delayRiskOptions.value = [
      {
        label: t("plan.options.hasRisk"),
        value: "1",
      },
      {
        label: t("plan.options.noRisk"),
        value: "0",
      },
    ];
    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",
        width: 200,
        width: "auto",
        align: "center",
      },
      {
        title: t("plan.table.workOrderNo"),
        field: "workOrderNo",
        width: 200,
        width: "auto",
        align: "center",
      },
      {
        title: t("basic.table.matchQuantity"),
        field: "deductionAmount",
        width: 200,
        width: "auto",
        align: "center",
      },
      {
        title: t("basic.table.workOrderType"),
        field: "workOrderType",
        width: 200,
        width: "auto",
        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"),
        field: "mainPartNumber",
        width: 200,
        width: "auto",
        align: "center",
      },
      {
        title: t("plan.table.mainPartDrawingNumber"),
        field: "mainPartDrawingNumber",
        width: 200,
        width: "auto",
        align: "center",
      },
      {
        title: t("basic.table.mainCustomer"),
        field: "customer",
        width: 200,
        width: "auto",
        align: "center",
      },
      {
        title: t("plan.table.productionQuantity"),
        field: "productionQuantity",
        width: 100,
        width: "auto",
        align: "center",
      },
      {
        title: t("basic.table.applicableFactories"),
        field: "applicableFactories",
        width: 200,
        width: 100,
        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;
              }
            }
          }
@@ -382,31 +426,31 @@
      {
        title: t("plan.table.productionBase"),
        field: "productionBase",
        width: 100,
        width: "auto",
        align: "center",
      },
      {
        title: t("plan.table.planStartDay"),
        field: "planStartDay",
        width: 200,
        width: "auto",
        align: "center",
      },
      {
        title: t("plan.table.planEndDayDate"),
        field: "planEndDay",
        width: 200,
        width: "auto",
        align: "center",
      },
      {
        title: t("plan.table.workorderCreationTime"),
        field: "orderCreateTime",
        width: 200,
        width: "auto",
        align: "center",
      },
      {
        title: t("plan.table.mismatchedProductionQuantity"),
        field: "unmatchedQuantity",
        width: 100,
        width: "auto",
        align: "center",
      },
      {
@@ -416,17 +460,17 @@
        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"),
        width: 100,
        title: t("common.common.require"),
        width: "auto",
        fixed: "right",
        slots: { default: "buttons" },
        align: "center",
@@ -439,12 +483,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",
@@ -463,18 +507,18 @@
        width: 200,
        align: "center",
      },
      {
        title: t("basic.table.processRouteID"),
        field: "processRouteId",
        width: 200,
        align: "center",
      },
      {
        title: t("plan.table.processRouteWorkingHours"),
        field: "processRouteHours",
        width: 100,
        align: "center",
      },
      // {
      //   title: t("basic.table.processRouteID"),
      //   field: "processRouteId",
      //   width: 200,
      //   align: "center",
      // },
      // {
      //   title: t("plan.table.processRouteWorkingHours"),
      //   field: "processRouteHours",
      //   width: 100,
      //   align: "center",
      // },
      {
        title: t("plan.table.demandQuantity"),
        field: "requireAmount",
@@ -510,6 +554,15 @@
        field: "orgCode",
        width: 100,
        align: "center",
        formatter: ({ cellValue, row, column }) => {
          if (cellValue) {
            for (let i = 0; i < aps_factory.value.length; i++) {
              if (cellValue === aps_factory.value[i].value) {
                return aps_factory.value[i].label;
              }
            }
          }
        },
      },
      {
        title: t("plan.table.productionBase"),
@@ -548,22 +601,54 @@
        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;
              }
            }
          }
        },
      },
    ];
    subUpdateGridOptions.value = [
    subUpAndDownGridOptions.value = [
      {
        title: t("basic.table.requirementID"),
        field: "requireId",
        width: 150,
        title: t("plan.table.documentNumber"),
        field: "documentNumber",
        align: "center",
      },
      {
        title: t("plan.table.level"),
        field: "requirementType",
        align: "center",
      },
      {
        title: t("plan.table.itemNumber"),
        field: "itemNumber",
        align: "center",
      },
      {
        title: t("plan.table.planStartDay"),
        field: "planStartDay",
        align: "center",
      },
      {
        title: t("plan.table.planEndDay"),
        field: "planEndDay",
        align: "center",
      },
      {
        title: t("plan.table.productionQuantity"),
        field: "productionQuantity",
        align: "center",
      },
    ]
    subUpdateGridOptions.value = [
      // {
      //   title: t("basic.table.requirementID"),
      //   field: "requireId",
      //   width: 150,
      //   align: "center",
      // },
      {
        title: t("basic.table.requirementTraceabilityID"),
        field: "requireTrackId",
@@ -587,6 +672,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"),
@@ -620,12 +714,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",
@@ -649,6 +743,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"),
@@ -710,6 +813,17 @@
      loadingSub.value = false;
    });
}
function handleCheckLevels(row) {
  openUpperLowerDialog.value = true;
  loadingSubUpAndDown.value = true;
  metalOrderManageUpAndDownList({requireId: row.requireId}).then((res) => {
    console.log(res,"metalOrderManageUpAndDownList");
    subUpAndDownList.value = res.rows;
    loadingSubUpAndDown.value = false;
  }).catch(() => {
    loadingSubUpAndDown.value = false;
  });
}
async function hanleBatchUpdateDate() {
  loadingUpdateDate.value = true;
  let planIds = subUpdateList.value.map((item) => {
@@ -753,7 +867,7 @@
    });
    loadingGenerateList.value = false;
    getList();
  }else {
  } else {
    loadingGenerateList.value = false;
  }
}