Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

云

3 天以前 41d4bedd762c6f8a8358baf33a065b052baab9cc

 src/views/salesManagement/deliveryLedger/index.vue

@@ -87,6 +87,11 @@
          show-overflow-tooltip
        />
        <el-table-column
          label="发货数量"
          prop="totalQuantity"
          show-overflow-tooltip
        />
        <el-table-column
          label="发货车牌号"
          prop="shippingCarNumber"
          show-overflow-tooltip
@@ -105,7 +110,7 @@
          label="审核状态"
          prop="status"
          align="center"
          width="120"
          width="100"
        >
          <template #default="scope">
            <el-tag :type="getApprovalStatusType(scope.row.status)">
@@ -113,6 +118,12 @@
            </el-tag>
          </template>
        </el-table-column>
        <el-table-column
          label="出库单号"
          prop="outboundBatches"
          show-overflow-tooltip
          width="130"
        />
        <el-table-column fixed="right" label="操作" width="220" align="center">
          <template #default="scope">
            <!--            <el-button-->
@@ -279,6 +290,9 @@
          <el-descriptions-item label="快递单号" :span="2">{{
            detailRow.expressNumber || "--"
          }}</el-descriptions-item>
          <el-descriptions-item label="出库单号" :span="2">{{
            detailRow.outboundBatches || "--"
          }}</el-descriptions-item>
        </el-descriptions>
        <el-table
          :data="getDeliveryProductInfoList()"