feat: 更新

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

@@ -14,6 +14,22 @@
         <view class="dot"></view>
         <text class="meta-text">信用代码：{{ creditCode }}</text>
       </view>
+      <view class="meta">
+        <view class="dot"></view>
+        <text class="meta-text">省份：{{ province }}</text>
+      </view>
+      <!-- <view class="meta">
+        <view class="dot"></view>
+        <text class="meta-text">客户性质：{{ customerNature }}</text>
+      </view>
+      <view class="meta">
+        <view class="dot"></view>
+        <text class="meta-text">客户等级：{{ customerLevel }}</text>
+      </view>
+      <view class="meta">
+        <view class="dot"></view>
+        <text class="meta-text">责任经理：{{ responsibleManager }}</text>
+      </view> -->
     </view>
     <view class="list-container" :style="{ paddingTop: statusBarHeight - 30 + 'px' }">
       <view v-if="loading" class="empty-row">加载中...</view>
@@ -31,11 +47,11 @@
                 </view>
                 <view class="info-sub-grid">
                   <view class="sub-item">
-                    <text class="sub-label">客户类型：</text>
+                    <text class="sub-label">客户性质：</text>
                     <text class="sub-value">{{ c.customerNature || '--' }}</text>
                   </view>
                   <view class="sub-item">
-                    <text class="sub-label">客户级别：</text>
+                    <text class="sub-label">客户等级：</text>
                     <text class="sub-value">{{ c.customerLevel || '--' }}</text>
                   </view>
                   <view class="sub-item">
@@ -98,6 +114,10 @@ export default {
       products: [],
       creditCode: "",
       loading: false,
+      province: "",
+      customerNature: "",
+      customerLevel: "",
+      responsibleManager: "",
     };
   },
   onLoad(options) {
@@ -107,7 +127,10 @@ export default {
     this.title = name || "黑名单详情";
     this.creditCode = options.id || "";
     this.dateStr = options.dateStr || ''
-
+    this.province = this.safeDecode(options.province);
+    this.customerNature = this.safeDecode(options.customerNature);
+    this.customerLevel = this.safeDecode(options.customerLevel);
+    this.responsibleManager = this.safeDecode(options.responsibleManager);
     this.fetchDetail(this.creditCode, options.dateStr); // 使用固定日期测试，或使用 dateStr
   },
   onShareAppMessage() {
@@ -125,7 +148,7 @@ export default {
   methods: {
     safeDecode(value) {
       const raw = value == null ? "" : String(value);
-      if (!raw) return "";
+      if (!raw) return "--";
       try {
         return decodeURIComponent(raw);
       } catch (e) {
@@ -136,7 +159,11 @@ export default {
       const name = encodeURIComponent(this.title || "");
       const id = encodeURIComponent(this.creditCode || "");
       const dateStr = encodeURIComponent(this.dateStr || "");
-      return `id=${id}&dateStr=${dateStr}&name=${name}`;
+      const province = encodeURIComponent(this.province || "");
+      const customerNature = encodeURIComponent(this.customerNature || "");
+      const customerLevel = encodeURIComponent(this.customerLevel || "");
+      const responsibleManager = encodeURIComponent(this.responsibleManager || "");
+      return `id=${id}&dateStr=${dateStr}&name=${name}&province=${province}&customerNature=${customerNature}&customerLevel=${customerLevel}&responsibleManager=${responsibleManager}`;
     },
     buildSharePath() {
       return `/traceCodePackages/traceabilityReport/pages/blacklist/detail/index?${this.buildShareQuery()}`;

traceCodePackages/traceabilityReport/pages/blacklist/index.vue

@@ -87,12 +87,12 @@
                   <text v-if="isCompanySelected(item)">✓</text>
                 </view>
                 <text class="company-name">{{ item.queryCustomer }}</text>
-                <text
+                <!-- <text
                   class="level-tag"
                   :class="getLevelClass(item.customerLevel)"
                 >
                   {{ item.customerLevel }}
-                </text>
+                </text> -->
               </view>
               <view class="header-right">
                 <text class="status-tag">黑名单</text>
@@ -109,14 +109,14 @@
                   <text class="label">省份</text>
                   <text class="value">{{ item.province }}</text>
                 </view>
-                <view class="info-item">
+                <!-- <view class="info-item">
                   <text class="label">责任经理</text>
                   <text class="value">{{ item.responsibleManager }}</text>
                 </view>
                 <view class="info-item">
                   <text class="label">客户性质</text>
                   <text class="value">{{ item.customerNature }}</text>
-                </view>
+                </view> -->
               </view>
             </view>
           </view>
@@ -441,7 +441,7 @@ export default {
 
     toDetail(item) {
       uni.navigateTo({
-        url: `/traceCodePackages/traceabilityReport/pages/blacklist/detail/index?id=${item.socialCreditCode}&dateStr=${item.billTime}&name=${encodeURIComponent(item.queryCustomer)}`,
+        url: `/traceCodePackages/traceabilityReport/pages/blacklist/detail/index?id=${item.socialCreditCode}&dateStr=${item.billTime}&name=${encodeURIComponent(item.queryCustomer)}&province=${encodeURIComponent(item.province || '')}&customerNature=${encodeURIComponent(item.customerNature || '')}&customerLevel=${encodeURIComponent(item.customerLevel || '')}&responsibleManager=${encodeURIComponent(item.responsibleManager || '')}`,
       });
     },
 
@@ -1275,5 +1275,4 @@ export default {
   background: #f5f5f5;
   color: #999;
 }
-
 </style>

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

@@ -1,32 +1,47 @@
 <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>
+        <text class="meta-text"
+          >所在省份：{{ customerProvinceName || "--" }}</text
+        >
       </view>
       <view class="meta">
         <view class="dot"></view>
-        <text class="meta-text">客户等级：{{ customerLevel || "--" }}</text>
+        <text class="meta-text">客户性质：{{ customerCategory || "--" }}</text>
       </view>
       <view class="meta">
         <view class="dot"></view>
-        <text class="meta-text">客户性质：{{ customerCategory || "--" }}</text>
+        <text class="meta-text">客户等级：{{ customerLevel || "--" }}</text>
       </view>
       <view class="meta">
         <view class="dot"></view>
-        <text class="meta-text">责任经理：{{ responsibleManager || "--" }}</text>
+        <text class="meta-text"
+          >责任经理：{{ responsibleManager || "--" }}</text
+        >
       </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>
 
@@ -37,6 +52,9 @@
         <view class="flow-table">
           <view class="flow-header">
             <view class="th col-company">收货企业</view>
+            <view class="th col-toCustomerCategory">客户性质</view>
+            <view class="th col-toCustomerLevel">客户等级</view>
+            <view class="th col-toResponsibleManager">责任经理</view>
             <view class="th col-time">单据时间</view>
             <view class="th col-type">单据类型</view>
             <view class="th col-product">产品名称</view>
@@ -46,15 +64,32 @@
             <view class="th col-code">追溯码（抽样）</view>
           </view>
           <view class="flow-body">
-            <view class="flow-row" v-for="(item, index) in flowList" :key="index">
+            <view
+              class="flow-row"
+              v-for="(item, index) in flowList"
+              :key="index"
+            >
               <view class="th col-company">{{ item.toEntName }}</view>
+              <view class="td col-toCustomerCategory">{{
+                item.toCustomerCategory
+              }}</view>
+              <view class="td col-toCustomerLevel">{{
+                item.toCustomerLevel
+              }}</view>
+              <view class="td col-toResponsibleManager">{{
+                item.toResponsibleManager
+              }}</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>
               <view class="td col-source">{{ item.regionName }}</view>
               <view class="td col-qty">{{ item.fromQty }}</view>
-              <view class="td col-code copyable-code" @click="copyTraceCode(item.traceCode)">{{ item.traceCode }}</view>
+              <view
+                class="td col-code copyable-code"
+                @click="copyTraceCode(item.traceCode)"
+                >{{ item.traceCode }}</view
+              >
               <!-- <view class="td col-chain chain-text">{{ item.batchTraceLink }}</view> -->
             </view>
             <view v-if="flowList.length === 0" class="empty-row">暂无数据</view>
@@ -75,7 +110,7 @@ import { formatDate } from "../../../../utils/utils.js";
 export default {
   components: {
     Water,
-    BottomScrollTip
+    BottomScrollTip,
   },
   data() {
     return {
@@ -145,7 +180,7 @@ export default {
     onBack() {
       try {
         uni.navigateBack();
-      } catch (e) { }
+      } catch (e) {}
     },
     copyTraceCode(code) {
       const text = String(code || "").trim();
@@ -333,6 +368,18 @@ export default {
   width: 350rpx;
 }
 
+.col-toCustomerLevel {
+  width: 160rpx;
+}
+
+.col-toCustomerCategory {
+  width: 160rpx;
+}
+
+.col-toResponsibleManager {
+  width: 160rpx;
+}
+
 .col-time {
   width: 220rpx;
 }

traceCodePackages/traceabilityReport/pages/reportExport/index.vue

@@ -129,11 +129,11 @@
             </view>
           </view>
           <view class="report-export-create-modal-row">
-            <text class="report-export-create-modal-label">客户类型</text>
+            <text class="report-export-create-modal-label">客户性质</text>
             <view class="report-export-create-modal-inputwrap"
               @click.stop="modalType !== 'read' && openDropdown('customerType')">
               <view class="report-export-create-modal-static">{{
-                form.customerType || "请选择客户类型"
+                form.customerType || "请选择客户性质"
                 }}</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
@@ -143,7 +143,7 @@
                     modalType !== 'read' && pickOption('customerType', op)
                     ">{{ op }}</view>
                 <view v-if="filteredOptions('customerType').length === 0"
-                  class="report-export-create-modal-dropdown-item">未查找到该客户类型</view>
+                  class="report-export-create-modal-dropdown-item">未查找到该客户性质</view>
               </view>
             </view>
           </view>