Compare commits

..

No commits in common. "2b74e3ec96414aba55a066793de2d693c424c945" and "b2476872c014565964630a5ef407bea87afeb1e8" have entirely different histories.

8 changed files with 42 additions and 24 deletions

View File

@ -26,7 +26,7 @@ import request from '@/utils/request';
export function getoutPortList(ChangeParams: any) { export function getoutPortList(ChangeParams: any) {
return request({ return request({
url: '/api/api/MaturationLibrary/getPort', url: '/api/MaturationLibrary/getPort',
method: 'post', method: 'post',
data: ChangeParams, data: ChangeParams,
}); });
@ -42,7 +42,7 @@ export function GetLiberaryBaeIn(ChangeParams: any) {
export function AutoStockOut(ChangeParams: any) { export function AutoStockOut(ChangeParams: any) {
return request({ return request({
url: '/api/api/MaturationLibrary/AutoStockOut', url: '/api/MaturationLibrary/AutoStockOut',
method: 'post', method: 'post',
data: ChangeParams, data: ChangeParams,
}); });

View File

@ -2,7 +2,7 @@ import request from '@/utils/request';
export function createcheckmark(data: any) { export function createcheckmark(data: any) {
return request({ return request({
url: '/api/api/checkmark/createMark', url: '/api/checkmark/createMark',
method: 'post', method: 'post',
data: data, data: data,
}); });
@ -27,7 +27,7 @@ export function Auditcheckmark(data: any) {
export function checkmarkAudit(data: any) { export function checkmarkAudit(data: any) {
return request({ return request({
url: '/api/api/checkmark/checkmarkAudit', url: '/api/checkmark/checkmarkAudit',
method: 'post', method: 'post',
data: data, data: data,
}); });

View File

@ -294,10 +294,19 @@ const handleQuery = () => {
state.wareHouseList = []; state.wareHouseList = [];
getQueryPageList(state.queryParams) getQueryPageList(state.queryParams)
.then((res: any) => { .then((res: any) => {
if(res.data.list.length == 0){
ElMessageBox.alert('查无数据', '提醒框', {
confirmButtonText: 'OK',
})
state.disableds = false;
state.loadings = false;
} else {
console.log(res.data);
state.wareHouseList = res.data.list; state.wareHouseList = res.data.list;
state.total = res.data.total; state.total = res.data.total;
state.disableds = false; state.disableds = false;
state.loadings = false; state.loadings = false;
}
}) })
.catch(() => { }); .catch(() => { });
} }
@ -377,8 +386,10 @@ function dialogOpend() {
state.formData.STORAGENAME = '' state.formData.STORAGENAME = ''
state.formData.DESCRIPTION = '' state.formData.DESCRIPTION = ''
if (state.selectItem && state.dialog.type === 'edit') { if (state.selectItem && state.dialog.type === 'edit') {
state.formData.STORAGENAME = state.selectItem.STORAGENAME state.formData = {
state.formData.DESCRIPTION = state.selectItem.DESCRIPTION STORAGENAME: state.selectItem.STORAGENAME,
DESCRIPTION: state.selectItem.DESCRIPTION
};
} }
} }
// ERP // ERP

View File

@ -317,7 +317,6 @@ function handleQuery2() {
getQueryPageList(query).then((res: any) => { getQueryPageList(query).then((res: any) => {
if(res.data.list.length == 0){ if(res.data.list.length == 0){
state.list2 = [] state.list2 = []
state.list = []
ElMessageBox.alert('查无数据', '提醒框', { ElMessageBox.alert('查无数据', '提醒框', {
confirmButtonText: 'OK', confirmButtonText: 'OK',
}) })

View File

@ -335,12 +335,9 @@ function handleAdd() {
state.boxDrawer = true; state.boxDrawer = true;
} }
async function handleQuery() { async function handleQuery() {
if (state.queryForm.params.DateValue && state.queryForm.params.DateValue.length > 0) { if (state.queryForm.params.DateValue.length > 0) {
state.queryForm.params.FROMDATE = state.queryForm.params.DateValue[0] state.queryForm.params.FROMDATE = state.queryForm.params.DateValue[0]
state.queryForm.params.TODATE = state.queryForm.params.DateValue[1] state.queryForm.params.TODATE = state.queryForm.params.DateValue[1]
} else {
state.queryForm.params.FROMDATE = ''
state.queryForm.params.TODATE = ''
} }
await getQueryPageList(state.queryForm) await getQueryPageList(state.queryForm)
.then((res: any) => { .then((res: any) => {

View File

@ -251,7 +251,7 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH
CHARGE : '', CHARGE : '',
} , } ,
boxDrawer :false, boxDrawer :false,
PhaseList: [{ label: '全部', Value: '' }, { label: 'C', Value: 'C' }, { label: 'D', Value: 'D' }, { label: 'S', Value: 'S' }] as any, PhaseList: [{ label: 'C', Value: 'C' }, { label: 'D', Value: 'D' }, { label: 'S', Value: 'S' }] as any,
ChangeERPLocation: [], ChangeERPLocation: [],
ChangeLocation: [], ChangeLocation: [],
AllNumber: 0,// AllNumber: 0,//

View File

@ -232,7 +232,7 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH
CHARGE : '', CHARGE : '',
} , } ,
boxDrawer :false, boxDrawer :false,
PhaseList: [{ label: '全部', Value: '' }, { label: 'C', Value: 'C' }, { label: 'D', Value: 'D' }, { label: 'S', Value: 'S' }] as any, PhaseList: [{ label: 'C', Value: 'C' }, { label: 'D', Value: 'D' }, { label: 'S', Value: 'S' }] as any,
ChangeERPLocation: [], ChangeERPLocation: [],
ChangeLocation: [], ChangeLocation: [],
AllNumber: 0,// AllNumber: 0,//
@ -533,11 +533,17 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH
state.queryParams.version = 'WEB00034' state.queryParams.version = 'WEB00034'
await getQueryPageList(state.queryParams) await getQueryPageList(state.queryParams)
.then((res: any) => { .then((res: any) => {
if (res.data.list.length > 0) {
state.BoxHistoryList = res.data.list state.BoxHistoryList = res.data.list
state.total = res.data.total state.total = res.data.total
} else {
state.BoxHistoryList = res.data.list
proxy.$ElMessage.success('查询结果为空');
}
}) })
// state.queryParams.version = 'WEB00032' // state.queryParams.version = 'WEB00032'
/*state.queryParams.version = 'WEB00034' state.queryParams.version = 'WEB00034'
state.AllNumber = 0 state.AllNumber = 0
state.UnitNumber = 0 state.UnitNumber = 0
await getQueryList(state.queryParams) await getQueryList(state.queryParams)
@ -549,7 +555,7 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH
state.UnitNumber = state.UnitNumber + Qty state.UnitNumber = state.UnitNumber + Qty
} }
})*/ })
} }
function exportExcel() { function exportExcel() {
state.queryParams.version = 'WEB00033' state.queryParams.version = 'WEB00033'

View File

@ -214,8 +214,13 @@ function updateInfo() {
async function handleQuery() { async function handleQuery() {
state.loading = true state.loading = true
await getQueryPageList(state.queryParams).then((res: any) => { await getQueryPageList(state.queryParams).then((res: any) => {
if (res.data.list.length > 0) {
state.dataList = res.data.list state.dataList = res.data.list
state.total = res.data.total state.total = res.data.total
} else {
state.dataList = res.data.list
proxy.$ElMessage.success('查询结果为空')
}
state.loading = false state.loading = false
}) })
} }