From aabb87ec15c40bfe2216f4228f7b6a2561586ffc Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 20 Feb 2025 17:18:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=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 +++
common/style/reset.css | 3 +++
pages/outbound/bill-out-store.vue | 25 ++++--------------------
pages/outbound/pick-confirm-2nd.vue | 18 +++--------------
pages/outbound/produce-out-store-2nd.vue | 9 ++++++++-
utils/getData2.js | 4 ++--
6 files changed, 23 insertions(+), 39 deletions(-)
diff --git a/common/style/layout.styl b/common/style/layout.styl
index 6a58489..2d46133 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -519,4 +519,7 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
width 70%
height 4rpx
background-color #fff
+}
+.del-icon {
+ right 32px
}
\ No newline at end of file
diff --git a/common/style/reset.css b/common/style/reset.css
index 8e5b014..680bafb 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -27,6 +27,9 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
.relative {
position: relative;
}
+.absolute {
+ position: absolute;
+}
.hide {
display: none;
}
diff --git a/pages/outbound/bill-out-store.vue b/pages/outbound/bill-out-store.vue
index 9575073..3894f3c 100644
--- a/pages/outbound/bill-out-store.vue
+++ b/pages/outbound/bill-out-store.vue
@@ -32,16 +32,6 @@
-
-
- 关联用料清单编码
-
-
-
-
-
@@ -84,7 +74,7 @@
-
+
@@ -108,9 +98,7 @@
index1: '',
options2: [{value: 'A1', text: 'A1车间'}, {value: 'A2', text: 'A2车间'}, {value: 'A3', text: 'A3车间'}],
allCheck: false,
- formTypeName: '',
- required: false,
- code: ''
+ formTypeName: ''
};
},
onLoad (options) {
@@ -120,11 +108,6 @@
if (this.$store.getters.publicObj !== '') {
this.currentData = this.$store.getters.publicObj
this._outStorageOrder()
- if (this.currentData.form_type === 'STK_TransferDirect' || this.currentData.form_type === 'ka7c19edf9d4b4b39b8cc4a06802163b0' || this.currentData.form_type === 'STK_MisDelivery') {
- this.required = true
- } else {
- this.required = false
- }
this.dataList = [...this.currentData.children]
this.dataList.map(el => {
this.$set(el, 'now_assign_qty', el.qty)
@@ -192,12 +175,12 @@
},
async _outStorageConfirm () {
this.disabled = true
- if (JSON.stringify(this.currentData) === '{}' || (this.required && !this.code)) {
+ if (JSON.stringify(this.currentData) === '{}') {
this.disabled = false
return
}
let arr = this.dataList.filter(el => el.checked === true)
- let obj = Object.assign(this.currentData, {children: arr, stor_code: this.index1, prd_ppbom_no: this.code})
+ let obj = Object.assign(this.currentData, {children: arr, stor_code: this.index1})
try {
let res = await outStorageConfirm(obj)
if (res.code === '200') {
diff --git a/pages/outbound/pick-confirm-2nd.vue b/pages/outbound/pick-confirm-2nd.vue
index 3c9c6f9..a8cf788 100644
--- a/pages/outbound/pick-confirm-2nd.vue
+++ b/pages/outbound/pick-confirm-2nd.vue
@@ -14,21 +14,11 @@
/>
-
-
- 货架编号
-
-
-
-
-
-
+
@@ -46,7 +36,6 @@
return {
title: '',
val1: '',
- val2: '',
disabled: false
};
},
@@ -56,17 +45,16 @@
methods: {
toEmpty () {
this.val1 = ''
- this.val2 = ''
this.disabled = false
},
async _takeConfirm () {
this.disabled = true
- if (!this.val1 || !this.val2) {
+ if (!this.val1) {
this.disabled = false
return
}
try {
- let res = await takeConfirm(this.val1, this.val2)
+ let res = await takeConfirm(this.val1)
if (res.code === '200') {
this.toEmpty()
}
diff --git a/pages/outbound/produce-out-store-2nd.vue b/pages/outbound/produce-out-store-2nd.vue
index 4204305..7c794c4 100644
--- a/pages/outbound/produce-out-store-2nd.vue
+++ b/pages/outbound/produce-out-store-2nd.vue
@@ -19,12 +19,13 @@
出库单据编号
-
+
{{editValue.toString()}}
+
@@ -217,6 +218,12 @@
} catch (e) {
this.disabled = false
}
+ },
+ toDel () {
+ this.editValue = []
+ this.selectedNum = null
+ this.dataList = []
+ this.checkData = []
}
}
}
diff --git a/utils/getData2.js b/utils/getData2.js
index b7f9df9..c1bd8e3 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -239,9 +239,9 @@ export const ctuOutConfirm = (scode, bcode, arr) => request({
/**
* 二楼取货确认
*/
-export const takeConfirm = (scode, bcode) => request({
+export const takeConfirm = (scode) => request({
url:'api/pda/outStorage/takeConfirm',
- data: {site_code: scode, shelf_code: bcode}
+ data: {site_code: scode}
})
/**
* 二楼货架绑定