diff --git a/src/pages/raw/warehouse/MaterialConversion/index.vue b/src/pages/raw/warehouse/MaterialConversion/index.vue index ddb3001..506fc1e 100644 --- a/src/pages/raw/warehouse/MaterialConversion/index.vue +++ b/src/pages/raw/warehouse/MaterialConversion/index.vue @@ -51,8 +51,8 @@ {{ $t('message.po_Return') }} - {{ $t('message.InventoryFinish') }} + {{ $t('message.InventoryFinish') }} + @@ -90,12 +90,22 @@ export default class KanDanHandOver extends BasePage { orderType: 'MC', }); if (this.model.code == '1') { - uni.showToast({ - //icon: 'success', - title: this.model.records.msg, - duration: 2000, - image: '/static/icons/icon-51.png', - }); + if (this.model.orderInInfoList.length != 0) { + uni.showToast({ + icon: 'success', + title: this.$t('message.Warehouse_Tip9') as string, + duration: 2000, + image: '/static/icons/icon-51.png', + }); + } else { + uni.showToast({ + //icon: 'success', + title: this.model.records.msg, + duration: 2000, + image: '/static/icons/icon-51.png', + }); + } + this.model.orderInInfoList.forEach((item: any) => { let arr: any = { label: item.productCode, @@ -184,13 +194,16 @@ export default class KanDanHandOver extends BasePage { font-size: 34rpx; font-weight: 500; text-align: center; + .title { flex: 3; } + .left, .right { flex: 1; } + .icon { display: flex; justify-content: center; @@ -219,20 +232,24 @@ export default class KanDanHandOver extends BasePage { padding: 30rpx 0; line-height: 35rpx; } + .single { width: 100%; height: 100rpx; display: flex; + .single-left { width: 80%; height: 100%; display: flex; + view { width: 110rpx; height: 100%; line-height: 100rpx; } } + .single-right { button { margin-top: 15rpx; @@ -241,12 +258,14 @@ export default class KanDanHandOver extends BasePage { } } } + .title { margin-bottom: 40rpx; color: #1a1a1a; font-size: 30rpx; font-weight: 500; } + .button-bar { position: fixed; bottom: 0;