From c7b768f994909368b96ca39f982bb11e19325adb Mon Sep 17 00:00:00 2001 From: 905166056 <905166056@qq.com> Date: Mon, 20 Dec 2021 17:00:24 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=89=A9=E5=93=81=E4=BF=A1=E6=81=AF=E7=9B=B8=E5=85=B32?= =?UTF-8?q?=E3=80=81=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../select-resource-staff.vue | 16 ++++++++++++++-- components/select-resource/select-resource.vue | 10 +++++++++- .../select-single-resource.vue | 3 ++- .../allocationStorehouseManage.vue | 14 ++++++-------- pages/applyRoomDetail/applyRoomDetail.vue | 2 +- pages/itemOutManage/itemOutManage.vue | 14 ++++++-------- .../purchaseApplyDetail/purchaseApplyDetail.vue | 3 ++- .../purchaseApplyManage/purchaseApplyManage.vue | 14 ++++++-------- .../resourceStoreManage/resourceStoreManage.vue | 11 ++++++++++- 9 files changed, 56 insertions(+), 31 deletions(-) diff --git a/components/select-resource-staff/select-resource-staff.vue b/components/select-resource-staff/select-resource-staff.vue index f97ddb8..b234f65 100644 --- a/components/select-resource-staff/select-resource-staff.vue +++ b/components/select-resource-staff/select-resource-staff.vue @@ -3,11 +3,11 @@ - + - + {{item.resName}}({{item.parentRstName}}>{{item.rstName}}) @@ -16,6 +16,11 @@ 编码：{{item.resCode}} + + + 固定资产：{{item.isFixedName}} + + @@ -158,4 +163,11 @@ .btn-box button{ width: 40%; } + .cu-list.menu-avatar>.cu-item .content{ + left: 40rpx; + width: 80%; + } + .cu-list{ + margin: 0; + } diff --git a/components/select-resource/select-resource.vue b/components/select-resource/select-resource.vue index d52bf81..11540cc 100644 --- a/components/select-resource/select-resource.vue +++ b/components/select-resource/select-resource.vue @@ -18,7 +18,7 @@ - + @@ -31,6 +31,11 @@ 仓库：{{item.shName}} + + + 固定资产：{{item.isFixedName}} + + @@ -231,4 +236,7 @@ left: 40rpx; width: 80%; } + .cu-list{ + margin: 0; + } diff --git a/components/select-single-resource/select-single-resource.vue b/components/select-single-resource/select-single-resource.vue index de44a81..bc31005 100644 --- a/components/select-single-resource/select-single-resource.vue +++ b/components/select-single-resource/select-single-resource.vue @@ -213,7 +213,8 @@ page: 1, row: 100, communityId: getCurrentCommunity().communityId, - giveType: 1 + giveType: 1, + flag: 1 }; queryResourceStoreResName(this, _data) .then(function(res) { diff --git a/pages/allocationStorehouseManage/allocationStorehouseManage.vue b/pages/allocationStorehouseManage/allocationStorehouseManage.vue index 3bea3b3..4e0a9a9 100644 --- a/pages/allocationStorehouseManage/allocationStorehouseManage.vue +++ b/pages/allocationStorehouseManage/allocationStorehouseManage.vue @@ -134,14 +134,12 @@ if (res.confirm) { deleteAllocationStorehouse(_that,item) .then(function(res){ - if(res.code == 0){ - uni.showToast({ - title: res.msg - }) - _that.page = 1; - _that.applyList = []; - _that.loadApply(); - } + uni.showToast({ + title: res.msg + }) + _that.page = 1; + _that.applyList = []; + _that.loadApply(); }) } else if (res.cancel) { console.log('cancel') diff --git a/pages/applyRoomDetail/applyRoomDetail.vue b/pages/applyRoomDetail/applyRoomDetail.vue index 5c483a0..6ed02d6 100644 --- a/pages/applyRoomDetail/applyRoomDetail.vue +++ b/pages/applyRoomDetail/applyRoomDetail.vue @@ -4,7 +4,7 @@ - 装修跟踪记录 + 空置房跟踪记录 查看 diff --git a/pages/itemOutManage/itemOutManage.vue b/pages/itemOutManage/itemOutManage.vue index f67c92f..1ff55d6 100644 --- a/pages/itemOutManage/itemOutManage.vue +++ b/pages/itemOutManage/itemOutManage.vue @@ -135,14 +135,12 @@ if (res.confirm) { deletePurchaseApply(_that,item) .then(function(res){ - if(res.code == 0){ - uni.showToast({ - title: res.msg - }) - _that.page = 1; - _that.applyList = []; - _that.loadApply(); - } + uni.showToast({ + title: res.msg + }) + _that.page = 1; + _that.applyList = []; + _that.loadApply(); }) } else if (res.cancel) { console.log('cancel') diff --git a/pages/purchaseApplyDetail/purchaseApplyDetail.vue b/pages/purchaseApplyDetail/purchaseApplyDetail.vue index a89764e..e094186 100644 --- a/pages/purchaseApplyDetail/purchaseApplyDetail.vue +++ b/pages/purchaseApplyDetail/purchaseApplyDetail.vue @@ -103,7 +103,7 @@ {{item.resName}} - {{item.price}} + {{item.price}}元/{{item.unitCodeName}} {{item.quantity}}{{item.unitCodeName}} {{item.purchasePrice ? item.purchasePrice : '-'}} {{item.purchaseQuantity ? item.purchaseQuantity + item.unitCodeName : '-'}} @@ -203,5 +203,6 @@ overflow: hidden; display: inline-block; text-align: center; + line-height: 30rpx; } diff --git a/pages/purchaseApplyManage/purchaseApplyManage.vue b/pages/purchaseApplyManage/purchaseApplyManage.vue index 8564bdc..6e73811 100644 --- a/pages/purchaseApplyManage/purchaseApplyManage.vue +++ b/pages/purchaseApplyManage/purchaseApplyManage.vue @@ -146,14 +146,12 @@ if (res.confirm) { deletePurchaseApply(_that,item) .then(function(res){ - if(res.code == 0){ - uni.showToast({ - title: res.msg - }) - _that.page = 1; - _that.applyList = []; - _that.loadApply(); - } + uni.showToast({ + title: res.msg + }) + _that.page = 1; + _that.applyList = []; + _that.loadApply(); }) } else if (res.cancel) { console.log('cancel') diff --git a/pages/resourceStoreManage/resourceStoreManage.vue b/pages/resourceStoreManage/resourceStoreManage.vue index 11c1493..aac38de 100644 --- a/pages/resourceStoreManage/resourceStoreManage.vue +++ b/pages/resourceStoreManage/resourceStoreManage.vue @@ -39,6 +39,11 @@ 最小计量总数：{{item.miniStock}}{{item.miniUnitCodeName}} + + + 固定资产：{{item.isFixedName}} + + @@ -155,12 +160,16 @@