From 9cc989ed777d42ad844f7b0ecb8d839cc3457329 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 8 Aug 2025 16:25:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/userTrustedDevice/index.vue   | 19 +++++++++++++++----
 .../smErpCgInventory/index.vue                |  4 ++--
 .../supermarketSpu/components/base-info.vue   | 11 ++++++-----
 .../components/package-unit.vue               |  4 ++--
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/views/admin/userTrustedDevice/index.vue b/src/views/admin/userTrustedDevice/index.vue
index 5dd7abf..9068060 100644
--- a/src/views/admin/userTrustedDevice/index.vue
+++ b/src/views/admin/userTrustedDevice/index.vue
@@ -1,9 +1,20 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
+			<el-row>
+				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+					<el-form-item label="手机号" prop="mobilePhone">
+						<el-input placeholder="请输入手机号" v-model="state.queryForm.mobilePhone" />
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
+						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+					</el-form-item>
+				</el-form>
+			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button
+					<!-- <el-button
 						icon="folder-add"
 						type="primary"
 						class="ml10"
@@ -11,7 +22,7 @@
 						v-auth="'admin_userTrustedDevice_add'"
 					>
 						新 增
-					</el-button>
+					</el-button> -->
 					<el-button
 						plain
 						:disabled="multiple"
@@ -52,14 +63,14 @@
 				<el-table-column prop="expireTime" label="过期时间" show-overflow-tooltip />
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<el-button
+						<!-- <el-button
 							icon="edit-pen"
 							text
 							type="primary"
 							v-auth="'admin_userTrustedDevice_edit'"
 							@click="formDialogRef.openDialog(scope.row.id)"
 							>编辑</el-button
-						>
+						> -->
 						<el-button icon="delete" text type="primary" v-auth="'admin_userTrustedDevice_del'" @click="handleDelete([scope.row.id])"
 							>删除</el-button
 						>
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
index 6ad8d89..ae7667f 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
@@ -173,7 +173,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/supermarket/smErpInventoryRecords/export", Object.assign(state.queryForm, { ids: selectObjs }), "采购入库.xlsx")
+	downBlobFile("/supermarket/smErpInventoryRecords/export", Object.assign(state.queryForm, { ids: selectObjs }), "采购入库-导出明细.xlsx")
 }
 
 // 全部数据导出excel
@@ -181,7 +181,7 @@ const handleExportSummary = () => {
 	downBlobFile(
 		"/supermarket/smErpInventoryRecords/exportSummary",
 		Object.assign(state.queryForm, { ids: selectObjs }),
-		"采购入库（全部）.xlsx",
+		"采购入库-导出汇总.xlsx",
 	)
 }
 
diff --git a/src/views/supermarketerp/supermarketSpu/components/base-info.vue b/src/views/supermarketerp/supermarketSpu/components/base-info.vue
index 289d028..46feb17 100644
--- a/src/views/supermarketerp/supermarketSpu/components/base-info.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/base-info.vue
@@ -53,7 +53,7 @@
 				<el-input-number v-model="form.grossMargin" :min="0" :precision="2" />
 			</el-form-item>
 		</el-col>
-		<el-col :span="8" class="mb20">
+		<el-col :span="24" class="mb20">
 			<el-form-item label="商品封面图" prop="picUrl">
 				<upload-img v-model:imageUrl="form.picUrl" />
 			</el-form-item>
@@ -63,10 +63,11 @@
 				<el-input v-model.trim="form.origin" placeholder="请输入商品产地" />
 			</el-form-item>
 		</el-col>
-		<el-col :span="24" class="mb20">
+		<!-- <el-col :span="24" class="mb20">
 			<hr />
-		</el-col>
-		<el-col :span="8" class="mb20">
+		</el-col> -->
+
+		<!-- <el-col :span="8" class="mb20">
 			<el-form-item label="条码" prop="barCode">
 				<el-input v-model.trim="form.barCode" />
 			</el-form-item>
@@ -113,7 +114,7 @@
 					<el-radio label="1" border>停销</el-radio>
 				</el-radio-group>
 			</el-form-item>
-		</el-col>
+		</el-col> -->
 	</el-row>
 </template>
 
diff --git a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
index a440296..3335357 100644
--- a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
@@ -95,11 +95,11 @@
 				<el-input-number v-model="row.promotionPrice" controls-position="right" :min="0" :precision="2" />
 			</template>
 		</vxe-column>
-		<vxe-column field="costPrice" title="成本价(元)" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
+		<!-- <vxe-column field="costPrice" title="成本价(元)" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 			<template #edit="{ row }">
 				<el-input-number v-model="row.costPrice" controls-position="right" :min="0" :precision="2" />
 			</template>
-		</vxe-column>
+		</vxe-column> -->
 		<vxe-column title="操作">
 			<template #default="scope">
 				<el-popconfirm title="是否删除?" @confirm="removeRow(scope.$rowIndex)">