From a8eb23551398f3e43028f75f9be7c0a6892e63cc Mon Sep 17 00:00:00 2001 From: xiangxy Date: Fri, 19 Dec 2025 09:50:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/style/layout.styl | 3 +- locale/en.json | 7 +- locale/jp.json | 7 +- locale/zh-Hans.json | 3 + pages/ftdlDTY/agv-manage.vue | 4 +- pages/ftdlDTY/line-down-mater.vue | 14 ++- pages/ftdlDTY/man-get-goods.vue | 10 +- pages/ftdlDTY/work-manage.vue | 156 ++++++++++++++++++++++-------- utils/getData4.js | 20 ++-- 9 files changed, 167 insertions(+), 57 deletions(-) diff --git a/common/style/layout.styl b/common/style/layout.styl index d59c00e..bb7d465 100644 --- a/common/style/layout.styl +++ b/common/style/layout.styl @@ -48,7 +48,8 @@ uni-button:after { .filter_label { display: block; line-height: 80rpx; - font-size: 28rpx; + // font-size: 28rpx; + font-size: 26rpx; color: #323232; font-weight: bold; letter-spacing: 4rpx; diff --git a/locale/en.json b/locale/en.json index c90b18b..798570a 100644 --- a/locale/en.json +++ b/locale/en.json @@ -30,6 +30,9 @@ "button.deregulate": "解除管制", "button.pause": "暂停", "button.recover": "恢复", + "button.finish": "完成", + "button.start-confirm": "起点确认", + "button.end-confirm": "终点确认", "login.username": "用户名", "login.password": "密码", "login.remember": "记住用户名", @@ -98,8 +101,8 @@ "grid.enter-area": "进入区域", "grid.wltype": "物料类型", "grid.has-task": "是否有任务", - "grid.region_code": "区域编码", - "grid.region_name": "区域名称", + "grid.region-code": "区域编码", + "grid.region-name": "区域名称", "toast.select-row": "请选择一行", "toast.device-not-empty": "设备不能为空", "toast.material-not-empty": "物料不能为空", diff --git a/locale/jp.json b/locale/jp.json index d60236a..d0d9feb 100644 --- a/locale/jp.json +++ b/locale/jp.json @@ -30,6 +30,9 @@ "button.deregulate": "規制解除", "button.pause": "一時停止", "button.recover": "回復", + "button.finish": "完了", + "button.start-confirm": "起点確認", + "button.end-confirm": "終点確認", "login.username": "ユーザー名", "login.password": "パスワード", "login.remember": "ユーザー名を記憶する", @@ -98,8 +101,8 @@ "grid.enter-area": "ゾーンに入る", "grid.wltype": "品目タイプ", "grid.has-task": "タスクの有無", - "grid.region_code": "ゾーンコーディング", - "grid.region_name": "領域名", + "grid.region-code": "ゾーンコーディング", + "grid.region-name": "領域名", "toast.select-row": "行を選択してください", "toast.device-not-empty": "デバイスを空にすることはできません", "toast.material-not-empty": "品目を空にすることはできません", diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json index afc7a80..798570a 100644 --- a/locale/zh-Hans.json +++ b/locale/zh-Hans.json @@ -30,6 +30,9 @@ "button.deregulate": "解除管制", "button.pause": "暂停", "button.recover": "恢复", + "button.finish": "完成", + "button.start-confirm": "起点确认", + "button.end-confirm": "终点确认", "login.username": "用户名", "login.password": "密码", "login.remember": "记住用户名", diff --git a/pages/ftdlDTY/agv-manage.vue b/pages/ftdlDTY/agv-manage.vue index 446ff98..971633a 100644 --- a/pages/ftdlDTY/agv-manage.vue +++ b/pages/ftdlDTY/agv-manage.vue @@ -5,11 +5,11 @@ - + {{$t('filter.carno')}} - + diff --git a/pages/ftdlDTY/line-down-mater.vue b/pages/ftdlDTY/line-down-mater.vue index d295eba..919f762 100644 --- a/pages/ftdlDTY/line-down-mater.vue +++ b/pages/ftdlDTY/line-down-mater.vue @@ -216,7 +216,13 @@ } } - \ No newline at end of file + diff --git a/pages/ftdlDTY/man-get-goods.vue b/pages/ftdlDTY/man-get-goods.vue index a395204..0960bfa 100644 --- a/pages/ftdlDTY/man-get-goods.vue +++ b/pages/ftdlDTY/man-get-goods.vue @@ -211,4 +211,12 @@ } } } - \ No newline at end of file + + \ No newline at end of file diff --git a/pages/ftdlDTY/work-manage.vue b/pages/ftdlDTY/work-manage.vue index 89ab64c..fbd4ead 100644 --- a/pages/ftdlDTY/work-manage.vue +++ b/pages/ftdlDTY/work-manage.vue @@ -50,12 +50,51 @@ - - - + + + + + + + + + + {{$t('filter.start-point')}} + + + + + + + + + + + + + + + + + + {{$t('filter.end-point')}} + + + + + + + + + + + + @@ -63,7 +102,7 @@ import NavBar from '@/components/NavBar.vue' import SearchBox from '@/components/SearchBox.vue' import { confirmAction } from '@/utils/utils.js' - import {queryTask, againTask, forceConfirm} from '@/utils/getData4.js' + import {queryTask, finishTask, startPointConfirm, endPointConfirm} from '@/utils/getData4.js' export default { components: { NavBar, @@ -73,8 +112,14 @@ return { title: '', val1: '', + val2: '', + val3: '', + show: false, + show2: false, dataList: [], + // dataList: [{task_code: 't01', point_code1: 'p01', point_code2: 'p02'}], pkId: '', + pkObj: {}, reload: false, status: 'more', contentText: { @@ -85,8 +130,9 @@ totalCount: 0, pageNum: 1, pageSize: 10, - disabled: false, + disabled1: false, disabled2: false, + disabled3: false, }; }, onLoad (options) { @@ -134,13 +180,62 @@ }, toCheck (e) { this.pkId = e.task_code === this.pkId ? '' : e.task_code + this.pkObj = e }, clearUp () { this.val1 = '' this.pkId = '' this.dataList = [] - this.disabled = false + this.disabled1 = false this.disabled2 = false + this.disabled3 = false + this.show = false + this.show2 = false + this.searchList() + }, + toStartConfirm () { + if (!this.pkId) { + return + } + this.val2 = this.pkObj.point_code1 + this.show = true + }, + async _startPointConfirm () { + this.disabled1 = true + this.show = false + try { + let res = await startPointConfirm(this.pkId, this.val2) + uni.showToast({ + title: res.message, + icon: 'none' + }) + this.clearUp() + this.disabled1 = false + } catch (e) { + this.disabled1 = false + } + }, + toEndConfirm () { + if (!this.pkId) { + return + } + this.val3 = this.pkObj.point_code2 + this.show2 = true + }, + async _endPointConfirm () { + this.disabled2 = true + this.show2 = false + try { + let res = await endPointConfirm(this.pkId, this.val3) + uni.showToast({ + title: res.message, + icon: 'none' + }) + this.clearUp() + this.disabled2 = false + } catch (e) { + this.disabled2 = false + } }, async handleConfirm() { if (!this.pkId) { @@ -148,46 +243,31 @@ } const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") if (isConfirmed) { - this._againTask() + this._finishTask() } }, - async _againTask () { - this.disabled = true + async _finishTask () { + this.disabled3 = true try { - let res = await againTask(this.pkId) + let res = await finishTask(this.pkId) uni.showToast({ title: res.message, icon: 'none' }) this.clearUp() - this.disabled = false + this.disabled3 = false } catch (e) { - this.disabled = false - } - }, - async handleConfirm2() { - if (!this.pkId) { - return - } - const isConfirmed = await confirmAction("确认操作", "确定要执行此操作吗？") - if (isConfirmed) { - this._forceConfirm() - } - }, - async _forceConfirm () { - this.disabled2 = true - try { - let res = await forceConfirm(this.pkId) - uni.showToast({ - title: res.message, - icon: 'none' - }) - this.clearUp() - this.disabled2 = false - } catch (e) { - this.disabled2 = false + this.disabled3 = false } } } } - \ No newline at end of file + + diff --git a/utils/getData4.js b/utils/getData4.js index afbe45f..41bb882 100644 --- a/utils/getData4.js +++ b/utils/getData4.js @@ -163,16 +163,22 @@ export const queryTask = (tcode) => request({ url:'api/hand/queryTask', data: {task_code: tcode} }) -// 1.2重新下发 -export const againTask = (tcode) => request({ - url:'api/hand/againTask', +// 1.2完成 +export const finishTask = (tcode) => request({ + url:'api/hand/finishTask', data: {task_code: tcode} }) -// 1.3强制确认 -export const forceConfirm = (tcode) => request({ - url:'api/hand/forceConfirm', - data: {task_code: tcode} +// 1.3起点确认 +export const startPointConfirm = (tcode, pcode) => request({ + url:'api/hand/startPointConfirm', + data: {task_code: tcode, point_code: pcode} }) +// 1.3终点确认 +export const endPointConfirm = (tcode, pcode) => request({ + url:'api/hand/endPointConfirm', + data: {task_code: tcode, point_code: pcode} +}) + // 管制区域 // 1.1根据区域查询进出区域信息