箱类型

src/views/modules/ecss/codelnotifyConfirm.vue

@@ -137,7 +137,7 @@
               <template v-else-if="item.columnProp === 'pn'">
                 <el-tooltip
                   v-if="isPnDataIncomplete(scope.row)"
-                  content="基本信息(每卷数量、每箱卷数、箱重量)未维护，点击跳转到维护页面"
+                  :content="getPnIncompleteTooltip(scope.row)"
                   placement="top">
                   <span
                     v-if="!item.columnHidden"
@@ -1857,8 +1857,33 @@
         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 !== '';
+        const packageNo = row.packageNo !== null && row.packageNo !== undefined && row.packageNo !== '';
+        return !hasBoxrolls || !hasRollqty || !hasBoxweight || !packageNo;
+      },
+
+      // 获取PN数据缺失的具体字段提示信息
+      getPnIncompleteTooltip(row) {
+        const missingFields = [];
         
-        return !hasBoxrolls || !hasRollqty || !hasBoxweight;
+        // 检查每个字段是否缺失
+        if (!(row.rollqty !== null && row.rollqty !== undefined && row.rollqty !== '')) {
+          missingFields.push('每卷数量');
+        }
+        if (!(row.boxrolls !== null && row.boxrolls !== undefined && row.boxrolls !== '')) {
+          missingFields.push('每箱卷数');
+        }
+        if (!(row.boxweight !== null && row.boxweight !== undefined && row.boxweight !== '')) {
+          missingFields.push('箱重量');
+        }
+        if (!(row.packageNo !== null && row.packageNo !== undefined && row.packageNo !== '')) {
+          missingFields.push('箱类型');
+        }
+
+        // 根据缺失字段生成提示信息
+        if (missingFields.length > 0) {
+          return `基本信息(${missingFields.join('、')})未维护，点击跳转到维护页面`;
+        }
+        return '';
       },
 
       // 跳转到PN维护页面
@@ -2002,8 +2027,8 @@
           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) {
+          const packageNo = row.packageNo !== null && row.packageNo !== undefined && row.packageNo !== '';
+          if (!hasBoxrolls || !hasRollqty || !hasBoxweight || !packageNo) {
             return { color: '#ff8c00' }; // 橙色
           }
         }