diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 16c6675..24d76b6 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -244,8 +244,10 @@ export default class LoginPage extends BasePage { lang: this.$i18n.locale as Lang, }); uni.showToast({ - icon: 'success', + //icon: 'success', + duration: 2000, title: this.$t('message.LoginSuccessful') as string, + image: '/static/icons/icon-51.png', }); uni.navigateTo({ url: page.login.area, diff --git a/src/pages/login/server/index.vue b/src/pages/login/server/index.vue index 154617b..79d2c1e 100644 --- a/src/pages/login/server/index.vue +++ b/src/pages/login/server/index.vue @@ -99,8 +99,9 @@ export default class ServerPage extends BasePage { } server.setServerAddress({ address }); uni.showToast({ - icon: 'success', + //icon: 'success', title: this.$t('message.SetServerSuccessfully') as string, + image: '/static/icons/icon-51.png', }); setTimeout(() => { uni.navigateBack({ delta: 1 }); diff --git a/src/pages/product/inbound/finishProductOffline/model.ts b/src/pages/product/inbound/finishProductOffline/model.ts index 1a79079..9dde266 100644 --- a/src/pages/product/inbound/finishProductOffline/model.ts +++ b/src/pages/product/inbound/finishProductOffline/model.ts @@ -1,13 +1,8 @@ -import { - getModule, - Module, - MutationAction, - VuexModule, -} from "vuex-module-decorators"; -import store from "@/store"; -import http from "@/utils/request"; -import { url } from "@/utils/url"; -import { session } from "@/store/modules/session"; +import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +import { url } from '@/utils/url'; +import { session } from '@/store/modules/session'; import vm from '@/main'; // import { order } from '@/pages/raw/handover/kan-dan/model'; class OrderInInfo { @@ -21,7 +16,7 @@ class OrderInInfo { namespaced: true, dynamic: true, store, - name: "product.inbound.finishProductOffline", + name: 'product.inbound.finishProductOffline', }) export class PickingModule extends VuexModule { /** @@ -38,7 +33,7 @@ export class PickingModule extends VuexModule { */ orderInInfo: OrderInInfo = new OrderInInfo(); //确认按钮的code码 - code = ""; + code = ''; //data data: any = {}; /** @@ -53,7 +48,7 @@ export class PickingModule extends VuexModule { warehouseCode: session.warehouseCode, //仓库编码 }, }); - console.log("data", data.data); + console.log('data', data.data); const returningTypeList = data.data.map((item: any) => ({ label: item.locationCode, value: item.locationCode + '(' + item.sendSpot + ')', @@ -70,17 +65,19 @@ export class PickingModule extends VuexModule { */ @MutationAction async queryOrderInInfo(form: any) { - console.log("loc", form); - const { data, code, msg }: any = await http.post( - url.inbound.finishProductOffline.barcode, - { - barcode: form.barCode, - locCode: form.aimWl.label, - loginName: session.loginName, - } - ); - if (code == "1") { - uni.showToast({ icon: "success", title: msg }); + console.log('loc', form); + const { data, code, msg }: any = await http.post(url.inbound.finishProductOffline.barcode, { + barcode: form.barCode, + locCode: form.aimWl.label, + loginName: session.loginName, + }); + if (code == '1') { + uni.showToast({ + //icon: "success", + duration: 2000, + title: msg, + image: '/static/icons/icon-51.png', + }); } else { //uni.showToast({ icon: "none", title: msg }); vm.customToast(msg); @@ -96,13 +93,15 @@ export class PickingModule extends VuexModule { */ @MutationAction async confirm(list: any[]) { - const { code, data, msg } = await http.post( - url.inbound.finishProductOffline.confirm, - list - ); - console.log("res数据", code, data, msg); - if (code == "1") { - uni.showToast({ icon: "success", title: msg }); + const { code, data, msg } = await http.post(url.inbound.finishProductOffline.confirm, list); + console.log('res数据', code, data, msg); + if (code == '1') { + uni.showToast({ + //icon: 'success', + title: msg, + duration: 2000, + image: '/static/icons/icon-51.png', + }); } else { //uni.showToast({ icon: "none", title: msg }); vm.customToast(msg); diff --git a/src/pages/product/outbound/stoOutbound/Back.vue b/src/pages/product/outbound/stoOutbound/Back.vue index a6663fd..435edf3 100644 --- a/src/pages/product/outbound/stoOutbound/Back.vue +++ b/src/pages/product/outbound/stoOutbound/Back.vue @@ -49,8 +49,8 @@ export default class stoOutboundDom extends BasePage { order3: any = ''; firstFocus = false; barCode: any = ''; - scanAmount: number = 0; - retreatNum: number = 0; + scanAmount = 0; + retreatNum = 0; async onReady() { let code = sessionStorage.getItem('SweepCode'); this.order3 = JSON.parse(code); @@ -79,8 +79,10 @@ export default class stoOutboundDom extends BasePage { await this.model.BackSweep(params); if (this.model.code == '1') { uni.showToast({ - icon: 'success', + //icon: 'success', title: this.$t('message.succeeded') as string, + duration: 2000, + image: '/static/icons/icon-51.png', }); this.barCode = ''; this.scanAmount -= 1; diff --git a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue index 678122d..a8f41f0 100644 --- a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue +++ b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue @@ -120,7 +120,7 @@ export default class stoOutboundDom extends BasePage { productDescZh: '', scanAmount: 0, rowItem: '', - row:'', + row: '', barCode: '', }; materialList: any = []; //物料列表 @@ -185,11 +185,13 @@ export default class stoOutboundDom extends BasePage { return; } await this.model.findProdInfoByDN(this.form.orderNo); - console.log('model.DNcode',this.model.DNcode) + console.log('model.DNcode', this.model.DNcode); if (this.model.DNcode == '1') { uni.showToast({ - icon: 'success', + //icon: 'success', title: this.$t('message.successful') as any, + duration: 2000, + image: '/static/icons/icon-51.png', }); this.form.productCode = this.model.materielList[0].materialCode; this.form.productDescZh = this.model.materielList[0].materialDesc; @@ -233,36 +235,40 @@ export default class stoOutboundDom extends BasePage { } //过账 async Posting() { - if(!this.form.orderNo){ + if (!this.form.orderNo) { this.customToast(this.$t('message.Commission_tips1') as string); - return + return; } let params = { - nxOutCode:this.form.orderNo, - rowItem:this.form.row, - materialCode:this.form.rowItem, - loginName:session.loginName, - factoryCode:session.factoryCode, - } - await this.model.Posting(params) - if(this.model.PostingCode == '1'){ - uni.showToast({ title: this.$t('message.Warehouse_Tip9') as any }); - this.empty() + nxOutCode: this.form.orderNo, + rowItem: this.form.row, + materialCode: this.form.rowItem, + loginName: session.loginName, + factoryCode: session.factoryCode, + }; + await this.model.Posting(params); + if (this.model.PostingCode == '1') { + uni.showToast({ + title: this.$t('message.Warehouse_Tip9') as any, + duration: 2000, + image: '/static/icons/icon-51.png', + }); + this.empty(); } } - empty(){ - this.form.dockCode = null - this.form.dockName = null - this.form.orderNo = null - this.form.qty = 0 - this.form.orderAmount = '' - this.form.productCode = '' - this.form.productDescZh = '' - this.form.scanAmount = 0 - this.form.rowItem = '' - this.form.row = '' - this.form.barCode = '' - this.model.empty() + empty() { + this.form.dockCode = null; + this.form.dockName = null; + this.form.orderNo = null; + this.form.qty = 0; + this.form.orderAmount = ''; + this.form.productCode = ''; + this.form.productDescZh = ''; + this.form.scanAmount = 0; + this.form.rowItem = ''; + this.form.row = ''; + this.form.barCode = ''; + this.model.empty(); } onOk() { this.$form.validate(async (valid: boolean) => { @@ -271,9 +277,9 @@ export default class stoOutboundDom extends BasePage { this.customToast(this.$t('message.product_Tip6') as string); return; } - if(this.form.barCode == ''){ + if (this.form.barCode == '') { this.customToast(this.$t('message.barcode') as string); - return + return; } const selctlist = { barcode: this.form.barCode, @@ -286,50 +292,55 @@ export default class stoOutboundDom extends BasePage { orderType: 4, productCode: this.form.productCode, }; - await this.model.confirmMove(selctlist).then(async () =>{ + await this.model.confirmMove(selctlist).then(async () => { if (this.model.code == '1') { - this.materialList = []; - uni.showToast({ icon: 'success', title: 'success' }); - this.form.barCode = ''; - this.form.productCode = ''; - model.orderInInfo.stoAmount = 0; - this.form.scanAmount = 0; - this.form.orderAmount = ''; - this.form.productDescZh = ''; - this.selectMaterielList = []; - this.form.rowItem = ''; - this.query(); + this.materialList = []; + uni.showToast({ + //icon: 'success', + title: 'success', + duration: 2000, + image: '/static/icons/icon-51.png', + }); + this.form.barCode = ''; + this.form.productCode = ''; + model.orderInInfo.stoAmount = 0; + this.form.scanAmount = 0; + this.form.orderAmount = ''; + this.form.productDescZh = ''; + this.selectMaterielList = []; + this.form.rowItem = ''; + this.query(); } - if(this.model.code == '2'){ + if (this.model.code == '2') { uni.showModal({ - content:this.$t('message.sweep') as any, - cancelText:this.$t('message.Cancel') as any, - confirmText:this.$t('message.workArea_Confirm') as any, - success:async (res) =>{ - if(res.confirm){ - let params = { - barcode: this.form.barCode, - loginName: session.loginName, - keepBy: session.loginName, - factoryCode: session.factoryCode, - order3: this.form.orderNo, - } - await this.model.delCode(params) - this.form.barCode = ''; - this.form.productCode = ''; - model.orderInInfo.stoAmount = 0; - this.form.scanAmount = 0; - this.form.orderAmount = ''; - this.form.productDescZh = ''; - this.selectMaterielList = []; - this.form.rowItem = ''; - this.query(); - } else if(res.cancel){ + content: this.$t('message.sweep') as any, + cancelText: this.$t('message.Cancel') as any, + confirmText: this.$t('message.workArea_Confirm') as any, + success: async (res) => { + if (res.confirm) { + let params = { + barcode: this.form.barCode, + loginName: session.loginName, + keepBy: session.loginName, + factoryCode: session.factoryCode, + order3: this.form.orderNo, + }; + await this.model.delCode(params); + this.form.barCode = ''; + this.form.productCode = ''; + model.orderInInfo.stoAmount = 0; + this.form.scanAmount = 0; + this.form.orderAmount = ''; + this.form.productDescZh = ''; + this.selectMaterielList = []; + this.form.rowItem = ''; + this.query(); + } else if (res.cancel) { this.form.barCode = ''; } - } - }) - } + }, + }); + } }); }); } @@ -410,7 +421,7 @@ export default class stoOutboundDom extends BasePage { -webkit-text-fill-color: #666; //字体颜色安卓与IOS适配 -webkit-opacity: 1; //不透明级别安卓与IOS适配 } -.disabled{ +.disabled { background-color: rgb(228, 143, 143); //修改默认灰色样式 color: #666; opacity: 1; //默认的不透明级别为0.3 diff --git a/src/pages/product/outbound/stoOutbound/index.vue b/src/pages/product/outbound/stoOutbound/index.vue index a446dfe..8ce81c4 100644 --- a/src/pages/product/outbound/stoOutbound/index.vue +++ b/src/pages/product/outbound/stoOutbound/index.vue @@ -27,18 +27,10 @@ - + - + @@ -58,19 +50,8 @@ - - + + @@ -91,36 +72,18 @@ - + - + - {{ - $t('message.product_PickingDetails') - }} + {{ $t('message.product_PickingDetails') }} {{ $t('message.product_Empty') }} @@ -351,7 +314,12 @@ export default class stoOutboundDom extends BasePage { this.materialList = []; // this.model.materielList = []; this.$table.onCheckAllTap(); - uni.showToast({ icon: 'success', title: 'success' }); + uni.showToast({ + //icon: 'success', + title: 'success', + duration: 2000, + image: '/static/icons/icon-51.png', + }); } }); this.form.barCode = ''; diff --git a/src/pages/product/warehouse/LocationInventory/index.vue b/src/pages/product/warehouse/LocationInventory/index.vue index 068e22e..a3d4cb2 100644 --- a/src/pages/product/warehouse/LocationInventory/index.vue +++ b/src/pages/product/warehouse/LocationInventory/index.vue @@ -50,14 +50,14 @@