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

src/views/supermarketerp/supermarketSpu/index.vue

@@ -87,11 +87,7 @@
 						<dict-tag :options="supermarket_nature" :value="scope.row.productNature" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="picUrl" label="封面图" width="100">
-					<template #default="scope">
-						<preview-image :src="scope.row.picUrl" />
-					</template>
-				</el-table-column>
+        <el-table-column prop="stock" label="剩余总库存" show-overflow-tooltip />
 				<el-table-column prop="supplierId" label="货商" show-overflow-tooltip>
 					<template #default="scope">
 						{{supermarketSupplier?.find((item: any) => item.supplierId ==
@@ -109,7 +105,11 @@
 				<el-table-column prop="retailPrice" label="零售价(元)" show-overflow-tooltip width="120">
 					<template #default="{ row }">{{ displayPrice(row.retailPrice, "") }}</template>
 				</el-table-column>
-				<el-table-column prop="stock" label="剩余总库存" show-overflow-tooltip />
+        <el-table-column prop="picUrl" label="封面图" width="100">
+          <template #default="scope">
+            <preview-image :src="scope.row.picUrl" />
+          </template>
+        </el-table-column>
 				<el-table-column prop="status" label="商品状态" width="100">
 					<template #default="scope">
 						<dict-tag :options="status" :value="scope.row.status" />