From c41327758d4f3a64e5670f8b063314c5bf0a65de Mon Sep 17 00:00:00 2001 From: guoshuang Date: Fri, 14 Oct 2022 11:44:25 +0800 Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E6=96=B0=E5=A2=9E=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E4=B8=AD=E5=BF=83=E5=9B=9E=E6=94=B6=E7=89=A9=E6=96=99?= =?UTF-8?q?&&=E5=8E=9F=E6=9D=90=E6=96=99=E6=8A=A5=E5=BA=9F=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/cn.ts | 2 + src/i18n/lang/en.ts | 2 + src/i18n/lang/ru.ts | 2 + src/pages.json | 8 + src/pages/raw/LineSide/CostCenter/index.vue | 252 ++++++++++++++++++ src/pages/raw/LineSide/CostCenter/model.ts | 57 ++++ .../LineSide/Lineedge-raw-transfer/index.vue | 9 +- .../raw/warehouse/RUS-rowScrap/index.vue | 4 +- src/utils/url.ts | 3 + 9 files changed, 331 insertions(+), 8 deletions(-) create mode 100644 src/pages/raw/LineSide/CostCenter/index.vue create mode 100644 src/pages/raw/LineSide/CostCenter/model.ts diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index ec69ebe..b4dce4f 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -501,5 +501,7 @@ export default { DNLine_PleaseSelect: '请选择DN行项目', semi_finished_Transfer: '线边库半成品移库', Lineedge_raw_transfer: '线边库原材料移库', + CostCenter: '成本中心', + recovery: '回收', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 28b0ebf..718fe00 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -501,5 +501,7 @@ export default { DNLine_PleaseSelect: 'Please select DN line item', semi_finished_Transfer: 'Transfer of semi-finished products', Lineedge_raw_transfer: 'Line edge raw material transfer', + CostCenter: 'Cost Center', + recovery: 'recovery', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index f47f592..0cc8403 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -501,5 +501,7 @@ export default { DNLine_PleaseSelect: 'Выберите пункт в строке DN', semi_finished_Transfer: 'складирование полуфабрикатов', Lineedge_raw_transfer: 'транзитный склад', + CostCenter: 'центр себестоимости', + recovery: 'рекуперация', }, }; diff --git a/src/pages.json b/src/pages.json index adea88d..f3a60fb 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1234,6 +1234,14 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/raw/LineSide/CostCenter/index", + "style": { + "navigationBarTitleText": "成本中心", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/product/STO-Outbound/index", "style": { diff --git a/src/pages/raw/LineSide/CostCenter/index.vue b/src/pages/raw/LineSide/CostCenter/index.vue new file mode 100644 index 0000000..bab2b49 --- /dev/null +++ b/src/pages/raw/LineSide/CostCenter/index.vue @@ -0,0 +1,252 @@ + + + diff --git a/src/pages/raw/LineSide/CostCenter/model.ts b/src/pages/raw/LineSide/CostCenter/model.ts new file mode 100644 index 0000000..ce8d45a --- /dev/null +++ b/src/pages/raw/LineSide/CostCenter/model.ts @@ -0,0 +1,57 @@ +/* + * @Author: zhou lei + * @Date: 2022-10-13 16:05:30 + * @LastEditTime: 2022-10-14 10:28:51 + * @LastEditors: zhou lei + * @Description: + * @FilePath: \hgwms-factory-app\src\pages\raw\LineSide\CostCenter\model.ts + * 联系方式:910592680@qq.com 18669792120 科海达信息技术有限公司 + */ +import { getModule, Module, 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 request from '@/utils/request'; +import { stringify } from 'query-string'; +// import { page } from '@/utils/page'; + +class OrderInInfo { + productDescZh?: string; + qty?: string; + custCode?: string; + custCodeName?: string; + productCode?: string; + locCode?: string; + barcode?: string; + // actualQty?: string; +} + +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'row.LineSide.CostCenter.index', +}) +export class wholeTransfer extends VuexModule { + /** + * 库位地点列表 + */ + WlList = []; + userDefined: any = ''; + detailedList: any; + code = ''; + delCode = ''; + removeList: any = []; + removeMaterialList: any = []; + dnNo = ''; + orderInInfo: OrderInInfo = new OrderInInfo(); + @MutationAction + async centerRecordTableRecovery(list: any) { + const records: any = await request.post(url.warehouse.center.centerRecordTableRecovery, stringify(list)); + const code = records.code; + return { code }; + } +} + +export default getModule(wholeTransfer); diff --git a/src/pages/raw/LineSide/Lineedge-raw-transfer/index.vue b/src/pages/raw/LineSide/Lineedge-raw-transfer/index.vue index 14bafdc..ccf5a74 100644 --- a/src/pages/raw/LineSide/Lineedge-raw-transfer/index.vue +++ b/src/pages/raw/LineSide/Lineedge-raw-transfer/index.vue @@ -31,7 +31,7 @@ - + @@ -91,10 +91,10 @@ export default class productCheckReceipt extends BasePage { aimWlSelect = false; cboPlaceSelect = false; rules: VFormRules = { - documentNo: [{ required: true, message: this.$t('message.Warehouse_Tip1') as string }], + //documentNo: [{ required: true, message: this.$t('message.Warehouse_Tip1') as string }], aimWl: [{ required: true, message: this.$t('message.Warehouse_Tip3') as string }], oldaimWl: [{ required: true, message: this.$t('message.product_Tip3') as string }], - cboPlace: [{ required: true, message: this.$t('message.Warehouse_Tip4') as string }], + //cboPlace: [{ required: true, message: this.$t('message.Warehouse_Tip4') as string }], }; value = ''; show = false; @@ -314,8 +314,5 @@ export default class productCheckReceipt extends BasePage { box-shadow: 0 1rpx 20rpx 0 rgba(128, 128, 128, 0.2); padding: 20rpx; } - - .button-bar { - } } diff --git a/src/pages/raw/warehouse/RUS-rowScrap/index.vue b/src/pages/raw/warehouse/RUS-rowScrap/index.vue index 3905da2..78c0bbb 100644 --- a/src/pages/raw/warehouse/RUS-rowScrap/index.vue +++ b/src/pages/raw/warehouse/RUS-rowScrap/index.vue @@ -31,9 +31,9 @@ - + diff --git a/src/utils/url.ts b/src/utils/url.ts index 84cb28e..3f37282 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -228,6 +228,9 @@ export const url = { }, }, warehouse: { + center: { + centerRecordTableRecovery: '/wmspda/bl/centerRecordTableRecovery', + }, rowTransfer: { list: '/wmspda/fg/listByOrder', listByOrder: '/wmspda/fg/listByOrder',