From ec0ff8dc9066b7a705d89518056ec0131c16b6f5 Mon Sep 17 00:00:00 2001
From: tangweijie <877588133@qq.com>
Date: Mon, 2 Feb 2026 17:45:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B6=88=E8=B4=B9=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. ConsumptionDetailDialog: 商品名称/编码为空时显示占位符
2. ConsumptionForm: 服刑人员姓名和罪犯编号设为只读不可修改
---
 .../prison/consumption/ConsumptionDetailDialog.vue   | 12 ++++++++++--
 src/views/prison/consumption/ConsumptionForm.vue     |  8 +++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/views/prison/consumption/ConsumptionDetailDialog.vue b/src/views/prison/consumption/ConsumptionDetailDialog.vue
index 8e3c744b..cffce68e 100644
--- a/src/views/prison/consumption/ConsumptionDetailDialog.vue
+++ b/src/views/prison/consumption/ConsumptionDetailDialog.vue
@@ -1,8 +1,16 @@
 <template>
   <Dialog title="消费明细" v-model="dialogVisible" width="600px">
     <el-table :data="detailList" v-loading="loading">
-      <el-table-column label="商品名称" prop="goodsName" align="center" />
-      <el-table-column label="商品编码" prop="goodsCode" align="center" width="120" />
+      <el-table-column label="商品名称" prop="goodsName" align="center">
+        <template #default="{ row }">
+          {{ row.goodsName || '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="商品编码" prop="goodsCode" align="center" width="120">
+        <template #default="{ row }">
+          {{ row.goodsCode || '-' }}
+        </template>
+      </el-table-column>
       <el-table-column label="单价" prop="goodsPrice" align="center" width="100">
         <template #default="{ row }">
           ¥{{ row.goodsPrice?.toFixed(2) }}
diff --git a/src/views/prison/consumption/ConsumptionForm.vue b/src/views/prison/consumption/ConsumptionForm.vue
index 0c6d96a7..81992731 100644
--- a/src/views/prison/consumption/ConsumptionForm.vue
+++ b/src/views/prison/consumption/ConsumptionForm.vue
@@ -9,13 +9,13 @@
     >
       <el-row :gutter="20">
         <el-col :span="8">
-          <el-form-item label="罪犯ID" prop="prisonerId">
-            <el-input v-model="formData.prisonerId" placeholder="请输入罪犯ID" />
+          <el-form-item label="服刑人员">
+            <el-input v-model="formData.prisonerName" placeholder="服刑人员姓名" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="罪犯编号" prop="prisonerNo">
-            <el-input v-model="formData.prisonerNo" placeholder="请输入罪犯编号" />
+            <el-input v-model="formData.prisonerNo" placeholder="罪犯编号" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -135,6 +135,7 @@ const formType = ref('')
 const formData = ref({
   id: undefined,
   prisonerId: undefined,
+  prisonerName: undefined,
   prisonerNo: undefined,
   orderNo: undefined,
   type: undefined,
@@ -228,6 +229,7 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     prisonerId: undefined,
+    prisonerName: undefined,
     prisonerNo: undefined,
     orderNo: undefined,
     type: undefined,