From 815e2cda769751dec5c1a1a71d0ff61b0d051d76 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 24 十月 2025 14:58:22 +0800
Subject: [PATCH] 最新版本541200007
---
pda/api/index.js | 18 ++++++
pda/pages/index/queueup.vue | 52 ++++++++++++++---
admin/src/views/platform/queueUp.vue | 65 +++++++++++----------
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java | 14 ++++
admin/src/api/platform/index.js | 3 +
admin/src/views/platform/components/WaybillDetail.vue | 5 +
pda/manifest.json | 2
7 files changed, 116 insertions(+), 43 deletions(-)
diff --git a/admin/src/api/platform/index.js b/admin/src/api/platform/index.js
index 873bfd1..f0c9de6 100644
--- a/admin/src/api/platform/index.js
+++ b/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)
+}
diff --git a/admin/src/views/platform/components/WaybillDetail.vue b/admin/src/views/platform/components/WaybillDetail.vue
index 4aac767..99aaf53 100644
--- a/admin/src/views/platform/components/WaybillDetail.vue
+++ b/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>
diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index 637a23f..0d92b07 100644
--- a/admin/src/views/platform/queueUp.vue
+++ b/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 {
diff --git a/pda/api/index.js b/pda/api/index.js
index 1864c60..79463dc 100644
--- a/pda/api/index.js
+++ b/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({
diff --git a/pda/manifest.json b/pda/manifest.json
index 1c0ad4f..abfa798 100644
--- a/pda/manifest.json
+++ b/pda/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "鏈堝彴璋冨害",
- "appid" : "__UNI__91B8BB7",
+ "appid" : "__UNI__5CB9224",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
diff --git a/pda/pages/index/queueup.vue b/pda/pages/index/queueup.vue
index 7cb8ab1..1870a0e 100644
--- a/pda/pages/index/queueup.vue
+++ b/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;
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
index 839941a..83e2ae8 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
+++ b/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")
--
Gitblit v1.9.3