From 35ed049c2df5fe8f5f92d1a80c037f6566832f8d Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 12 Mar 2025 11:32:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9110?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 4 ++--
pages/manage/point-reset.vue | 2 +-
pages/manage/waste-foil-move.vue | 33 ++++++++++++++++++++++++++------
utils/getData2.js | 16 ++++++++++------
4 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/manifest.json b/manifest.json
index 432ab95..4a3e5db 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "龙电宁鑫",
"appid" : "__UNI__759339F",
"description" : "龙电宁鑫手持系统",
- "versionName" : "1.0.9",
- "versionCode" : 109,
+ "versionName" : "1.1.0",
+ "versionCode" : 110,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/manage/point-reset.vue b/pages/manage/point-reset.vue
index 54edf15..8d6df68 100644
--- a/pages/manage/point-reset.vue
+++ b/pages/manage/point-reset.vue
@@ -87,7 +87,7 @@
},
async _startMoveWasteFoilv2 () {
try {
- let res = await startMoveWasteFoilv2(this.index2, this.index1)
+ let res = await startMoveWasteFoilv2('', this.index2, this.index1)
this.clearUp()
uni.showToast({
title: res.message,
diff --git a/pages/manage/waste-foil-move.vue b/pages/manage/waste-foil-move.vue
index 326f313..1d826ee 100644
--- a/pages/manage/waste-foil-move.vue
+++ b/pages/manage/waste-foil-move.vue
@@ -13,11 +13,19 @@
/>
+
+
+ 载具类型
+
+
+
+
+
-
+
@@ -29,7 +37,7 @@
import NavBar from '@/components/NavBar.vue'
import SearchBox from '@/components/SearchBox.vue'
import LinkScan from '@/components/LinkScan.vue'
- import {startMoveWasteFoilv2, resumeMoveWasteFoilv2, resumeAutoMoveWasteFoil} from '@/utils/getData2.js'
+ import {getVehicleType, startMoveWasteFoilv2, resumeMoveWasteFoilv2, resumeAutoMoveWasteFoil} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -40,16 +48,28 @@
return {
title: '',
val1: '',
+ options3: [],
+ index3: '',
disabled: false
};
},
onLoad (options) {
this.title = options.title
+ this._getVehicleType()
},
methods: {
+ async _getVehicleType () {
+ let res = await getVehicleType()
+ if (res.code === 200 && res.content) {
+ this.options3 = [...res.content]
+ this.options3.map(el => {
+ this.$set(el, 'text', el.label)
+ })
+ }
+ },
async toSure1 () {
this.disabled = true
- if (!this.val1) {
+ if (!this.val1 || !this.index3) {
this.disabled = false
return
}
@@ -68,7 +88,7 @@
},
async _startMoveWasteFoilv2 () {
try {
- let res = await startMoveWasteFoilv2(this.val1)
+ let res = await startMoveWasteFoilv2(this.index3, this.val1)
this.clearUp()
uni.showToast({
title: res.message,
@@ -103,7 +123,7 @@
},
async _resumeMoveWasteFoilv2 (type) {
try {
- let res = await resumeMoveWasteFoilv2(type, this.val1)
+ let res = await resumeMoveWasteFoilv2(type, this.val1, this.index3)
this.clearUp()
uni.showToast({
title: res.message,
@@ -115,6 +135,7 @@
},
clearUp () {
this.val1 = ''
+ this.index3 = ''
this.disabled = false
},
async _resumeAutoMoveWasteFoil () {
@@ -124,7 +145,7 @@
return
}
try {
- let res = await resumeAutoMoveWasteFoil(this.val1)
+ let res = await resumeAutoMoveWasteFoil(this.val1, this.index3)
uni.showToast({
title: res.message,
icon: 'none'
diff --git a/utils/getData2.js b/utils/getData2.js
index dfd4ae9..0a3a692 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -49,17 +49,21 @@ export const resumeMoveWasteFoilv3 = (flag, scode, ecode) => request({
data: {flag: flag, startPoint: scode, endPoint: ecode}
})
// 废箔搬运
-export const startMoveWasteFoilv2 = (code, sp) => request({
+export const getVehicleType = () => request({
+ url:'api/dict/dictDetail?code=vehicle_type&page=0&size=9999',
+ method: 'get'
+})
+export const startMoveWasteFoilv2 = (vt, code, sp) => request({
url:'api/pda/other/startMoveWasteFoil/v2',
- data: {point_code: code, start_point: sp}
+ data: {vehicle_type: vt, point_code: code, start_point: sp}
})
-export const resumeMoveWasteFoilv2 = (flag, code) => request({
+export const resumeMoveWasteFoilv2 = (flag, code, vt) => request({
url:'api/pda/other/resumeMoveWasteFoil/v2',
- data: {flag: flag, point_code: code}
+ data: {flag: flag, point_code: code, vehicle_type: vt}
})
-export const resumeAutoMoveWasteFoil = (code) => request({
+export const resumeAutoMoveWasteFoil = (code, vt) => request({
url:'api/pda/other/resumeAutoMoveWasteFoil',
- data: {point_code: code}
+ data: {point_code: code, vehicle_type: vt}
})
// 管芯入库
export const gxgetGxSpecification = () => request({