diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 4e892a0..1e93ce2 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -288,11 +288,14 @@ export default { Scrap_ScrapNo: '报废单', Scrap_Tip: '请输入报废单号', Scrap_ScrapDetails: '报废明细', + operatingTime: '操作时间', + finishedProductReport: '报废明细', //领用借用 borrow_OrderNo: '单号', borrow_Tip: '请输入单号', borrow_CollectionAndBorrowingDetails: '领用借用明细', + usingDetail: '领用借用明细', //成品主菜单 EnterTheWarehouse: '入库', diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index e86a357..41529a4 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -288,11 +288,14 @@ export default { Scrap_ScrapNo: 'Scrap No', Scrap_Tip: 'Please input scrap No', Scrap_ScrapDetails: 'Scrap detail', + operatingTime: 'operatingTime', + finishedProductReport: 'Scrap details', //领用借用 borrow_OrderNo: 'Order No', borrow_Tip: 'Please input order No', borrow_CollectionAndBorrowingDetails: 'Cost center detail', + usingDetail: 'borrowing details', //成品主菜单 // EnterTheWarehouse: 'Enter The Warehouse', diff --git a/src/pages.json b/src/pages.json index d745c1f..c3a33dc 100644 --- a/src/pages.json +++ b/src/pages.json @@ -770,6 +770,22 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/product/warehouse/wholeScrap/detail", + "style": { + "navigationBarTitleText": "成品报废明细", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, + { + "path": "pages/product/warehouse/wholeCollect/detail", + "style": { + "navigationBarTitleText": "成品领用借用明细", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/demo/index", "style": { diff --git a/src/pages/product/warehouse/wholeCollect/config.ts b/src/pages/product/warehouse/wholeCollect/config.ts new file mode 100644 index 0000000..11b20f2 --- /dev/null +++ b/src/pages/product/warehouse/wholeCollect/config.ts @@ -0,0 +1,48 @@ +/** + * 成品领用借用详细列表 + */ +import vm from "@/main"; +export const headers = [ + //条码号 + { + label: vm.$t("message.product_barCode"), + key: "barCode", + width: 300, + }, + //单号 + { + label: vm.$t("message.borrow_OrderNo"), + key: "proMoveCode", + width: 300, + }, + //型号编码 + { + label: vm.$t("message.ModelCode"), + key: "materialCode", + width: 300, + }, + //型号名称 + { + label: vm.$t("message.ModelName"), + key: "materialDesc", + width: 300, + }, + //源库位 + { + label: vm.$t("message.SourceLocation"), + key: "wlFromCode", + width: 300, + }, + //目标库位 + { + label: vm.$t("message.Warehouse_TargetLocation"), + key: "wlToCode", + width: 300, + }, + // //操作时间 + { + label: vm.$t("message.operatingTime"), + key: "moveTime", + width: 300, + }, +]; diff --git a/src/pages/product/warehouse/wholeCollect/detail.vue b/src/pages/product/warehouse/wholeCollect/detail.vue new file mode 100644 index 0000000..9326fab --- /dev/null +++ b/src/pages/product/warehouse/wholeCollect/detail.vue @@ -0,0 +1,182 @@ + + + + + diff --git a/src/pages/product/warehouse/wholeCollect/index.vue b/src/pages/product/warehouse/wholeCollect/index.vue index d335945..11ffacd 100644 --- a/src/pages/product/warehouse/wholeCollect/index.vue +++ b/src/pages/product/warehouse/wholeCollect/index.vue @@ -46,7 +46,7 @@ - {{ $t('message.detailed') }} + {{ $t('message.detailed') }} {{ $t('message.InventoryFinish') }} @@ -192,6 +192,18 @@ export default class ProductCheckReceipt extends BasePage { this.form.order3 = ''; this.form.barcode = ''; } + //查询明细 + async bill() { + if (!this.form.order3) { + uni.showToast({ + icon: 'none', + title: this.$t('message.Commission_tips1') as string, + }); + return; + } + await this.model.queryDetailed(this.form.order3); + this.toPage(this.page.product.warehouse.wholeCollect.stoOutboundDetail); + } } diff --git a/src/pages/product/warehouse/wholeScrap/index.vue b/src/pages/product/warehouse/wholeScrap/index.vue index bcc1ebc..44d5484 100644 --- a/src/pages/product/warehouse/wholeScrap/index.vue +++ b/src/pages/product/warehouse/wholeScrap/index.vue @@ -54,7 +54,7 @@ - {{ $t('message.detailed') }} + {{ $t('message.detailed') }} {{ $t('message.InventoryFinish') }} @@ -205,6 +205,18 @@ export default class productCheckReceipt extends BasePage { this.form.order3 = ''; this.form.barcode = ''; } + //查询明细 + async bill() { + if (!this.form.order3) { + uni.showToast({ + icon: 'none', + title: this.$t('message.Commission_tips1') as string, + }); + return; + } + await this.model.queryDetailed(this.form.order3); + this.toPage(this.page.product.warehouse.wholeScrap.stoOutboundDetail); + } } diff --git a/src/pages/product/warehouse/wholeScrap/model.ts b/src/pages/product/warehouse/wholeScrap/model.ts index 7f1954a..c328221 100644 --- a/src/pages/product/warehouse/wholeScrap/model.ts +++ b/src/pages/product/warehouse/wholeScrap/model.ts @@ -31,6 +31,7 @@ export class wholeScrap extends VuexModule { code: any = ''; recordsList: any = []; choiceCodeList: any = []; + materielList: any = []; /** * 物料型号类型 */ @@ -101,6 +102,21 @@ export class wholeScrap extends VuexModule { const code = records.code; return { code }; } + /** + * 查询明细 + * 查询DN单号 + * @param dnNo + */ + @MutationAction + async queryDetailed(proMoveCode: any) { + const { code, data } = await http.post(url.warehouse.rowTransfer.queryListByMoveCode, { + proMoveCode, + factoryCode: session.factoryCode as string, + loginName: session.loginName as string, + }); + const materielList = data; + return { materielList, code }; + } @MutationAction async queryScrapList(param: any) { diff --git a/src/pages/raw/commission/entrant/index.vue b/src/pages/raw/commission/entrant/index.vue index cf440b9..402ddef 100644 --- a/src/pages/raw/commission/entrant/index.vue +++ b/src/pages/raw/commission/entrant/index.vue @@ -419,6 +419,9 @@ export default class dnReceiptDom extends BasePage { .material-right-code { width: 80%; height: 100%; + line-height: 100rpx; + text-align: left; + padding-left: 10px; // line-height: 100rpx; } } diff --git a/src/pages/raw/commission/goOut/index.vue b/src/pages/raw/commission/goOut/index.vue index 483ea21..0227911 100644 --- a/src/pages/raw/commission/goOut/index.vue +++ b/src/pages/raw/commission/goOut/index.vue @@ -420,6 +420,9 @@ export default class dnReceiptDom extends BasePage { .material-right-code { width: 80%; height: 100%; + line-height: 100rpx; + text-align: left; + padding-left: 10px; // line-height: 100rpx; } } diff --git a/src/utils/page.ts b/src/utils/page.ts index 3569f5f..c9cb1d6 100644 --- a/src/utils/page.ts +++ b/src/utils/page.ts @@ -40,9 +40,11 @@ export const page = { }, wholeScrap: { index: '/pages/product/warehouse/wholeScrap/index', + stoOutboundDetail: '/pages/product/warehouse/wholeScrap/detail', }, wholeCollect: { index: '/pages/product/warehouse/wholeCollect/index', + stoOutboundDetail: '/pages/product/warehouse/wholeCollect/detail', }, MaterialInventory: { index: '/pages/product/warehouse/MaterialInventory/index', diff --git a/src/utils/url.ts b/src/utils/url.ts index 98f13e4..b29acf1 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -192,6 +192,8 @@ export const url = { list: '/wmspda/fg/listByOrder', commit: '/wmspda/fg/confirmMove', getCode: '/wmspda/fg/getCpMoveBatchNo', + //查询明细 + queryListByMoveCode: '/wmspda/fg/queryListByMoveCode', }, rowScrap: { list: '/wmspda/fg/listByOrder',