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