Merge branch 'master' of https://gitea.zianxin.com/zax/biz-pc-cloud

src/views/supermarketerp/supermarketSpu/index.vue

@@ -80,7 +80,18 @@
 							覆盖导入
 						</el-button>
 					</el-tooltip>
-					<el-button plain class="ml10" icon="upload-filled" type="primary" @click="excelUploadPdRef.show()">~盘点导入~</el-button>
+					<el-tooltip effect="dark" content="导入盘点数据" placement="top">
+						<el-button
+							plain
+							v-auth="'supermarket_supermarketSpu_import'"
+							class="ml10"
+							icon="upload-filled"
+							type="primary"
+							@click="excelUploadPd.show()"
+						>
+							盘点导入
+						</el-button>
+					</el-tooltip>
 				</div>
 			</el-row>
 			<el-table
@@ -186,12 +197,7 @@
 			@refreshDataList="refreshDataList"
 		/>
 
-		<upload-excel
-			ref="excelUploadPdRef"
-			title="pd导入"
-			url="/supermarket/supermarketSpu/importNewUpdate"
-			@refreshDataList="refreshDataList"
-		/>
+		<upload-excel ref="excelUploadPd" title="导入库存盘点" url="/supermarket/supermarketSpu/importPD" @refreshDataList="refreshDataList" />
 	</div>
 </template>
 
@@ -209,6 +215,7 @@ import { getSupplierSimpleAll } from "/@/api/supermarketerp/smErpSupplier"
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 const excelUploadRef = ref()
 const excelUploadUpdateRef = ref()
+const excelUploadPd = ref()
 const { supermarket_nature, status } = useDict("supermarket_nature", "status")
 const formDialogRef = ref() // 对话框ref引用
 const queryRef = ref() // 搜索表单ref引用