最新版本541200007

doum

昨天 815e2cda769751dec5c1a1a71d0ff61b0d051d76

最新版本541200007

 admin/src/api/platform/index.js

@@ -147,3 +147,6 @@
export function jobUrge (data) {
  return request.post('/visitsAdmin/cloudService/business/platformJob/jobUrge', data)
}
export function backToWatiSign (data) {
  return request.post('/visitsAdmin/cloudService/business/platformJob/backToWatiSign', data)
}

 admin/src/views/platform/components/WaybillDetail.vue

@@ -28,7 +28,7 @@
      <div class="content">
        <div class="item" v-for="item in info.wmsJobContractVOList">
          <div class="contract">
            <span>合同号：{{ item.contractCode }}</span>
            <span>合同号：{{ item.contractCode || '-'}}</span>
            <!-- <div> -->
              <span class="scs" v-if="item.status == 1">WMS作业已完成</span>
              <span class="pad" v-if="item.status == 0">WMS作业未完成</span>
@@ -39,11 +39,14 @@
            <!-- </div> -->
          </div>
          <div class="placeholder6" v-if="info && info.type === 1">收货地：{{ item.address }}</div>
          <div class="placeholder6" v-if="info && info.type !== 1 && item.platformWmsDetailList.length">发货地：{{ item.platformWmsDetailList[0].inRepertotyName || '' }}</div>
          <div class="list">
            <div class="line" v-for="line in item.platformWmsDetailList">
              <div class="left"><span>物料名称：</span><span>{{ line.materialName }}</span></div>
              <div class="right"><span>数量：</span><span>{{ line.ioQty }}万支</span></div>
<!--
              <div class="right" v-if="info && info.type === 0"><span>供应商：</span><span>{{ line.inRepertotyCode }} / {{ line.inRepertotyName }}</span></div>
-->
            </div>
          </div>
        </div>

 admin/src/views/platform/queueUp.vue

@@ -65,12 +65,13 @@
          <span v-if="row.status == 7" class="primaryColor">转移中</span>
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center" width="200" fixed="right">
      <el-table-column label="操作" align="center" width="250" fixed="right">
        <template slot-scope="{ row }">
          <el-button v-if="row.billCode" type="text" @click="handleDetail(row)"
            v-permissions="['business:company:update']">运单详情</el-button>
          <el-button v-else type="text" @click="subDetail(row)">预约详情</el-button>
          <el-button type="text" @click="jiaji(row.id)">加急</el-button>
          <el-button type="text" class="red" @click="backSignin(row.id)">退回签到</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -120,7 +121,8 @@
  getPlatformGroupList,
  platformLineUpPage,
  getPlatformGroupWork,
  jobUrge
  jobUrge,
  backToWatiSign
} from '@/api'
import { queryQueueUpConfig } from './config'
import WaybillDetail from './components/WaybillDetail.vue'
@@ -136,7 +138,7 @@
    WaybillDetail,
    DriverDetail
  },
  data() {
  data () {
    return {
      filters: {},
      activeGroup: {
@@ -151,18 +153,18 @@
      pagination: {
        pageSize: 10,
        page: 1,
        total: 0,
        total: 0
      },
      queryQueueUpConfig,
      isShowDetail: false, // 运单详情
      detail: {}
    }
  },
  created() {
  created () {
    this.getPlatGroupList()
  },
  methods: {
    openSign() {
    openSign () {
      this.isPlatformSign = true
      this.$nextTick(() => {
        this.$refs.PlatformSignRef.isShowModal = true
@@ -176,7 +178,7 @@
        this.$refs.PlatformSignRef.getList()
      })
    },
    jiaji(id) {
    jiaji (id) {
      this.$confirm('确认加急吗？', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -188,20 +190,22 @@
          })
      }).catch(() => {

      });
      // this.$dialog.exportConfirm('确认加急吗？', {
      //   confirmButtonText: '确定',
      //   cancelButtonText: '取消',
      // })
      //   .then(() => {
      //     jobUrge({ id })
      //       .then(res => {
      //         this.getPlatGroupList()
      //       })
      //   })
      //   .catch(() => {})
      })
    },
    getPlatGroupList() {
    backSignin (id) {
      this.$confirm('确认重新签到吗？', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        backToWatiSign({ id })
          .then(res => {
            this.getPlatGroupList()
          })
      }).catch(() => {
      })
    },
    getPlatGroupList () {
      getPlatformGroupList({
        queryData: 1,
        queryType: 1
@@ -219,13 +223,13 @@
        }
      })
    },
    getList() {
    getList () {
      const { activeGroup, pagination, filters } = this
      this.loading = true
      platformLineUpPage({
        model: { platformGroupId: activeGroup.id, ...filters, callType: 3 },
        capacity: pagination.pageSize,
        page: pagination.page,
        page: pagination.page
      }).then(res => {
        this.loading = false
        this.dataList = res.records || []
@@ -234,33 +238,33 @@
        this.loading = false
      })
    },
    getPlatformGroupWork() {
    getPlatformGroupWork () {
      const { activeGroup } = this
      getPlatformGroupWork(activeGroup.id).then(res => {
        this.staticParam = res || {}
      })
    },
    handleSizeChange(e) {
    handleSizeChange (e) {
      this.pagination.pageSize = e
      this.getList(1)
    },
    handlePageChange(e) {
    handlePageChange (e) {
      this.pagination.page = e
      this.getList()
    },
    platgroupClick(item) {
    platgroupClick (item) {
      this.activeGroup = { ...item }
      this.pagination.page = 1
      this.filters = {}
      this.getPlatformGroupWork()
      this.getList()
    },
    clear() {
    clear () {
      this.pagination.page = 1
      this.filters = {}
      this.getList()
    },
    subDetail(row) {
    subDetail (row) {
      this.isShowDriver = true
      this.$nextTick(() => {
        this.$refs.DriverDetailRef.id = row.bookId
@@ -269,14 +273,14 @@
        this.$refs.DriverDetailRef.isShowModal = true
      })
    },
    handleDetail(row) {
    handleDetail (row) {
      this.isShowDetail = true
      this.$nextTick(() => {
        this.$refs.WaybillDetailRef.isShowModal = true
        this.$refs.WaybillDetailRef.id = row.id
        this.$refs.WaybillDetailRef.getDetail()
      })
    },
    }
  }
}
</script>
@@ -345,7 +349,6 @@
    }
  }
}


.main_header {
  .platgroup_tabs {

 pda/api/index.js

@@ -119,6 +119,24 @@
    data
  })
}
 
//加急
export const jobUrge = (data) => {
  return http({
    url: 'visitsAdmin/cloudService/web/pdaPlatform/jobUrge',
    method: 'post',
    data
  })
}
//退回签到
export const backToWatiSign = (data) => {
  return http({
    url: 'visitsAdmin/cloudService/web/pdaPlatform/backToWatiSign',
    method: 'post',
    data
  })
}

//  完成作业
export const finishWork = (data) => {
  return http({

 pda/manifest.json

@@ -1,6 +1,6 @@
{
    "name" : "月台调度",
    "appid" : "__UNI__91B8BB7",
    "appid" : "__UNI__5CB9224",
    "description" : "",
    "versionName" : "1.0.0",
    "versionCode" : "100",

 pda/pages/index/queueup.vue

@@ -1,15 +1,14 @@
<template>
  <view class="main_app">
    <view class="main_content">
      <view class="title" @click="showPlatformgroup = true"
        >{{ platformGroup.name
        }}<u-icon
      <view class="title" @click="showPlatformgroup = true" >{{ platformGroup.name||''}}
      <u-icon
          name="arrow-down"
          size="20"
          class="ml12"
          color="#999999"
        ></u-icon
      ></view>
        ></u-icon>
      </view>
      <view class="input_wrap">
        <u-icon name="search" class="mr12" size="19" color="#999999" />
        <input
@@ -72,9 +71,10 @@
                  <text class="label primaryColor">签到时间</text>
                  <text class="value primaryColor" v-if="item.signDate">{{ item.signDate.slice(5, 16) }}</text>
                </view>
        <!-- <view class="btns">
          <view class="btn active">入园</view>
        </view> -->
         <view class="btns">
          <view class="btn active" @click="jiaji(item.id)">加急</view>
          <view class="btn  active1" @click="backSignin(item.id)">退回签到</view>
        </view> 
      </view>
      <view v-if="platformLineUpList.length == 0" class="empty_wrap">
        <image src="@/static/default_nodata@2x.png" />
@@ -142,11 +142,11 @@
</template>

<script>
import { platformLineUpPage, getPlatformGroupList, wmsJobDetail } from '@/api'
import { platformLineUpPage, getPlatformGroupList, wmsJobDetail,jobUrge,backToWatiSign } from '@/api'
export default {
  data() {
    return {
            windowTop: 24,
      windowTop: 24,
      showDetail: false,
      showPlatformgroup: false,
      capacity: 10,
@@ -218,6 +218,32 @@
      this.platformLineUpList = []
      this.getList()
    },
    jiaji(id){
        uni.showModal({
            content: `确认加急吗？`,
            success: (res) => {
                if (res.confirm) {
                    jobUrge({ id:id }).then(res => {
                        this.showToast('加急成功')
                        this.handleQuery()
                    })
                }
            }
        })
    },
    backSignin(id){
        uni.showModal({
            content: `确认退回签到吗？该操作后司机需要重新签到！`,
            success: (res) => {
                if (res.confirm) {
                    backToWatiSign({ id:id }).then(res => {
                        this.showToast('退回签到成功')
                        this.handleQuery()
                    })
                }
            }
        })
    },
    platConfirm(e) {
      const index = e.indexs[0]
      this.platformGroup = this.platformGroupList[index]
@@ -343,6 +369,12 @@
          border: 1rpx solid #999999;
          margin-left: 20rpx;
        }
        .active1{
            width: 140rpx;
            background-color: #cb0000;
            color: #fff;
            border-color: #cb0000;
        }
        .active {
          background-color: $uni-color-primary;
          color: #fff;

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java

@@ -131,7 +131,21 @@
        return ApiResponse.success("操作成功");
    }

    @ApiOperation("任务加急")
    @PostMapping("/jobUrge")
    @CloudRequiredPermission("business:platform:update")
    public ApiResponse  jobUrge (@RequestBody PlatformJob platformJob, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
        platformJobService.jobUrge(platformJob.getId(),getLoginUser(token));
        return ApiResponse.success("操作成功");
    }

    @ApiOperation("移除车辆排队队列（回到待签到）")
    @PostMapping("/backToWatiSign")
    @CloudRequiredPermission("business:platform:update")
    public ApiResponse backToWatiSign (@RequestBody PlatformJob platformJob,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        platformJobService.backToWatiSign(platformJob.getId(),getLoginUser(token));
        return ApiResponse.success("操作成功");
    }
    @ApiOperation("转移月台")
    @PostMapping("/platformMove")
    @CloudRequiredPermission("business:platform:update")