''
liukangdong
2024-10-08 0adb696e7fade5eeb02396e5d4bacf9355ca5e2e
''
已修改6个文件
68 ■■■■ 文件已修改
admin/.env.development 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/visitorManagement.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/platform/LogisticsRecord/leaveAuth.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/platform/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/platform/queueUp.vue 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/statistics/platformRecord.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/.env.development
@@ -2,6 +2,6 @@
NODE_ENV = 'development'
VUE_APP_API_URL  = 'http://localhost:10010'
# VUE_APP_API_URL  = 'http://192.168.0.101:10010'
# VUE_APP_API_URL  = 'http://192.168.0.103:10010'
VUE_APP_API_URL  = 'http://10.50.250.253:8088/gateway_interface'
admin/src/views/business/visitorManagement.vue
@@ -8,8 +8,8 @@
            <el-form-item label="手机号" prop="phone">
                <el-input v-model="searchForm.phone" placeholder="请输入手机号" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="组织名称" prop="companyName">
                <el-input v-model="searchForm.companyName" placeholder="请输入组织名称" @keypress.enter.native="search"></el-input>
            <el-form-item label="公司名称" prop="companyName">
                <el-input v-model="searchForm.companyName" placeholder="请输入公司名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="身份证号" prop="idcardNo">
                <el-input v-model="searchForm.idcardNo" placeholder="请输入身份证号" @keypress.enter.native="search"></el-input>
@@ -54,7 +54,7 @@
                    </template>
                </el-table-column>
                <el-table-column prop="idcardDecode" label="身份证号" width="150px"></el-table-column>
                <el-table-column prop="visitCompanyName" label="组织" min-width="100px"></el-table-column>
                <el-table-column prop="visitCompanyName" label="公司" min-width="100px"></el-table-column>
                <el-table-column prop="visitTimes" label="拜访次数" min-width="100px"></el-table-column>
                <el-table-column prop="lastVisitDate" label="最后拜访时间" min-width="100px"></el-table-column>
            </el-table>
admin/src/views/platform/LogisticsRecord/leaveAuth.vue
@@ -50,8 +50,9 @@
      <el-table-column prop="remark" label="备注" min-width="150" show-overflow-tooltip />
      <el-table-column label="操作" align="center" fixed="right" min-width="100" show-overflow-tooltip>
        <template v-slot="scope">
          <el-button type="text" v-permissions="['business:platformbooks:detail']"
          <el-button v-if="scope.row.status == 6" type="text" v-permissions="['business:platformbooks:detail']"
            @click="handleAuth(scope.row)">离园授权</el-button>
            <span v-else>-</span>
        </template>
      </el-table-column>
    </el-table>
@@ -178,8 +179,8 @@
      this.$prompt('备注', '离园授权', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
      }).then(({ remark }) => {
        platformPowerLevel({ jobId: row.id, remark }).then(res => {
      }).then(({ value }) => {
        platformPowerLevel({ jobId: row.id, remark: value }).then(res => {
          Message.success('离园授权成功')
          this.getList()
        })
admin/src/views/platform/index.vue
@@ -314,6 +314,12 @@
      this.$nextTick(() => {
        this.$refs.PlatformQueuingRef.isShowModal = true
        this.$refs.PlatformQueuingRef.callType = callType
        this.$refs.PlatformQueuingRef.carCodeFront = ''
        this.$refs.PlatformQueuingRef.pagination = {
          total: 0,
          pageSize: 10,
          page: 1
        }
        this.$refs.PlatformQueuingRef.activePlat = { ...item }
        this.$refs.PlatformQueuingRef.getList()
        this.$refs.PlatformQueuingRef.title = item.name
admin/src/views/platform/queueUp.vue
@@ -21,7 +21,7 @@
        <span></span>
      </div>
    </div>
    <el-table class="mb20" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
    <el-table v-if="activeGroup.type == 2" 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,13 +33,9 @@
          </div>
        </template>
      </el-table-column>
      <el-table-column v-if="activeGroup.type == 2" prop="contractNum" label="合同单号" min-width="120" />
      <template v-else>
        <el-table-column prop="carrierName" label="运输公司" min-width="120" />
        <el-table-column prop="billCode" label="运单号" min-width="120" />
      </template>
      <el-table-column prop="contractNum" label="合同单号" min-width="120" />
      <el-table-column prop="totalNum" label="总运输量(万支)" min-width="110" />
      <el-table-column prop="driverName" label="驾驶员" min-width="130">
      <el-table-column label="驾驶员" min-width="130">
        <template slot-scope="{ row }">
          <span class="mr10">{{ row.driverName }}</span>
          <span>{{ row.drivierPhone }}</span>
@@ -48,12 +44,38 @@
      <el-table-column prop="signDate" label="签到时间" min-width="150" />
      <el-table-column label="操作" align="center" width="100" fixed="right">
        <template slot-scope="{ row }">
          <el-button v-if="activeGroup.type != 2" type="text" @click="handleDetail(row)"
            v-permissions="['business:company:update']">运单详情</el-button>
          <el-button v-if="activeGroup.type == 2" type="text" @click="subDetail(row)">预约详情</el-button>
        </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-column type="index" label="序号" width="80" />
      <el-table-column label="车牌号" width="130">
        <template slot-scope="{ row }">
          <div class="plate_id">
            <span>{{ row.carCodeFront.slice(0, 1) }}</span>
            <span>{{ row.carCodeFront.slice(1, 2) }}</span>
            <span>·</span>
            <span>{{ row.carCodeFront.slice(2) }}</span>
          </div>
        </template>
      </el-table-column>
      <el-table-column prop="carrierName" label="运输公司" min-width="120" />
      <el-table-column prop="totalNum" label="总运输量(万支)" min-width="110" />
      <el-table-column label="驾驶员" min-width="130">
        <template slot-scope="{ row }">
          <span class="mr10">{{ row.driverName }}</span>
          <span>{{ row.drivierPhone }}</span>
        </template>
      </el-table-column>
      <el-table-column prop="signDate" label="签到时间" min-width="150" />
      <el-table-column label="操作" align="center" width="100" fixed="right">
        <template slot-scope="{ row }">
          <el-button type="text" @click="handleDetail(row)"
            v-permissions="['business:company:update']">运单详情</el-button>
        </template>
      </el-table-column>
    </el-table>
    <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="pagination" />
    <!--  -->
admin/src/views/statistics/platformRecord.vue
@@ -26,7 +26,7 @@
import QueryForm from '@/components/common/QueryForm'
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration);
dayjs.extend(duration)
import { platformJobPage, getPlatformGroupList } from '@/api'
export default {
  components: {
@@ -86,7 +86,7 @@
      })
    },
    getGroupList() {
      getPlatformGroupList({queryData: 0,queryType: 0}).then(res => {
      getPlatformGroupList({ queryData: 0, queryType: 0 }).then(res => {
        this.queryFormConfig.formItems[1].options = res.map(i => {
          return {
            value: i.id,
@@ -106,6 +106,7 @@
          beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
          beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
        },
        sorts: [{ direction: 'DESC', property: 'START_DATE' }],
        capacity: pagination.pageSize,
        page: page || pagination.page,
      }).then(res => {
@@ -114,7 +115,7 @@
        this.list.forEach(item => {
          item.inTypeTemp = item.inType == 0 ? '整托盘' : '件烟'
          item.taskOrigin = 'WMS获取'
          item.workTime = dayjs.duration(item.workTime, 'seconds').format('H时m分s秒');
          item.workTime = dayjs.duration(item.workTime, 'seconds').format('H时m分s秒')
        })
        this.pagination.total = res.total || 0
      }, () => {