Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-11-05 50353c2ae43cdddb8433358f4ba66bef30c5d628

 admin/src/views/platform/queueUp.vue

@@ -21,7 +21,7 @@
        <span></span>
      </div>
    </div>
    <el-table v-if="activeGroup.type == 2" class="mb20" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
    <el-table class="mb20" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
      <el-table-column type="index" label="序号" width="80" />
      <el-table-column label="车牌号" width="130">
        <template slot-scope="{ row }">
@@ -33,8 +33,21 @@
          </div>
        </template>
      </el-table-column>
      <el-table-column prop="contractNum" label="合同单号" min-width="120" />
      <el-table-column prop="totalNum" label="总运输量(万支)" min-width="110" />
      <el-table-column prop="carrierName" label="运输公司" min-width="120">
        <template v-slot="scope">
          <span>{{ scope.row.carrierName || '-' }}</span>
        </template>
      </el-table-column>
      <el-table-column prop="contractNum" label="运输单号/合同号" min-width="120">
        <template v-slot="scope">
          <span>{{ scope.row.billCode || scope.row.contractNum || '-' }}</span>
        </template>
      </el-table-column>
      <el-table-column prop="totalNum" label="总运输量(万支)" min-width="110">
        <template v-slot="scope">
          <span>{{ scope.row.totalNum || '-' }}</span>
        </template>
      </el-table-column>
      <el-table-column label="驾驶员" min-width="130">
        <template slot-scope="{ row }">
          <span class="mr10">{{ row.driverName }}</span>
@@ -50,7 +63,7 @@
        </template>
      </el-table-column>
    </el-table>
    <el-table v-else class="mb20" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
    <!-- <el-table v-else class="mb20" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
      <el-table-column type="index" label="序号" width="80" />
      <el-table-column label="车牌号" width="130">
        <template slot-scope="{ row }">
@@ -78,7 +91,7 @@
          <el-button v-else type="text" @click="subDetail(row)">预约详情</el-button>
        </template>
      </el-table-column>
    </el-table>
    </el-table> -->
    <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="pagination" />

    <!--  -->