linwenxin 1 éve
szülő
commit
aff24e3f14

+ 7 - 2
src/views/mallManagement/order/order_detail/index.vue

@@ -34,7 +34,7 @@
                       <el-button slot="reference" size="small" type="danger">取消订单</el-button>
                     </el-popconfirm>
                   </template>
-                  <template v-if="orderDetail.orderStatus === 'DFH'">
+                  <template v-if="orderDetail.examineStatus === 'OK'">
                     <el-button size="small" type="primary" @click="showDialog('send')">发货</el-button>
                     <el-popconfirm title="确定取消订单吗?" @confirm="cancelOrder" style="margin-left: 10px">
                       <el-button slot="reference" size="small" type="danger">取消订单</el-button>
@@ -400,7 +400,12 @@
           >
           <span style="margin-right: 30px; font-size: 18px">已收款金额:{{ orderDetail.paidAmount }}</span>
         </div>
-        <el-table :data="orderPaymentRecordListData" style="width: 100%" border>
+        <el-table
+          v-if="orderPaymentRecordListData.length"
+          :data="orderPaymentRecordListData"
+          style="width: 100%"
+          border
+        >
           <el-table-column prop="payStatus" label="收款标志" align="center">
             <template slot-scope="scope">
               <div>

+ 1 - 1
src/views/mallManagement/order/order_list/index.vue

@@ -373,7 +373,7 @@
                         <el-button
                           type="text"
                           size="small"
-                          v-if="order.orderStatus === 'DFH' && $restrict('deliver')"
+                          v-if="order.examineStatus === 'OK' && $restrict('deliver')"
                           @click="showLogistics(order, 'add')"
                           >发货</el-button
                         >