diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 8c70565..439bff4 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -203,20 +203,23 @@ export default { InventoryPleaseScan: "请扫描单号", InventoryFinish: "完成", - // 委外-入库 - CommissionEntrant: "委外入库", - CommissionedSingleNumber: "单号", - CommissionedMaterielNo: "物料号", - CommissionedMaterielDesc: "物料描述", - CommissionedDemandData: "需求数据", - CommissionedCumulativeData: "累计数据", - CommissionedLocation: "库位", - CommissionedThisNumber: "本次数量", - CommissionedEntrantDetails: "入库明细", + // 委外-入库 + CommissionEntrant:'委外入库', + CommissionedSingleNumber:'单号', + CommissionedMaterielNo:'物料号', + CommissionedMaterielDesc:'物料描述', + CommissionedDemandData:'需求数据', + CommissionedCumulativeData:'累计数据', + CommissionedLocation:'库位', + CommissionedThisNumber:'本次数量', + CommissionedNumber:'入库数量', + CommissionedEntrantDetails:'入库明细', + CommissionedReceiptQuantity:'收货数量', - // 委外-出库 - CommissionGoOut: "委外出库", - CommissionedGoOutDetails: "出库明细", + // 委外-出库 + CommissionGoOut:'委外出库', + CommissionedGoOutDetails:'出库明细', + CommissionedGoOutNumber:'出库数量', //移库 Warehouse_QueryCriteria: "查询条件", Warehouse_TransferOrderNo: "移库单号", diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index fffaa1e..4867625 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -208,19 +208,22 @@ export default { InventoryFinish: "Finish", // 委外-入库 - CommissionEntrant: "委外入库", - CommissionedSingleNumber: "单号", - CommissionedMaterielNo: "物料号", - CommissionedMaterielDesc: "物料描述", - CommissionedDemandData: "需求数据", - CommissionedCumulativeData: "累计数据", - CommissionedLocation: "库位", - CommissionedThisNumber: "本次数量", - CommissionedEntrantDetails: "入库明细", - - // 委外-出库 - CommissionGoOut: "委外出库", - CommissionedGoOutDetails: "出库明细", + CommissionEntrant:"委外入库", + CommissionedSingleNumber:"单号", + CommissionedMaterielNo:"物料号", + CommissionedMaterielDesc:"物料描述", + CommissionedDemandData:"需求数据", + CommissionedCumulativeData:"累计数据", + CommissionedLocation:"库位", + CommissionedThisNumber:"本次数量", + CommissionedNumber:"入库数量", + CommissionedEntrantDetails:"入库明细", + CommissionedReceiptQuantity:"收货数量", + + // 委外-出库 + CommissionGoOut:"委外出库", + CommissionedGoOutDetails:"出库明细", + CommissionedGoOutNumber:"出库数量", //移库 Warehouse_QueryCriteria: "Query criteria", diff --git a/src/pages/raw/commission/entrant/config.ts b/src/pages/raw/commission/entrant/config.ts index 1d45ca0..0fe0d5b 100644 --- a/src/pages/raw/commission/entrant/config.ts +++ b/src/pages/raw/commission/entrant/config.ts @@ -1,21 +1,40 @@ +/* + * @Author: zhou lei + * @Date: 2021-11-10 17:14:44 + * @LastEditTime: 2021-11-22 17:43:40 + * @LastEditors: zhou lei + * @Description: + * @FilePath: /wms_haiwai_app/src/pages/raw/commission/entrant/config.ts + * 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司 + */ /** * 看单明细表格列 */ import vm from '@/main'; export const headers = [ { - label: vm.$t('message.product_barCode'), - key: 'barcode', - width: 300, + label: vm.$t('message.CommissionedSingleNumber'), + key: 'poNo', + width: 200, }, { - label: vm.$t('message.product_FGCode'), + label: vm.$t('message.po_MaterielNo'), key: 'materialCode', width: 300, }, { - label: vm.$t('message.product_FGDes'), + label: vm.$t('message.CommissionedMaterielDesc'), key: 'materialDesc', width: 300, }, + { + label: vm.$t('message.CommissionedReceiptQuantity'), + key: 'amount', + width: 200, + }, + { + label: vm.$t('message.CommissionedLocation'), + key: 'wlCode', + width: 200, + } ]; diff --git a/src/pages/raw/commission/entrant/detail.vue b/src/pages/raw/commission/entrant/detail.vue index 246b6e3..95103b0 100644 --- a/src/pages/raw/commission/entrant/detail.vue +++ b/src/pages/raw/commission/entrant/detail.vue @@ -26,41 +26,8 @@ >{{ $t('message.po_Total') }} {{ model.materielList.length }} {{ $t('message.po_Records') }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -72,7 +39,7 @@ import model from './model'; import { headers } from './config'; @Component -export default class RawReceiptDetail extends BasePage { +export default class RawCommissionEntrantDetail extends BasePage { /** * 页面Module */ @@ -87,6 +54,9 @@ export default class RawReceiptDetail extends BasePage { * 表头 */ headers = headers; + onLoad(params:any){ + this.model.info(params.poNo) + } /** * 逐条修改 diff --git a/src/pages/raw/commission/entrant/model.ts b/src/pages/raw/commission/entrant/model.ts index 3386098..9190c6d 100644 --- a/src/pages/raw/commission/entrant/model.ts +++ b/src/pages/raw/commission/entrant/model.ts @@ -30,10 +30,12 @@ export class ReturningModule extends VuexModule { * 月台列表 */ returningTypeList: any[] = []; + /** * 物料列表 */ materielList: any[] = []; + locationCodeList: any[] = []; //条码扫描的返回的结果 oneMaterielDetail: any = {}; @@ -43,6 +45,72 @@ export class ReturningModule extends VuexModule { orderInInfo: OrderInInfo = new OrderInInfo(); //记账按钮的code码 code = ""; + /** + * 委外出库单号查询 + * @param orderNo + */ + @Action + async queryOrder(form: any) { + const result = await http.post(url.material.commission.entrant.queryOrder, { + ...form, + loginName: session.loginName, + factoryCode: session.factoryCode, + }); + const orderInInfo = result.data.records[0] || {}; + 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 }; + // } + + /** + * 提交 + */ + @Action + async materialComplete(form: any) { + const res = await http.post( + url.material.commission.goOut.materialComplete, + { + factoryCode: session.factoryCode, + loginName: session.loginName, + ...form, + } + ); + console.log(res, ">>>>>res"); + } + /** + * 获取物料 + * + * @returns + * @memberof ReturningModule + */ + @MutationAction + async info(poNo: string) { + const list: [] = await http.post(url.material.commission.entrant.info, { + factoryCode: session.factoryCode, + poNo: poNo, + loginName: session.loginName, + }); + const locationCodeList = list.map((item: any) => ({ + label: item.locationCode, + value: item.locationCode, + })); + return { locationCodeList }; + } /** * 查询月台列表 */ diff --git a/src/pages/raw/commission/goOut/config.ts b/src/pages/raw/commission/goOut/config.ts index 1d45ca0..7e6a1b2 100644 --- a/src/pages/raw/commission/goOut/config.ts +++ b/src/pages/raw/commission/goOut/config.ts @@ -1,21 +1,40 @@ +/* + * @Author: zhou lei + * @Date: 2021-11-11 11:09:57 + * @LastEditTime: 2021-11-22 15:16:21 + * @LastEditors: zhou lei + * @Description: + * @FilePath: /wms_haiwai_app/src/pages/raw/commission/goOut/config.ts + * 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司 + */ /** * 看单明细表格列 */ import vm from '@/main'; export const headers = [ { - label: vm.$t('message.product_barCode'), - key: 'barcode', - width: 300, + label: vm.$t('message.CommissionedSingleNumber'), + key: 'poNo', + width: 200, }, { - label: vm.$t('message.product_FGCode'), + label: vm.$t('message.po_MaterielNo'), key: 'materialCode', width: 300, }, { - label: vm.$t('message.product_FGDes'), + label: vm.$t('message.CommissionedMaterielDesc'), key: 'materialDesc', width: 300, }, + { + label: vm.$t('message.CommissionedGoOutNumber'), + key: 'outAmount', + width: 200, + }, + { + label: vm.$t('message.CommissionedLocation'), + key: 'wlCode', + width: 200, + } ]; diff --git a/src/pages/raw/commission/goOut/detail.vue b/src/pages/raw/commission/goOut/detail.vue index f1b6367..03c3be8 100644 --- a/src/pages/raw/commission/goOut/detail.vue +++ b/src/pages/raw/commission/goOut/detail.vue @@ -4,7 +4,7 @@ - {{ $t('message.CommissionedGoOutDetails') }} + {{ $t("message.CommissionedGoOutDetails") }} @@ -23,56 +23,23 @@
{{ $t('message.po_Total') }} {{ model.materielList.length }} - {{ $t('message.po_Records') }}{{ $t("message.po_Total") }} {{ model.materielList.length }} + {{ $t("message.po_Records") }} - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - -