Yangwl
/
lanju-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复 明细界面问题

Browse Source
master
hou 4 years ago
parent d709971c6f
commit 02e1a3cb5f
11 changed files with 130 additions and 89 deletions
Show Stats Download Patch File Download Diff File

2
src/i18n/lang/cn.ts
Unescape Escape View File

@ -245,6 +245,8 @@ export default {
start: "开始时间", start: "开始时间",
_tips5: "请选择相同库位", _tips5: "请选择相同库位",
_tips6: "请先输入要查询的单号", _tips6: "请先输入要查询的单号",
Out: "出",
enter: "入",
//移库 //移库
Warehouse_QueryCriteria: "查询条件", Warehouse_QueryCriteria: "查询条件",
Warehouse_TransferOrderNo: "移库单号", Warehouse_TransferOrderNo: "移库单号",

3
src/i18n/lang/en.ts
Unescape Escape View File

@ -247,7 +247,8 @@ export default {
start: "start time", start: "start time",
_tips5: "Please select the same location", _tips5: "Please select the same location",
_tips6: "Please enter the order number to query first", _tips6: "Please enter the order number to query first",
Out: "Out",
enter: "enter",
//移库 //移库
Warehouse_QueryCriteria: "Query criteria", Warehouse_QueryCriteria: "Query criteria",
Warehouse_TransferOrderNo: "Transfer order No", Warehouse_TransferOrderNo: "Transfer order No",

53
src/pages/product/warehouse/wholeCollect/model.ts
Unescape Escape View File

@ -1,10 +1,16 @@
import { Action, getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; import {
import store from '@/store'; Action,
import http from '@/utils/request'; getModule,
import { url } from '@/utils/url'; Module,
import { session } from '@/store/modules/session'; 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 { page } from '@/utils/page'; // import { page } from '@/utils/page';
import vm from '@/main'; import vm from "@/main";
class OrderInInfo { class OrderInInfo {
productDescZh?: string; productDescZh?: string;
@ -20,7 +26,7 @@ class OrderInInfo {
namespaced: true, namespaced: true,
dynamic: true, dynamic: true,
store, store,
name: 'product.warehouse.wholeCollect', name: "product.warehouse.wholeCollect",
}) })
export class wholeCollect extends VuexModule { export class wholeCollect extends VuexModule {
/** /**
@ -40,7 +46,7 @@ export class wholeCollect extends VuexModule {
/** /**
* 隐藏看单号 * 隐藏看单号
*/ */
dnNo = ''; dnNo = "";
/** /**
* 看单号查询结果 * 看单号查询结果
*/ */
@ -89,25 +95,28 @@ export class wholeCollect extends VuexModule {
factoryCode: session.factoryCode, factoryCode: session.factoryCode,
loginName: session.loginName, loginName: session.loginName,
}); });
console.log('获取来的数据', res.data.records); console.log("获取来的数据", res.data.records);
const orderInInfo = res.data.records[0] || {}; const orderInInfo = res.data.records[0] || {};
if (orderInInfo.custCode == '0') { if (orderInInfo.custCode == "0") {
orderInInfo.custCodeName = vm.$t('message.Warehouse_NX') as any; orderInInfo.custCodeName = vm.$t("message.Warehouse_NX") as any;
} else if (orderInInfo.custCode == '1') { } else if (orderInInfo.custCode == "1") {
orderInInfo.custCodeName = vm.$t('message.Warehouse_WX') as any; orderInInfo.custCodeName = vm.$t("message.Warehouse_WX") as any;
} else if (orderInInfo.custCode == '2') { } else if (orderInInfo.custCode == "2") {
orderInInfo.custCodeName = vm.$t('message.Warehouse_YJ') as any; orderInInfo.custCodeName = vm.$t("message.Warehouse_YJ") as any;
} else if (orderInInfo.custCode == '4') { } else if (orderInInfo.custCode == "4") {
orderInInfo.custCodeName = vm.$t('message.Warehouse_BCP') as any; orderInInfo.custCodeName = vm.$t("message.Warehouse_BCP") as any;
} }
return { orderInInfo }; return { orderInInfo };
} }
@MutationAction @MutationAction
async onTakeoutConfirm(list: any[]) { async onTakeoutConfirm(list: any[]) {
const records: any = await http.post(url.warehouse.rowTransfer.commit, list); const records: any = await http.post(
url.warehouse.rowTransfer.commit,
list
);
if (records.code == 1) { if (records.code == 1) {
uni.showToast({ icon: 'success', title: 'success' }); uni.showToast({ icon: "success", title: "success" });
// uni.navigateTo({ url: page.product.warehouse.index }); // uni.navigateTo({ url: page.product.warehouse.index });
} }
return {}; return {};
@ -141,11 +150,11 @@ export class wholeCollect extends VuexModule {
/** /**
* 修改库位 * 修改库位
*/ */
@Action({ commit: 'updateCheckedOrderInInfoListKw' }) @Action({ commit: "updateCheckedOrderInInfoListKw" })
async changeOrderInLocation(kw: string) { async changeOrderInLocation(kw: string) {
await http.post('/material/orderin/enter', { await http.post("/wmspda/material/orderin/enter", {
loginName: session.loginName, loginName: session.loginName,
warehouseCode: '', warehouseCode: "",
factoryCode: session.factoryCode, factoryCode: session.factoryCode,
locationCode: kw, locationCode: kw,
}); });

55
src/pages/product/warehouse/wholeLnventory/model.ts
Unescape Escape View File

@ -1,10 +1,16 @@
import { Action, getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; import {
import store from '@/store'; Action,
import http from '@/utils/request'; getModule,
import { url } from '@/utils/url'; Module,
import { session } from '@/store/modules/session'; 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 { page } from '@/utils/page'; // import { page } from '@/utils/page';
import vm from '@/main'; import vm from "@/main";
class OrderInInfo { class OrderInInfo {
productDescZh?: string; productDescZh?: string;
@ -16,7 +22,7 @@ class OrderInInfo {
namespaced: true, namespaced: true,
dynamic: true, dynamic: true,
store, store,
name: 'product.warehouse.wholeLnventory', name: "product.warehouse.wholeLnventory",
}) })
export class wholeLnventory extends VuexModule { export class wholeLnventory extends VuexModule {
/** /**
@ -36,9 +42,9 @@ export class wholeLnventory extends VuexModule {
/** /**
* 隐藏看单号 * 隐藏看单号
*/ */
dnNo = ''; dnNo = "";
records = { records = {
code: '', code: "",
}; };
/** /**
* 看单号查询结果 * 看单号查询结果
@ -92,20 +98,23 @@ export class wholeLnventory extends VuexModule {
}); });
const WlListaa = res.data; const WlListaa = res.data;
const WlList = res.data.map((_: any) => ({ const WlList = res.data.map((_: any) => ({
label: _.productCode + '-' + _.locCode, label: _.productCode + "-" + _.locCode,
value: _.locCode, value: _.locCode,
})); }));
console.log('WlList', WlList); console.log("WlList", WlList);
return { WlList, WlListaa }; return { WlList, WlListaa };
} }
@MutationAction @MutationAction
async onTakeoutConfirm(list: any) { async onTakeoutConfirm(list: any) {
const records: any = await http.post(url.warehouse.wholeLnventory.commit, list); const records: any = await http.post(
url.warehouse.wholeLnventory.commit,
list
);
if (records.code == 1) { if (records.code == 1) {
uni.showToast({ uni.showToast({
icon: 'success', icon: "success",
title: 'success', title: "success",
}); });
// uni.navigateTo({ url: page.product.warehouse.index }); // uni.navigateTo({ url: page.product.warehouse.index });
} }
@ -114,10 +123,16 @@ export class wholeLnventory extends VuexModule {
@MutationAction @MutationAction
async toScanCode(list: any) { async toScanCode(list: any) {
const records: any = await http.post(url.warehouse.wholeLnventory.scanCode, list); const records: any = await http.post(
url.warehouse.wholeLnventory.scanCode,
list
);
if (records.code == 1) { if (records.code == 1) {
console.log('数据啊啊啊', records); console.log("数据啊啊啊", records);
uni.showToast({ icon: 'none', title: vm.$t('message.Warehouse_Tip9') as any }); uni.showToast({
icon: "none",
title: vm.$t("message.Warehouse_Tip9") as any,
});
return { records }; return { records };
} }
// if (records.code == 0) { // if (records.code == 0) {
@ -128,12 +143,12 @@ export class wholeLnventory extends VuexModule {
/** /**
* 修改库位 * 修改库位
*/ */
@Action({ commit: 'updateCheckedOrderInInfoListKw' }) @Action({ commit: "updateCheckedOrderInInfoListKw" })
async changeOrderInLocation(kw: string) { async changeOrderInLocation(kw: string) {
await http.post('/material/orderin/enter', { await http.post("/wmspda/material/orderin/enter", {
// loginName: '1999', // loginName: '1999',
loginName: session.loginName, loginName: session.loginName,
warehouseCode: '', warehouseCode: "",
// factoryCode: '1999', // factoryCode: '1999',
factoryCode: session.factoryCode, factoryCode: session.factoryCode,
locationCode: kw, locationCode: kw,

55
src/pages/product/warehouse/wholeScrap/model.ts
Unescape Escape View File

@ -1,9 +1,15 @@
import { Action, getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; import {
import store from '@/store'; Action,
import http from '@/utils/request'; getModule,
import { url } from '@/utils/url'; Module,
import { session } from '@/store/modules/session'; MutationAction,
import vm from '@/main'; 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 { page } from '@/utils/page'; // import { page } from '@/utils/page';
class OrderInInfo { class OrderInInfo {
@ -21,7 +27,7 @@ class OrderInInfo {
namespaced: true, namespaced: true,
dynamic: true, dynamic: true,
store, store,
name: 'product.warehouse.wholeScrap', name: "product.warehouse.wholeScrap",
}) })
export class wholeScrap extends VuexModule { export class wholeScrap extends VuexModule {
/** /**
@ -41,7 +47,7 @@ export class wholeScrap extends VuexModule {
/** /**
* 隐藏看单号 * 隐藏看单号
*/ */
dnNo = ''; dnNo = "";
/** /**
* 看单号查询结果 * 看单号查询结果
*/ */
@ -94,27 +100,30 @@ export class wholeScrap extends VuexModule {
loginName: session.loginName, loginName: session.loginName,
// loginName: '1999', // loginName: '1999',
}); });
console.log('获取来的数据', res.data.records); console.log("获取来的数据", res.data.records);
const orderInInfo = res.data.records[0]; const orderInInfo = res.data.records[0];
if (orderInInfo.custCode == '0') { if (orderInInfo.custCode == "0") {
orderInInfo.custCodeName = vm.$t('message.Warehouse_NX') as any; orderInInfo.custCodeName = vm.$t("message.Warehouse_NX") as any;
} else if (orderInInfo.custCode == '1') { } else if (orderInInfo.custCode == "1") {
orderInInfo.custCodeName = vm.$t('message.Warehouse_WX') as any; orderInInfo.custCodeName = vm.$t("message.Warehouse_WX") as any;
} else if (orderInInfo.custCode == '2') { } else if (orderInInfo.custCode == "2") {
orderInInfo.custCodeName = vm.$t('message.Warehouse_YJ') as any; orderInInfo.custCodeName = vm.$t("message.Warehouse_YJ") as any;
} else if (orderInInfo.custCode == '4') { } else if (orderInInfo.custCode == "4") {
orderInInfo.custCodeName = vm.$t('message.Warehouse_BCP') as any; orderInInfo.custCodeName = vm.$t("message.Warehouse_BCP") as any;
} }
return { orderInInfo }; return { orderInInfo };
} }
@MutationAction @MutationAction
async onTakeoutConfirm(list: any) { async onTakeoutConfirm(list: any) {
const records: any = await http.post(url.warehouse.rowTransfer.commit, list); const records: any = await http.post(
url.warehouse.rowTransfer.commit,
list
);
if (records.code == 1) { if (records.code == 1) {
uni.showToast({ uni.showToast({
icon: 'success', icon: "success",
title: 'success', title: "success",
}); });
// uni.navigateTo({ url: page.product.warehouse.index }); // uni.navigateTo({ url: page.product.warehouse.index });
} }
@ -149,12 +158,12 @@ export class wholeScrap extends VuexModule {
/** /**
* 修改库位 * 修改库位
*/ */
@Action({ commit: 'updateCheckedOrderInInfoListKw' }) @Action({ commit: "updateCheckedOrderInInfoListKw" })
async changeOrderInLocation(kw: string) { async changeOrderInLocation(kw: string) {
await http.post('/material/orderin/enter', { await http.post("/wmspda/material/orderin/enter", {
loginName: session.loginName, loginName: session.loginName,
// loginName: '1999', // loginName: '1999',
warehouseCode: '', warehouseCode: "",
factoryCode: session.factoryCode, factoryCode: session.factoryCode,
// factoryCode: '1999', // factoryCode: '1999',
locationCode: kw, locationCode: kw,

6
src/pages/product/warehouse/wholeTransfer/Local-details.vue
Unescape Escape View File

@ -52,7 +52,7 @@ export default class RawReceiptDetail extends BasePage {
if (this.cpRef4 == "") { if (this.cpRef4 == "") {
uni.showToast({ uni.showToast({
icon: "none", icon: "none",
title: "请先输入要查询的单号" as any, title: this.$t("message._tips6") as any,
}); });
return; return;
} }
@ -67,9 +67,9 @@ export default class RawReceiptDetail extends BasePage {
let arr = this.model.detailedList; let arr = this.model.detailedList;
arr.forEach((item: any) => { arr.forEach((item: any) => {
if (item.oiType == 10 || item.oiType == "10") { if (item.oiType == 10 || item.oiType == "10") {
item.oiType = "入"; item.oiType = this.$t("message.enter");
} else { } else {
item.oiType = "出"; item.oiType = this.$t("message.Out");
} }
}); });
this.detailedList = arr; this.detailedList = arr;

2
src/pages/product/warehouse/wholeTransfer/model.ts
Unescape Escape View File

@ -180,7 +180,7 @@ export class wholeTransfer extends VuexModule {
*/ */
@Action({ commit: "updateCheckedOrderInInfoListKw" }) @Action({ commit: "updateCheckedOrderInInfoListKw" })
async changeOrderInLocation(kw: string) { async changeOrderInLocation(kw: string) {
await http.post("/material/orderin/enter", { await http.post("/wmspda/material/orderin/enter", {
loginName: session.loginName, loginName: session.loginName,
// loginName: '1999', // loginName: '1999',
warehouseCode: "", warehouseCode: "",

2
src/pages/raw/ingoods/dnReturnGoods/model.ts
Unescape Escape View File

@ -186,7 +186,7 @@ export class ReceiptModule extends VuexModule {
*/ */
@Action({ commit: "updateCheckedOrderInInfoListKw" }) @Action({ commit: "updateCheckedOrderInInfoListKw" })
async changeOrderInLocation(kw: string) { async changeOrderInLocation(kw: string) {
await http.post("/material/orderin/enter", { await http.post("/wmspda/material/orderin/enter", {
warehouseCode: session.warehouseCode, warehouseCode: session.warehouseCode,
factoryCode: session.factoryCode, factoryCode: session.factoryCode,
loginName: session.loginName, loginName: session.loginName,

2
src/pages/raw/ingoods/poReceipt/model.ts
Unescape Escape View File

@ -187,7 +187,7 @@ export class ReceiptModule extends VuexModule {
*/ */
@Action({ commit: "updateCheckedOrderInInfoListKw" }) @Action({ commit: "updateCheckedOrderInInfoListKw" })
async changeOrderInLocation(kw: string) { async changeOrderInLocation(kw: string) {
await http.post("/material/orderin/enter", { await http.post("/wmspda/material/orderin/enter", {
factoryCode: session.factoryCode, factoryCode: session.factoryCode,
loginName: session.loginName, loginName: session.loginName,
warehouseCode: session.warehouseCode, warehouseCode: session.warehouseCode,

37
src/pages/raw/ingoods/receipt/model.ts
Unescape Escape View File

@ -5,11 +5,11 @@ import {
Mutation, Mutation,
MutationAction, MutationAction,
VuexModule, VuexModule,
} from 'vuex-module-decorators'; } from "vuex-module-decorators";
import store from '@/store'; import store from "@/store";
import http from '@/utils/request'; import http from "@/utils/request";
import { url } from '@/utils/url'; import { url } from "@/utils/url";
import { session } from '@/store/modules/session'; import { session } from "@/store/modules/session";
class OrderInInfo { class OrderInInfo {
checked?: boolean; checked?: boolean;
@ -23,7 +23,7 @@ class OrderInInfo {
namespaced: true, namespaced: true,
dynamic: true, dynamic: true,
store, store,
name: 'raw.ingoods.receipt', name: "raw.ingoods.receipt",
}) })
export class ReceiptModule extends VuexModule { export class ReceiptModule extends VuexModule {
/** /**
@ -33,7 +33,7 @@ export class ReceiptModule extends VuexModule {
/** /**
* 隐藏看单号 * 隐藏看单号
*/ */
hideKdOrderNo = ''; hideKdOrderNo = "";
/** /**
* 看单号查询结果 * 看单号查询结果
*/ */
@ -134,8 +134,12 @@ export class ReceiptModule extends VuexModule {
loginName: session.loginName, loginName: session.loginName,
}); });
const orderInInfo = list[0] || {}; const orderInInfo = list[0] || {};
const orderInInfoList = list.filter((_: OrderInInfo) => _.userDefined10 === '1'); const orderInInfoList = list.filter(
const orderInInfoListEx = list.filter((_: OrderInInfo) => _.userDefined10 === '0'); (_: OrderInInfo) => _.userDefined10 === "1"
);
const orderInInfoListEx = list.filter(
(_: OrderInInfo) => _.userDefined10 === "0"
);
return { hideKdOrderNo, orderInInfo, orderInInfoList, orderInInfoListEx }; return { hideKdOrderNo, orderInInfo, orderInInfoList, orderInInfoListEx };
} }
@ -145,8 +149,8 @@ export class ReceiptModule extends VuexModule {
@MutationAction @MutationAction
async submitOrderInEnter() { async submitOrderInEnter() {
const list = (this.state as any).orderInInfoList.map((item: any) => { const list = (this.state as any).orderInInfoList.map((item: any) => {
item.orderStatus = item.checked ? '2' : '1'; item.orderStatus = item.checked ? "2" : "1";
item.requestAmount = item.checked ? item.y : '0'; item.requestAmount = item.checked ? item.y : "0";
return item; return item;
}); });
const result: any = await http.post(url.material.POorderin.enter, { const result: any = await http.post(url.material.POorderin.enter, {
@ -156,11 +160,12 @@ export class ReceiptModule extends VuexModule {
list, list,
}); });
uni.showToast({ uni.showToast({
icon: 'none', icon: "none",
title: result.msg, title: result.msg,
}); });
const orderInInfoList = result.list.sort( const orderInInfoList = result.list.sort(
(a: any, b: any) => Number(a.accountingStatus) - Number(b.accountingStatus), (a: any, b: any) =>
Number(a.accountingStatus) - Number(b.accountingStatus)
); );
return { orderInInfoList }; return { orderInInfoList };
} }
@ -168,11 +173,11 @@ export class ReceiptModule extends VuexModule {
/** /**
* 修改库位 * 修改库位
*/ */
@Action({ commit: 'updateCheckedOrderInInfoListKw' }) @Action({ commit: "updateCheckedOrderInInfoListKw" })
async changeOrderInLocation(kw: string) { async changeOrderInLocation(kw: string) {
await http.post('/material/orderin/enter', { await http.post("/wmspda/material/orderin/enter", {
loginName: session.loginName, loginName: session.loginName,
warehouseCode: '', warehouseCode: "",
factoryCode: session.factoryCode, factoryCode: session.factoryCode,
locationCode: kw, locationCode: kw,
}); });

2
src/pages/raw/warehouse/rowInventory/model.ts
Unescape Escape View File

@ -310,7 +310,7 @@ export class ReceiptModule extends VuexModule {
*/ */
@Action({ commit: "updateCheckedOrderInInfoListKw" }) @Action({ commit: "updateCheckedOrderInInfoListKw" })
async changeOrderInLocation(kw: string) { async changeOrderInLocation(kw: string) {
await http.post("/material/orderin/enter", { await http.post("/wmspda/material/orderin/enter", {
warehouseCode: session.warehouseCode, warehouseCode: session.warehouseCode,
factoryCode: session.factoryCode, factoryCode: session.factoryCode,
loginName: session.loginName, loginName: session.loginName,

Write Preview
Loading…
Cancel
Save