From 4160d08a28616a5586d8ef8a441dfb0d944b08ce Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Fri, 16 May 2025 15:26:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(emptyOrder):=20=E7=A9=BA=E5=8D=95=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E9=80=89=E8=B4=AD=E4=BA=A7=E5=93=81=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../specialBusiness/emptyOrder/index.vue      |  7 +++
 .../emptyOrder/rigiestList.vue                | 43 ++++++++++++++++---
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/views/information/specialBusiness/emptyOrder/index.vue b/src/views/information/specialBusiness/emptyOrder/index.vue
index 7ba0dbb..d523d1b 100644
--- a/src/views/information/specialBusiness/emptyOrder/index.vue
+++ b/src/views/information/specialBusiness/emptyOrder/index.vue
@@ -1451,6 +1451,13 @@ export default {
         })
         return false
       } else {
+        if (!this.selectData.selSkuNameList || !this.selectData.selSkuList) {
+          this.$message({
+            message: '请产品选择规格',
+            type: 'warning'
+          })
+          return false
+        }
         const obj = {
           pkProduct: this.selectData.pkId,
           productCode: this.selectData.productCode,
diff --git a/src/views/information/specialBusiness/emptyOrder/rigiestList.vue b/src/views/information/specialBusiness/emptyOrder/rigiestList.vue
index f4117da..03d255d 100644
--- a/src/views/information/specialBusiness/emptyOrder/rigiestList.vue
+++ b/src/views/information/specialBusiness/emptyOrder/rigiestList.vue
@@ -226,16 +226,47 @@
             align="center"
             label="选购产品"
             min-width="200"
-            show-overflow-tooltip
-          />
+          >
+            <template slot-scope="scope">
+              <div v-for="(item,idx) in scope.row.detailList || []" :key="idx">
+                <el-tooltip :content="item.productName" placement="top" :disabled="!item.productName || item.productName.length < 15">
+                  <div style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
+                    {{ item.productName }}
+                  </div>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="产品规格"
-          />
+            min-width="180"
+          >
+            <template slot-scope="scope">
+              <div v-for="(item,idx) in scope.row.detailList || []" :key="idx">
+                <el-tooltip :content="item.specsName" placement="top" :disabled="!item.specsName || item.specsName.length < 10">
+                  <div style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
+                    {{ item.specsName }}
+                  </div>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="产品数量"
-          />
+            min-width="180"
+          >
+            <template slot-scope="scope">
+              <div v-for="(item,idx) in scope.row.detailList || []" :key="idx">
+                <el-tooltip :content="String(item.quantity)" placement="top" :disabled="String(item.quantity).length < 5">
+                  <div style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
+                    {{ item.quantity }}
+                  </div>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="recName"
@@ -443,9 +474,9 @@ export default {
       })
     },
     tableRowClassName({ row, rowIndex }) {
-      if (rowIndex % 2 == 1) {
+      if (rowIndex % 2 === 1) {
         return 'warning-row'
-      } else if (rowIndex % 2 == 0) {
+      } else if (rowIndex % 2 === 0) {
         return 'success-row'
       }
       return ''