feat:更新

traceCodePackages/traceabilityReport/pages/blacklist/history/index.vue

@@ -1,4 +1,5 @@
 <template>
+  <Water></Water>
   <view class="history-page">
     <view class="header-section">
       <view class="header-title">历史记录</view>
@@ -96,10 +97,13 @@
 import EmptyView from "../../../../wigets/empty.vue";
 import { formatDate } from "../../../../utils/utils.js";
 import request from "../../../../request/index.js";
+import Water from "@/components/water/water.vue";
+
 
 export default {
   components: {
     EmptyView,
+    Water
   },
   data() {
     return {

traceCodePackages/traceabilityReport/pages/blacklist/index.vue

@@ -15,7 +15,7 @@
       <view class="header-toolbar">
         <view class="update-tip">
           <!-- <text class="tip-icon">🕒</text> -->
-          <text>更新：{{
+          <text>统计日期：{{
             formatDate(
               new Date().setDate(new Date().getDate() - 1),
               "YYYY-MM-DD",
@@ -27,7 +27,7 @@
           <view class="selector" @click.stop="toggleProvinceDropdown">
             <text class="selector-text">{{
               selectedProvince || "全部省份"
-              }}</text>
+            }}</text>
             <text class="selector-arrow" :class="{ open: dropdownProvinceOpen }"></text>
           </view>
         </view>

traceCodePackages/traceabilityReport/pages/ganmaoling/history/index.vue

@@ -1,4 +1,5 @@
 <template>
+  <Water></Water>
   <view class="history-page">
     <view class="header-section">
       <view class="header-title">历史记录</view>
@@ -104,10 +105,13 @@
 import EmptyView from "../../../../wigets/empty.vue";
 import { formatDate } from "../../../../utils/utils.js";
 import request from "../../../../request/index.js";
+import Water from "@/components/water/water.vue";
+
 
 export default {
   components: {
     EmptyView,
+    Water
   },
   data() {
     return {
@@ -206,7 +210,6 @@ export default {
     handleExportByDate(date) {
       this.currentExportDate = date;
       this.emailModalOpen = true;
-      this.emailForm.email = "";
       this.emailError = false;
     },
 

traceCodePackages/traceabilityReport/pages/ganmaoling/index.vue

@@ -20,7 +20,7 @@
       <view class="header-toolbar">
         <view class="update-tip">
           <!-- <text class="tip-icon">🕒</text> -->
-          <text>更新：{{
+          <text>统计日期：{{
             formatDate(
               new Date().setDate(new Date().getDate() - 1),
               "YYYY-MM-DD",
@@ -32,7 +32,7 @@
           <view class="selector" @click.stop="toggleProvinceDropdown">
             <text class="selector-text">{{
               selectedProvince || "全部省份"
-            }}</text>
+              }}</text>
             <text class="selector-arrow" :class="{ open: dropdownProvinceOpen }"></text>
           </view>
         </view>
@@ -263,7 +263,6 @@ export default {
         return
       }
       this.emailModalOpen = true;
-      this.emailForm.email = "";
       this.emailError = false;
     },
 

traceCodePackages/traceabilityReport/pages/reportExport/detail/index.vue

@@ -2,35 +2,19 @@
   <Water></Water>
   <view class="detail-page">
     <view class="tabs">
-      <view
-        class="tab"
-        v-for="(t, i) in tabs"
-        :key="t.label"
-        :class="{ active: category == t.value }"
-        :style="{ opacity: isLoading ? 0.5 : 1 }"
-        @click="selectTab(t)"
-      >
+      <view class="tab" v-for="(t, i) in tabs" :key="t.label" :class="{ active: category == t.value }"
+        :style="{ opacity: isLoading ? 0.5 : 1 }" @click="selectTab(t)">
         {{ t.label }}
       </view>
     </view>
     <view class="card" :style="{ height: tableBodyHeight + 'rpx' }">
-      <scroll-view
-        class="grid-scroll"
-        scroll-y="true"
-        scroll-x="true"
-        :show-scrollbar="false"
-        :style="{
-          maxHeight: tableBodyHeight + 'rpx',
-          opacity: category == 1 ? 1 : 0,
-        }"
-        enhanced
-        @scrolltolower="onTableScrollToLower"
-      >
-        <view
-          :style="{
-            width: '3000rpx',
-          }"
-        >
+      <scroll-view class="grid-scroll" scroll-y="true" scroll-x="true" :show-scrollbar="false" :style="{
+        maxHeight: tableBodyHeight + 'rpx',
+        opacity: category == 1 ? 1 : 0,
+      }" enhanced @scrolltolower="onTableScrollToLower">
+        <view :style="{
+          width: '2500rpx',
+        }">
           <view class="grid-header">
             <text class="hcell hcell-sticky-left">查询企业名称</text>
             <text class="hcell">出库方企业名称</text>
@@ -42,80 +26,45 @@
             <text class="hcell">终端到达数量</text>
             <text class="hcell">出库时间</text>
             <text class="hcell">追溯码抽样</text>
-            <text class="hcell">链路</text>
+            <!-- <text class="hcell">链路</text> -->
           </view>
           <view v-if="!loading && rows.length > 0" class="grid-body">
-            <view
-              v-for="(row, idx) in rows"
-              :key="idx + '-' + (row.produceBatchNo || '')"
-              class="grow"
-            >
-              <view
-                v-if="row.flags.enterpriseName"
-                class="gcell gcol-1 gspan"
-                :class="['sticky-left']"
-                :style="{ gridRowEnd: 'span ' + row.spans.enterpriseName }"
-                >{{ row.enterpriseName }}</view
-              >
-              <view
-                v-if="row.flags.fromEntName"
-                class="gcell gcol-2 gspan"
-                :style="{ gridRowEnd: 'span ' + row.spans.fromEntName }"
-                >{{ row.fromEntName }}</view
-              >
-              <view
-                v-if="row.flags.physicName"
-                class="gcell gcol-3 gspan"
-                :style="{ gridRowEnd: 'span ' + row.spans.physicName }"
-                >{{ row.physicName }}</view
-              >
-              <view
-                v-if="row.flags.spec"
-                class="gcell gcol-4 gspan"
-                :style="{ gridRowEnd: 'span ' + row.spans.spec }"
-              >
-                {{ row.spec }}</view
-              >
+            <view v-for="(row, idx) in rows" :key="idx + '-' + (row.produceBatchNo || '')" class="grow">
+              <view v-if="row.flags.enterpriseName" class="gcell gcol-1 gspan" :class="['sticky-left']"
+                :style="{ gridRowEnd: 'span ' + row.spans.enterpriseName }">{{ row.enterpriseName }}</view>
+              <view v-if="row.flags.fromEntName" class="gcell gcol-2 gspan"
+                :style="{ gridRowEnd: 'span ' + row.spans.fromEntName }">{{ row.fromEntName }}</view>
+              <view v-if="row.flags.physicName" class="gcell gcol-3 gspan"
+                :style="{ gridRowEnd: 'span ' + row.spans.physicName }">{{ row.physicName }}</view>
+              <view v-if="row.flags.spec" class="gcell gcol-4 gspan" :style="{ gridRowEnd: 'span ' + row.spans.spec }">
+                {{ row.spec }}</view>
               <view class="gcell gcol-5">{{ row.produceBatchNo }}</view>
               <view class="gcell gcol-6">{{ row.fromRegionName }}</view>
               <view class="gcell gcol-7">{{ row.fromQuantity }}</view>
               <view class="gcell gcol-8">{{ row.toQuantity }}</view>
               <view class="gcell gcol-9">{{ row.billTime }}</view>
               <view class="gcell gcol-10">{{ row.tracCode }}</view>
-              <view class="gcell gcol-11">{{ row.batchTraceLink }}</view>
+              <!-- <view class="gcell gcol-11">{{ row.batchTraceLink }}</view> -->
             </view>
             <view class="gcell gcell-full loading-row" v-if="hasMore">
               <view class="loading-wrapper">
-                <image
-                  class="loading-icon"
-                  src="../../../../static/images/loading.png"
-                />
+                <image class="loading-icon" src="../../../../static/images/loading.png" />
               </view>
             </view>
           </view>
         </view>
       </scroll-view>
-      <scroll-view
-        class="grid-scroll"
-        scroll-y="true"
-        scroll-x="true"
-        :show-scrollbar="false"
-        :style="{
-          maxHeight: tableBodyHeight + 'rpx',
-          opacity: category == 2 ? 1 : 0,
-          position: 'absolute',
-          top: '0',
-          left: '0',
-          zIndex: category == 2 ? '92' : '-1',
-        }"
-        enhanced
-        @scrolltolower="onTableScrollToLower"
-      >
-        <view
-          :style="{
-            width: '3000rpx',
-          }"
-        >
+      <scroll-view class="grid-scroll" scroll-y="true" scroll-x="true" :show-scrollbar="false" :style="{
+        maxHeight: tableBodyHeight + 'rpx',
+        opacity: category == 2 ? 1 : 0,
+        position: 'absolute',
+        top: '0',
+        left: '0',
+        zIndex: category == 2 ? '92' : '-1',
+      }" enhanced @scrolltolower="onTableScrollToLower">
+        <view :style="{
+          width: '2500rpx',
+        }">
           <view class="grid-header">
             <text class="hcell hcell-sticky-left">查询企业名称</text>
             <text class="hcell">入库方企业名称</text>
@@ -127,55 +76,30 @@
             <text class="hcell">终端到达数量</text>
             <text class="hcell">入库时间</text>
             <text class="hcell">追溯码抽样</text>
-            <text class="hcell">链路</text>
+            <!-- <text class="hcell">链路</text> -->
           </view>
 
           <view v-if="!_loading && _rows.length > 0" class="grid-body">
-            <view
-              v-for="(row, idx) in _rows"
-              :key="idx + '-' + (row.produceBatchNo || '')"
-              class="grow"
-            >
-              <view
-                v-if="row.flags.enterpriseName"
-                class="gcell gcol-1 gspan"
-                :class="['sticky-left']"
-                :style="{ gridRowEnd: 'span ' + row.spans.enterpriseName }"
-                >{{ row.enterpriseName }}</view
-              >
-              <view
-                v-if="row.flags.fromEntName"
-                class="gcell gcol-2 gspan"
-                :style="{ gridRowEnd: 'span ' + row.spans.fromEntName }"
-                >{{ row.fromEntName }}</view
-              >
-              <view
-                v-if="row.flags.physicName"
-                class="gcell gcol-3 gspan"
-                :style="{ gridRowEnd: 'span ' + row.spans.physicName }"
-                >{{ row.physicName }}</view
-              >
-              <view
-                v-if="row.flags.spec"
-                class="gcell gcol-4 gspan"
-                :style="{ gridRowEnd: 'span ' + row.spans.spec }"
-              >
-                {{ row.spec }}</view
-              >
+            <view v-for="(row, idx) in _rows" :key="idx + '-' + (row.produceBatchNo || '')" class="grow">
+              <view v-if="row.flags.enterpriseName" class="gcell gcol-1 gspan" :class="['sticky-left']"
+                :style="{ gridRowEnd: 'span ' + row.spans.enterpriseName }">{{ row.enterpriseName }}</view>
+              <view v-if="row.flags.fromEntName" class="gcell gcol-2 gspan"
+                :style="{ gridRowEnd: 'span ' + row.spans.fromEntName }">{{ row.fromEntName }}</view>
+              <view v-if="row.flags.physicName" class="gcell gcol-3 gspan"
+                :style="{ gridRowEnd: 'span ' + row.spans.physicName }">{{ row.physicName }}</view>
+              <view v-if="row.flags.spec" class="gcell gcol-4 gspan" :style="{ gridRowEnd: 'span ' + row.spans.spec }">
+                {{ row.spec }}</view>
               <view class="gcell gcol-5">{{ row.produceBatchNo }}</view>
               <view class="gcell gcol-6">{{ row.fromRegionName }}</view>
               <view class="gcell gcol-7">{{ row.fromQuantity }}</view>
               <view class="gcell gcol-8">{{ row.toQuantity }}</view>
               <view class="gcell gcol-9">{{ row.billTime }}</view>
               <view class="gcell gcol-10">{{ row.tracCode }}</view>
-              <view class="gcell gcol-11">{{ row.batchTraceLink }}</view>
+              <!-- <view class="gcell gcol-11">{{ row.batchTraceLink }}</view> -->
             </view>
             <view class="gcell gcell-full loading-row" v-if="_hasMore">
               <view class="loading-wrapper">
-                <image
-                  class="loading-icon"
-                  src="../../../../static/images/loading.png"
-                />
+                <image class="loading-icon" src="../../../../static/images/loading.png" />
               </view>
             </view>
           </view>
@@ -184,10 +108,7 @@
       <view v-if="isLoading" class="loading-wrap">
         <view class="loading-row">
           <view class="loading-wrapper">
-            <image
-              class="loading-icon"
-              src="../../../../static/images/loading.png"
-            />
+            <image class="loading-icon" src="../../../../static/images/loading.png" />
           </view>
         </view>
       </view>
@@ -572,7 +493,7 @@ export default {
   color: #333;
 }
 
-.tab + .tab {
+.tab+.tab {
   margin-left: 12rpx;
 }
 
@@ -593,7 +514,7 @@ export default {
   top: 0;
   z-index: 10;
   display: grid;
-  grid-template-columns: 340rpx 300rpx 220rpx 220rpx 220rpx 220rpx 220rpx 220rpx 340rpx 200rpx 500rpx;
+  grid-template-columns: 340rpx 300rpx 220rpx 220rpx 220rpx 220rpx 220rpx 220rpx 340rpx 200rpx;
 }
 
 .grid-header .hcell {
@@ -628,7 +549,7 @@ export default {
 .grid-body {
   background: #fff;
   display: grid;
-  grid-template-columns: 340rpx 300rpx 220rpx 220rpx 220rpx 220rpx 220rpx 220rpx 340rpx 200rpx 500rpx;
+  grid-template-columns: 340rpx 300rpx 220rpx 220rpx 220rpx 220rpx 220rpx 220rpx 340rpx 200rpx;
   grid-auto-rows: auto;
 }