Merge remote-tracking branch 'origin/master'

jiangping

2025-03-11 8d1f2f2e82f3f7512930c536e91ee7c92315f3d6

Merge remote-tracking branch 'origin/master'

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

@@ -80,8 +80,8 @@
      filters: {
        selDate: [],
        fastdate: 0,
        createDateStart: '',
        createDateEnd: ''
        beginWorkDateEnd: '',
        beginDoneDateEnd: ''
      },
      list: [],
      queryFormConfig: {
@@ -102,8 +102,8 @@
            label: '驾驶员'
          },
          {
            filed1: 'createDateStart',
            filed2: 'createDateEnd',
            filed1: 'beginWorkDateEnd',
            filed2: 'beginDoneDateEnd',
            type: 'datetime',
            label: '作业时间'
          },
@@ -123,13 +123,13 @@
  methods: {
    changeRadio(day) {
      const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD') + ' 00:00:00', dayjs().format('YYYY-MM-DD') + ' 23:59:59']
      this.filters.createDateStart = arr[0]
      this.filters.createDateEnd = arr[1]
      this.filters.beginWorkDateEnd = arr[0]
      this.filters.beginDoneDateEnd = arr[1]
      this.getList(1)
    },
    changeForm(str) {
      if(this.filters.createDateStart > this.filters.createDateEnd){
        this.filters.createDateStart = this.filters.createDateEnd
      if(this.filters.beginWorkDateEnd > this.filters.beginDoneDateEnd){
        this.filters.beginWorkDateEnd = this.filters.beginDoneDateEnd
        return this.$message.error('开始时间不能大于结束时间')
      }
      this.getList()

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

@@ -41,7 +41,8 @@
        <template v-slot="scope">
          <el-button type="text" v-permissions="['business:platformbooks:detail']"
            @click="handleDetail(scope.row)">预约详情</el-button>
          <el-button  type="text" class="red" v-permissions="['business:platformbooks:delete']" @click="handleDel(scope.row)">删除</el-button>
          <el-button type="text" class="red" v-permissions="['business:platformbooks:delete']"
            @click="handleDel(scope.row)">删除</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -112,7 +113,7 @@
import UploadAvatarImage from '@/components/common/UploadAvatarImage'
import { Message } from 'element-ui'
import dayjs from 'dayjs'
import BaseComputHeight from "@/components/base/BaseComputHeight";
import BaseComputHeight from "@/components/base/BaseComputHeight"
export default {
  extends: BaseComputHeight,
  components: {
@@ -133,7 +134,8 @@
        total: 0
      },
      filters: {
        selDate: [],
        arriveDateStart: '',
        arriveDateEnd: '',
        fastdate: 0
      },
      list: [],
@@ -187,10 +189,10 @@
            ]
          },
          {
            filed: 'selDate',
            type: 'datetimerange',
            label: '操作时间',
            pickerOptions: {}
            filed1: 'arriveDateStart',
            filed2: 'arriveDateEnd',
            type: 'datetime',
            label: '操作时间'
          },
          {
            type: 'slot',
@@ -204,7 +206,7 @@
  },
  created () {
    this.changeRadio('0')
    this.getList()
    // this.getList()
  },
  methods: {
    checkSurplus () {
@@ -224,23 +226,23 @@
    },
    changeRadio (day) {
      const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD') + ' 00:00:00', dayjs().format('YYYY-MM-DD') + ' 23:59:59']
      this.$set(this.filters, 'selDate', arr)
      this.getList()
      this.filters.arriveDateStart = arr[0]
      this.filters.arriveDateEnd = arr[1]
      this.getList(1)
    },
    changeForm (str) {
      if (str === 'selDate') {
        this.$set(this.filters, 'fastdate', null)
        this.getList()
      if (this.filters.arriveDateStart > this.filters.arriveDateEnd) {
        this.filters.arriveDateStart = this.filters.arriveDateEnd
        return this.$message.error('开始时间不能大于结束时间')
      }
      this.getList()
    },
    getList (page) {
      const { pagination, filters } = this
      this.loading = true
      platformBooksPage({
        model: {
          ...filters,
          arriveDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
          arriveDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null
          ...filters
        },
        capacity: pagination.pageSize,
        page: page || pagination.page
@@ -264,9 +266,7 @@
            page: this.pagination.page,
            capacity: 1000000,
            model: {
              ...filters,
              arriveDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
              arriveDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null
              ...filters
            }
          })
            .then(response => {
@@ -325,9 +325,7 @@
    },
    clear () {
      this.pagination.page = 1
      this.filters = {
        selDate: []
      }
      this.filters = {}
      this.getList()
      // this.changeRadio('0')
    },

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

@@ -91,7 +91,9 @@
      },
      filters: {
        selDate: [],
        fastdate: 0
        fastdate: 0,
        createDateStart: '',
        createDateEnd: ''
      },
      list: [],
      queryFormConfig: {
@@ -137,10 +139,10 @@
            ]
          },
          {
            filed: 'selDate',
            type: 'datetimerange',
            label: '操作时间',
            pickerOptions: {}
            filed1: 'createDateStart',
            filed2: 'createDateEnd',
            type: 'datetime',
            label: '操作时间'
          },
          {
            type: 'slot',
@@ -158,14 +160,16 @@
  methods: {
    changeRadio(day) {
      const arr = [dayjs().subtract(day, 'day').format('YYYY-MM-DD') + ' 00:00:00', dayjs().format('YYYY-MM-DD') + ' 23:59:59']
      this.$set(this.filters, 'selDate', arr)
      this.getList()
      this.filters.createDateStart = arr[0]
      this.filters.createDateEnd = arr[1]
      this.getList(1)
    },
    changeForm(str) {
      if (str === 'selDate') {
        this.$set(this.filters, 'fastdate', null)
        this.getList()
      if(this.filters.createDateStart > this.filters.createDateEnd){
        this.filters.createDateStart = this.filters.createDateEnd
        return this.$message.error('开始时间不能大于结束时间')
      }
      this.getList()
    },
    getList(page) {
      const { pagination, filters } = this
@@ -173,9 +177,7 @@
      platformJobPage({
        model: {
          ...filters,
          jobType: '0',
          createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
          createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
          jobType: '0'
        },
        capacity: pagination.pageSize,
        page: page || pagination.page,
@@ -210,9 +212,7 @@
            jobType: '0',
            model: {
              ...filters,
              jobType: '0',
              createDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
              createDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
              jobType: '0'
            }
          })
            .then(response => {
@@ -228,10 +228,8 @@
    },
    clear() {
      this.pagination.page = 1
      this.filters = {
        selDate: [],
      }
      this.getList()
      this.filters = {}
      this.getList(0)
      // this.changeRadio('0')
    },
    handleDetail(row) {

 screen/src/views/LogisticsEfficiency.vue

@@ -353,7 +353,8 @@
          <div class="list">
            <div class="item" v-for="item in activeCar.contractList">
              <div class="head">
                <div class="code">合同号：<span v-if="item.detailList && item.detailList.length > 0">{{ item.detailList[0].contractNum }}</span></div>
                <div class="code">合同号：<span v-if="item.detailList && item.detailList.length > 0">{{
                  item.detailList[0].contractNum }}</span></div>
                <div class="addr">收货地：{{ item.address }}</div>
              </div>
              <div class="line" v-for="i in item.detailList">
@@ -633,6 +634,8 @@

const echartMap = ref()
const initMap = () => {
  console.log('----')

  var myChart = echarts.init(echartMap.value)
  echarts.registerMap('js', ahJSON)
  const scatterData = data7.value.carsList.map(item => {
@@ -957,6 +960,11 @@
  carsListPost().then(res => {
    const result = res.data || {}
    data7.value = result
    initMap()
  }, () => {
    data7.value = {
      carsList: []
    }
    initMap()
  })
  carsEventListP().then(res => {
@@ -1917,6 +1925,7 @@
          border-bottom: 1px solid rgba(255, 255, 255, 0.16);
          margin-bottom: 10px;
          padding-right: 10px;

          .code {
            font-weight: 500;
            font-size: 14px;