Browse Source

Merge branch 'develop_cuxiao' of jianguan-web/jg-ocs-html into pre-release

李磊 1 year ago
parent
commit
0db5bb3f5d
1 changed files with 9 additions and 7 deletions
  1. 9 7
      src/views/salesManagement/salesList/list.vue

+ 9 - 7
src/views/salesManagement/salesList/list.vue

@@ -140,15 +140,15 @@
           </template>
           <!-- 销售单号 -->
           <template slot="salesBillNo" slot-scope="text, record">
-            <span class="link-bule" @click="handleDetail(record,0)">{{ record.salesBillNo }}</span>
+            <span class="link-bule" @click="handleDetail(record,0)">{{ record.salesBillNo||'--' }}</span>
           </template>
           <!-- 备货单号 -->
           <template slot="dispatchBillNo" slot-scope="text, record">
-            <span class="link-bule" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span>
+            <span class="link-bule" @click="handleDetail(record,1)">{{ record.dispatchBillNo||'--' }}</span>
           </template>
           <!-- 发货单号  -->
           <template slot="sendBillNo" slot-scope="text, record">
-            <span class="link-bule" @click="handleDetail(record,2)">{{ record.dispatchBillNo }}</span>
+            <span class="link-bule" @click="handleDetail(record,2)">{{ record.sendBillNo||'--' }}</span>
           </template>
         </s-table>
 
@@ -336,16 +336,18 @@ export default {
       this.detailType = type
       if (type != 2) {
         this.bizSn = type == 0 ? row.salesBillSn : row.dispatchBillSn
-        this.$nextTick(() => {
+        if (this.bizSn) {
           this.showDetailModal = true
-        })
+        }
       } else {
-        this.showTipModal = true
         const infoObj = {
           sendBillSn: row.sendBillSn,
           customeName: row.buyerName
         }
-        this.$refs.detailModal.getDetail(infoObj, 1, '发货单详情')
+        if (row.sendBillSn) {
+          this.showTipModal = true
+          this.$refs.detailModal.getDetail(infoObj, 1, '发货单详情')
+        }
       }
     },
     closeDetailModal () {