From ac826512060a098de1f67e0f0727b1d748614db6 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Wed, 13 Aug 2025 09:04:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8F=91=E8=B4=A7=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=8D=95=EF=BC=8C=E6=88=90=E5=8A=9F=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/ecss/codelnotifyConfirm.vue | 67 ++++++++++++++++++-
 src/views/modules/ecss/partHsCode.vue         |  8 +++
 2 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue
index 9a5ff42..2b7297c 100644
--- a/src/views/modules/ecss/codelnotifyConfirm.vue
+++ b/src/views/modules/ecss/codelnotifyConfirm.vue
@@ -126,9 +126,28 @@
             :min-width="item.columnWidth"
             :label="item.columnLabel">
             <template slot-scope="scope">
-              <template v-if="item.columnProp === 'ttlAmount' || item.columnProp === 'sumPrice'">
-                <span>{{!!scope.row[item.columnProp]?scope.row[item.columnProp].toFixed(2):''}}</span>
+              <!-- 金额字段特殊处理 -->
+              <span v-if="item.columnProp === 'ttlAmount' || item.columnProp === 'sumPrice'">
+                {{!!scope.row[item.columnProp]?scope.row[item.columnProp].toFixed(2):''}}
+              </span>
+
+              <!-- PN字段特殊处理，添加提示信息 -->
+              <template v-else-if="item.columnProp === 'pn'">
+                <el-tooltip
+                  v-if="isPnDataIncomplete(scope.row)"
+                  content="基本信息(每卷数量、每箱卷数、箱重量)未维护，点击跳转到维护页面"
+                  placement="top">
+                  <span
+                    v-if="!item.columnHidden"
+                    class="clickable-pn"
+                    @click="navigateToPartHsCode(scope.row.pn)">
+                    {{ scope.row[item.columnProp] }}
+                  </span>
+                </el-tooltip>
+                <span v-else-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
               </template>
+
+              <!-- 其他字段正常处理 -->
               <template v-else>
                 <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
                 <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
@@ -1644,6 +1663,28 @@
       }
     },
     methods: {
+      isPnDataIncomplete(row) {
+        const hasBoxrolls = row.boxrolls !== null && row.boxrolls !== undefined && row.boxrolls !== '';
+        const hasRollqty = row.rollqty !== null && row.rollqty !== undefined && row.rollqty !== '';
+        const hasBoxweight = row.boxweight !== null && row.boxweight !== undefined && row.boxweight !== '';
+
+        return !hasBoxrolls || !hasRollqty || !hasBoxweight;
+      },
+
+      // 跳转到PN维护页面
+      navigateToPartHsCode(pn) {
+        if (!pn) {
+          this.$message.warning('PN不能为空');
+          return;
+        }
+        this.$router.push({
+          path: '/ecss-partHsCode',
+          query: {
+            sku: pn
+          }
+        });
+      },
+
       openPartDialog () {
         this.searchPartList();
         this.partFlag = true
@@ -1737,6 +1778,18 @@
         if ((column.property === 'pn' || column.property === 'qty') && row.modifyFlag===true) {  // 根据列属性判断
           return { color: '#ff5d03' };
         }
+
+        // 检查 pn 列，当 boxrolls、rollqty、boxweight 其中任意一个没有值时，将 pn 颜色改成橙色
+        if (column.property === 'pn') {
+          const hasBoxrolls = row.boxrolls !== null && row.boxrolls !== undefined && row.boxrolls !== '';
+          const hasRollqty = row.rollqty !== null && row.rollqty !== undefined && row.rollqty !== '';
+          const hasBoxweight = row.boxweight !== null && row.boxweight !== undefined && row.boxweight !== '';
+
+          if (!hasBoxrolls || !hasRollqty || !hasBoxweight) {
+            return { color: '#ff8c00' }; // 橙色
+          }
+        }
+
         return {};
       },
       changeData(row){
@@ -2345,6 +2398,16 @@
   height: 24px;
 }
 
+/* 可点击的PN样式 */
+.clickable-pn {
+  cursor: pointer;
+  text-decoration: underline;
+}
+
+.clickable-pn:hover {
+  opacity: 0.8;
+}
+
 /* 对话框标题样式 */
 .dialog-title {
   display: flex;
diff --git a/src/views/modules/ecss/partHsCode.vue b/src/views/modules/ecss/partHsCode.vue
index 51596e6..28e329a 100644
--- a/src/views/modules/ecss/partHsCode.vue
+++ b/src/views/modules/ecss/partHsCode.vue
@@ -930,10 +930,18 @@
       },
     },
     activated() {
+      // 检查是否有新的sku参数
+      if (this.$route.query.sku && this.$route.query.sku !== this.searchData.sku) {
+        this.searchData.sku = this.$route.query.sku;
+      }
       this.searchTable()
     },
     created() {
       this.getBu();
+      // 接收来自路由的sku参数
+      if (this.$route.query.sku) {
+        this.searchData.sku = this.$route.query.sku;
+      }
     }
   }
 </script>