From c70c544b203b52f709cd94ec599b1e2344f76860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
<8702040+cai-ling@user.noreply.gitee.com>
Date: Mon, 25 Nov 2024 10:03:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/style/layout.css | 2 +-
pages/management/alloc-maintenance_new.vue | 29 +++++++++++++----
pages/management/in-storage_new.vue | 36 +++++++++++++++++-----
pages/management/receive-confirm_new.vue | 23 ++++++++++++--
utils/getData2.js | 5 +++
5 files changed, 77 insertions(+), 18 deletions(-)
diff --git a/common/style/layout.css b/common/style/layout.css
index 391ea1a..bcc3c21 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -97,7 +97,7 @@ uni-toast .uni-toast {
background-color: #e1e1e1;
}
.confirm-button{
- min-width: 80px;
+ min-width: 65px;
height: 30px;
line-height: 30px;
color: #fff;
diff --git a/pages/management/alloc-maintenance_new.vue b/pages/management/alloc-maintenance_new.vue
index 3dab570..9dfdb2a 100644
--- a/pages/management/alloc-maintenance_new.vue
+++ b/pages/management/alloc-maintenance_new.vue
@@ -3,16 +3,19 @@
-
-
-
+
+
+
-
+
-
+
+
+
+
调拨单
@@ -151,7 +154,7 @@
import ScanInput from '@/components/ScanInput.vue'
import Pagination from '@/components/Pagination.vue'
import GridDetail from '@/components/GridDetail.vue'
- import {getWarehouseInfo, getOrganizationInfo, allocationPage, allocationBillDetail, allocationBillConfirm, allocationBillDetailUpdate} from '@/utils/getData2.js'
+ import {getWarehouseInfo, getOrganizationInfo, allocationPage, allocationBillDetail, allocationBillConfirm, allocationBillDetailUpdate, easOutInBillSync} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -405,6 +408,20 @@
getDetails (type,e) {
this.delShow = !this.delShow
this.detailObj = {type: type, data:e}
+ },
+ // 同步
+ async _easOutInBillSync () {
+ this.disabled1 = true
+ try {
+ let res = await easOutInBillSync('ALLO')
+ uni.showToast({
+ title: res.desc,
+ icon: 'none'
+ })
+ this.disabled1 = false
+ } catch (e) {
+ this.disabled1 = false
+ }
}
}
}
diff --git a/pages/management/in-storage_new.vue b/pages/management/in-storage_new.vue
index e178cce..36655c4 100644
--- a/pages/management/in-storage_new.vue
+++ b/pages/management/in-storage_new.vue
@@ -3,7 +3,7 @@
-
+
@@ -12,10 +12,13 @@
-
-
-
-
+
+
+
+
+
+
+
{{title}}
@@ -93,7 +96,8 @@
- | {{el.wlbm}} |
+ {{el.wlbm}} |
+ {{el.wlbm}} |
{{el.wlmc}} |
{{el.gzhbm}} |
{{el.ckmc}} |
@@ -196,8 +200,8 @@
import ScanInput from '@/components/ScanInput.vue'
import Pagination from '@/components/Pagination.vue'
import GridDetail from '@/components/GridDetail.vue'
- import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate} from '@/utils/getData2.js'
- // import {updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate} from '@/utils/getData2.js'
+ import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync} from '@/utils/getData2.js'
+ // import {updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync} from '@/utils/getData2.js'
// import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation} from '@/utils/mork2.js'
export default {
components: {
@@ -497,6 +501,7 @@
})
this.popdisabled = false
} catch (e) {
+ this.popdisabled = false
}
},
// 点击单据审核按钮
@@ -529,6 +534,21 @@
getDetails (type,e) {
this.delShow = !this.delShow
this.detailObj = {type: type, data:e}
+ },
+ // 同步
+ async _easOutInBillSync () {
+ this.disabled1 = true
+ try {
+ let type = this.id === 'CGRKD' ? 'SRMINOUT' : 'EASINOUT'
+ let res = await easOutInBillSync(type)
+ uni.showToast({
+ title: res.desc,
+ icon: 'none'
+ })
+ this.disabled1 = false
+ } catch (e) {
+ this.disabled1 = false
+ }
}
}
}
diff --git a/pages/management/receive-confirm_new.vue b/pages/management/receive-confirm_new.vue
index 8455b64..0f0dd84 100644
--- a/pages/management/receive-confirm_new.vue
+++ b/pages/management/receive-confirm_new.vue
@@ -3,13 +3,16 @@
-
+
-
+
+
+
+
收货确认
@@ -210,7 +213,7 @@
import ScanInput from '@/components/ScanInput.vue'
import Pagination from '@/components/Pagination.vue'
import GridDetail from '@/components/GridDetail.vue'
- import {getOrganizationInfo, getWarehouseInfo, receiptPage, receiptBillDetailPage, receiptBillDetailUpdate, receiptBillDetailSetStor, receiptBillConfirm, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl} from '@/utils/getData2.js'
+ import {getOrganizationInfo, getWarehouseInfo, receiptPage, receiptBillDetailPage, receiptBillDetailUpdate, receiptBillDetailSetStor, receiptBillConfirm, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, easOutInBillSync} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -589,6 +592,20 @@
getDetails (type,e) {
this.delShow = !this.delShow
this.detailObj = {type: type, data:e}
+ },
+ // 同步
+ async _easOutInBillSync () {
+ this.disabled1 = true
+ try {
+ let res = await easOutInBillSync('RECE')
+ uni.showToast({
+ title: res.desc,
+ icon: 'none'
+ })
+ this.disabled1 = false
+ } catch (e) {
+ this.disabled1 = false
+ }
}
}
}
diff --git a/utils/getData2.js b/utils/getData2.js
index 7dd3f14..e6c250f 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -308,3 +308,8 @@ export const stIvtCheckdtlBasedOnFinance = (arr) => request({
url:'api/stIvtCheckdtl/basedOnFinance',
data: arr
})
+// 同步
+export const easOutInBillSync = (type) => request({
+ url:'api/easOutInBill/sync',
+ data: {type: type}
+})
\ No newline at end of file