update:操作成功提示修改

master
guoshuang 4 years ago
parent 3dda852529
commit b25d23c3e3

@ -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,

@ -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 });

@ -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);

@ -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;

@ -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

@ -27,18 +27,10 @@
<!-- ></u-select>-->
<!-- </u-form-item>-->
<u-form-item :required="true" :label="this.$t('message.product_STONumber')" prop="orderNo">
<u-search
:placeholder="this.$t('message.po_PleaseInput')"
v-model="form.orderNo"
@search="model.queryOrderInInfo"
:show-action="false"
></u-search>
<u-search :placeholder="this.$t('message.po_PleaseInput')" v-model="form.orderNo" @search="model.queryOrderInInfo" :show-action="false"></u-search>
</u-form-item>
<u-form-item :label="this.$t('message.product_TotalNumber')">
<u-input
v-model="model.orderInInfo.stoAmount"
:placeholder="this.$t('message.po_PleaseInput')"
/>
<u-input v-model="model.orderInInfo.stoAmount" :placeholder="this.$t('message.po_PleaseInput')" />
</u-form-item>
<!-- <u-row gutter="0">-->
<!-- <u-col :span="4">-->
@ -58,19 +50,8 @@
<!-- </u-col>-->
<!-- </u-row>-->
<u-form-item :required="true" :label="this.$t('message.product_FGCode')">
<u-input
v-model="form.productCode"
type="select"
@click="materialCodeSelect = true"
:placeholder="this.$t('message.po_PleaseInput')"
/>
<u-select
:confirm-text="this.$t('message.product_Confirm')"
:cancel-text="this.$t('message.product_Cancel')"
v-model="materialCodeSelect"
:list="model.materielList"
@confirm="materialConfirm"
></u-select>
<u-input v-model="form.productCode" type="select" @click="materialCodeSelect = true" :placeholder="this.$t('message.po_PleaseInput')" />
<u-select :confirm-text="this.$t('message.product_Confirm')" :cancel-text="this.$t('message.product_Cancel')" v-model="materialCodeSelect" :list="model.materielList" @confirm="materialConfirm"></u-select>
</u-form-item>
<u-form-item :label="this.$t('message.product_FGDes')">
<u-input :disabled="true" v-model="form.productDescZh" placeholder="" />
@ -91,36 +72,18 @@
<!-- <u-input v-model="form.rfPwd" />-->
<!-- </u-form-item>-->
<u-form-item :label="this.$t('message.product_BarCode')">
<u-search
:placeholder="this.$t('message.po_PleaseInput')"
v-model="form.barCode"
@search="onSubmit"
:focus="firstFocus"
:show-action="false"
></u-search>
<u-search :placeholder="this.$t('message.po_PleaseInput')" v-model="form.barCode" @search="onSubmit" :focus="firstFocus" :show-action="false"></u-search>
</u-form-item>
<u-col :span="12">
<view class="table-wrapper">
<wyb-table
class="table"
ref="table"
width="100%"
enable-check="multiple"
show-left-and-right-border
:headers="headers"
:contents="materialList"
:show-vert-border="false"
@onCheck="onCheck"
></wyb-table>
<wyb-table class="table" ref="table" width="100%" enable-check="multiple" show-left-and-right-border :headers="headers" :contents="materialList" :show-vert-border="false" @onCheck="onCheck"></wyb-table>
</view>
</u-col>
</u-form>
<view class="bottom-bar">
<u-row class="button-bar">
<u-col :span="4">
<u-button type="warning" @click="toPage(page.product.outbound.stoOutboundDetail)">{{
$t('message.product_PickingDetails')
}}</u-button>
<u-button type="warning" @click="toPage(page.product.outbound.stoOutboundDetail)">{{ $t('message.product_PickingDetails') }}</u-button>
</u-col>
<u-col :span="4">
<u-button type="error" @click="resetHandle">{{ $t('message.product_Empty') }}</u-button>
@ -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 = '';

@ -50,14 +50,14 @@
<script lang="ts">
import { Component, Ref } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page';
import { VForm, VFormRules } from 'vue/types/form';
import { VForm } from 'vue/types/form';
import model from './model';
import jPicker from '@/components/J-Picker/jPicker.vue';
import { session } from '@/store/modules/session';
interface OptionType {
label: string;
value: string;
}
// interface OptionType {
// label: string;
// value: string;
// }
@Component({
components: {
jPicker,
@ -99,8 +99,10 @@ export default class ProductCheckReceipt extends BasePage {
if (this.model.code == '1') {
//this.customToast(this.$t('message.product_Tip8') as string);
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.product_Tip8') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
let num = 0;
this.model.modelList.forEach((item: any) => {
@ -149,8 +151,10 @@ export default class ProductCheckReceipt extends BasePage {
if (this.model.code == '1') {
//this.customToast(this.$t('message.product_Tip8') as string);
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.product_Tip8') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
this.total += 1;
this.model.modelList.forEach((item: any) => {
@ -195,8 +199,10 @@ export default class ProductCheckReceipt extends BasePage {
await this.model.onTakeoutConfirm(params);
if (this.model.status == 'S') {
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.success') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
this.form.pddNo = '';
this.form.barcode = '';

@ -58,14 +58,14 @@
<script lang="ts">
import { Component, Ref } from 'vue-property-decorator';
import { BasePage } from '@/components/base/page';
import { VForm, VFormRules } from 'vue/types/form';
import { VForm } from 'vue/types/form';
import model from './model';
import jPicker from '@/components/J-Picker/jPicker.vue';
import { session } from '@/store/modules/session';
interface OptionType {
label: string;
value: string;
}
// interface OptionType {
// label: string;
// value: string;
// }
@Component({
components: {
jPicker,
@ -107,8 +107,10 @@ export default class ProductCheckReceipt extends BasePage {
if (this.model.code == '1') {
//this.customToast(this.$t('message.product_Tip8') as string);
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.product_Tip8') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
let num = 0;
this.model.modelList.forEach((item: any) => {
@ -158,8 +160,10 @@ export default class ProductCheckReceipt extends BasePage {
if (this.model.code == '1') {
//this.customToast(this.$t('message.product_Tip8') as string);
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.product_Tip8') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
this.total += 1;
this.model.modelList.forEach((item: any) => {
@ -198,8 +202,10 @@ export default class ProductCheckReceipt extends BasePage {
await this.model.onTakeoutConfirm(params);
if (this.model.status == 'S') {
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.success') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
this.form.pddNo = '';
this.form.barcode = '';

@ -117,8 +117,10 @@ export default class ProductCheckReceipt extends BasePage {
if (this.model.code == '1') {
//this.customToast(this.$t('message.product_Tip8') as string);
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.product_Tip8') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
this.wl.value = this.model.choiceCodeList[0].value;
this.Some = this.model.recordsList[0];
@ -161,8 +163,10 @@ export default class ProductCheckReceipt extends BasePage {
if (this.model.code == '1') {
//this.customToast(this.$t('message.product_Tip8') as string);
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.product_Tip8') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
//this.Some.actualQty += 1;
this.onSubmit();
@ -213,8 +217,10 @@ export default class ProductCheckReceipt extends BasePage {
await this.model.onTakeoutConfirm(orderlist);
if (this.model.code == '1') {
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.success') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
}
this.Some = {};
@ -242,8 +248,10 @@ export default class ProductCheckReceipt extends BasePage {
this.model.close(this.form.order3);
if (this.model.code == '1') {
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.success') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
this.Some = {};
this.Some.fileNo = ' ';
@ -261,8 +269,10 @@ export default class ProductCheckReceipt extends BasePage {
await this.model.close(this.form.order3);
if (this.model.code == '1') {
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.success') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
// this.Some = {};
// this.Some.fileNo = ' ';

@ -128,8 +128,10 @@ export default class productCheckReceipt extends BasePage {
if (model.code == '1') {
//this.customToast(this.$t('message.product_Tip8') as string);
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.product_Tip8') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
//
const storeList = [];

@ -81,8 +81,10 @@ export class wholeLnventory extends VuexModule {
const records: any = await http.post(url.warehouse.wholeLnventory.commit, list);
if (records.code == 1) {
uni.showToast({
icon: 'success',
//icon: 'success',
title: 'success',
duration: 2000,
image: '/static/icons/icon-51.png',
});
// uni.navigateTo({ url: page.product.warehouse.index });
}

@ -141,8 +141,10 @@ export default class productCheckReceipt extends BasePage {
if (this.model.code == '1') {
//this.customToast(this.$t('message.product_Tip8') as string);
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.product_Tip8') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
// this.Some.actualQty += 1;
this.onSubmit();
@ -231,8 +233,10 @@ export default class productCheckReceipt extends BasePage {
await this.model.onTakeoutConfirm(orderlist);
if (this.model.code == '1') {
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.success') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
this.Some = {};
this.Some.fileNo = ' ';
@ -259,8 +263,10 @@ export default class productCheckReceipt extends BasePage {
model.close(this.form.order3);
if (this.model.code == '1') {
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.success') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
this.Some = {};
this.Some.fileNo = ' ';
@ -278,8 +284,10 @@ export default class productCheckReceipt extends BasePage {
await this.model.close(this.form.order3);
if (this.model.code == '1') {
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.success') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
// this.Some = {};
// this.Some.fileNo = ' ';

@ -139,8 +139,10 @@ export default class productCheckReceipt extends BasePage {
await model.getProductCode(params);
if (this.model.code == '1') {
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.successful') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
}
if (this.model.code == '2') {

@ -267,8 +267,10 @@ export class AggregatingModule extends VuexModule {
async uploadOrderList(params: any) {
await http.post(url.sumscan.u.order, params);
uni.showToast({
icon: 'success',
//icon: 'success',
title: 'success',
duration: 2000,
image: '/static/icons/icon-51.png',
});
}

@ -1,22 +1,15 @@
import {
Action,
getModule,
Module,
Mutation,
MutationAction,
VuexModule,
} from "vuex-module-decorators";
import store from "@/store";
import http from "@/utils/request";
import { url } from "@/utils/url";
import { auth } from "@/store/modules/auth";
import { session } from "@/store/modules/session";
import { Action, getModule, Module, Mutation, MutationAction, VuexModule } from 'vuex-module-decorators';
import store from '@/store';
import http from '@/utils/request';
import { url } from '@/utils/url';
import { auth } from '@/store/modules/auth';
import { session } from '@/store/modules/session';
@Module({
namespaced: true,
dynamic: true,
store,
name: "raw.handover.feeding",
name: 'raw.handover.feeding',
})
export class FeedingModule extends VuexModule {
/**
@ -92,7 +85,7 @@ export class FeedingModule extends VuexModule {
/**
*
*/
@Action({ commit: "clearState" })
@Action({ commit: 'clearState' })
async saveBlDetailUpload(params: any) {
await auth.checkPassword({
factoryCode: session.factoryCode as string,
@ -105,8 +98,10 @@ export class FeedingModule extends VuexModule {
...params,
});
uni.showToast({
icon: "success",
title: "success",
//icon: "success",
title: 'success',
duration: 2000,
image: '/static/icons/icon-51.png',
});
}
@ -143,10 +138,10 @@ export class FeedingModule extends VuexModule {
return { blDetailList };
}
//查询明细
@Action({ commit: "updateCheckedOrderInInfoListKw" })
@Action({ commit: 'updateCheckedOrderInInfoListKw' })
async querydetaildlist(content: any) {
let res: any = await http.post("/wmspda/tl/getBlListSn", content);
console.log("明细》》》》》》》》》", res.list);
const res: any = await http.post('/wmspda/tl/getBlListSn', content);
console.log('明细》》》》》》》》》', res.list);
this.detailedList = res.list;
return res;
}
@ -167,12 +162,9 @@ export class FeedingModule extends VuexModule {
return { locationList };
}
@Action({ commit: "updateCheckedOrderInInfoListKw" })
@Action({ commit: 'updateCheckedOrderInInfoListKw' })
async queryByFactoryCodeAndWorkAreaCode(content: any) {
let res = await http.post(
"/wmspda/fg/queryByFactoryCodeAndWorkAreaCode",
content
);
const res = await http.post('/wmspda/fg/queryByFactoryCodeAndWorkAreaCode', content);
return res;
}
}

@ -92,7 +92,6 @@ import { orderHeaders } from './config';
import { session } from '@/store/modules/session';
import { VForm, VFormRules } from 'vue/types/form';
import jPicker from '@/components/J-Picker/jPicker.vue';
import { pick } from 'lodash/fp';
@Component({
components: {
jPicker,
@ -120,7 +119,7 @@ export default class RawReceiptDetail extends BasePage {
LocationList: any = [];
//
Location: any = [];
someIndex: number = 0;
someIndex = 0;
some: any = {};
qty: any = '';
/**
@ -258,7 +257,7 @@ export default class RawReceiptDetail extends BasePage {
this.business();
}
business() {
let num: number = 0;
let num = 0;
this.LocationList.forEach((item: any) => {
num += parseFloat(item.qty);
});
@ -298,8 +297,10 @@ export default class RawReceiptDetail extends BasePage {
await this.model.saveProOrderResultUpload(dataList);
if (this.model.code == '1') {
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.Warehouse_Tip9') as any,
duration: 2000,
image: '/static/icons/icon-51.png',
});
// this.GetLocation();
setTimeout(() => {

@ -1,15 +1,9 @@
import {
Action,
getModule,
Module,
MutationAction,
VuexModule,
} from "vuex-module-decorators";
import store from "@/store";
import http from "@/utils/request";
import { url } from "@/utils/url";
import { auth } from "@/store/modules/auth";
import { session } from "@/store/modules/session";
import { Action, getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators';
import store from '@/store';
import http from '@/utils/request';
import { url } from '@/utils/url';
import { auth } from '@/store/modules/auth';
import { session } from '@/store/modules/session';
class OrderInInfo {
amount?: any;
@ -22,7 +16,7 @@ class OrderInInfo {
namespaced: true,
dynamic: true,
store,
name: "raw.handover.returning",
name: 'raw.handover.returning',
})
export class ReturningModule extends VuexModule {
/**
@ -63,11 +57,11 @@ export class ReturningModule extends VuexModule {
this.materielList = [];
const { data }: any = await http.post(url.material.prdOrder.info, {
prdOrderFrom,
page: "1",
rows: "50",
page: '1',
rows: '50',
loginName: session.loginName,
});
console.log("qqqqqqqqq", data);
console.log('qqqqqqqqq', data);
const materielList = data.map((item: any) => ({
label: item.materialCode,
value: item.materialCode,
@ -75,8 +69,8 @@ export class ReturningModule extends VuexModule {
wkposCode: item.wkposCode,
sendSpot: item.sendSpot,
}));
console.log("物料列表", data);
console.log("物料名列表", materielList);
console.log('物料列表', data);
console.log('物料名列表', materielList);
const orderInInfo = data[0] || {};
return { orderInInfo, materielList };
}
@ -87,11 +81,11 @@ export class ReturningModule extends VuexModule {
const { data }: any = await http.post(url.material.prdOrder.info, {
requireDateMin: time.requireDateMin,
requireDateMax: time.requireDateMax,
page: "1",
rows: "50",
page: '1',
rows: '50',
loginName: session.loginName,
});
console.log("qqqqqqqqq", data);
console.log('qqqqqqqqq', data);
const materielList = data.map((item: any) => ({
label: item.prdOrder,
value: item.materialCode,
@ -100,8 +94,8 @@ export class ReturningModule extends VuexModule {
sendSpot: item.sendSpot,
}));
//materielList 包含页面table想要展示的字段sendSpot接收人value物料号label订单号
console.log("时间查询物料列表", data);
console.log("时间查询物料名列表", materielList);
console.log('时间查询物料列表', data);
console.log('时间查询物料名列表', materielList);
const orderInInfo = data[0] || {};
return { orderInInfo, materielList };
}
@ -131,20 +125,19 @@ export class ReturningModule extends VuexModule {
operatorPass: params.operator,
factoryCode: session.factoryCode,
loginName: session.loginName,
unit: "",
unit: '',
...params,
});
uni.showToast({
icon: "success",
title: "success",
//icon: "success",
title: 'success',
duration: 2000,
image: '/static/icons/icon-51.png',
});
}
@Action({ commit: "updateCheckedOrderInInfoListKw" })
@Action({ commit: 'updateCheckedOrderInInfoListKw' })
async queryByFactoryCodeAndWorkAreaCode(content: any) {
let res = await http.post(
"/wmspda/fg/queryByFactoryCodeAndWorkAreaCode",
content
);
const res = await http.post('/wmspda/fg/queryByFactoryCodeAndWorkAreaCode', content);
return res;
}
}

@ -66,7 +66,6 @@ import model from './model';
import { summaryHeaders } from './config';
import { VForm, VFormRules } from 'vue/types/form';
import { auth } from '@/store/modules/auth';
import { pick } from 'lodash/fp';
import http from '@/utils/request';
import { url } from '@/utils/url';
import { session } from '@/store/modules/session';
@ -202,7 +201,7 @@ export default class VirtualSummary extends BasePage {
return;
} else {
const inputAmount = parseFloat(this.amountForm.amount); //
const totalHvAmount = firstSelection[0].totalHvAmount;
//const totalHvAmount = firstSelection[0].totalHvAmount;
const demand = firstSelection[0].amount; //
const totalMoAmount = firstSelection[0].totalMoAmount; //
console.log('2222', 2222222222222222222);
@ -237,8 +236,10 @@ export default class VirtualSummary extends BasePage {
}
});
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.success') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
}
}
@ -292,7 +293,7 @@ export default class VirtualSummary extends BasePage {
list.push(item);
}
});
console.log("数据。。。",list);
console.log('数据。。。', list);
await model.uploadSummaryList({
operatorPass: this.submitForm.receiver,
factoryCode: session.factoryCode as string,

@ -192,8 +192,10 @@ export default class dnReceiptDom extends BasePage {
return;
}
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.successful') as any,
duration: 2000,
image: '/static/icons/icon-51.png',
});
let list: any = localStorage.getItem('list');
localStorage.removeItem('list');
@ -331,20 +333,20 @@ export default class dnReceiptDom extends BasePage {
success: (res) => {
if (res.confirm) {
this.LocationList.splice(e.contentIndex, 1);
let externalIndex: number = 0;
let externalIndex = 0;
this.DNReceivingList.forEach((item: any, index: any) => {
if (item.poNo == e.lineData.poNo && item.materialCode == e.lineData.materialCode && item.poLine == e.lineData.poLine) {
externalIndex = index;
}
});
let inside: number = 0;
let inside = 0;
this.DNReceivingList[externalIndex].wllist.forEach((item: any, index: any) => {
if (item.receiptAmount == e.lineData.receiptAmount && item.wlCode == e.lineData.wlCode) {
inside = index;
}
});
this.DNReceivingList[externalIndex].wllist.splice(inside, 1);
let num: number = 0;
let num = 0;
this.DNReceivingList[externalIndex].wllist.forEach((item: any) => {
num += parseFloat(item.receiptAmount);
});

@ -193,8 +193,10 @@ export default class dnReceiptDom extends BasePage {
return;
}
uni.showToast({
icon: 'success',
//icon: 'success',
title: this.$t('message.successful') as any,
duration: 2000,
image: '/static/icons/icon-51.png',
});
let list: any = localStorage.getItem('list');
localStorage.removeItem('list');
@ -332,20 +334,20 @@ export default class dnReceiptDom extends BasePage {
success: (res) => {
if (res.confirm) {
this.LocationList.splice(e.contentIndex, 1);
let externalIndex: number = 0;
let externalIndex = 0;
this.DNReceivingList.forEach((item: any, index: any) => {
if (item.poNo == e.lineData.poNo && item.materialCode == e.lineData.materialCode && item.poLine == e.lineData.poLine) {
externalIndex = index;
}
});
let inside: number = 0;
let inside = 0;
this.DNReceivingList[externalIndex].wllist.forEach((item: any, index: any) => {
if (item.receiptAmount == e.lineData.receiptAmount && item.wlCode == e.lineData.wlCode) {
inside = index;
}
});
this.DNReceivingList[externalIndex].wllist.splice(inside, 1);
let num: number = 0;
let num = 0;
this.DNReceivingList[externalIndex].wllist.forEach((item: any) => {
num += parseFloat(item.receiptAmount);
});

@ -82,7 +82,12 @@ export default class KanDanHandOver extends BasePage {
order3: this.order3,
});
if (this.model.code == '1') {
uni.showToast({ icon: 'success', title: this.$t('message.successful') as string });
uni.showToast({
//icon: 'success',
title: this.$t('message.successful') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
this.model.orderInInfoList.forEach((item: any) => {
//item.fileNo = '';
let arr: any = {
@ -126,7 +131,12 @@ export default class KanDanHandOver extends BasePage {
orderlist.push(this.Some);
await model.onTakeoutConfirm(orderlist);
if (this.model.code == '1') {
uni.showToast({ icon: 'success', title: this.$t('message.success') as string });
uni.showToast({
//icon: 'success',
title: this.$t('message.success') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
this.Some = {};
//this.Some.fileNo = ' ';
this.wl = {};

@ -87,7 +87,12 @@ export default class KanDanHandOver extends BasePage {
order3: this.order3,
});
if (this.model.code == '1') {
uni.showToast({ icon: 'success', title: this.$t('message.successful') as string });
uni.showToast({
//icon: 'success',
title: this.$t('message.successful') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
this.model.orderInInfoList.forEach((item: any) => {
item.fileNo = '';
let arr: any = {
@ -113,7 +118,7 @@ export default class KanDanHandOver extends BasePage {
//
async submit() {
if (this.order3 === '') {
this.customToast(this.$t('message.Commission_tips1') as string);
this.customToast(this.$t('message.Commission_tips1') as string);
return;
}
if (!this.Some) {
@ -131,7 +136,12 @@ export default class KanDanHandOver extends BasePage {
orderlist.push(this.Some);
await model.onTakeoutConfirm(orderlist);
if (this.model.code == '1') {
uni.showToast({ icon: 'success', title: this.$t('message.success') as string });
uni.showToast({
//icon: 'success',
title: this.$t('message.success') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
this.Some = {};
this.Some.fileNo = ' ';
this.wl = {};

@ -75,7 +75,12 @@ export default class KanDanHandOver extends BasePage {
order3: this.order3,
});
if (model.code == '1') {
uni.showToast({ icon: 'success', title: this.$t('message.successful') as string });
uni.showToast({
//icon: 'success',
title: this.$t('message.successful') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
this.orderlist = model.materielList[0];
this.NEWqty = model.materielList[0].qty;
}
@ -118,7 +123,12 @@ export default class KanDanHandOver extends BasePage {
await model.onTakeoutConfirm(arr);
if (model.code == '1') {
//this.customToast(this.$t('message.Warehouse_Tip9') as string);
uni.showToast({ icon: 'success', title: this.$t('message.Warehouse_Tip9') as string });
uni.showToast({
//icon: 'success',
title: this.$t('message.Warehouse_Tip9') as string,
duration: 2000,
image: '/static/icons/icon-51.png',
});
//model.empty();
this.orderlist = {};
this.model.materielList.length = 0;

Loading…
Cancel
Save