From a3d41de73a39b6833e06551c7112222b170cec10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=99=AE=E5=BB=BA?= <450837357@qq.com>
Date: Sat, 15 Mar 2025 10:56:41 +0800
Subject: [PATCH] first

---
 .../components/table-action-modal.vue         |  6 +--
 .../auxiliaryProduceinfo/index.vue            | 48 +++++++++++--------
 2 files changed, 30 insertions(+), 24 deletions(-)
 rename src/views/{ => storage}/auxiliaryProduceinfo/components/table-action-modal.vue (97%)
 rename src/views/{ => storage}/auxiliaryProduceinfo/index.vue (95%)

diff --git a/src/views/auxiliaryProduceinfo/components/table-action-modal.vue b/src/views/storage/auxiliaryProduceinfo/components/table-action-modal.vue
similarity index 97%
rename from src/views/auxiliaryProduceinfo/components/table-action-modal.vue
rename to src/views/storage/auxiliaryProduceinfo/components/table-action-modal.vue
index eedeff3..c5a688c 100644
--- a/src/views/auxiliaryProduceinfo/components/table-action-modal.vue
+++ b/src/views/storage/auxiliaryProduceinfo/components/table-action-modal.vue
@@ -81,9 +81,9 @@
 						<!-- <n-form-item-grid-item :span="8" label="应入重量" path="weightRecived">
 							<n-input-number v-model:value="formModel.weightRecived" placeholder="请输入应入重量" />
 						</n-form-item-grid-item> -->
-						<n-form-item-grid-item :span="8" label="入库重量" path="totalWeight">
-							<n-input-number v-model:value="formModel.totalWeight" placeholder="请输入毛重" />
-						</n-form-item-grid-item>
+						<!--            <n-form-item-grid-item :span="8" label="入库重量" path="totalWeight">-->
+						<!--              <n-input-number v-model:value="formModel.totalWeight" placeholder="请输入毛重" />-->
+						<!--            </n-form-item-grid-item>-->
 						<n-form-item-grid-item :span="8" label="重量单位" path="weightUnit">
 							<n-input v-model:value="formModel.weightUnit" placeholder="请输入重量单位" />
 						</n-form-item-grid-item>
diff --git a/src/views/auxiliaryProduceinfo/index.vue b/src/views/storage/auxiliaryProduceinfo/index.vue
similarity index 95%
rename from src/views/auxiliaryProduceinfo/index.vue
rename to src/views/storage/auxiliaryProduceinfo/index.vue
index 4d28f06..83ef482 100644
--- a/src/views/auxiliaryProduceinfo/index.vue
+++ b/src/views/storage/auxiliaryProduceinfo/index.vue
@@ -23,15 +23,15 @@
 				<n-descriptions-item :span="1" label="应入数量：">
 					{{ RecptInfo.quantityRecived }}
 				</n-descriptions-item>
-				<n-descriptions-item :span="1" label="应入重量：">
-					{{ RecptInfo.weightRecived }}
-				</n-descriptions-item>
+				<!--        <n-descriptions-item :span="1" label="应入重量：">-->
+				<!--          {{ RecptInfo.weightRecived }}-->
+				<!--        </n-descriptions-item>-->
 				<n-descriptions-item :span="1" label="入库数量：">
 					{{ num }}
 				</n-descriptions-item>
-				<n-descriptions-item :span="1" label="入库重量：">
-					{{ weight }}
-				</n-descriptions-item>
+				<!--        <n-descriptions-item :span="1" label="入库重量：">-->
+				<!--          {{ weight }}-->
+				<!--        </n-descriptions-item>-->
 				<n-descriptions-item :span="1" label="入库仓库：">
 					<n-select
 						v-model:value="RecptInfo.warehouseId"
@@ -293,6 +293,11 @@ const columns: Ref<DataTableColumns<wms.recptLineRawType.columns>> = ref([
 		key: 'specification',
 		width: 120
 	},
+	{
+		title: '颜色',
+		key: 'colorName',
+		width: 120
+	},
 	// {
 	//   title: '应入数量',
 	//   key: 'quantityRecived',
@@ -334,21 +339,21 @@ const columns: Ref<DataTableColumns<wms.recptLineRawType.columns>> = ref([
 			);
 		}
 	},
-	{
-		title: '入库重量',
-		key: 'weight',
-		width: 180,
-		render: row => {
-			return (
-				<div class="flex-center">
-					<sapn class="color-red mr-5px">*</sapn>
-					<n-form-item path={`weight${row.recptId}`}>
-						<n-input disabled={info.value} v-model:value={row.weight}></n-input>
-					</n-form-item>
-				</div>
-			);
-		}
-	},
+	// {
+	//   title: '入库重量',
+	//   key: 'weight',
+	//   width: 180,
+	//   render: row => {
+	//     return (
+	//       <div class="flex-center">
+	//         <sapn class="color-red mr-5px">*</sapn>
+	//         <n-form-item path={`weight${row.recptId}`}>
+	//           <n-input disabled={info.value} v-model:value={row.weight}></n-input>
+	//         </n-form-item>
+	//       </div>
+	//     );
+	//   }
+	// },
 	{
 		title: '仓库名称',
 		key: 'warehouseName',
@@ -687,5 +692,6 @@ function init() {
 	// 获取部门信息
 	// getDeptTree();
 }
+
 init();
 </script>