From 69652d36eda56799de38bf0cd650efc714500f86 Mon Sep 17 00:00:00 2001 From: zhoulei Date: Sat, 22 Jan 2022 10:32:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E5=B0=81=E8=A3=85=E5=AF=B9=E8=B1=A1tr?= =?UTF-8?q?im=E9=80=9A=E7=94=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/login/login/index.vue | 1 - src/utils/mixin.ts | 14 ++++++++++++-- types/vue-prototype.d.ts | 13 ++++++++++++- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 968e305..017292c 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -107,7 +107,6 @@ export default class LoginPage extends BasePage { get serverAddress(): string | null { return server.serverAddress; } - // 小数点保留 username = ''; @Watch('username') diff --git a/src/utils/mixin.ts b/src/utils/mixin.ts index d04d3a7..78f83ad 100644 --- a/src/utils/mixin.ts +++ b/src/utils/mixin.ts @@ -1,7 +1,7 @@ /* * @Author: zhou lei * @Date: 2022-01-20 11:26:20 - * @LastEditTime: 2022-01-20 17:48:10 + * @LastEditTime: 2022-01-22 10:21:10 * @LastEditors: zhou lei * @Description: * @FilePath: /wms_haiwai_app/src/utils/mixin.ts @@ -9,7 +9,7 @@ */ import Vue from 'vue'; import { Component } from 'vue-property-decorator'; - +import _ from 'lodash'; @Component // 一定要用Component修饰 export default class MyMixins extends Vue { customToast(msg: string, type = 'MODEL', title = '') { @@ -26,4 +26,14 @@ export default class MyMixins extends Vue { }); } } + /** + * search trim 去空格 + * + * @param {*} v + * @param {*} key + * @memberof MyMixins + */ + searchchange(v, key) { + _.set(this, key, this.$u.trim(v)); + } } diff --git a/types/vue-prototype.d.ts b/types/vue-prototype.d.ts index 638147a..bbb2ec4 100644 --- a/types/vue-prototype.d.ts +++ b/types/vue-prototype.d.ts @@ -2,7 +2,7 @@ /* * @Author: zhou lei * @Date: 2022-01-21 09:23:56 - * @LastEditTime: 2022-01-21 11:47:17 + * @LastEditTime: 2022-01-22 09:58:04 * @LastEditors: zhou lei * @Description: * @FilePath: /wms_haiwai_app/types/vue-prototype.d.ts @@ -22,5 +22,16 @@ declare module 'vue/types/vue' { * @memberof Vue */ customToast(msg: string, type?: string = 'toast', title?: string = ''): void; + $u: { + trim(v: any); + }; + /** + * search trim 去空格 + * + * @param {*} v + * @param {*} key + * @memberof Vue + */ + searchchange(v: any, key: any): void; } } From c5e5dc4fc7d868d2cf5da7635ca2391a76aa0cad Mon Sep 17 00:00:00 2001 From: guoshuang Date: Sat, 22 Jan 2022 11:06:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E5=89=8D=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/SemiProduct/DumpList/DumpListFH/index.vue | 2 +- src/pages/SemiProduct/DumpList/DumpListSH/index.vue | 2 +- src/pages/product/inbound/finishProductOffline/index.vue | 2 +- .../product/inbound/semiFinishProductOffline2/index.vue | 2 +- src/pages/product/outbound/stoOutbound/DN-delivergoods.vue | 2 +- src/pages/product/warehouse/LocationInventory/index.vue | 4 ++-- src/pages/product/warehouse/MaterialInventory/index.vue | 4 ++-- src/pages/product/warehouse/wholeCollect/index.vue | 4 ++-- src/pages/product/warehouse/wholeLnventory/index.vue | 4 ++-- src/pages/product/warehouse/wholeScrap/index.vue | 4 ++-- src/pages/product/warehouse/wholeTransfer/index.vue | 6 +++--- src/pages/raw/handover/returning/index.vue | 2 +- src/pages/raw/ingoods/dnReceipt/ImportDN.vue | 2 +- src/pages/raw/ingoods/dnReceipt/dnReceiving.vue | 4 ++-- src/pages/raw/ingoods/dnReceipt/index.vue | 2 +- src/pages/raw/ingoods/dnReturnGoods/index.vue | 4 ++-- src/pages/raw/ingoods/poReceipt/index.vue | 4 ++-- src/pages/raw/ingoods/poReceipt/poReceiving.vue | 2 +- src/pages/raw/ingoods/receipt/index.vue | 2 +- src/pages/raw/warehouse/rowCollect/index.vue | 2 +- src/pages/raw/warehouse/rowInventory/index.vue | 2 +- src/pages/raw/warehouse/rowScrap/index.vue | 2 +- src/pages/raw/warehouse/rowTransfer/index.vue | 2 +- 23 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/pages/SemiProduct/DumpList/DumpListFH/index.vue b/src/pages/SemiProduct/DumpList/DumpListFH/index.vue index 9116d86..9dc8e9a 100644 --- a/src/pages/SemiProduct/DumpList/DumpListFH/index.vue +++ b/src/pages/SemiProduct/DumpList/DumpListFH/index.vue @@ -11,7 +11,7 @@ diff --git a/src/pages/SemiProduct/DumpList/DumpListSH/index.vue b/src/pages/SemiProduct/DumpList/DumpListSH/index.vue index 3e5f05d..e5dd647 100644 --- a/src/pages/SemiProduct/DumpList/DumpListSH/index.vue +++ b/src/pages/SemiProduct/DumpList/DumpListSH/index.vue @@ -11,7 +11,7 @@ diff --git a/src/pages/product/inbound/finishProductOffline/index.vue b/src/pages/product/inbound/finishProductOffline/index.vue index 643062e..4f2d2e0 100644 --- a/src/pages/product/inbound/finishProductOffline/index.vue +++ b/src/pages/product/inbound/finishProductOffline/index.vue @@ -25,7 +25,7 @@ - + diff --git a/src/pages/product/inbound/semiFinishProductOffline2/index.vue b/src/pages/product/inbound/semiFinishProductOffline2/index.vue index 06cc43c..e909343 100644 --- a/src/pages/product/inbound/semiFinishProductOffline2/index.vue +++ b/src/pages/product/inbound/semiFinishProductOffline2/index.vue @@ -34,7 +34,7 @@ diff --git a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue index 266acd8..3f1fb73 100644 --- a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue +++ b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue @@ -10,7 +10,7 @@ - + diff --git a/src/pages/product/warehouse/LocationInventory/index.vue b/src/pages/product/warehouse/LocationInventory/index.vue index 9b4bfd4..147187d 100644 --- a/src/pages/product/warehouse/LocationInventory/index.vue +++ b/src/pages/product/warehouse/LocationInventory/index.vue @@ -12,7 +12,7 @@ {{ $t('message.code') }} - + {{ $t('message.Query') }} @@ -32,7 +32,7 @@ - + diff --git a/src/pages/product/warehouse/MaterialInventory/index.vue b/src/pages/product/warehouse/MaterialInventory/index.vue index 5a3fbfc..68d2344 100644 --- a/src/pages/product/warehouse/MaterialInventory/index.vue +++ b/src/pages/product/warehouse/MaterialInventory/index.vue @@ -12,7 +12,7 @@ {{ $t('message.code') }} - + {{ $t('message.Query') }} @@ -40,7 +40,7 @@ - + diff --git a/src/pages/product/warehouse/wholeCollect/index.vue b/src/pages/product/warehouse/wholeCollect/index.vue index 8d998d8..562147d 100644 --- a/src/pages/product/warehouse/wholeCollect/index.vue +++ b/src/pages/product/warehouse/wholeCollect/index.vue @@ -12,7 +12,7 @@ {{ $t('message.Requisition') }} - + {{ $t('message.Query') }} @@ -44,7 +44,7 @@ - + diff --git a/src/pages/product/warehouse/wholeLnventory/index.vue b/src/pages/product/warehouse/wholeLnventory/index.vue index 8915bdf..5adb1aa 100644 --- a/src/pages/product/warehouse/wholeLnventory/index.vue +++ b/src/pages/product/warehouse/wholeLnventory/index.vue @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/src/pages/product/warehouse/wholeScrap/index.vue b/src/pages/product/warehouse/wholeScrap/index.vue index cd900ab..d495fb0 100644 --- a/src/pages/product/warehouse/wholeScrap/index.vue +++ b/src/pages/product/warehouse/wholeScrap/index.vue @@ -12,7 +12,7 @@ {{ $t('message.Scrap_ScrapNo') }} - + {{ $t('message.Query') }} @@ -52,7 +52,7 @@ - + diff --git a/src/pages/product/warehouse/wholeTransfer/index.vue b/src/pages/product/warehouse/wholeTransfer/index.vue index 0f9a009..719ed1e 100644 --- a/src/pages/product/warehouse/wholeTransfer/index.vue +++ b/src/pages/product/warehouse/wholeTransfer/index.vue @@ -2,7 +2,7 @@ - + {{ $t('message.Relocation') }} @@ -15,7 +15,7 @@ - + - {{ $t('message.po_Return') }} + {{ $t('message.po_Return') }} diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue index 98b9af2..7c72e93 100644 --- a/src/pages/raw/handover/returning/index.vue +++ b/src/pages/raw/handover/returning/index.vue @@ -10,7 +10,7 @@ - + {{ $t('message.screen') }} diff --git a/src/pages/raw/ingoods/dnReceipt/index.vue b/src/pages/raw/ingoods/dnReceipt/index.vue index edd2aaa..3ab8f7b 100644 --- a/src/pages/raw/ingoods/dnReceipt/index.vue +++ b/src/pages/raw/ingoods/dnReceipt/index.vue @@ -18,7 +18,7 @@ > diff --git a/src/pages/raw/ingoods/dnReturnGoods/index.vue b/src/pages/raw/ingoods/dnReturnGoods/index.vue index c08b63b..f8dd177 100644 --- a/src/pages/raw/ingoods/dnReturnGoods/index.vue +++ b/src/pages/raw/ingoods/dnReturnGoods/index.vue @@ -8,8 +8,8 @@ - - + + diff --git a/src/pages/raw/ingoods/poReceipt/index.vue b/src/pages/raw/ingoods/poReceipt/index.vue index 9ffbbdf..bcb052e 100644 --- a/src/pages/raw/ingoods/poReceipt/index.vue +++ b/src/pages/raw/ingoods/poReceipt/index.vue @@ -7,7 +7,7 @@ - {{ $t("message.po_ReceivingGoods") }} + {{$t("message.po_ReceivingGoods") }} @@ -18,7 +18,7 @@ > diff --git a/src/pages/raw/ingoods/poReceipt/poReceiving.vue b/src/pages/raw/ingoods/poReceipt/poReceiving.vue index b0a6b0c..3a91bad 100644 --- a/src/pages/raw/ingoods/poReceipt/poReceiving.vue +++ b/src/pages/raw/ingoods/poReceipt/poReceiving.vue @@ -18,7 +18,7 @@ {{ $t("message.po_OddNumbers") }} diff --git a/src/pages/raw/ingoods/receipt/index.vue b/src/pages/raw/ingoods/receipt/index.vue index e5482a8..dbb8080 100644 --- a/src/pages/raw/ingoods/receipt/index.vue +++ b/src/pages/raw/ingoods/receipt/index.vue @@ -11,7 +11,7 @@ diff --git a/src/pages/raw/warehouse/rowCollect/index.vue b/src/pages/raw/warehouse/rowCollect/index.vue index c210d6f..d492f30 100644 --- a/src/pages/raw/warehouse/rowCollect/index.vue +++ b/src/pages/raw/warehouse/rowCollect/index.vue @@ -12,7 +12,7 @@ {{ $t('message.CommissionedSingleNumber') }} - + {{ $t('message.Query') }} diff --git a/src/pages/raw/warehouse/rowInventory/index.vue b/src/pages/raw/warehouse/rowInventory/index.vue index b20d323..9ecffe0 100644 --- a/src/pages/raw/warehouse/rowInventory/index.vue +++ b/src/pages/raw/warehouse/rowInventory/index.vue @@ -9,7 +9,7 @@ - + diff --git a/src/pages/raw/warehouse/rowScrap/index.vue b/src/pages/raw/warehouse/rowScrap/index.vue index 7c9c1f4..72f5976 100644 --- a/src/pages/raw/warehouse/rowScrap/index.vue +++ b/src/pages/raw/warehouse/rowScrap/index.vue @@ -12,7 +12,7 @@ {{ $t('message.CommissionedSingleNumber') }} - + {{ $t('message.Query') }} diff --git a/src/pages/raw/warehouse/rowTransfer/index.vue b/src/pages/raw/warehouse/rowTransfer/index.vue index f6e2be8..4ccb338 100644 --- a/src/pages/raw/warehouse/rowTransfer/index.vue +++ b/src/pages/raw/warehouse/rowTransfer/index.vue @@ -10,7 +10,7 @@ - + From 86d28e88768e2121fa4a247ff9a184f8daf8bfc1 Mon Sep 17 00:00:00 2001 From: guoshuang Date: Sat, 22 Jan 2022 15:17:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/raw/ingoods/dnReceipt/ImportDN.vue | 2 +- .../raw/ingoods/dnReceipt/dnReceiving.vue | 68 +++++++++---------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue index 87da53c..e99ff29 100644 --- a/src/pages/raw/ingoods/dnReceipt/ImportDN.vue +++ b/src/pages/raw/ingoods/dnReceipt/ImportDN.vue @@ -520,7 +520,7 @@ export default class dnReceiptDom extends BasePage { .number-right-title { width: 140rpx; height: 100%; - text-align: center; + //text-align: center; line-height: 100rpx; } .input { diff --git a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue index fe53b9e..cf98bcc 100644 --- a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue +++ b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue @@ -521,7 +521,7 @@ export default class dnReceiptDom extends BasePage { .number-right-title { width: 140rpx; height: 100%; - text-align: center; + //text-align: center; line-height: 100rpx; } .input { @@ -532,39 +532,39 @@ export default class dnReceiptDom extends BasePage { } } } - .library { - width: 100%; - height: 100rpx; - display: flex; - .library-left { - width: 50%; - height: 100%; - display: flex; - view { - width: 100rpx; - line-height: 100rpx; - } - .search { - padding-left: 20px; - } - } - .library-right { - width: 50%; - height: 100%; - display: flex; - .library-right-title { - width: 120rpx; - height: 100%; - padding-left: 4px; - line-height: 100rpx; - } - .input { - width: 200rpx; - height: 70rpx; - margin-top: 15rpx; - } - } - } + // .library { + // width: 100%; + // height: 100rpx; + // display: flex; + // .library-left { + // width: 50%; + // height: 100%; + // display: flex; + // view { + // width: 100rpx; + // line-height: 100rpx; + // } + // .search { + // padding-left: 20px; + // } + // } + // .library-right { + // width: 50%; + // height: 100%; + // display: flex; + // .library-right-title { + // width: 120rpx; + // height: 100%; + // padding-left: 4px; + // line-height: 100rpx; + // } + // .input { + // width: 200rpx; + // height: 70rpx; + // margin-top: 15rpx; + // } + // } + // } .add { width: 100%; height: 100rpx;