diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 45b04d7..66c44fc 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -420,7 +420,7 @@ export default { Warehouse_Tip6: '请选择物料', Warehouse_Tip7: '盘点未完成,确定继续吗', selectCode: '请先选择编码', - standard:'条码不规范', + standard: '条码长度必须是20位', Warehouse_Tip8: '请输入成本中心', Warehouse_Tip9: '操作成功', DocumentNumber: '文件号', diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 5b5416d..5d55925 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -68,7 +68,7 @@ export default { LBWK: 'List is empty', CommissionedDetails:'detail', closing:'Confirm closing order?', - standard:'Non standard barcode', + standard:'FG barcode length must be 20', rawMenu_InTheLibrary: 'RAW WH', rawMenu_ReturnGoods: 'Return', rawMenu_SignOut: 'Sign out', @@ -250,7 +250,7 @@ export default { ModelName: 'Model name', ModelScanned: 'Model scanned', selectCode: 'Please select code first', - DocumentNumber: 'Document number', + DocumentNumber: 'File number', closure: 'Close', // 委外-入库 diff --git a/src/pages/product/warehouse/LocationInventory/index.vue b/src/pages/product/warehouse/LocationInventory/index.vue index 9f5bfab..52879cf 100644 --- a/src/pages/product/warehouse/LocationInventory/index.vue +++ b/src/pages/product/warehouse/LocationInventory/index.vue @@ -11,7 +11,7 @@ - {{ $t('message.code') }} + {{ $t('message.code') }} @@ -97,7 +97,11 @@ export default class ProductCheckReceipt extends BasePage { }; await this.model.queryScrapList(param); if (this.model.code == '1') { - this.customToast(this.$t('message.product_Tip8') as string); + //this.customToast(this.$t('message.product_Tip8') as string); + uni.showToast({ + icon: 'success', + title: this.$t('message.product_Tip8') as string, + }); let num = 0; this.model.modelList.forEach((item: any) => { num += item.spQty; @@ -143,7 +147,11 @@ export default class ProductCheckReceipt extends BasePage { }; await this.model.getProductCode(params); if (this.model.code == '1') { - this.customToast(this.$t('message.product_Tip8') as string); + //this.customToast(this.$t('message.product_Tip8') as string); + uni.showToast({ + icon: 'success', + title: this.$t('message.product_Tip8') as string, + }); this.total += 1; this.model.modelList.forEach((item: any) => { if (item.locCode == this.wl.value) { @@ -264,7 +272,7 @@ export default class ProductCheckReceipt extends BasePage { view { width: 110rpx; height: 100%; - line-height: 100rpx; + line-height: 35rpx; } } .single-right { diff --git a/src/pages/product/warehouse/MaterialInventory/index.vue b/src/pages/product/warehouse/MaterialInventory/index.vue index 68d2344..ad62670 100644 --- a/src/pages/product/warehouse/MaterialInventory/index.vue +++ b/src/pages/product/warehouse/MaterialInventory/index.vue @@ -11,7 +11,7 @@ - {{ $t('message.code') }} + {{ $t('message.code') }} @@ -105,7 +105,11 @@ export default class ProductCheckReceipt extends BasePage { }; await this.model.queryScrapList(param); if (this.model.code == '1') { - this.customToast(this.$t('message.product_Tip8') as string); + //this.customToast(this.$t('message.product_Tip8') as string); + uni.showToast({ + icon: 'success', + title: this.$t('message.product_Tip8') as string, + }); let num = 0; this.model.modelList.forEach((item: any) => { num += parseFloat(item.spQty); @@ -152,7 +156,11 @@ export default class ProductCheckReceipt extends BasePage { }; await this.model.getProductCode(params); if (this.model.code == '1') { - this.customToast(this.$t('message.product_Tip8') as string); + //this.customToast(this.$t('message.product_Tip8') as string); + uni.showToast({ + icon: 'success', + title: this.$t('message.product_Tip8') as string, + }); this.total += 1; this.model.modelList.forEach((item: any) => { if (item.productCode == this.wl.value) { @@ -262,7 +270,7 @@ export default class ProductCheckReceipt extends BasePage { view { width: 110rpx; height: 100%; - line-height: 100rpx; + line-height: 35rpx; } } .single-right { diff --git a/src/pages/product/warehouse/wholeCollect/index.vue b/src/pages/product/warehouse/wholeCollect/index.vue index 9b80a21..96d55a7 100644 --- a/src/pages/product/warehouse/wholeCollect/index.vue +++ b/src/pages/product/warehouse/wholeCollect/index.vue @@ -115,7 +115,11 @@ export default class ProductCheckReceipt extends BasePage { }; await this.model.queryScrapList(param); if (this.model.code == '1') { - this.customToast(this.$t('message.product_Tip8') as string); + //this.customToast(this.$t('message.product_Tip8') as string); + uni.showToast({ + icon: 'success', + title: this.$t('message.product_Tip8') as string, + }); this.wl.value = this.model.choiceCodeList[0].value; this.Some = this.model.recordsList[0]; } @@ -204,10 +208,12 @@ export default class ProductCheckReceipt extends BasePage { content: this.$t('message.Commission_tips8') as string, confirmText: this.$t('message.workArea_Confirm') as string, cancelText: this.$t('message.Cancel') as string, - success: function (res) { + success: (res: any) => { if (res.confirm) { + //debugger; + console.log("////111111"); this.model.close(this.form.order3); - if (this.model.code == '1') { + if (model.code == '1') { uni.showToast({ icon: 'success', title: this.$t('message.success') as string, diff --git a/src/pages/product/warehouse/wholeLnventory/index.vue b/src/pages/product/warehouse/wholeLnventory/index.vue index 5adb1aa..2b9e7f9 100644 --- a/src/pages/product/warehouse/wholeLnventory/index.vue +++ b/src/pages/product/warehouse/wholeLnventory/index.vue @@ -31,7 +31,7 @@ - + @@ -87,6 +87,7 @@ export default class productCheckReceipt extends BasePage { * 页面Module */ model = model; + border = true; aaa: number = null; bbb: number = null; /** @@ -125,7 +126,11 @@ export default class productCheckReceipt extends BasePage { } await this.model.getProductCode(this.form.pddNo); if (model.code == '1') { - this.customToast(this.$t('message.product_Tip8') as string); + //this.customToast(this.$t('message.product_Tip8') as string); + uni.showToast({ + icon: 'success', + title: this.$t('message.product_Tip8') as string, + }); // 获取选择库位的集合 const storeList = []; storeList.push(this.model.WlListaa[0]); diff --git a/src/pages/product/warehouse/wholeScrap/index.vue b/src/pages/product/warehouse/wholeScrap/index.vue index 8d85297..8513226 100644 --- a/src/pages/product/warehouse/wholeScrap/index.vue +++ b/src/pages/product/warehouse/wholeScrap/index.vue @@ -45,7 +45,7 @@ - + @@ -96,6 +96,7 @@ import { session } from '@/store/modules/session'; export default class productCheckReceipt extends BasePage { @Ref('form') readonly $form!: VForm; model = model; + border = true; form = { productCode: '', order3: '', @@ -226,9 +227,9 @@ export default class productCheckReceipt extends BasePage { content: this.$t('message.Commission_tips8') as string, confirmText: this.$t('message.workArea_Confirm') as string, cancelText: this.$t('message.Cancel') as string, - success: function (res) { + success: (res: any) => { if (res.confirm) { - this.model.close(this.form.order3); + model.close(this.form.order3); if (this.model.code == '1') { uni.showToast({ icon: 'success', diff --git a/src/pages/product/warehouse/wholeTransfer/config.ts b/src/pages/product/warehouse/wholeTransfer/config.ts index f03cd17..264f19d 100644 --- a/src/pages/product/warehouse/wholeTransfer/config.ts +++ b/src/pages/product/warehouse/wholeTransfer/config.ts @@ -197,10 +197,10 @@ export const Headers = [ key: 'materialCode', //产品编码 width: 300, }, - { - label: vm.$t('message.Access_type'), - key: 'oiType', //出入类型 - }, + // { + // label: vm.$t('message.Access_type'), + // key: 'oiType', //出入类型 + // }, { label: vm.$t('message.product_Location'), key: 'wlToCode', //库位 diff --git a/src/pages/raw/commission/goOut/index.vue b/src/pages/raw/commission/goOut/index.vue index 3c44215..e5043db 100644 --- a/src/pages/raw/commission/goOut/index.vue +++ b/src/pages/raw/commission/goOut/index.vue @@ -169,7 +169,7 @@ export default class dnReceiptDom extends BasePage { //输入单号 查询数据 async query() { this.list = []; - this.wlCode = ''; + //this.wlCode = ''; this.nowAmount = ''; this.every = ''; this.materialList = []; diff --git a/src/pages/raw/handover/aggregating/index.vue b/src/pages/raw/handover/aggregating/index.vue index 79274b0..7ff0f4c 100644 --- a/src/pages/raw/handover/aggregating/index.vue +++ b/src/pages/raw/handover/aggregating/index.vue @@ -11,7 +11,7 @@ - + - + @@ -162,6 +162,7 @@ export default class Aggregating extends BasePage { * 页面Module */ model = model; + border = true; /** * 表头 */ diff --git a/src/pages/raw/handover/aggregating/order.vue b/src/pages/raw/handover/aggregating/order.vue index c1527e8..d534a10 100644 --- a/src/pages/raw/handover/aggregating/order.vue +++ b/src/pages/raw/handover/aggregating/order.vue @@ -25,12 +25,12 @@ - + - + @@ -83,7 +83,7 @@ export default class AggregatingOrder extends BasePage { * 页面Module */ model = model; - + border = true; /** * 表头 */ diff --git a/src/pages/raw/handover/aggregating/summary.vue b/src/pages/raw/handover/aggregating/summary.vue index c6405b6..53f614a 100644 --- a/src/pages/raw/handover/aggregating/summary.vue +++ b/src/pages/raw/handover/aggregating/summary.vue @@ -25,12 +25,12 @@ - + - + @@ -83,7 +83,7 @@ export default class AggregatingSummary extends BasePage { * 页面Module */ model = model; - + border = true; /** * 表头 */ diff --git a/src/pages/raw/handover/feeding/Location.vue b/src/pages/raw/handover/feeding/Location.vue index 6ba1e29..e3bfb8a 100644 --- a/src/pages/raw/handover/feeding/Location.vue +++ b/src/pages/raw/handover/feeding/Location.vue @@ -83,12 +83,12 @@ - + - + diff --git a/src/pages/raw/handover/picking/index.vue b/src/pages/raw/handover/picking/index.vue index 66e7f30..3439aa9 100644 --- a/src/pages/raw/handover/picking/index.vue +++ b/src/pages/raw/handover/picking/index.vue @@ -12,11 +12,11 @@ - + - + @@ -24,7 +24,7 @@ - + @@ -76,7 +76,7 @@ export default class pickingDom extends BasePage { * 页面Module */ model = model; - + border = true; /** * 表头 */ diff --git a/src/pages/raw/handover/returning/index.vue b/src/pages/raw/handover/returning/index.vue index 94ab20c..c8305d0 100644 --- a/src/pages/raw/handover/returning/index.vue +++ b/src/pages/raw/handover/returning/index.vue @@ -54,17 +54,17 @@ - + - + - + @@ -104,6 +104,7 @@ export default class returningDom extends BasePage { * 页面Module */ model = model; + border = true; /** * 表单数据 */ diff --git a/src/pages/raw/handover/virtual/index.vue b/src/pages/raw/handover/virtual/index.vue index cddb2f7..2b895b7 100644 --- a/src/pages/raw/handover/virtual/index.vue +++ b/src/pages/raw/handover/virtual/index.vue @@ -12,7 +12,7 @@ - + - + - + - + @@ -30,12 +30,12 @@ - + - + @@ -83,7 +83,7 @@ export default class VirtualSummary extends BasePage { * 页面Module */ model = model; - + border = true; /** * 表头 */ diff --git a/src/pages/raw/warehouse/rowCollect/index.vue b/src/pages/raw/warehouse/rowCollect/index.vue index 332d72a..15f3aec 100644 --- a/src/pages/raw/warehouse/rowCollect/index.vue +++ b/src/pages/raw/warehouse/rowCollect/index.vue @@ -39,9 +39,9 @@ - + {{ $t('message.po_Return') }} @@ -84,7 +84,7 @@ export default class KanDanHandOver extends BasePage { if (this.model.code == '1') { uni.showToast({ icon: 'success', title: this.$t('message.successful') as string }); this.model.orderInInfoList.forEach((item: any) => { - item.fileNo = ''; + //item.fileNo = ''; let arr: any = { label: item.productCode, value: item.productCode, @@ -115,10 +115,10 @@ export default class KanDanHandOver extends BasePage { this.customToast(this.$t('message.Warehouse_Tip5') as string); return; } - if (this.Some.fileNo == '' || this.Some.fileNo == null || this.Some.fileNo == undefined) { - this.customToast(this.$t('message.fileNumber') as string); - return; - } + // if (this.Some.fileNo == '' || this.Some.fileNo == null || this.Some.fileNo == undefined) { + // this.customToast(this.$t('message.fileNumber') as string); + // return; + // } let orderlist = []; this.Some.type = '1'; this.Some.keepBy = session.loginName; @@ -128,7 +128,7 @@ export default class KanDanHandOver extends BasePage { if (this.model.code == '1') { uni.showToast({ icon: 'success', title: this.$t('message.success') as string }); this.Some = {}; - this.Some.fileNo = ' '; + //this.Some.fileNo = ' '; this.wl = {}; this.MaterialList = []; this.query(); diff --git a/src/pages/raw/warehouse/rowScrap/index.vue b/src/pages/raw/warehouse/rowScrap/index.vue index 0a7ac43..557f7b1 100644 --- a/src/pages/raw/warehouse/rowScrap/index.vue +++ b/src/pages/raw/warehouse/rowScrap/index.vue @@ -44,7 +44,7 @@ - + @@ -73,6 +73,7 @@ export default class KanDanHandOver extends BasePage { //单号 order3 = ''; model = model; + border = true; wl: any = {}; Some: any = {}; MaterialList: any = []; diff --git a/src/pages/raw/warehouse/rowTransfer/index.vue b/src/pages/raw/warehouse/rowTransfer/index.vue index c993c8c..2fae48f 100644 --- a/src/pages/raw/warehouse/rowTransfer/index.vue +++ b/src/pages/raw/warehouse/rowTransfer/index.vue @@ -35,7 +35,7 @@ - + @@ -62,6 +62,7 @@ export default class KanDanHandOver extends BasePage { order3 = ''; NEWqty = ''; model = model; + border = true; materialCodeSelect = false; orderlist: any = []; //查询单号