协同审批：增加原料管理页面

huminmin

2026-03-16 2fc20934018994b7a8abe5199d717a29283cbb8e

 src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue

@@ -168,6 +168,43 @@
        </el-skeleton>
      </div>

      <div v-if="isRawMaterialApproval" style="margin: 10px 0 18px;">
        <el-divider content-position="left">原料详情</el-divider>
        <el-skeleton :loading="rawMaterialLoading" animated>
          <template #template>
            <el-skeleton-item variant="h3" style="width: 30%" />
            <el-skeleton-item variant="text" style="width: 100%" />
            <el-skeleton-item variant="text" style="width: 100%" />
          </template>
          <template #default>
            <el-empty v-if="!currentRawMaterial" description="未查询到对应原料详情" />
            <template v-else>
              <el-descriptions :column="2" border>
                <el-descriptions-item label="产品名称">{{ currentRawMaterial.productName }}</el-descriptions-item>
                <el-descriptions-item label="规格">{{ currentRawMaterial.model }}</el-descriptions-item>
                <el-descriptions-item label="单位">{{ currentRawMaterial.unit }}</el-descriptions-item>
                <el-descriptions-item label="批号">{{ currentRawMaterial.batchNo }}</el-descriptions-item>
                <el-descriptions-item label="检验类型">{{ currentRawMaterial.checkTypeText }}</el-descriptions-item>
                <el-descriptions-item label="检测结果">{{ currentRawMaterial.checkResultText }}</el-descriptions-item>
                <el-descriptions-item label="检验员">{{ currentRawMaterial.checkUserName }}</el-descriptions-item>
                <el-descriptions-item label="检测日期">{{ currentRawMaterial.checkTime }}</el-descriptions-item>
              </el-descriptions>

              <div style="margin-top: 20px;">
                <h4>检测项目明细</h4>
                <el-table :data="currentRawMaterial.qualityInspectItem || []" border style="width: 100%">
                  <el-table-column prop="name" label="检测项目" />
                  <el-table-column prop="unit" label="单位" />
                  <el-table-column prop="standardValue" label="标准值" />
                  <el-table-column prop="internalControl" label="内控值" />
                  <el-table-column prop="testValue" label="化验值" />
                </el-table>
              </div>
            </template>
          </template>
        </el-skeleton>
      </div>

      <el-form :model="{ activities }" ref="formRef" label-position="top">
        <el-steps :active="getActiveStep()" finish-status="success" process-status="process" align-center direction="vertical">
          <el-step
@@ -232,6 +269,7 @@
import { WarningFilled, Edit, Check, MoreFilled } from '@element-plus/icons-vue'
import { getQuotationList } from "@/api/salesManagement/salesQuotation.js";
import { getPurchaseByCode } from "@/api/procurementManagement/procurementLedger.js";
import {findRawMaterialDetail} from "@/api/qualityManagement/rawMaterial.js";
const emit = defineEmits(['close'])
const { proxy } = getCurrentInstance()

@@ -252,9 +290,12 @@
const quotationLoading = ref(false)
const currentQuotation = ref({})
const purchaseLoading = ref(false)
const rawMaterialLoading = ref(false)
const currentPurchase = ref({})
const currentRawMaterial = ref({})
const isQuotationApproval = computed(() => Number(props.approveType) === 6)
const isPurchaseApproval = computed(() => Number(props.approveType) === 5)
const isRawMaterialApproval = computed(() => Number(props.approveType) === 9)

const data = reactive({
   form: {
@@ -291,10 +332,12 @@

// 打开弹框
const openDialog = (type, row) => {
  console.log(type, row);
  operationType.value = type;
  dialogFormVisible.value = true;
  currentQuotation.value = {}
  currentPurchase.value = {}
  currentRawMaterial.value = {}
   userListNoPageByTenantId().then((res) => {
      userList.value = res.data;
   });
@@ -355,6 +398,15 @@
    }
  }

  if (isRawMaterialApproval.value) {
    rawMaterialLoading.value = true
    findRawMaterialDetail(row.approveRecordId).then(res => {
      currentRawMaterial.value = res.data;
    }).finally(() => {
      rawMaterialLoading.value = false
    })
  }

  approveProcessDetails(row.approveId).then((res) => {
    activities.value = res.data
    // 增加isApproval字段