feat：更新

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

@@ -1,27 +1,18 @@
 <template>
   <Water></Water>
   <view class="nav" :style="{ paddingTop: statusBarHeight + 'px' }">
-    <text
-      class="nav-back"
-      :style="{ top: statusBarHeight + 'px' }"
-      @click="onBack"
-    ></text>
+    <text class="nav-back" :style="{ top: statusBarHeight + 'px' }" @click="onBack"></text>
     <view class="nav-title">{{ title }}</view>
   </view>
   <view class="page">
-    <view
-      class="header-card"
-      :style="{ paddingTop: statusBarHeight + 60 + 'px' }"
-    >
+    <view class="header-card" :style="{ paddingTop: statusBarHeight + 60 + 'px' }">
       <view class="meta">
         <view class="dot"></view>
         <text class="meta-text">所在省份：{{ customerProvinceName || "--" }}</text>
       </view>
       <view class="meta">
         <view class="dot"></view>
-        <text class="meta-text"
-          >客户等级：{{ customerLevel || "--" }}</text
-        >
+        <text class="meta-text">客户等级：{{ customerLevel || "--" }}</text>
       </view>
       <view class="meta">
         <view class="dot"></view>
@@ -33,11 +24,9 @@
       </view>
       <view class="meta">
         <view class="dot"></view>
-        <text class="meta-text"
-          >累计预警次数：{{
-            totalWarningAmount || totalWarningAmount == 0 ? totalWarningAmount : "--"
-          }}</text
-        >
+        <text class="meta-text">累计预警次数：{{
+          totalWarningAmount || totalWarningAmount == 0 ? totalWarningAmount : "--"
+        }}</text>
       </view>
     </view>
 
@@ -47,6 +36,7 @@
       <scroll-view scroll-x="true" class="table-scroll">
         <view class="flow-table">
           <view class="flow-header">
+            <view class="th col-company">收货企业</view>
             <view class="th col-time">单据时间</view>
             <view class="th col-type">单据类型</view>
             <view class="th col-product">产品名称</view>
@@ -56,12 +46,9 @@
             <!-- <view class="th col-chain">链路</view> -->
           </view>
           <view class="flow-body">
-            <view
-              class="flow-row"
-              v-for="(item, index) in flowList"
-              :key="index"
-            >
-              <view class="td col-time">{{ formatBillTime(item.billTime) }}</view>
+            <view class="flow-row" v-for="(item, index) in flowList" :key="index">
+              <view class="th col-company">{{ item.toEntName }}</view>
+              <view class="td col-time">{{ item.billTime }}</view>
               <view class="td col-type">{{ item.billType }}</view>
               <view class="td col-product">{{ item.productName }}</view>
               <view class="td col-batch">{{ item.productBatchNo }}</view>
@@ -123,7 +110,7 @@ export default {
     onBack() {
       try {
         uni.navigateBack();
-      } catch (e) {}
+      } catch (e) { }
     },
     fetchDetail(customerName, updatedTime) {
       this.loading = true;
@@ -250,7 +237,7 @@ export default {
 }
 
 .flow-table {
-  min-width: 1060rpx;
+  min-width: 1410rpx;
   border-top: 1rpx solid #ccc;
   border-left: 1rpx solid #ccc;
 }
@@ -294,6 +281,10 @@ export default {
   border-bottom: 1rpx solid #ccc;
 }
 
+.col-company {
+  width: 350rpx;
+}
+
 .col-time {
   width: 220rpx;
 }

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

@@ -156,6 +156,8 @@ export default {
   },
   created() {
     this.resetFetch();
+    const userEmail = uni.getStorageSync('traceCode_useremail')
+    this.emailForm.email = userEmail
   },
   methods: {
     formatDate,
@@ -229,7 +231,7 @@ export default {
         `/report/ganmaoling/sendemail`,
         {
           updatedTime: this.currentExportDate,
-          emailAddress: '635509855@qq.com',//this.emailForm.email + "@999.com.cn",
+          emailAddress: this.emailForm.email + "@999.com.cn",
           path: "traceabilityReport/pages/ganmaoling/history/index.vue",
         },
         "post",

traceCodePackages/traceabilityReport/pages/ganmaoling/index.vue

@@ -61,7 +61,7 @@
             <view class="info-grid">
               <view class="info-item">
                 <text class="label">省份</text>
-                <text class="value">{{ item.customerProvinceName }}</text>
+                <text class="value">{{ item.customerProvinceName ?? '--' }}</text>
               </view>
               <view class="info-item">
                 <text class="label">责任人</text>
@@ -285,7 +285,7 @@ export default {
         `/report/ganmaoling/sendemail`,
         {
           updatedTime: dateStr,
-          emailAddress: '635509855@qq.com',//this.emailForm.email + "@999.com.cn",
+          emailAddress: this.emailForm.email + "@999.com.cn",
           path: "traceabilityReport/pages/ganmaoling/index.vue",
         },
         "post",

traceCodePackages/traceabilityReport/pages/reportExport/index.vue

@@ -41,7 +41,7 @@
         <view class="report-export-item-row">规格：{{ item.pkgSpec || "" }}</view>
         <view class="report-export-item-row">时间：{{ formatDate(item.beginTime) }}～{{
           formatDate(item.endTime)
-          }}</view>
+        }}</view>
         <!-- <view
           class="report-export-item-row"
           style="color: red"
@@ -53,7 +53,7 @@
             <view class="report-export-progress-fill" :style="{ width: `${item.progress || 10}%` }"></view>
             <text class="report-export-progress-text">{{
               item.progress || 10
-            }}</text>
+              }}</text>
           </view>
         </view>
         <view v-if="item.status == 1" class="report-export-action-row">
@@ -133,7 +133,7 @@
               @click.stop="modalType !== 'read' && openDropdown('customerType')">
               <view class="report-export-create-modal-static">{{
                 form.customerType || "请选择客户类型"
-              }}</view>
+                }}</view>
               <view class="report-export-input-arrow" v-if="modalType !== 'read'"></view>
               <view class="report-export-create-modal-dropdown" v-if="dropdown.customerType" @click.stop
                 :style="dropdownPosStyle()">
@@ -225,7 +225,7 @@
               @click.stop="modalType !== 'read' && openDropdown('product')">
               <view class="report-export-create-modal-static">{{
                 form.product?.physicName || "请选择品种"
-              }}</view>
+                }}</view>
               <view class="report-export-input-arrow" v-if="modalType !== 'read'"></view>
               <view class="report-export-create-modal-dropdown" :style="[{ top: 'auto', bottom: '84rpx' }]"
                 v-if="dropdown.product" @click.stop>
@@ -259,7 +259,7 @@
               ">
               <view class="report-export-create-modal-static">{{
                 form.pkgSpec || "请选择规格(请先选择品种)"
-              }}</view>
+                }}</view>
               <view class="report-export-input-arrow" v-if="modalType !== 'read'"></view>
               <view class="report-export-create-modal-dropdown" v-if="dropdown.pkgSpec" @click.stop
                 :style="[{ top: 'auto', bottom: '84rpx' }]">
@@ -281,12 +281,12 @@
                 <uni-icons type="calendar" size="22" color="#c0c4cc"></uni-icons>
                 <view style="flex: 1; text-align: center">{{
                   dateRange && dateRange.length ? dateRange[0] : "开始时间"
-                  }}
+                }}
                 </view>
                 <view>-</view>
                 <view style="flex: 1; text-align: center">{{
                   dateRange && dateRange.length ? dateRange[1] : "结束时间"
-                  }}
+                }}
                 </view>
               </view>
               <view class="report-export-input-simulator-clear" v-if="dateRange && dateRange.length"
@@ -322,7 +322,7 @@
           <view class="report-export-create-modal-inputwrap" @click.stop="openFilterDropdown('product')">
             <view class="report-export-create-modal-static">{{
               filterForm.product?.physicName || "请选择品种"
-            }}</view>
+              }}</view>
             <view class="report-export-create-modal-dropdown" :style="[{ top: 'auto', bottom: '84rpx' }]"
               v-if="filterDropdown.product" @click.stop>
               <view class="report-export-dropdown-search-row">
@@ -1284,7 +1284,7 @@ export default {
       const url = "/report/sendemail";
       request(url, {
         taskId: this.currentItem?.id,
-        emailAddress: '635509855@qq.com',//email + "@999.com.cn",
+        emailAddress: email + "@999.com.cn",
         path: "reportExport/index.vue",
       }).then((res) => {
         uni.hideLoading();