diff --git a/App.vue b/App.vue index 03963a6..fd7bdeb 100644 --- a/App.vue +++ b/App.vue @@ -1,23 +1,29 @@ - - - diff --git a/apis/commonApi.js b/apis/commonApi.js index f65ec0f..8f44412 100644 --- a/apis/commonApi.js +++ b/apis/commonApi.js @@ -28,11 +28,20 @@ let baseInfo = null function syncStore(res) { if (res.enterpriseList && res.enterpriseList.length > 0) { let supplierInfo = res.enterpriseList[0] + let vipExpireTime = supplierInfo.supplier.vipExpireTime + let isVip = false + if (vipExpireTime) { + let now = new Date().getTime() + if (now < new Date(vipExpireTime).getTime()) { + isVip = true + } + } store.commit('setSupplierInfo', { id: supplierInfo.id, name: supplierInfo.name, fddEnterpriseStatus: supplierInfo.fddEnterpriseStatus, - supplierId: supplierInfo.supplier.id + supplierId: supplierInfo.supplier.id, + isVip }) store.commit('setUserInfo', { name: supplierInfo.employeeName, userId: res.userId, mobile: res.mobile, avatar: null }) } 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/base-paper-deals.vue b/pages/client-detail/base-paper-deals.vue index e57afec..8c8356e 100644 --- a/pages/client-detail/base-paper-deals.vue +++ b/pages/client-detail/base-paper-deals.vue @@ -58,9 +58,10 @@ export default { option: { size: 10, auto: true, - emptyText: '暂无数据~', + emptyText: '暂无原纸交易~', background: '#F7F8FA', - disabled: false + disabled: false, + emptyImage: '/static/imgs/order/order-empty.png' }, params: { asc: '', 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-detail/equipment-information.vue b/pages/client-detail/equipment-information.vue index ddd4afb..ee95823 100644 --- a/pages/client-detail/equipment-information.vue +++ b/pages/client-detail/equipment-information.vue @@ -122,9 +122,10 @@ export default { option: { size: 10, auto: true, - emptyText: '暂无数据~', + emptyText: '暂无设备信息~', background: '#F7F8FA', - disabled: false + disabled: false, + emptyImage: '/static/imgs/order/order-empty.png' }, seemoreFlag: 0, params: { diff --git a/pages/client-detail/index.vue b/pages/client-detail/index.vue index 18d9c24..59e5694 100644 --- a/pages/client-detail/index.vue +++ b/pages/client-detail/index.vue @@ -1,29 +1,33 @@ 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/mine/index.vue b/pages/mine/index.vue index f86e802..a3ac149 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -275,7 +275,7 @@ export default { onShow() { getBaseInfo({}, true).then((res) => { if (res) { - this.companyNum = res.enterpriseList.length + this.companyNum = res.enterpriseList?.length || 1 } }) }, 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/pages/trade/orderList.vue b/pages/trade/orderList.vue index 0fbe729..f941b59 100644 --- a/pages/trade/orderList.vue +++ b/pages/trade/orderList.vue @@ -68,14 +68,15 @@ export default { auto: true, emptyText: '暂无订单信息~', background: '#F7F8FA', - fontSize: '40rpx' + fontSize: '40rpx', + emptyImage: '/static/imgs/client-detail/no-data-icon.png' }, params: { asc: '', desc: '', - // customerEnterpriseId: this.$store.state.supplierInfo.id || null, // 客户企业ID默认为空，传值时网关获取当前用户关联企业id失效 - // mallSupplierId: this.$store.state.supplierInfo.supplierId || null, // 供应商id - customerEnterpriseId: '651107734133018624', + customerEnterpriseId: this.$store.state.supplierInfo.id || null, // 客户企业ID默认为空，传值时网关获取当前用户关联企业id失效 + mallSupplierId: this.$store.state.supplierInfo.supplierId || null, // 供应商id + // customerEnterpriseId: '651107734133018624', // mallSupplierId: '670334117090562048', // 供应商id status: '0' // 状态 0 全部 待发货/30106,待收货/30107,待借款/30207,已完成/30104 // enterpriseIds: [] //企业ID集合网关获取 diff --git a/pages/trade/quotationList.vue b/pages/trade/quotationList.vue index f22b753..2cafc09 100644 --- a/pages/trade/quotationList.vue +++ b/pages/trade/quotationList.vue @@ -71,13 +71,14 @@ export default { auto: true, emptyText: '暂无报价信息~', background: '#F7F8FA', - fontSize: '40rpx' + fontSize: '40rpx', + emptyImage: '/static/imgs/client-detail/no-data-icon.png' }, params: { asc: '', desc: '', - // mallSupplierIds: [this.$store.state.supplierInfo.supplierId], // 网关获取供应商ID集合 - mallSupplierIds: ['553703427180466176'] // 网关获取供应商ID集合 + mallSupplierIds: [this.$store.state.supplierInfo.supplierId], // 网关获取供应商ID集合 + // mallSupplierIds: ['553703427180466176'] // 网关获取供应商ID集合 }, pagination: { pageNum: 0, // 初始会执行一次下拉加载 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 diff --git a/store/index.js b/store/index.js index bcb384a..a8b0258 100644 --- a/store/index.js +++ b/store/index.js @@ -15,11 +15,12 @@ let qnToken = null, * @value supplierId 供应商id * @value name 企业名称 * @value fddEnterpriseStatus 法大大认证状态 。1未认证，2认证进行中，3认证成功，4认证失败 + * @value isVip 是否是vip企业 */ supplierInfo = null, uecToken = null, searchHistory = null -const supplierInfoParams = ['id', 'name', 'fddEnterpriseStatus', 'supplierId'] +const supplierInfoParams = ['id', 'name', 'fddEnterpriseStatus', 'supplierId', 'isVip'] const userInfoParams = ['name', 'userId', 'mobile', 'avatar'] try { uecToken = uni.getStorageSync('uecToken')