From eef4079220fcd69ab388ac95eaf3d376555db444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=99=93=E9=B9=8F?= Date: Wed, 30 Apr 2025 15:19:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/list/index.ts | 8 + src/i18n/pages/login/zh-cn.ts | 4 +- src/i18n/pages/materialReceiptNotice/en.ts | 8 +- src/i18n/pages/materialReceiptNotice/zh-cn.ts | 5 +- src/layout/navBars/topBar/user.vue | 8 +- src/router/route.ts | 2 +- src/views/login/component/account.vue | 14 +- src/views/materialReceiptNotice/ceshi.vue | 13 +- .../componentPrinting.vue | 408 ++++++++++-------- src/views/materialReceiptNotice/index.vue | 17 +- src/views/mssPurchaseOrder/index.vue | 153 +++---- .../mssPurchaseOrder/purchaseDetails.vue | 67 ++- src/views/mssPurchaseOrder/selectedData.vue | 15 +- src/views/system/user/dialog.vue | 20 +- 14 files changed, 414 insertions(+), 328 deletions(-) diff --git a/src/api/list/index.ts b/src/api/list/index.ts index 0826497..b085f90 100644 --- a/src/api/list/index.ts +++ b/src/api/list/index.ts @@ -111,5 +111,13 @@ export function listApi() { params:data, }); }, + //根据每包数量得到全部包裹的条码 + setBaoShuTiaoMa: (data: object) => { + return request({ + url: '/api/Admin/InvoiceOrder/SetBaoShuTiaoMa', + method: 'post', + data, + }); + }, }; } diff --git a/src/i18n/pages/login/zh-cn.ts b/src/i18n/pages/login/zh-cn.ts index 3367b53..d3f43ae 100644 --- a/src/i18n/pages/login/zh-cn.ts +++ b/src/i18n/pages/login/zh-cn.ts @@ -9,8 +9,8 @@ export default { two4: '友情链接', }, account: { - accountPlaceholder1: '用户名 admin 或不输均为 common', - accountPlaceholder2: '密码：123456', + accountPlaceholder1: '用户名', + accountPlaceholder2: '密码', accountPlaceholder3: '请输入验证码', accountBtnText: '登 录', }, diff --git a/src/i18n/pages/materialReceiptNotice/en.ts b/src/i18n/pages/materialReceiptNotice/en.ts index 2e1e033..b4e5718 100644 --- a/src/i18n/pages/materialReceiptNotice/en.ts +++ b/src/i18n/pages/materialReceiptNotice/en.ts @@ -33,7 +33,9 @@ export default { batchUpdateEarliestDeliveryDate: 'Batch update Earliest Delivery Date', batchUpdateLatestDeliveryDate: 'Batch update Latest Delivery Date', specification:'Specification', - + xsddh:'SO#', + sgxsddh:'SO#(manual)', + khmc:'Customer', /*发货订单及其明细*/ startDate: 'Start Date', endDate: 'End Date', @@ -60,6 +62,7 @@ export default { deliveryNote1:'Delivery Note', deliveryNoteNumber:'Delivery Note Number', deliveryNoteNumber1:'GRN #', + deliveryNoteNumber2:'Delivery tracking number', PO:'PO #', PO1:'PO #', shipper:'Shipper', @@ -74,6 +77,7 @@ export default { copy:'Copy', deleteText:'Delete', scqd:'Please confirm the deletion of the delivery note?', - receiver:'Receiver' + receiver:'Receiver', + sltzddh:'Delivery Note Number' }, }; diff --git a/src/i18n/pages/materialReceiptNotice/zh-cn.ts b/src/i18n/pages/materialReceiptNotice/zh-cn.ts index 2d998e4..0b12f6e 100644 --- a/src/i18n/pages/materialReceiptNotice/zh-cn.ts +++ b/src/i18n/pages/materialReceiptNotice/zh-cn.ts @@ -34,7 +34,8 @@ export default { batchUpdateLatestDeliveryDate: '批量修改选中承诺最新交期', specification: '物料规格', xsddh:'销售订单号', - + sgxsddh:'手工销售订单号', + khmc:'客户名称', /*发货订单及其明细*/ startDate: '开始送货日期', endDate: '送货结束日期', @@ -62,6 +63,7 @@ export default { deliveryNote1:'采购送货单', deliveryNoteNumber:'收料通知单编号（送货单号）', deliveryNoteNumber1:'收料通知单编号', + deliveryNoteNumber2:'送货单号', PO:'PO号', PO1:'采购订单号', shipper:'送货人', @@ -77,5 +79,6 @@ export default { deleteText:'删除', scqd:'确定要删除该条送货单?', receiver:'接收人', + sltzddh:'收料通知单单号' }, }; diff --git a/src/layout/navBars/topBar/user.vue b/src/layout/navBars/topBar/user.vue index 679af67..208283d 100644 --- a/src/layout/navBars/topBar/user.vue +++ b/src/layout/navBars/topBar/user.vue @@ -65,7 +65,7 @@ - {{ userInfos.userName === '' ? 'common' : userInfos.userName }} + {{ state.userInfoObj.name === '' ? 'common' : state.userInfoObj.name }} @@ -87,7 +87,7 @@ @@ -127,7 +127,8 @@ const state = reactive({ disabledI18n: 'zh-cn', disabledSize: 'large', dialogShow:false, - password:'' + password:'', + userInfoObj:{} }); const dialogCloseFun = () => { state.dialogShow = false @@ -251,6 +252,7 @@ onMounted(() => { } else { onLanguageChange('zh-cn', false); } + state.userInfoObj = Local.get('setUserInfo') }); diff --git a/src/router/route.ts b/src/router/route.ts index 88538ae..9712784 100644 --- a/src/router/route.ts +++ b/src/router/route.ts @@ -119,7 +119,7 @@ export const dynamicRoutes: Array = [ isKeepAlive: true, isAffix: false, isIframe: false, - roles: ['admin', 'common'], + roles: ['admin'], icon: 'iconfont icon-xitongshezhi', }, children: [ diff --git a/src/views/login/component/account.vue b/src/views/login/component/account.vue index 1c11855..c0691c1 100644 --- a/src/views/login/component/account.vue +++ b/src/views/login/component/account.vue @@ -75,7 +75,7 @@ const state = reactive({ language:Local.get('langes'), isShowPassword: false, ruleForm: { - //kingdee123.. + //Maxcess#-!@#4 userName: '', password: '', code: '', @@ -101,6 +101,11 @@ const initI18nOrSize = (value: string, attr: string) => { const currentTime = computed(() => { return formatAxis(new Date()); }); +const accGetUserInfo = async () => { + await useLoginApi().getAccountInfo({}).then((resUser:any) => { + Local.set('setUserInfo',resUser.data); + }) +} // 登录 const onSignIn = () => { state.loading.signIn = true; @@ -109,13 +114,11 @@ const onSignIn = () => { passWord: state.ruleForm.password, }).then( async (res:any) => { state.loading.signIn = false; - useLoginApi().getAccountInfo({}).then((resUser:any) => { - Local.set('setUserInfo',resUser.data); - Cookies.set('userName', resUser.data.name); - }) if(res.data !== null){ + accGetUserInfo() // 存储 token 到浏览器缓存 Session.set('token', res.data); + Cookies.set('userName', state.ruleForm.userName); // 模拟数据，对接接口时，记得删除多余代码及对应依赖的引入。用于 `/src/stores/userInfo.ts` 中不同用户登录判断（模拟数据） if (!themeConfig.value.isRequestRoutes) { // 前端控制路由，2、请注意执行顺序 @@ -131,7 +134,6 @@ const onSignIn = () => { } }) - }; // 登录成功后的跳转 const signInSuccess = (isNoPower: boolean | undefined) => { diff --git a/src/views/materialReceiptNotice/ceshi.vue b/src/views/materialReceiptNotice/ceshi.vue index 9bb05cb..a7fe450 100644 --- a/src/views/materialReceiptNotice/ceshi.vue +++ b/src/views/materialReceiptNotice/ceshi.vue @@ -11,15 +11,14 @@ {{ t('message.index.deliveryNoteNumber') }}： {{ state.pageData.fBillNo }} -
- 客户： - {{ state.pageData.fBillNo }} -
{{ t('message.index.supplierName') }}： {{ state.pageData.supplierName }}
- +
+ {{ t('message.index.khmc') }}： + {{ state.pageData.fPurchaseOrgName }} +
{{ t('message.index.deliveryDate') }}： {{ state.pageData.deliveryDate }} @@ -75,6 +74,7 @@ const state = reactive({ supplierName: '', deliveryDate: '', f_VHUB_Text: '', + fPurchaseOrgName:'' }, option: { tip: false, @@ -94,7 +94,7 @@ const state = reactive({ { label: computed(() => t('message.index.partNumber')), prop: 'materialCode' }, { label: computed(() => t('message.index.materialName')), prop: 'materialName' }, { label: computed(() => t('message.index.unit1')), prop: 'unitName' }, - { label: computed(() => t('message.index.POQTY')), prop: 'purchaseQty' }, + // { label: computed(() => t('message.index.POQTY')), prop: 'purchaseQty' }, { label: computed(() => t('message.index.deliveryQTY')), prop: 'qty' }, { label: computed(() => t('message.index.maxcessLot')), prop: 'mssSupplierLot' }, { label: computed(() => t('message.index.supplierLot')), prop: 'fSupplierLot' }, @@ -111,6 +111,7 @@ watch( state.pageData.supplierName = arr[0].supplierName; state.pageData.deliveryDate = arr[0].deliveryDate; state.pageData.f_VHUB_Text = arr[0].f_VHUB_Text; + state.pageData.fPurchaseOrgName = arr[0].fPurchaseOrgName; } }, { immediate: true, deep: true } diff --git a/src/views/materialReceiptNotice/componentPrinting.vue b/src/views/materialReceiptNotice/componentPrinting.vue index 9f4d5ba..01e2db1 100644 --- a/src/views/materialReceiptNotice/componentPrinting.vue +++ b/src/views/materialReceiptNotice/componentPrinting.vue @@ -6,22 +6,28 @@
+ -