diff --git a/src/pages/raw/commission/goOut/index.vue b/src/pages/raw/commission/goOut/index.vue
index 47de24e..cd8e043 100644
--- a/src/pages/raw/commission/goOut/index.vue
+++ b/src/pages/raw/commission/goOut/index.vue
@@ -8,16 +8,18 @@
-
+
+
-
+
+
+
+
+
+
+
-
+
+
+
-
+
+
+
@@ -156,11 +168,24 @@ export default class stoOutboundDom extends BasePage {
* 表单数据
*/
form = {
+ // poNo
+ poNo:null,
+ // 物料号
+ materialCode:null,
+ // 物料描述
+ materialDesc:null,
+ poLine:null,
+ unit:null,
+ // 累计出库数量
+ outAmount:null,
+ // 需求数量
+ orderAmount: '',
+ locationCode:null,//库位
dockCode: null, // 月台类型code
dockName: null, // 月台类型name
orderNo: null,
qty: 0,
- orderAmount: '',
+
productCode: '', // 物料类型name
productDescZh: '',
scanAmount: '',
@@ -179,6 +204,7 @@ export default class stoOutboundDom extends BasePage {
returningTypeSelect = false;
// 物料类型选择
materialCodeSelect = false;
+ locationCodeSelect = false;
/**
* 表单验证规则
*/
@@ -189,7 +215,7 @@ export default class stoOutboundDom extends BasePage {
// 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
async onReady() {
this.$form.setRules(this.rules);
- model.queryReturningTypeList();
+ model.queryByFactoryCodeAndWorkAreaCode();
}
onCheck(e: any) {
console.log('e.data', e.data);
@@ -219,6 +245,18 @@ export default class stoOutboundDom extends BasePage {
});
console.log('this.form', this.form);
}
+ locationCodeConfirm(v: any) {
+ console.log('v[0].value', v[0]);
+ // this.form.productCode = v[0].value;
+ this.model.locationCodeList.forEach((item: any) => {
+ console.log('item',item)
+ if (v[0].value == item.value) {
+ this.form.locationCode = item.value;
+ }
+ });
+ console.log('this.form', this.form);
+ }
+
/**
* 清空
*/
diff --git a/src/pages/raw/commission/goOut/model.ts b/src/pages/raw/commission/goOut/model.ts
index f8d0098..de35a11 100644
--- a/src/pages/raw/commission/goOut/model.ts
+++ b/src/pages/raw/commission/goOut/model.ts
@@ -28,7 +28,7 @@ export class ReturningModule extends VuexModule {
* 物料列表
*/
materielList: any[] = [];
-
+ locationCodeList: any[] =[];
//条码扫描的返回的结果
oneMaterielDetail: any = {};
/**
@@ -37,51 +37,38 @@ export class ReturningModule extends VuexModule {
orderInInfo: OrderInInfo = new OrderInInfo();
//记账按钮的code码
code = '';
- /**
- * 查询月台列表
- */
- @MutationAction
- async queryReturningTypeList() {
- const list: [] = await http.post(url.outbound.stoOutbound.yuetaiType, {
- factoryCode: session.factoryCode,
- whCode: session.warehouseCode,
- loginName: session.loginName,
- });
- const returningTypeList = list.map((item: any) => ({
- label: item.dockName,
- value: item.dockCode,
- }));
- return { returningTypeList };
- }
+
/**
- * 查询订单号
+ * 委外出库单号查询
* @param orderNo
*/
- @MutationAction
- async queryOrderInInfo(stoNo: string) {
- const result = await http.post(url.outbound.stoOutbound.info, {
- stoNo,
- deleteFlag: 2,
- finalState: 3,
+ @Action
+ async queryOrder(form:any) {
+ const result = await http.post(url.material.commission.goOut.queryOrder, {
+ ...form,
loginName: session.loginName,
+ factoryCode:session.factoryCode
});
- let stoAmount = 0;
- result.data.records.forEach((item: any) => {
- stoAmount += item.orderAmount;
- });
- const materielList = result.data.records.map((item: any) => ({
- label: item.materialCode,
- value: item.stoItem,
- ...item,
- }));
- console.log('materielList', materielList);
- if (result.data.records[0]) {
- result.data.records[0].stoAmount = stoAmount;
- }
const orderInInfo = result.data.records[0] || {};
- return { orderInInfo, materielList };
+ return { orderInInfo };
}
+ /**
+ * 库位
+ */
+ @MutationAction
+ async queryByFactoryCodeAndWorkAreaCode() {
+ const list: [] = await http.post(url.material.commission.goOut.queryByFactoryCodeAndWorkAreaCode, {
+ factoryCode: session.factoryCode,
+ whCode: session.warehouseCode,
+ loginName: session.loginName,
+ });
+ const locationCodeList = list.map((item: any) => ({
+ label: item.locationCode,
+ value: item.locationCode,
+ }));
+ return { locationCodeList };
+ }
/**
* 扫条码
diff --git a/src/utils/url.ts b/src/utils/url.ts
index f3c5bbb..052b27f 100644
--- a/src/utils/url.ts
+++ b/src/utils/url.ts
@@ -84,6 +84,20 @@ export const url = {
// 5.盘点完成
orderComplete: "/product/finished/checkRaw/orderComplete",
},
+ // 委外 commission
+ commission: {
+ // 出库 goOut
+ goOut:{
+ // 出库单号查询
+ queryOrder: "/material/outsourcing/queryOrder",
+ // 库位下拉列表
+ queryByFactoryCodeAndWorkAreaCode: "/wmspda/fg/queryByFactoryCodeAndWorkAreaCode",
+ // 出库提交
+ materialComplete: "/material/outsourcing/materialComplete",
+ // 出库明细查询
+ outInfo: "/material/outsourcing/outInfo",
+ },
+ },
},
SFG: {
DumpListFH: {