feat: 更新

traceCodePackages/traceabilityReport/pages/ganmaoling/index.vue

@@ -9,62 +9,63 @@
 				}">
 					<view class="grid-header">
 						<!-- Row 1 -->
-						<text class="hcell header-group hcell-sticky-left" style="grid-column: 1 / 2; grid-row: 1 / 2; z-index: 12;">该企业累计预警次数</text>
-						<text class="hcell header-group" style="grid-column: 2 / 7; grid-row: 1 / 2;">客户基础信息</text>
-						<text class="hcell header-group" style="grid-column: 7 / 16; grid-row: 1 / 2;">流转信息</text>
+						<text class="hcell header-group" style="grid-column: 1 / 6; grid-row: 1 / 2;">客户基础信息</text>
+						<text class="hcell header-group" style="grid-column: 6 / 15; grid-row: 1 / 2;">流转信息</text>
+						<text class="hcell header-group" style="grid-column: 15 / 16; grid-row: 1 / 2;">该企业累计预警次数</text>
 
 						<!-- Row 2 -->
-						<text class="hcell hcell-sticky-left" style="grid-column: 1 / 2; grid-row: 2 / 3;">累计预警次数</text>
-						<text class="hcell" style="grid-column: 2 / 3; grid-row: 2 / 3;">客户名称</text>
-						<text class="hcell" style="grid-column: 3 / 4; grid-row: 2 / 3;">客户所在省份</text>
-						<text class="hcell" style="grid-column: 4 / 5; grid-row: 2 / 3;">客户级别</text>
-						<text class="hcell" style="grid-column: 5 / 6; grid-row: 2 / 3;">客户性质</text>
-						<text class="hcell" style="grid-column: 6 / 7; grid-row: 2 / 3;">责任经理</text>
-						<text class="hcell" style="grid-column: 7 / 8; grid-row: 2 / 3;">收货企业名称</text>
-						<text class="hcell" style="grid-column: 8 / 9; grid-row: 2 / 3;">收货企业所在省份</text>
-						<text class="hcell" style="grid-column: 9 / 10; grid-row: 2 / 3;">单据时间</text>
-						<text class="hcell" style="grid-column: 10 / 11; grid-row: 2 / 3;">单据类型</text>
-						<text class="hcell" style="grid-column: 11 / 12; grid-row: 2 / 3;">产品名称</text>
-						<text class="hcell" style="grid-column: 12 / 13; grid-row: 2 / 3;">批号</text>
-						<text class="hcell" style="grid-column: 13 / 14; grid-row: 2 / 3;">发货地</text>
-						<text class="hcell" style="grid-column: 14 / 15; grid-row: 2 / 3;">数量</text>
-						<text class="hcell" style="grid-column: 15 / 16; grid-row: 2 / 3;">链路</text>
+						<text class="hcell" style="grid-column: 1 / 2; grid-row: 2 / 3;">客户名称</text>
+						<text class="hcell" style="grid-column: 2 / 3; grid-row: 2 / 3;">客户所在省份</text>
+						<text class="hcell" style="grid-column: 3 / 4; grid-row: 2 / 3;">客户级别</text>
+						<text class="hcell" style="grid-column: 4 / 5; grid-row: 2 / 3;">客户性质</text>
+						<text class="hcell" style="grid-column: 5 / 6; grid-row: 2 / 3;">责任经理</text>
+						<text class="hcell" style="grid-column: 6 / 7; grid-row: 2 / 3;">收货企业名称</text>
+						<text class="hcell" style="grid-column: 7 / 8; grid-row: 2 / 3;">收货企业所在省份</text>
+						<text class="hcell" style="grid-column: 8 / 9; grid-row: 2 / 3;">单据时间</text>
+						<text class="hcell" style="grid-column: 9 / 10; grid-row: 2 / 3;">单据类型</text>
+						<text class="hcell" style="grid-column: 10 / 11; grid-row: 2 / 3;">产品名称</text>
+						<text class="hcell" style="grid-column: 11 / 12; grid-row: 2 / 3;">批号</text>
+						<text class="hcell" style="grid-column: 12 / 13; grid-row: 2 / 3;">发货地</text>
+						<text class="hcell" style="grid-column: 13 / 14; grid-row: 2 / 3;">数量</text>
+						<text class="hcell" style="grid-column: 14 / 15; grid-row: 2 / 3;">链路</text>
+						<text class="hcell" style="grid-column: 15 / 16; grid-row: 2 / 3;">累计预警次数</text>
 					</view>
 
 					<view v-if="!loading && rows.length > 0" class="grid-body">
 						<view v-for="(row, idx) in rows" :key="idx" class="grow">
 							<!-- Common Columns (merged) -->
-							<view v-if="row.flags.common" class="gcell gcol-1 sticky-left gspan"
-								:style="{ gridRowEnd: 'span ' + row.spans.common }">{{ row.alertCount }}</view>
-							<view v-if="row.flags.common" class="gcell gcol-2 gspan"
+							<view v-if="row.flags.common" class="gcell gcol-1 gspan"
 								:style="{ gridRowEnd: 'span ' + row.spans.common }">{{ row.customerName }}</view>
-							<view v-if="row.flags.common" class="gcell gcol-3 gspan"
+							<view v-if="row.flags.common" class="gcell gcol-2 gspan"
 								:style="{ gridRowEnd: 'span ' + row.spans.common }">{{ row.customerProvince }}</view>
-							<view v-if="row.flags.common" class="gcell gcol-4 gspan"
+							<view v-if="row.flags.common" class="gcell gcol-3 gspan"
 								:style="{ gridRowEnd: 'span ' + row.spans.common }">{{ row.customerLevel }}</view>
-							<view v-if="row.flags.common" class="gcell gcol-5 gspan"
+							<view v-if="row.flags.common" class="gcell gcol-4 gspan"
 								:style="{ gridRowEnd: 'span ' + row.spans.common }">{{ row.customerNature }}</view>
-							<view v-if="row.flags.common" class="gcell gcol-6 gspan"
+							<view v-if="row.flags.common" class="gcell gcol-5 gspan"
 								:style="{ gridRowEnd: 'span ' + row.spans.common }">{{ row.manager }}</view>
-							<view v-if="row.flags.common" class="gcell gcol-7 gspan"
+							<view v-if="row.flags.common" class="gcell gcol-6 gspan"
 								:style="{ gridRowEnd: 'span ' + row.spans.common }">{{ row.receiverName }}</view>
-							<view v-if="row.flags.common" class="gcell gcol-8 gspan"
+							<view v-if="row.flags.common" class="gcell gcol-7 gspan"
 								:style="{ gridRowEnd: 'span ' + row.spans.common }">{{ row.receiverProvince }}</view>
-							<view v-if="row.flags.common" class="gcell gcol-9 gspan"
+							<view v-if="row.flags.common" class="gcell gcol-8 gspan"
 								:style="{ gridRowEnd: 'span ' + row.spans.common }">{{ row.docTime }}</view>
-							<view v-if="row.flags.common" class="gcell gcol-10 gspan"
+							<view v-if="row.flags.common" class="gcell gcol-9 gspan"
 								:style="{ gridRowEnd: 'span ' + row.spans.common }">{{ row.docType }}</view>
-							<view v-if="row.flags.common" class="gcell gcol-11 gspan"
+							<view v-if="row.flags.common" class="gcell gcol-10 gspan"
 								:style="{ gridRowEnd: 'span ' + row.spans.common }">{{ row.productName }}</view>
 							
 							<!-- Detail Columns (not merged) -->
-							<view class="gcell gcol-12">{{ row.batchNo }}</view>
-							<view class="gcell gcol-13">{{ row.sourceRegion }}</view>
-							<view class="gcell gcol-14">{{ row.quantity }}</view>
+							<view class="gcell gcol-11">{{ row.batchNo }}</view>
+							<view class="gcell gcol-12">{{ row.sourceRegion }}</view>
+							<view class="gcell gcol-13">{{ row.quantity }}</view>
 
 							<!-- Link Column (merged) -->
+							<view v-if="row.flags.common" class="gcell gcol-14 gspan"
+								:style="{ gridRowEnd: 'span ' + row.spans.common }">{{ row.traceLink }}</view>
+
 							<view v-if="row.flags.common" class="gcell gcol-15 gspan"
-								:style="{ gridRowEnd: 'span ' + row.spans.common, borderRight: 'none' }">{{ row.traceLink }}</view>
+								:style="{ gridRowEnd: 'span ' + row.spans.common, borderRight: 'none' }">{{ row.alertCount }}</view>
 						</view>
 						<view class="gcell gcell-full loading-row" v-if="hasMore">
 							<view class="loading-wrapper">
@@ -116,7 +117,7 @@ export default {
 	created() {
 		this.tableBodyHeight = 14 * 80;
 		// this.fetchList();
-		this.generateFakeData();
+		// this.generateFakeData();
 	},
 	computed: {
 		showEmptyData() {
@@ -338,7 +339,7 @@ export default {
 		top: 0;
 		z-index: 10;
 		display: grid;
-		grid-template-columns: 200rpx 220rpx 160rpx 140rpx 140rpx 140rpx 220rpx 160rpx 200rpx 140rpx 200rpx 180rpx 160rpx 140rpx 300rpx;
+		grid-template-columns: 220rpx 160rpx 140rpx 140rpx 140rpx 220rpx 160rpx 200rpx 140rpx 200rpx 180rpx 160rpx 140rpx 300rpx 200rpx;
 		grid-auto-rows: 76rpx;
 	}
 
@@ -386,7 +387,7 @@ export default {
 	.grid-body {
 		background: #fff;
 		display: grid;
-		grid-template-columns: 200rpx 220rpx 160rpx 140rpx 140rpx 140rpx 220rpx 160rpx 200rpx 140rpx 200rpx 180rpx 160rpx 140rpx 300rpx;
+		grid-template-columns: 220rpx 160rpx 140rpx 140rpx 140rpx 220rpx 160rpx 200rpx 140rpx 200rpx 180rpx 160rpx 140rpx 300rpx 200rpx;
 		grid-auto-rows: auto;
 	}
 
@@ -526,7 +527,7 @@ export default {
 .loading-wrap {
 	position: absolute;
 	left: 0;
-	top: 85rpx;
+	top: 152rpx;
 	z-index: 999;
 	width: 100%;
 	background-color: #fff;

traceCodePackages/traceabilityReport/pages/index.vue

@@ -12,19 +12,19 @@
           @click="activeTab = 'ganmaoling'">感冒灵大批量</view>
       </view>
     </view>
-    <view class="content" v-show="activeTab === 'scan' && hasScanFunction">
+    <view class="content" v-if="activeTab === 'scan' && hasScanFunction">
       <ScanningRate ref="scanRate" />
     </view>
     <view class="content" :style="{ padding: '0', marginTop: '85rpx' }"
-      v-show="activeTab === 'export' && hasReportFunction">
+      v-if="activeTab === 'export' && hasReportFunction">
       <ReportExport />
     </view>
     <view class="content" :style="{ padding: '0', marginTop: '85rpx' }"
-      v-show="activeTab === 'blacklist' && hasBlacklistFunction">
+      v-if="activeTab === 'blacklist' && hasBlacklistFunction">
       <Blacklist />
     </view>
     <view class="content" :style="{ padding: '0', marginTop: '85rpx' }"
-      v-show="activeTab === 'ganmaoling' && hasGanmaolingFunction">
+      v-if="activeTab === 'ganmaoling' && hasGanmaolingFunction">
       <Ganmaoling />
     </view>
   </view>