From 5e38979dbef31c7868415438be3f4187dfbd52a1 Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Sat, 17 May 2025 09:28:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update=20=E6=97=A0=E6=9D=A5=E6=BA=90?= =?UTF-8?q?=E8=BD=AC=E5=BA=93=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=85=B4=E8=BF=9C?= =?UTF-8?q?=E6=B3=B0=E5=B7=A5=E5=8E=82=E4=B8=8E=E6=B3=97=E6=B4=AA=E3=80=81?= =?UTF-8?q?=E8=82=A1=E4=BB=BD=E7=9A=84=E8=BD=AC=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stocked/NoOrMoveLibrary/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/stocked/NoOrMoveLibrary/index.vue b/src/views/stocked/NoOrMoveLibrary/index.vue index 6a854b8..0511f64 100644 --- a/src/views/stocked/NoOrMoveLibrary/index.vue +++ b/src/views/stocked/NoOrMoveLibrary/index.vue @@ -636,9 +636,9 @@ function changeFac(e: any) { state.queryParams.params.destinationErpFactory = e state.spcERPFactoryList = [] as any ERPLocationQuery() - if(e == "1010" || e == "1020") { + if(e == "1010" || e == "1020" || e == "1200") { state.spcERPFactoryList = state.ERPFactoryList.filter((item: any) => - (item.ERPFACTORY === "1010" || item.ERPFACTORY === "1020") + (item.ERPFACTORY === "1010" || item.ERPFACTORY === "1020" || item.ERPFACTORY === "1200") ) }else { state.spcERPFactoryList = state.ERPFactoryList.filter((item: any) => From e10a0574331f9f6c5a61bde09fe1698ff205c652 Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Sat, 17 May 2025 09:35:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update=20=E6=97=A0=E6=9D=A5=E6=BA=90?= =?UTF-8?q?=E8=BD=AC=E5=BA=93=EF=BC=8C=E4=BC=98=E5=8C=96=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stocked/NoOrMoveLibrary/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/stocked/NoOrMoveLibrary/index.vue b/src/views/stocked/NoOrMoveLibrary/index.vue index 0511f64..e1d3a62 100644 --- a/src/views/stocked/NoOrMoveLibrary/index.vue +++ b/src/views/stocked/NoOrMoveLibrary/index.vue @@ -673,9 +673,9 @@ function ERPFactoryQuery() { state.ERPFactoryList.unshift({ ERPFACTORY: '' }) - if(state.queryParams.params.ERPFACTORY == "1010" || state.queryParams.params.ERPFACTORY == "1020") { + if(state.queryParams.params.ERPFACTORY == "1010" || state.queryParams.params.ERPFACTORY == "1020" || state.queryParams.params.ERPFACTORY == "1200") { state.spcERPFactoryList = state.ERPFactoryList.filter((item: any) => - (item.ERPFACTORY === "1010" || item.ERPFACTORY === "1020") + (item.ERPFACTORY === "1010" || item.ERPFACTORY === "1020" || item.ERPFACTORY === "1200") ) }else { state.spcERPFactoryList = state.ERPFactoryList.filter((item: any) => From 7bde6e4142117a8c953fe4bf349198acd21ab38f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Mon, 19 May 2025 09:01:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=9A=E5=8A=A9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=8C=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/label/index.ts | 11 ++++ .../stocked/careerAssistanceInquiry/index.vue | 56 +++++++++++++++---- 2 files changed, 55 insertions(+), 12 deletions(-) diff --git a/src/api/label/index.ts b/src/api/label/index.ts index d7ed687..5aa9ace 100644 --- a/src/api/label/index.ts +++ b/src/api/label/index.ts @@ -131,4 +131,15 @@ export function printStorage(data: any) { method: 'post', data: data, }); +} + +/** + * + * @returns 获取用户信息 + */ +export function getUserInfo() { + return request({ + url: '/api/CostCenter/getUserInfo', + method: 'get', + }) } \ No newline at end of file diff --git a/src/views/stocked/careerAssistanceInquiry/index.vue b/src/views/stocked/careerAssistanceInquiry/index.vue index e4d253b..b0ed975 100644 --- a/src/views/stocked/careerAssistanceInquiry/index.vue +++ b/src/views/stocked/careerAssistanceInquiry/index.vue @@ -156,16 +156,30 @@ - - + + - + + - + + + + + - + + - + + + + + + + + 更新 @@ -207,10 +221,11 @@ import router from "@/router"; import exportDataToExcel from "@/utils/export-excel"; import { localStorage } from '@/utils/storage' - import { updateCareerAssistance, updateRemark } from '@/api/label' + import { updateCareerAssistance, updateRemark, getUserInfo } from '@/api/label' import { bTableHeight } from "../../../composables/calcTableHeight"; import { getORG } from '@/api/auth'; import { search } from '@/api/wareHouse' +import { log } from "node:console"; const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(310); @@ -234,6 +249,9 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH CAREER_ASSISTANCE : '', CHARGE : '', } , + userList: [], + SALESHIPREQUESTNAME: '', + SALESHIPREQUESTDETAILNAME: '', boxDrawer :false, PhaseList: [{ label: '全部', Value: '' }, { label: 'C', Value: 'C' }, { label: 'D', Value: 'D' }, { label: 'S', Value: 'S' }] as any, ChangeERPLocation: [], @@ -260,7 +278,9 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH FROMDATE: '', TODATE: '', CAREER_ASSISTANCE :'', - DESC_CN:'' + DESC_CN:'', + OQARESULTSTATE: '', + PACKINGGRADE: '', }, pageNum: 1, pageSize: 10 @@ -431,7 +451,7 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH handleQuery(); ERPFactoryQuery(); // ERPLocationQuery(); - + getUser(); updateTableHeight(); window.addEventListener('resize', handleResize); }); @@ -489,6 +509,12 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH } } + function getUser() { + getUserInfo().then((res: any) => { + state.userList = res.data; + }) + } + function modifiedRemark() { if ( state.multipleSelection.length == 0) { ElMessageBox.alert('列表为空', { @@ -496,6 +522,8 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH }) return } + console.log(state.multipleSelection); + // return let boxLists = [] for (var i = 0 ; i < state.multipleSelection.length; ++ i) { state.multipleSelection[i].key = { @@ -514,15 +542,19 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH boxList : boxLists, USER : localStorage.get('userId'), remark: state.CAREER_ASSISTANCE, - CUSTOMNO : state.COUSTOMNO + // CUSTOMNO : state.COUSTOMNO, + SALESHIPREQUESTNAME: state.SALESHIPREQUESTNAME, // 销售订单 + SALESHIPREQUESTDETAILNAME: state.SALESHIPREQUESTDETAILNAME,// 销售订单行号 } // console.log(PRINT) // return; updateCareerAssistance(PRINT).then((res: any) => { console.log(res.success) - state.CAREER_ASSISTANCE = '' - state.COUSTOMNO = '' + // state.COUSTOMNO = '' if (res.success) { + state.SALESHIPREQUESTNAME = ''; + state.SALESHIPREQUESTDETAILNAME = ''; + state.CAREER_ASSISTANCE = ''; // proxy.$ElMessage.success('备注更新成功'); ElMessageBox.alert('业助更新成功', '提醒框', { confirmButtonText: 'OK',