xgj 1 ay önce
ebeveyn
işleme
aaf7321b38

+ 8 - 5
src/views/promotion/components/PreviewPromotionalInvoiceDetailDialog.vue

@@ -75,11 +75,15 @@
               <template #default="{ row }">
                 <div>
                   <div>{{ row?.order?.promotionSite?.name }}</div>
-                  <div style="color: #a8abb2">[ {{ row.order.promotionSite.sn }} ]</div>
+                  <div style="color: #a8abb2">[ {{ row.order?.promotionSite?.sn }} ]</div>
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="promotionGoods" :formatter="v => v.order.promotionGoods.memberCardName" label="订单商品名称" />
+            <el-table-column
+              prop="promotionGoods"
+              :formatter="v => v.order.promotionGoods?.memberCardName"
+              label="订单商品名称"
+            />
             <el-table-column prop="promotionGoods" label="实付金额">
               <template #default="{ row }">
                 <div>
@@ -87,7 +91,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="status" :formatter="v => v.order.promotionGoods.memberCardName" label="订单状态">
+            <el-table-column prop="status" :formatter="v => v.order.promotionGoods?.memberCardName" label="订单状态">
               <template #default="{ row }">
                 <div :class="orderStatusList[row.order.status - 1]?.color">
                   {{ orderStatusList[row.order.status - 1]?.label }}
@@ -102,9 +106,8 @@
                   {{ row.order.paymentType === 1 ? "平台" : row?.order.agency?.nickname }}
                 </div>
                 <div style="color: #a8abb2">
-                  [ 收款ID:{{ row.order.mchId }}]
+                  [ 收款ID:{{ row.order?.mchId }}]
                   <br />
-                  <!-- [账号ID: {{ row.order.agencyId }}] -->
                 </div>
               </template>
             </el-table-column>

+ 5 - 9
src/views/promotion/order.vue

@@ -128,8 +128,8 @@
         <el-table-column prop="promotionSite" label="订单来源信息">
           <template #default="{ row }">
             <div>
-              <div>{{ row.agency.nickname }}</div>
-              <div style="color: #a8abb2">[ {{ row.promotionSite.name }} ]</div>
+              <div>{{ row.agency?.nickname }}</div>
+              <div style="color: #a8abb2">[ {{ row.promotionSite?.name }} ]</div>
             </div>
           </template>
         </el-table-column>
@@ -155,20 +155,16 @@
             <div>
               {{ row.paymentType === 1 ? "平台" : row?.agency?.nickname }}
             </div>
-            <div style="color: #a8abb2">
-              [ 收款ID:{{ row.mchId }} ]
-              <br />
-              <!-- [ 账号ID: {{ row.agencyId }} ] -->
-            </div>
+            <div style="color: #a8abb2">[ 收款ID:{{ row?.mchId }} ]</div>
           </template>
         </el-table-column>
         <el-table-column prop="archives" label="用户信息">
           <template #default="{ row }">
             <div>
-              {{ row.archives.name }}
+              {{ row.archives?.name }}
             </div>
             <div>
-              <div v-for="(item, index) in row.archives.accounts" :key="index" class="space-x-4">
+              <div v-for="(item, index) in row.archives?.accounts" :key="index" class="space-x-4">
                 <span class="inline-block whitespace-nowrap w-[4em]">{{ accountTypes[item.type] }}</span>
                 <span>【{{ item.account }}】</span>
               </div>