fix: 用河南鹤壁代码覆盖山西长治

yuan

5 天以前 9ea5ff67655241271bdf04bb50ca3a8d60c4e22a

 src/views/inventoryManagement/receiptManagement/Record.vue

@@ -1,14 +1,14 @@
<template>
  <div>
    <div class="search_form"
         style="margin-bottom: 10px;">
      <el-form ref="searchFormRef"
    <div class="search_form" style="margin-bottom: 10px;">
      <el-form
          ref="searchFormRef"
               :model="searchForm"
               class="demo-form-inline">
          class="demo-form-inline"
      >
        <el-row :gutter="20">
          <el-col :span="4">
            <el-form-item label="入库日期"
                          prop="timeStr">
            <el-form-item label="入库日期" prop="timeStr">
              <el-date-picker v-model="searchForm.timeStr"
                              type="date"
                              placeholder="请选择日期"
@@ -18,17 +18,16 @@
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item label="产品大类"
                          prop="productName">
            <el-form-item label="产品大类" prop="productName">
              <el-input v-model="searchForm.productName"
                        style="width: 240px"
                        placeholder="请输入"
                        clearable />
            </el-form-item>
          </el-col>

          <el-col :span="4">
            <el-form-item label="规格型号"
                          prop="model">
            <el-form-item label="产品规格" prop="model">
              <el-input v-model="searchForm.model"
                        style="width: 240px"
                        placeholder="请输入"
@@ -36,8 +35,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item label="批号"
                          prop="batchNo">
            <el-form-item label="批号" prop="batchNo">
              <el-input v-model="searchForm.batchNo"
                        style="width: 240px"
                        placeholder="请输入"
@@ -45,8 +43,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="4">
            <el-form-item label="来源"
                          prop="recordType">
            <el-form-item label="来源" prop="recordType">
              <el-select v-model="searchForm.recordType"
                         style="width: 240px"
                         placeholder="请选择"
@@ -61,10 +58,10 @@
          <!-- 按钮 -->
          <el-col :span="4">
            <el-form-item>
              <el-button type="primary"
                         @click="getList">
              <el-button type="primary" @click="getList">
                搜索
              </el-button>

              <el-button @click="resetSearch">
                重置
              </el-button>
@@ -74,11 +71,11 @@
      </el-form>
    </div>
    <div class="actions">
      <el-button type="primary"
      <!-- <el-button type="primary"
                 :disabled="!canBatchApprove"
                 @click="handleBatchApprove">审批</el-button>
      <el-button :disabled="!canReverseApprove"
                 @click="handleReverseApprove">反审</el-button>
                 @click="handleReverseApprove">反审</el-button> -->
      <el-button @click="handleOut">导出</el-button>
      <el-button type="danger"
                 plain
@@ -105,11 +102,16 @@
                         width="60" />
        <el-table-column label="入库批次"
                         prop="inboundBatches"
                         width="200"
                         width="150"
                         show-overflow-tooltip />
        <el-table-column label="入库时间"
                         prop="createTime"
                         show-overflow-tooltip />
                         width="120"
                         show-overflow-tooltip>
          <template #default="scope">
            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
          </template>
        </el-table-column>
        <el-table-column label="产品大类"
                         prop="productName"
                         show-overflow-tooltip />
@@ -118,6 +120,7 @@
                         show-overflow-tooltip />
        <el-table-column label="批号"
                         prop="batchNo"
                         width="180"
                         show-overflow-tooltip />
        <el-table-column label="单位"
                         prop="unit"
@@ -135,7 +138,8 @@
            {{ getRecordType(scope.row.recordType) }}
          </template>
        </el-table-column>
        <el-table-column v-if="showSourceOrderNoColumn"
        <el-table-column
            v-if="showSourceOrderNoColumn"
                         label="源单号"
                         width="150"
                         prop="sourceOrderNo"
@@ -144,16 +148,15 @@
            {{ formatSourceOrderNo(scope.row?.sourceOrderNo) }}
          </template>
        </el-table-column>
        <el-table-column label="审批状态"
        <!-- <el-table-column label="审批状态"
                         prop="approvalStatus"
                         show-overflow-tooltip>
          <template #default="scope">
            <el-tag :type="getApprovalStatusTagType(scope.row.approvalStatus)"
                    size="small">
            <el-tag :type="getApprovalStatusTagType(scope.row.approvalStatus)" size="small">
              {{ getApprovalStatusLabel(scope.row.approvalStatus) }}
            </el-tag>
          </template>
        </el-table-column>
        </el-table-column> -->
      </el-table>
      <pagination v-show="total > 0"
                  :total="total"
@@ -186,6 +189,7 @@
    findAllQualifiedStockInRecordTypeOptions,
    // findAllUnQualifiedStockInRecordTypeOptions,
  } from "@/api/basicData/enum.js";
import { parseTime } from "@/utils/ruoyi";

  const { proxy } = getCurrentInstance();

@@ -193,13 +197,13 @@
    type: {
      type: String,
      required: true,
      default: "0",
    default: '0'
    },
    topParentProductId: {
      type: [String, Number],
      default: undefined,
    },
  });
    default: undefined
  }
})

  const tableData = ref([]);
  const selectedRows = ref([]);
@@ -228,14 +232,11 @@
    searchFormRef.value?.resetFields();
    page.current = 1;
    getList();
  };
}

  const getRecordType = recordType => {
    return (
      stockRecordTypeOptions.value.find(item => item.value === recordType)
        ?.label || ""
    );
  };
const getRecordType = (recordType) => {
  return stockRecordTypeOptions.value.find(item => item.value === recordType)?.label || ''
}

  const approvalStatusLabelMap = {
    0: "待审批",
@@ -250,7 +251,7 @@
  };
  approvalStatusLabelMap[3] = "待确认";

  const getApprovalStatusLabel = status => {
const getApprovalStatusLabel = (status) => {
    if (status === null || status === undefined || status === "") {
      return "待审批";
    }
@@ -258,73 +259,41 @@
  };

  // 通过/驳回固定色；其余（含待审批、空值、未映射但文案为待审批）统一用 warning 预警色
  const getApprovalStatusTagType = status => {
    if (
      status === 1 ||
      status === "1" ||
      status === "approved" ||
      status === "APPROVED"
    )
      return "success";
    if (
      status === 2 ||
      status === "2" ||
      status === "rejected" ||
      status === "REJECTED"
    )
      return "danger";
const getApprovalStatusTagType = (status) => {
  if (status === 1 || status === "1" || status === "approved" || status === "APPROVED") return "success";
  if (status === 2 || status === "2" || status === "rejected" || status === "REJECTED") return "danger";
    return "warning";
  };

  const isPendingApproval = status => {
    return (
      status === 0 ||
      status === "0" ||
      status === "pending" ||
      status === "PENDING" ||
      status === null ||
      status === undefined ||
      status === ""
    );
  return status === 0 || status === "0" || status === "pending" || status === "PENDING" || status === null || status === undefined || status === "";
  };

  const isRejectedApproval = status => {
    return (
      status === 2 ||
      status === "2" ||
      status === "rejected" ||
      status === "REJECTED"
    );
  return status === 2 || status === "2" || status === "rejected" || status === "REJECTED";
  };

  const isRowSelectable = row => {
    return (
      isPendingApproval(row?.approvalStatus) ||
      isRejectedApproval(row?.approvalStatus)
    );
  return isPendingApproval(row?.approvalStatus) || isRejectedApproval(row?.approvalStatus);
  };

  const canBatchApprove = computed(() => {
    return (
      selectedRows.value.length > 0 &&
      selectedRows.value.every(row => isPendingApproval(row.approvalStatus))
    );
  return selectedRows.value.length > 0
      && selectedRows.value.every(row => isPendingApproval(row.approvalStatus));
  });

  const canReverseApprove = computed(() => {
    return (
      selectedRows.value.length > 0 &&
      selectedRows.value.every(row => isRejectedApproval(row.approvalStatus))
    );
  return selectedRows.value.length > 0
      && selectedRows.value.every(row => isRejectedApproval(row.approvalStatus));
  });

  const canDelete = computed(() => canBatchApprove.value);
  const showSourceOrderNoColumn = computed(() => {
    const topParentProductId = Number(props.topParentProductId);
    return topParentProductId === 276 || topParentProductId === 278;
  return topParentProductId === 1 || topParentProductId === 3;
  });

  const formatSourceOrderNo = value => {
const formatSourceOrderNo = (value) => {
    const text = String(value ?? "").trim();
    return text || "--";
  };
@@ -337,44 +306,33 @@

  const getList = () => {
    tableLoading.value = true;
    getStockInRecordListPage(
      Object.assign(
        {},
        {
          ...searchForm.value,
          ...page,
          topParentProductId: props.topParentProductId,
        }
      )
    )
  getStockInRecordListPage(Object.assign({}, {...searchForm.value, ...page,  topParentProductId: props.topParentProductId}))
      .then(res => {
        tableData.value = res.data.records;
        total.value = res.data.total || 0;
      })
      .finally(() => {
      }).finally(() => {
        tableLoading.value = false;
      });
  })
  };

  // 获取来源类型选项
  const fetchStockRecordTypeOptions = () => {
    if (props.type === "0") {
      findAllQualifiedStockInRecordTypeOptions().then(res => {
  if (props.type === '0') {
    findAllQualifiedStockInRecordTypeOptions()
        .then(res => {
        stockRecordTypeOptions.value = res.data;
      });
      return;
        })
    return
    }
    // findAllUnQualifiedStockInRecordTypeOptions()
    //     .then(res => {
    //       stockRecordTypeOptions.value = res.data;
    //     })
  };
}

  // 表格选择数据
  const handleSelectionChange = selection => {
    selectedRows.value = selection.filter(
      item => item.id && isRowSelectable(item)
    );
  selectedRows.value = selection.filter(item => item.id && isRowSelectable(item));
  };

  const expandedRowKeys = ref([]);
@@ -427,7 +385,7 @@
            proxy.$modal.msgError("审批通过失败");
          });
      })
      .catch(action => {
      .catch((action) => {
        if (action === "cancel") {
          batchApproveStockInRecords({ ids, approvalStatus: 2 })
            .then(() => {
@@ -452,11 +410,7 @@
    })
      .then(() => {
        // 根据不同的 tab 类型调用不同的导出接口
        proxy.download(
          "/stockInRecord/exportStockInRecord",
          { type: props.type },
          props.type === "0" ? "合格入库.xlsx" : "不合格入库.xlsx"
        );
        proxy.download("/stockInRecord/exportStockInRecord", {type: props.type}, props.type === '0' ? "合格入库.xlsx" : "不合格入库.xlsx");
      })
      .catch(() => {
        proxy.$modal.msg("已取消");