From 5bd73d9e6f6cf77ab072180361dc28b2c2518418 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Mon, 19 Aug 2024 14:59:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B7=A5=E4=BD=8D=E4=B8=8A=E8=B4=A7?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/inout/splitCode.js | 9 ++++
.../basic/collectPoint/gatherOrderType.vue | 13 +++++
.../basic/collectPoint/selectWorkplace.vue | 5 +-
src/views/basic/workplace/workplaceManage.vue | 22 +++++++--
src/views/collect/IoCreateOrder.vue | 48 +++++++++++++++++++
src/views/collect/PanelOrderDeal.vue | 14 +++++-
6 files changed, 105 insertions(+), 6 deletions(-)
diff --git a/src/api/inout/splitCode.js b/src/api/inout/splitCode.js
index 31a538f1..50879d3b 100644
--- a/src/api/inout/splitCode.js
+++ b/src/api/inout/splitCode.js
@@ -36,4 +36,13 @@ export function splitFifoDetail(query) {
}
+export function findInvRemind(query) {
+ return axios({
+ url: "/udiwms/ioSplit/findInvRemind",
+ method: "get",
+ params: query
+ });
+}
+
+
diff --git a/src/views/basic/collectPoint/gatherOrderType.vue b/src/views/basic/collectPoint/gatherOrderType.vue
index 59e6ad43..04a8c48d 100644
--- a/src/views/basic/collectPoint/gatherOrderType.vue
+++ b/src/views/basic/collectPoint/gatherOrderType.vue
@@ -46,6 +46,7 @@
+
@@ -164,6 +165,18 @@
>
+
+
+
+
+
diff --git a/src/views/basic/collectPoint/selectWorkplace.vue b/src/views/basic/collectPoint/selectWorkplace.vue
index fb1ce51c..1ec28a6b 100644
--- a/src/views/basic/collectPoint/selectWorkplace.vue
+++ b/src/views/basic/collectPoint/selectWorkplace.vue
@@ -46,11 +46,12 @@
-
+
-
+
+
{{operationTypes[scope.row.operationType]}}
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index bf1e7a23..dcbc1fba 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -109,12 +109,13 @@
>
-
+
-
+
+
{{ operationTypes[scope.row.operationType] }}
@@ -297,6 +298,18 @@
+
+
+
+
+
+
@@ -308,7 +321,7 @@
-
+
@@ -578,6 +591,9 @@ export default {
checkInsert: [
{ required: true, message: '处理结果不能为空', trigger: 'blur' }
],
+ invRemindNumber: [
+ { required: true, message: '请输入工位存量提醒数', trigger: 'blur' }
+ ],
warnType: [
{ required: true, message: '请选择提醒方式', trigger: 'blur' }
],
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index d0840992..512f0cd9 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -37,6 +37,10 @@
type="warning">
+
+
{{ item.workplaceName }}
{{
@@ -283,6 +289,7 @@ import {filterNoPage, remoteFilter} from "@/api/basic/sicker/skPersonApi";
import dialogInvProduct from "@/views/inout/DialogSelectInvProduct";
import {listPage} from "@/api/basic/sysWorkplaceManage";
import {printSplitLabel} from "@/api/collect/splitCreateOrder";
+import { findInvRemind } from "@/api/inout/splitCode";
export default {
name: "ioCreateOrder",
@@ -495,6 +502,21 @@ export default {
DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct
},
methods: {
+ changeInvRemind(val){
+ let post = {
+ workPlaceCode: val
+ }
+ findInvRemind(post).then((response) => {
+ if (response.code === 20000) {
+ this.msgTip = response.data
+ }else {
+
+ }
+ })
+ .catch(() => {
+
+ });
+ },
successCloseData(){
let workPlaceCode = this.orderFormData.workPlaceCode
this.orderFormData ={
@@ -1744,6 +1766,32 @@ export default {