From 98110b32cef655400543ff35d7e5668fd9e1e228 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 25 Feb 2025 18:35:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../smErpCgDd/components/linkCgCodeDialog.vue      |  6 ++++--
 src/views/supermarketerp/smErpCgDd/index.vue       | 12 ++++++------
 .../supermarketerp/smErpCgDd/smErpCgDdOption.vue   |  1 -
 src/views/supermarketerp/smErpCgPlan/index.vue     |  4 ++--
 .../components/linkCgCodeDialog.vue                |  9 +++++----
 .../supermarketerp/smErpInventoryRecords/index.vue | 14 +++++++-------
 6 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/src/views/supermarketerp/smErpCgDd/components/linkCgCodeDialog.vue b/src/views/supermarketerp/smErpCgDd/components/linkCgCodeDialog.vue
index ca3057c..8b3946a 100644
--- a/src/views/supermarketerp/smErpCgDd/components/linkCgCodeDialog.vue
+++ b/src/views/supermarketerp/smErpCgDd/components/linkCgCodeDialog.vue
@@ -12,9 +12,11 @@
 			@radio-change="radioChangeEvent"
 		>
 			<vxe-column type="radio" width="60" align="center"></vxe-column>
-			<vxe-column field="id" title="id" align="center" width="200"></vxe-column>
+<!--			<vxe-column field="id" title="id" align="center" width="200"></vxe-column>-->
+
 			<vxe-column field="planCode" title="编号" align="center" width="200"></vxe-column>
 			<vxe-column field="planDate" title="单据日期" align="center" width="200"></vxe-column>
+      <vxe-column field="productName" title="商品名称" align="center" width="200"></vxe-column>
 			<vxe-column field="handlerUserId" title="经办人" align="center" width="100"></vxe-column>
 			<vxe-column field="checkStatus" title="审批状态" align="center" width="100"></vxe-column>
 			<vxe-column field="remark" title="备注" show-overflow align="center" min-width="100"></vxe-column>
@@ -35,7 +37,7 @@
 			:data="currRadioRowItems"
 		>
 			<vxe-column type="checkbox" width="60" align="center"></vxe-column>
-			<vxe-column field="erpSpuId" title="erpSpuId" align="center" width="200"></vxe-column>
+<!--			<vxe-column field="erpSpuId" title="erpSpuId" align="center" width="200"></vxe-column>-->
 			<vxe-column field="unit" title="包装单位" align="center" width="200"></vxe-column>
 			<vxe-column field="quantity" title="数量" align="center" width="100"></vxe-column>
 			<vxe-column field="purchasePrice" title="进价" align="center" width="100"></vxe-column>
diff --git a/src/views/supermarketerp/smErpCgDd/index.vue b/src/views/supermarketerp/smErpCgDd/index.vue
index 70f6c6e..4e447b4 100644
--- a/src/views/supermarketerp/smErpCgDd/index.vue
+++ b/src/views/supermarketerp/smErpCgDd/index.vue
@@ -41,12 +41,12 @@
 				<el-table-column prop="code" label="编号" show-overflow-tooltip />
 				<el-table-column prop="ddDate" label="单据日期" show-overflow-tooltip />
 				<el-table-column prop="productName" label="商品信息" show-overflow-tooltip />
-				<el-table-column prop="handlerUserId" label="经办人" show-overflow-tooltip />
-				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
-					<template #default="scope">
-						<dict-tag :options="check_status" :value="scope.row.checkStatus" />
-					</template>
-				</el-table-column>
+				<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
+<!--				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>-->
+<!--					<template #default="scope">-->
+<!--						<dict-tag :options="check_status" :value="scope.row.checkStatus" />-->
+<!--					</template>-->
+<!--				</el-table-column>-->
 				<!-- <el-table-column prop="totalAmount" label="金额合计" show-overflow-tooltip /> -->
 				<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
diff --git a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
index 5c8a31e..ea82be1 100644
--- a/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
+++ b/src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
@@ -10,7 +10,6 @@
 					<el-form-item label="单据日期" prop="dDate">
 						<el-input v-model="baseDataForm.ddDate" readonly style="width: 200px" />
 					</el-form-item>
-
 					<el-form-item label="经办人" prop="handlerUserId">
 						<SelectHandlerUser v-model.trim="baseDataForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
 					</el-form-item>
diff --git a/src/views/supermarketerp/smErpCgPlan/index.vue b/src/views/supermarketerp/smErpCgPlan/index.vue
index af9e353..d41b7e0 100644
--- a/src/views/supermarketerp/smErpCgPlan/index.vue
+++ b/src/views/supermarketerp/smErpCgPlan/index.vue
@@ -63,8 +63,8 @@
 				<el-table-column prop="planCode" label="编号" show-overflow-tooltip />
 				<el-table-column prop="planDate" label="单据日期" show-overflow-tooltip />
 				<el-table-column prop="productName" label="商品信息" show-overflow-tooltip />
-				<el-table-column prop="handlerUserId" label="经办人" show-overflow-tooltip />
-				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip />
+				<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
+<!--				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip />-->
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
diff --git a/src/views/supermarketerp/smErpInventoryRecords/components/linkCgCodeDialog.vue b/src/views/supermarketerp/smErpInventoryRecords/components/linkCgCodeDialog.vue
index 8b1f927..b78f427 100644
--- a/src/views/supermarketerp/smErpInventoryRecords/components/linkCgCodeDialog.vue
+++ b/src/views/supermarketerp/smErpInventoryRecords/components/linkCgCodeDialog.vue
@@ -12,9 +12,10 @@
 			@radio-change="radioChangeEvent"
 		>
 			<vxe-column type="radio" width="60" align="center"></vxe-column>
-			<vxe-column field="id" title="id" align="center" width="200"></vxe-column>
-			<vxe-column field="planCode" title="编号" align="center" width="200"></vxe-column>
-			<vxe-column field="planDate" title="单据日期" align="center" width="200"></vxe-column>
+<!--			<vxe-column field="id" title="id" align="center" width="200"></vxe-column>-->
+      <vxe-column field="productName" title="商品" align="center" width="200"></vxe-column>
+			<vxe-column field="code" title="编号" align="center" width="200"></vxe-column>
+			<vxe-column field="ddDate" title="单据日期" align="center" width="200"></vxe-column>
 			<vxe-column field="handlerUserId" title="经办人" align="center" width="100"></vxe-column>
 			<vxe-column field="checkStatus" title="审批状态" align="center" width="100"></vxe-column>
 			<vxe-column field="remark" title="备注" show-overflow align="center" min-width="100"></vxe-column>
@@ -35,7 +36,7 @@
 			:data="currRadioRowItems"
 		>
 			<vxe-column type="checkbox" width="60" align="center"></vxe-column>
-			<vxe-column field="erpSpuId" title="erpSpuId" align="center" width="200"></vxe-column>
+<!--			<vxe-column field="erpSpuId" title="erpSpuId" align="center" width="200"></vxe-column>-->
 			<vxe-column field="unit" title="包装单位" align="center" width="200"></vxe-column>
 			<vxe-column field="quantity" title="数量" align="center" width="100"></vxe-column>
 			<vxe-column field="purchasePrice" title="进价" align="center" width="100"></vxe-column>
diff --git a/src/views/supermarketerp/smErpInventoryRecords/index.vue b/src/views/supermarketerp/smErpInventoryRecords/index.vue
index 03f8070..72a8161 100644
--- a/src/views/supermarketerp/smErpInventoryRecords/index.vue
+++ b/src/views/supermarketerp/smErpInventoryRecords/index.vue
@@ -74,13 +74,13 @@
 				<el-table-column type="index" label="#" width="50" />
 				<el-table-column prop="inventoryCode" label="单据编号" show-overflow-tooltip />
 				<el-table-column prop="inventoryDate" label="单据日期" show-overflow-tooltip />
-				<el-table-column prop="inventoryDate" label="入库商品" show-overflow-tooltip />
-				<el-table-column prop="handlerUserId" label="经办人" show-overflow-tooltip />
-				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
-					<template #default="scope">
-						<dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>
-					</template>
-				</el-table-column>
+				<el-table-column prop="productName" label="入库商品" show-overflow-tooltip />
+				<el-table-column prop="handlerUserName" label="经办人" show-overflow-tooltip />
+<!--				<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>-->
+<!--					<template #default="scope">-->
+<!--						<dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>-->
+<!--					</template>-->
+<!--				</el-table-column>-->
 				<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
 				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
 				<el-table-column prop="totalAmount" label="入库总金额" show-overflow-tooltip />

From 771be56f658690b7d0bb8b8b01727ab8e00eb500 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 25 Feb 2025 18:47:26 +0800
Subject: [PATCH 2/2] 11

---
 src/views/hard/hard-order/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue
index 621e599..578f6ca 100644
--- a/src/views/hard/hard-order/index.vue
+++ b/src/views/hard/hard-order/index.vue
@@ -14,8 +14,8 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="4">
-						<el-form-item class="w100" label="用户部门" prop="deptIdIdDeepen">
-							<select-dept v-model="state.queryForm.deptIdIdDeepen" />
+						<el-form-item class="w100" label="用户部门" prop="deptId">
+							<select-dept v-model="state.queryForm.deptId" />
 						</el-form-item>
 					</el-col>
 					<el-col :span="4">