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',