From 370b2f80abdf4b07e1a8a87a49f59969a066d416 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Mon, 11 Aug 2025 16:13:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=A5=E5=BA=93=E5=8D=95=E9=87=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E8=A7=84=E6=A0=BC=EF=BC=9B=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E7=9A=84=E5=8D=95=E6=8D=AE=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supermarketerp/purchaseManagement/smErpCgDd/index.vue  | 4 +++-
 .../purchaseManagement/smErpCgInventory/form.vue           | 7 ++++++-
 .../purchaseManagement/smErpCgInventory/index.vue          | 1 +
 .../purchaseManagement/smErpCgPlan/index.vue               | 4 +++-
 src/views/supermarketerp/stockTaking/form.vue              | 1 -
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue
index d2bbfea..61a96cd 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue
@@ -1,5 +1,7 @@
 <template>
-	<div class="layout-padding">
+	<div>暂无数据</div>
+
+	<div v-if="false" class="layout-padding">
 		<div v-if="!processFormState.showForm" class="layout-padding-auto layout-padding-view">
 			<el-row>
 				<div class="mb8" style="width: 100%">
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
index 4141930..768bb37 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
@@ -40,7 +40,7 @@
 						<el-input v-model.trim="baseDataForm.inventoryCode" readonly style="width: 200px" :disabled="disabled" />
 					</el-form-item>
 					<el-form-item label="单据日期" prop="inventoryDate">
-						<el-input v-model.trim="baseDataForm.inventoryDate" readonly style="width: 200px" :disabled="disabled" />
+						<el-date-picker v-model="baseDataForm.inventoryDate" style="width: 200px" :disabled="disabled" value-format="YYYY-MM-DD" />
 					</el-form-item>
 					<!-- <el-form-item label="关联采购订单" prop="linkCode">
 						<el-input
@@ -139,6 +139,11 @@
 						<span>{{ row.selectedUnitObj?.unit ?? "请选择" }}</span>
 					</template>
 				</vxe-column>
+				<vxe-column field="spec" title="规格">
+					<template #default="{ row }">
+						{{ row.selectedUnitObj?.spec }}
+					</template>
+				</vxe-column>
 				<vxe-column field="quantity" title="数量" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #edit="{ row, $rowIndex }">
 						<el-input-number
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
index ae7667f..d582261 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
@@ -75,6 +75,7 @@
 						{{ displayPrice(row.totalAmount) }}
 					</template>
 				</el-table-column>
+				<el-table-column prop="createBy" label="创建人" show-overflow-tooltip />
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
 						<el-button icon="edit-pen" text type="primary" v-auth="'supermarket_smErpInventoryRecords_edit'" @click="edit(scope.row)">
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue
index fb78c37..d4e72f2 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue
@@ -1,5 +1,7 @@
 <template>
-	<div class="layout-padding">
+	<div>暂无数据</div>
+
+	<div v-if="false" class="layout-padding">
 		<div v-if="!processFormState.showForm" class="layout-padding-auto layout-padding-view">
 			<el-row v-show="showSearch">
 				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
diff --git a/src/views/supermarketerp/stockTaking/form.vue b/src/views/supermarketerp/stockTaking/form.vue
index 6233f15..df571e1 100644
--- a/src/views/supermarketerp/stockTaking/form.vue
+++ b/src/views/supermarketerp/stockTaking/form.vue
@@ -97,7 +97,6 @@
 						<div v-for="(item, index) in row.erpUnitVos" :key="index">
 							单位：{{ item.unit }} &nbsp; 装数：{{ item.packageNum }} &nbsp; 进价：{{ displayPrice(item.purchasePrice, "元") }} &nbsp;
 							规格：{{ item.spec }}
-							<hr />
 						</div>
 					</template>
 				</vxe-column>