src/views/basicData/product/index.vue

@@ -153,12 +153,15 @@
        <el-row>
          <el-col :span="24">
            <el-form-item label="单位：" prop="unit">
              <el-input
              <el-select
                v-model="modelForm.unit"
                placeholder="请输入单位"
                placeholder="请选择单位"
                clearable
                @keydown.enter.prevent
              />
                style="width: 100%"
              >
                <el-option label="吨" value="吨" />
                <el-option label="公斤" value="公斤" />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>

 src/views/consumablesLogistics/stockManagement/Qualified.vue

@@ -34,7 +34,7 @@
        <el-table-column fixed="right" label="操作" min-width="60" align="center">
          <template #default="scope">
            <el-button link type="primary" size="small" @click="showSubtractModal(scope.row)" :disabled="scope.row.unLockedQuantity === 0">出库</el-button>
            <el-button link type="primary" size="small" v-if="scope.row.unLockedQuantity > 0" @click="showFrozenModal(scope.row)">冻结</el-button>
            <!-- <el-button link type="primary" size="small" v-if="scope.row.unLockedQuantity > 0" @click="showFrozenModal(scope.row)">冻结</el-button> -->
            <el-button link type="primary" size="small" v-if="scope.row.lockedQuantity > 0" @click="showThawModal(scope.row)">解冻</el-button>
          </template>
        </el-table-column>

 src/views/consumablesLogistics/stockReport/index.vue

@@ -214,11 +214,11 @@
             prop="currentStock"
             align="center"
           />
            <el-table-column
            <!-- <el-table-column
             label="现净重(吨)"
             prop="currentWeight"
             align="center"
           />
           /> -->
           <el-table-column label="来源"
                            prop="recordType"
                            v-if="searchForm.reportType !== 'inout'"

 src/views/inventoryManagement/dispatchLog/Record.vue

@@ -82,17 +82,17 @@
                    show-overflow-tooltip
                />
                <el-table-column
                    label="毛重(吨)"
                    label="毛重"
                    prop="grossWeight"
                    show-overflow-tooltip
                />
                <el-table-column
                    label="皮重(吨)"
                    label="皮重"
                    prop="tareWeight"
                    show-overflow-tooltip
                />
                <el-table-column
                    label="净重(吨)"
                    label="净重"
                    prop="netWeight"
                    show-overflow-tooltip
                />
@@ -159,6 +159,8 @@
            />
          </el-form-item> -->

          

          <el-form-item
            label="车牌号"
            prop="licensePlateNo"
@@ -166,9 +168,22 @@
          >
            <el-input v-model="editForm.licensePlateNo" />
          </el-form-item>

          <el-form-item
            label="毛重(吨)"
            label="单位"
            prop="unit"
          >
            <el-select
              v-model="editForm.unit"
              placeholder="请选择单位"
              style="width: 100%"
              clearable
            >
              <el-option label="吨" value="吨" />
              <el-option label="公斤" value="公斤" />
            </el-select>
          </el-form-item>
          <el-form-item
            label="毛重"
            prop="grossWeight"
            :rules="[{ required: true, message: '请输入毛重', trigger: ['blur','change'] }]"
          >
@@ -182,7 +197,7 @@
          </el-form-item>

          <el-form-item
            label="皮重(吨)"
            label="皮重"
            prop="tareWeight"
            :rules="[{ required: true, message: '请输入皮重', trigger: ['blur','change'] }]"
          >
@@ -196,7 +211,7 @@
          </el-form-item>

          <el-form-item
            label="净重(吨)"
            label="净重"
            prop="netWeight"
            :rules="[{ required: true, message: '净重由毛重和皮重自动计算', trigger: ['blur','change'] }]"
          >

 src/views/inventoryManagement/receiptManagement/Record.vue

@@ -82,15 +82,15 @@
                         prop="licensePlateNo"
                         v-if="type === '0'"
                         show-overflow-tooltip/>
        <el-table-column label="毛重(吨)"
        <el-table-column label="毛重"
                         prop="grossWeight"
                         v-if="type === '0'"
                         show-overflow-tooltip/>
        <el-table-column label="皮重(吨)"
        <el-table-column label="皮重"
                         prop="tareWeight"
                         v-if="type === '0'"
                         show-overflow-tooltip/>
        <el-table-column label="净重(吨)"
        <el-table-column label="净重"
                         prop="netWeight"
                         v-if="type === '0'"
                         show-overflow-tooltip/>
@@ -151,6 +151,8 @@
          </el-form-item> -->

          <template v-if="type === '0'">
            

            <el-form-item
              label="车牌号"
              prop="licensePlateNo"
@@ -158,9 +160,22 @@
            >
              <el-input v-model="editForm.licensePlateNo" />
            </el-form-item>

            <el-form-item
              label="毛重(吨)"
              label="单位"
              prop="unit"
            >
              <el-select
                v-model="editForm.unit"
                placeholder="请选择单位"
                style="width: 100%"
                clearable
              >
                <el-option label="吨" value="吨" />
                <el-option label="公斤" value="公斤" />
              </el-select>
            </el-form-item>
            <el-form-item
              label="毛重"
              prop="grossWeight"
              :rules="[{ required: true, message: '请输入毛重', trigger: ['blur', 'change'] }]"
            >
@@ -174,7 +189,7 @@
            </el-form-item>

            <el-form-item
              label="皮重(吨)"
              label="皮重"
              prop="tareWeight"
              :rules="[{ required: true, message: '请输入皮重', trigger: ['blur', 'change'] }]"
            >
@@ -188,7 +203,7 @@
            </el-form-item>

            <el-form-item
              label="净重(吨)"
              label="净重"
              prop="netWeight"
              :rules="[{ required: true, message: '请输入净重', trigger: ['blur', 'change'] }]"
            >

 src/views/inventoryManagement/stockManagement/New.vue

@@ -30,12 +30,7 @@
          <el-input v-model="formState.productModelName"  disabled />
        </el-form-item>

        <el-form-item
            label="单位"
            prop="unit"
        >
          <el-input v-model="formState.unit"  disabled />
        </el-form-item>
        

        <!-- 半成品：允许手动填写数量入库 -->
        <el-form-item
@@ -66,10 +61,23 @@
        >
          <el-input v-model="formState.licensePlateNo" />
        </el-form-item>

        <el-form-item
            label="单位"
            prop="unit"
        >
          <el-select
              v-model="formState.unit"
              placeholder="请选择单位"
              style="width: 100%"
              clearable
          >
            <el-option label="吨" value="吨" />
            <el-option label="公斤" value="公斤" />
          </el-select>
        </el-form-item>
        <el-form-item
            v-if="type === 'qualified' && formState.productType === 0"
            label="毛重(吨)"
            label="毛重"
            prop="grossWeight"
            :rules="[{ required: true, message: '请输入毛重', trigger: ['blur','change'] }]"
        >
@@ -84,7 +92,7 @@

        <el-form-item
            v-if="type === 'qualified' && formState.productType === 0"
            label="皮重(吨)"
            label="皮重"
            prop="tareWeight"
            :rules="[{ required: true, message: '请输入皮重', trigger: ['blur','change'] }]"
        >
@@ -99,7 +107,7 @@

        <el-form-item
            v-if="type === 'qualified' && formState.productType === 0"
            label="净重(吨)"
            label="净重"
            prop="netWeight"
            :rules="[{ required: true, message: '请先输入毛重和皮重自动计算净重', trigger: ['blur','change'] }]"
        >

 src/views/inventoryManagement/stockManagement/Qualified.vue

@@ -28,7 +28,7 @@
        <el-table-column label="规格型号" prop="model" show-overflow-tooltip />
        <el-table-column label="单位" prop="unit" show-overflow-tooltip />
        <el-table-column label="库存数量" prop="qualitity" show-overflow-tooltip />
        <el-table-column label="冻结数量" prop="lockedQuantity" show-overflow-tooltip />
        <!-- <el-table-column label="冻结数量" prop="lockedQuantity" show-overflow-tooltip /> -->
        <!-- <el-table-column label="库存预警数量" prop="warnNum"  show-overflow-tooltip /> -->
        <!-- <el-table-column label="净重(吨)" prop="netWeight"  show-overflow-tooltip /> -->
        <el-table-column label="备注" prop="remark"  show-overflow-tooltip />
@@ -36,7 +36,7 @@
        <el-table-column fixed="right" label="操作" min-width="60" align="center">
          <template #default="scope">
            <el-button link type="primary" size="small" @click="showSubtractModal(scope.row)" :disabled="scope.row.unLockedQuantity === 0">出库</el-button>
            <el-button link type="primary" size="small" v-if="scope.row.unLockedQuantity > 0" @click="showFrozenModal(scope.row)">冻结</el-button>
            <!-- <el-button link type="primary" size="small" v-if="scope.row.unLockedQuantity > 0" @click="showFrozenModal(scope.row)">冻结</el-button> -->
            <el-button link type="primary" size="small" v-if="scope.row.lockedQuantity > 0" @click="showThawModal(scope.row)">解冻</el-button>
          </template>
        </el-table-column>

 src/views/inventoryManagement/stockManagement/Subtract.vue

@@ -31,22 +31,28 @@
        </el-form-item>

        <el-form-item
            label="单位"
            prop="unit"
        >
          <el-input v-model="formState.unit"  disabled />
        </el-form-item>

        <el-form-item
            label="车牌号"
            prop="licensePlateNo"
            :rules="[{ required: true, message: '请输入车牌号', trigger: ['blur','change'] }]"
        >
          <el-input v-model="formState.licensePlateNo" />
        </el-form-item>

        <el-form-item
            label="毛重(吨)"
            label="单位"
            prop="unit"
        >
          <el-select
              v-model="formState.unit"
              placeholder="请选择单位"
              style="width: 100%"
              clearable
          >
            <el-option label="吨" value="吨" />
            <el-option label="公斤" value="公斤" />
          </el-select>
        </el-form-item>
        <el-form-item
            label="毛重"
            prop="grossWeight"
            :rules="[{ required: true, message: '请输入毛重', trigger: ['blur','change'] }]"
        >
@@ -60,7 +66,7 @@
        </el-form-item>

        <el-form-item
            label="皮重(吨)"
            label="皮重"
            prop="tareWeight"
            :rules="[{ required: true, message: '请输入皮重', trigger: ['blur','change'] }]"
        >
@@ -74,7 +80,7 @@
        </el-form-item>

        <el-form-item
            label="净重(吨)"
            label="净重"
            prop="netWeight"
            :rules="[{ required: true, message: '净重由毛重和皮重自动计算', trigger: ['blur','change'] }]"
        >

 src/views/inventoryManagement/stockReport/index.vue

@@ -214,11 +214,11 @@
             prop="currentStock"
             align="center"
           />
            <el-table-column
            <!-- <el-table-column
             label="现净重(吨)"
             prop="currentWeight"
             align="center"
           />
           /> -->
           <el-table-column label="来源"
                            prop="recordType"
                            v-if="searchForm.reportType !== 'inout'"

 src/views/productionManagement/productionOrder/index.vue

@@ -128,6 +128,12 @@
      width: '120px',
    },
    {
      label: "单位",
      prop: "unit",
      width: '100px',
      showOverflowTooltip: true,
    },
    {
      label: "工艺路线编号",
      prop: "processRouteCode",
      width: '200px',

 src/views/qualityManagement/rawMaterial/components/formDia.vue

@@ -2,11 +2,18 @@
  <div>
    <el-dialog
        v-model="dialogFormVisible"
        :title="operationType === 'add' ? '新增原料' : '编辑原料'"
        :title="operationType === 'add' ? '新增原料' : operationType === 'view' ? '原料详情' : '编辑原料'"
        width="70%"
        @close="closeDia"
    >
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
      <el-form
          v-if="operationType !== 'view'"
          :model="form"
          label-width="140px"
          label-position="top"
          :rules="rules"
          ref="formRef"
      >
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="产品名称：" prop="productId">
@@ -18,7 +25,7 @@
                  @change="getModels"
                  :data="productOptions"
                  :render-after-expand="false"
                  :disabled="operationType === 'edit'"
                  :disabled="operationType === 'edit' || operationType === 'view'"
                  style="width: 100%"
              />
            </el-form-item>
@@ -26,7 +33,7 @@
          <el-col :span="12">
            <el-form-item label="规格型号：" prop="productModelId">
              <el-select v-model="form.productModelId" placeholder="请选择" clearable
                         :disabled="operationType === 'edit'"
                         :disabled="operationType === 'edit' || operationType === 'view'"
                         filterable readonly @change="handleChangeModel">
                <el-option v-for="item in modelOptions" :key="item.id" :label="item.model" :value="item.id"/>
              </el-select>
@@ -41,14 +48,20 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="批号：" prop="batchNo">
              <el-input style="width: 100%" v-model="form.batchNo" placeholder="请输入" clearable/>
              <el-input
                  style="width: 100%"
                  v-model="form.batchNo"
                  placeholder="请输入"
                  clearable
                  :disabled="operationType === 'view'"
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="检验类型：" prop="checkType">
              <el-select v-model="form.checkType">
              <el-select v-model="form.checkType" :disabled="operationType === 'view'">
                <el-option label="入厂检" :value="0"/>
                <el-option label="车间检" :value="1"/>
                <el-option label="出厂检" :value="2"/>
@@ -57,7 +70,7 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="检测结果：" prop="checkResult">
              <el-select v-model="form.checkResult">
              <el-select v-model="form.checkResult" :disabled="operationType === 'view'">
                <el-option label="合格" :value="1"/>
                <el-option label="不合格" :value="0"/>
              </el-select>
@@ -67,7 +80,14 @@
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="检验员：" prop="checkUserName">
              <el-select v-model="form.checkUserName" placeholder="请选择" clearable filterable style="width: 100%">
              <el-select
                  v-model="form.checkUserName"
                  placeholder="请选择"
                  clearable
                  filterable
                  style="width: 100%"
                  :disabled="operationType === 'view'"
              >
                <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
                           :value="item.nickName"/>
              </el-select>
@@ -84,13 +104,34 @@
                  format="YYYY-MM-DD"
                  clearable
                  style="width: 100%"
                  :disabled="operationType === 'view'"
              />
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <el-descriptions
          v-else
          :column="2"
          border
          size="small"
          style="margin-bottom: 12px;"
      >
        <el-descriptions-item label="产品名称">{{ viewProductName }}</el-descriptions-item>
        <el-descriptions-item label="规格型号">{{ viewProductModel }}</el-descriptions-item>
        <el-descriptions-item label="单位">{{ form.unit || '-' }}</el-descriptions-item>
        <el-descriptions-item label="批号">{{ form.batchNo || '-' }}</el-descriptions-item>
        <el-descriptions-item label="检验类型">{{ viewCheckType }}</el-descriptions-item>
        <el-descriptions-item label="检测结果">{{ viewCheckResult }}</el-descriptions-item>
        <el-descriptions-item label="检验员">{{ form.checkUserName || '-' }}</el-descriptions-item>
        <el-descriptions-item label="检测日期">{{ form.checkTime || '-' }}</el-descriptions-item>
      </el-descriptions>
      <div style="margin-bottom: 10px">
        <el-button type="primary" @click="isShowItems = true">添加检测项目</el-button>
        <el-button
            v-if="operationType !== 'view'"
            type="primary"
            @click="isShowItems = true"
        >添加检测项目</el-button>
      </div>
      <PIMTable
          rowKey="id"
@@ -101,13 +142,18 @@
          height="400"
      >
        <template #slot="{ row }">
          <el-input v-model="row.testValue" clearable/>
          <span v-if="operationType === 'view'">{{ row.testValue }}</span>
          <el-input
              v-else
              v-model="row.testValue"
              clearable
          />
        </template>
      </PIMTable>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary" @click="submitForm">确认</el-button>
          <el-button @click="closeDia">取消</el-button>
          <el-button v-if="operationType !== 'view'" type="primary" @click="submitForm">确认</el-button>
          <el-button @click="closeDia">{{ operationType === 'view' ? '关闭' : '取消' }}</el-button>
        </div>
      </template>
    </el-dialog>
@@ -117,7 +163,7 @@
</template>

<script setup>
import {ref, reactive, toRefs, getCurrentInstance, nextTick} from "vue";
import {ref, reactive, toRefs, getCurrentInstance, nextTick, computed} from "vue";
import {modelList, productTreeList} from "@/api/basicData/product.js";
import {qualityInspectParamInfo} from "@/api/qualityManagement/qualityInspectParam.js";
import {qualityInspectDetailByProductId} from "@/api/qualityManagement/metricMaintenance.js";
@@ -190,6 +236,7 @@
        name: '删除',
        type: 'text',
        clickFun: (row) => handleDelete(row.id),
        disabled: () => operationType.value === 'view',
      }
    ]
  }
@@ -258,6 +305,27 @@
      getQualityInspectParamList(row.id);
    }
  }
  if (operationType.value === 'view') {
    await fetchData(row.id);
    currentProductId.value = row.productId || 0
    if (currentProductId.value) {
      try {
        const res = await modelList({id: currentProductId.value});
        modelOptions.value = res || [];
        if (form.value.productModelId) {
          handleChangeModel(form.value.productModelId);
        }
      } catch (e) {
        console.error("加载规格型号失败", e);
        modelOptions.value = [];
      }
    }
    if (currentProductId.value) {
      // 加载参数列表，保证“详情”也能展示化验值/标准值等
    } else {
      getQualityInspectParamList(row.id);
    }
  }
  // 最后再打开弹窗，并清理校验态，避免必填提示闪烁
  dialogFormVisible.value = true;
  nextTick(() => {
@@ -297,7 +365,7 @@

const findNodeById = (nodes, productId) => {
  for (let i = 0; i < nodes.length; i++) {
    if (nodes[i].value === productId) {
    if (String(nodes[i].value) === String(productId)) {
      return nodes[i].label; // 找到节点，返回该节点
    }
    if (nodes[i].children && nodes[i].children.length > 0) {
@@ -309,6 +377,34 @@
  }
  return null; // 没有找到节点，返回null
};

// 详情模式展示字段（不使用表单控件）
const viewProductName = computed(() => {
  const id = form.value?.productId
  const label = id ? findNodeById(productOptions.value || [], id) : null
  return label || id || '-'
})

const viewProductModel = computed(() => {
  const modelId = form.value?.productModelId
  const matched = (modelOptions.value || []).find((x) => String(x.id) === String(modelId))
  return matched?.model || modelId || '-'
})

const viewCheckType = computed(() => {
  const t = form.value?.checkType
  if (t === 0 || t === '0') return '入厂检'
  if (t === 1 || t === '1') return '车间检'
  if (t === 2 || t === '2') return '出厂检'
  return '-'
})

const viewCheckResult = computed(() => {
  const r = form.value?.checkResult
  if (r === 1 || r === '1') return '合格'
  if (r === 0 || r === '0') return '不合格'
  return '-'
})

function convertIdToValue(data) {
  return data.map((item) => {
@@ -327,6 +423,7 @@

// 提交产品表单
const submitForm = () => {
  if (operationType.value === 'view') return;
  proxy.$refs.formRef.validate(valid => {
    if (valid) {
      const data = {...form.value, qualityInspectItem: tableData.value}
@@ -373,6 +470,7 @@
};

const handleDelete = (id) => {
  if (operationType.value === 'view') return;
  tableData.value = tableData.value.filter(item => item.id !== id);
}


 src/views/qualityManagement/rawMaterial/index.vue

@@ -182,8 +182,15 @@
    label: "操作",
    align: "center",
    fixed: "right",
    width: 280,
        width: 320,
    operation: [
          {
            name: "详情",
            type: "text",
            clickFun: (row) => {
              openForm("view", row);
            },
          },
      {
        name: "编辑",
        type: "text",
@@ -192,7 +199,7 @@
        },
        disabled: (row) => {
          // 已提交则禁用
          if (row.inspectState == 1) return true;
          if (row.inspectState == 1&&!hasRawCancel.value) return true;
        }
      },
      {