Merge remote-tracking branch 'origin/master'

k94314517

2024-09-30 df70441cb1dd210a0df4f0c0eaefc09c14d72a14

Merge remote-tracking branch 'origin/master'

 admin/src/views/platform/LogisticsRecord/subscribe.vue

@@ -28,7 +28,7 @@
      <el-table-column prop="driverPhone" label="联系方式" min-width="100" show-overflow-tooltip />
      <el-table-column prop="inTypeTemp" label="入库类型" min-width="100" show-overflow-tooltip />
      <el-table-column prop="arriveDate" label="预约到场时间" min-width="150" show-overflow-tooltip />
      <el-table-column prop="auditName" label="审批结果" min-width="100" show-overflow-tooltip>
      <el-table-column label="审批结果" min-width="100" show-overflow-tooltip>
        <template v-slot="scope">
          <span v-if="scope.row.status == '0'">待审批</span>
          <span v-if="scope.row.status == '1'">审批中</span>
@@ -37,7 +37,7 @@
          <span v-if="scope.row.status == '4'">已取消</span>
        </template>
      </el-table-column>
      <el-table-column prop="name" label="当前审批人" min-width="100" show-overflow-tooltip />
      <el-table-column prop="auditName" label="当前审批人" min-width="100" show-overflow-tooltip />
      <el-table-column prop="editDate" label="操作时间" min-width="150" show-overflow-tooltip />
      <el-table-column prop="name" label="操作" min-width="120" align="center" fixed="right" show-overflow-tooltip>
        <template v-slot="scope">