diff --git a/pages/client-credit/index.vue b/pages/client-credit/index.vue index ba4ea52..873c48d 100644 --- a/pages/client-credit/index.vue +++ b/pages/client-credit/index.vue @@ -91,6 +91,12 @@ export default { hasCreditList: [] } }, + onLoad(option) { + if (option.enterpriseId) { + this.form.name = option.name + this.form.enterpriseId = option.enterpriseId + } + }, methods: { back, showCompany(e) { diff --git a/pages/client-detail/basic-information.vue b/pages/client-detail/basic-information.vue index 8421927..d1cd486 100644 --- a/pages/client-detail/basic-information.vue +++ b/pages/client-detail/basic-information.vue @@ -1,117 +1,131 @@ diff --git a/pages/client-list/index.vue b/pages/client-list/index.vue index 7ed3d71..ead1686 100644 --- a/pages/client-list/index.vue +++ b/pages/client-list/index.vue @@ -15,7 +15,7 @@ > --> - + > @@ -90,7 +90,7 @@ export default { onStatusChange(e) { this.pagination.pageNum = 1 this.$refs.list.refresh() - this.getList() + // this.getList() // const value = e.detail.value }, getList() { diff --git a/pages/order-detail/index.vue b/pages/order-detail/index.vue index c56ecd4..80a970b 100644 --- a/pages/order-detail/index.vue +++ b/pages/order-detail/index.vue @@ -35,7 +35,7 @@ 出库 @@ -145,6 +145,31 @@ + + + + 请输入出库数量 + + + + + + + 确认 + + + 取消 + + + + @@ -173,7 +198,12 @@ export default { supplierOrderStatusEnum: Object.freeze(supplierOrderStatusEnum), paymentMethodEnum: Object.freeze(paymentMethodEnum), showList: ['send', 'receive'], - steps: [] + steps: [], + outInfo: { + quantity: 0, + max: 0, + index: 0 + } } }, onLoad(option) { @@ -194,6 +224,33 @@ export default { methods: { go2, back, + showModal(order, index) { + // 计算已出库数 + let quantity = 0 + order.outboundProcessList.forEach((item) => { + if (item.status == '30302') { + quantity += item.quantity + } + }) + this.outInfo.max = order.pieceQuantity - quantity + this.outInfo.index = index + this.$refs.popup.open('bottom') + }, + closeModal() { + this.$refs.popup.close() + }, + makeOut() { + // 校验 + if (this.outInfo.quantity > this.outInfo.max) { + uni.showToast({ + title: '出库数量不能大于上限', + icon: 'none' + }) + return + } + this.operatePaper(this.outInfo.index, 'outbound', this.outInfo.quantity) + this.closeModal() + }, transformAddress(address) { let res = '' if (address.provinceName) { @@ -634,4 +691,57 @@ export default { z-index: 5; } } +.popup_modal { + width: 750rpx; + height: 600rpx; + background-color: #fff; + border-radius: 10px 10px 0 0; + .popup_modal-title { + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + width: 750rpx; + height: 88rpx; + font-weight: 600; + border-bottom: 2rpx solid #d8d8d8; + } + .popup_modal-scroll { + width: 750rpx; + height: 600rpx; + .popup_modal-scroll-item { + display: flex; + flex-direction: row; + align-items: center; + justify-content: flex-start; + width: 750rpx; + height: 88rpx; + padding: 0rpx 32rpx; + border-bottom: 2rpx solid #d8d8d8; + } + } +} +.button { + flex-grow: 0; + flex-shrink: 0; + display: flex; + align-items: center; + justify-content: center; + border-radius: 10rpx; + .text { + font-size: 30rpx; + font-weight: 500; + text-align: center; + } +} +.button__cancel { + width: 270rpx; + height: 88rpx; + border: 2rpx solid #979797; +} +.button__submit { + width: 400rpx; + height: 88rpx; + background: #007aff; +} diff --git a/pages/search/index.vue b/pages/search/index.vue index eca9d44..9c22c08 100644 --- a/pages/search/index.vue +++ b/pages/search/index.vue @@ -19,7 +19,7 @@ - + 搜索历史 @@ -30,6 +30,10 @@ + + + 搜索无内容，换个关键词在试一次吧 + diff --git a/static/imgs/client/search-empty.png b/static/imgs/client/search-empty.png new file mode 100644 index 0000000..63334c0 Binary files /dev/null and b/static/imgs/client/search-empty.png differ