feat 取消货位级联选择
This commit is contained in:
parent
abc0b7be73
commit
5009f73821
@ -39,11 +39,11 @@
|
|||||||
<el-form-item label="货位" prop="params.LOCATION">
|
<el-form-item label="货位" prop="params.LOCATION">
|
||||||
<el-select v-model="state.ChangeLocation" multiple clearable collapse-tags placeholder="请选择货位"
|
<el-select v-model="state.ChangeLocation" multiple clearable collapse-tags placeholder="请选择货位"
|
||||||
popper-class="custom-header" :max-collapse-tags="1" style="width: 240px"
|
popper-class="custom-header" :max-collapse-tags="1" style="width: 240px"
|
||||||
@visible-change="JudgeMentERPLocation" filterable>
|
remote :remote-method="handleInput" filterable>
|
||||||
<template #header>
|
<template #header>
|
||||||
</template>
|
</template>
|
||||||
<el-option v-for="item in LocationList" :key="item.STORAGENAME" :label="item.DESCRIPTION"
|
<el-option v-for="item in LocationList" :key="item.storageName" :label="item.storageName"
|
||||||
:value="item.STORAGENAME" />
|
:value="item.storageName" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
@ -297,6 +297,7 @@
|
|||||||
import { getORG } from '@/api/auth';
|
import { getORG } from '@/api/auth';
|
||||||
import { bTableHeight } from "../../../../composables/calcTableHeight";
|
import { bTableHeight } from "../../../../composables/calcTableHeight";
|
||||||
import dayjs from 'dayjs'
|
import dayjs from 'dayjs'
|
||||||
|
import { search } from '@/api/wareHouse'
|
||||||
|
|
||||||
const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(310);
|
const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(310);
|
||||||
const { proxy }: any = getCurrentInstance();
|
const { proxy }: any = getCurrentInstance();
|
||||||
@ -557,6 +558,24 @@
|
|||||||
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function handleInput(val: any) {
|
||||||
|
let index = [1, 3, 4, 7, 8]
|
||||||
|
if (index.indexOf(val.length) > -1) {
|
||||||
|
state.LocationList = []
|
||||||
|
search({
|
||||||
|
storageName: val,
|
||||||
|
orgNo: JSON.parse(localStorage.getItem('orgNo'))
|
||||||
|
}).then((res:any) => {
|
||||||
|
if (res.resultObj) {
|
||||||
|
state.LocationList = res.resultObj
|
||||||
|
} else {
|
||||||
|
proxy.$ElMessage.warning(res.message);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function exportExcel() {
|
function exportExcel() {
|
||||||
let paramsObjet = state.queryParams.params;
|
let paramsObjet = state.queryParams.params;
|
||||||
const parmlist = Object.keys(paramsObjet).filter((key: any) => key !== 'SITENAME')
|
const parmlist = Object.keys(paramsObjet).filter((key: any) => key !== 'SITENAME')
|
||||||
@ -692,7 +711,7 @@
|
|||||||
if (!areAllNotEmpty(state.ChangeERPLocation)) {
|
if (!areAllNotEmpty(state.ChangeERPLocation)) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (!value) {
|
/*if (!value) {
|
||||||
let ERPLOCATIONList = state.ChangeERPLocation;
|
let ERPLOCATIONList = state.ChangeERPLocation;
|
||||||
getQueryList({
|
getQueryList({
|
||||||
queryId: "GetLocationListForSomeERPLocation",
|
queryId: "GetLocationListForSomeERPLocation",
|
||||||
@ -709,7 +728,7 @@
|
|||||||
});
|
});
|
||||||
})
|
})
|
||||||
.catch(() => { });
|
.catch(() => { });
|
||||||
}
|
}*/
|
||||||
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
@ -75,7 +75,6 @@
|
|||||||
v-model="state.queryParams.params.ERPLOCATION"
|
v-model="state.queryParams.params.ERPLOCATION"
|
||||||
placeholder="选择仓库"
|
placeholder="选择仓库"
|
||||||
clearable
|
clearable
|
||||||
@change="getStorageSpec"
|
|
||||||
style="width: 170px"
|
style="width: 170px"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
@ -90,18 +89,19 @@
|
|||||||
<el-col :span="4">
|
<el-col :span="4">
|
||||||
<el-form-item label="货位" prop="queryParams.params">
|
<el-form-item label="货位" prop="queryParams.params">
|
||||||
<el-select
|
<el-select
|
||||||
:filter-method="locatioNFilter"
|
|
||||||
filterable
|
filterable
|
||||||
v-model="state.queryParams.params.LOCATIONNAME"
|
v-model="state.queryParams.params.LOCATIONNAME"
|
||||||
|
remote
|
||||||
|
:remote-method="handleInput"
|
||||||
clearable
|
clearable
|
||||||
placeholder="选择库位"
|
placeholder="选择库位"
|
||||||
style="width: 170px"
|
style="width: 170px"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in state.LocationList"
|
v-for="item in state.LocationList"
|
||||||
:key="item.ENUMVALUE"
|
:key="item.storageName"
|
||||||
:label="item.DESCRIPTION"
|
:label="item.storageName"
|
||||||
:value="item.ENUMVALUE"
|
:value="item.storageName"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -293,6 +293,7 @@ import { localStorage } from '@/utils/storage'
|
|||||||
import { bTableHeight } from '../../../composables/calcTableHeight'
|
import { bTableHeight } from '../../../composables/calcTableHeight'
|
||||||
import { getORG } from '@/api/auth'
|
import { getORG } from '@/api/auth'
|
||||||
import { cals } from '@/utils/cal'
|
import { cals } from '@/utils/cal'
|
||||||
|
import { search } from '@/api/wareHouse'
|
||||||
|
|
||||||
const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(280)
|
const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(280)
|
||||||
const queryFormRef = ref(ElForm)
|
const queryFormRef = ref(ElForm)
|
||||||
@ -458,6 +459,23 @@ onMounted(() => {
|
|||||||
window.addEventListener('resize', handleResize)
|
window.addEventListener('resize', handleResize)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
function handleInput(val: any) {
|
||||||
|
let index = [1, 3, 4, 7, 8]
|
||||||
|
if (index.indexOf(val.length) > -1) {
|
||||||
|
state.LocationList = []
|
||||||
|
search({
|
||||||
|
storageName: val,
|
||||||
|
orgNo: JSON.parse(localStorage.get('orgNo'))
|
||||||
|
}).then((res:any) => {
|
||||||
|
if (res.resultObj) {
|
||||||
|
state.LocationList = res.resultObj
|
||||||
|
} else {
|
||||||
|
proxy.$ElMessage.warning(res.message);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const exportLabel = () => {
|
const exportLabel = () => {
|
||||||
console.log('state.multipleSelection', state.multipleSelection) // 打印选中行的数据
|
console.log('state.multipleSelection', state.multipleSelection) // 打印选中行的数据
|
||||||
printLabel(state.multipleSelection)
|
printLabel(state.multipleSelection)
|
||||||
|
@ -50,14 +50,16 @@
|
|||||||
<el-select
|
<el-select
|
||||||
size="small"
|
size="small"
|
||||||
filterable
|
filterable
|
||||||
|
remote
|
||||||
|
:remote-method="handleInput"
|
||||||
v-model="queryParams.params.LOCATIONNAME"
|
v-model="queryParams.params.LOCATIONNAME"
|
||||||
placeholder="下拉选择货位"
|
placeholder="下拉选择货位"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in LocationList"
|
v-for="item in LocationList"
|
||||||
:key="item.ENUMVALUE"
|
:key="item.storageName"
|
||||||
:label="item.DESCRIPTION"
|
:label="item.storageName"
|
||||||
:value="item.ENUMVALUE"
|
:value="item.storageName"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -286,6 +288,7 @@ import { IFTRUE } from '@/utils/CommonUtil'
|
|||||||
import { bTableHeight } from '../../../composables/calcTableHeight'
|
import { bTableHeight } from '../../../composables/calcTableHeight'
|
||||||
import { getORG } from '@/api/auth'
|
import { getORG } from '@/api/auth'
|
||||||
import { cals } from '@/utils/cal'
|
import { cals } from '@/utils/cal'
|
||||||
|
import { search } from '@/api/wareHouse'
|
||||||
|
|
||||||
const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(330)
|
const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(330)
|
||||||
const queryFormRef = ref(ElForm)
|
const queryFormRef = ref(ElForm)
|
||||||
@ -506,6 +509,23 @@ onMounted(() => {
|
|||||||
window.addEventListener('resize', handleResize)
|
window.addEventListener('resize', handleResize)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
function handleInput(val: any) {
|
||||||
|
let index = [1, 3, 4, 7, 8]
|
||||||
|
if (index.indexOf(val.length) > -1) {
|
||||||
|
state.LocationList = []
|
||||||
|
search({
|
||||||
|
storageName: val,
|
||||||
|
orgNo: JSON.parse(localStorage.getItem('orgNo'))
|
||||||
|
}).then((res:any) => {
|
||||||
|
if (res.resultObj) {
|
||||||
|
state.LocationList = res.resultObj
|
||||||
|
} else {
|
||||||
|
proxy.$ElMessage.warning(res.message);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function getRKey(row: any) {
|
function getRKey(row: any) {
|
||||||
// console.log(row.CHARGE)
|
// console.log(row.CHARGE)
|
||||||
return row.CHARGE
|
return row.CHARGE
|
||||||
@ -590,7 +610,7 @@ function changeERPLocation(e: any) {
|
|||||||
// console.log(e)
|
// console.log(e)
|
||||||
state.queryParams.params.LOCATIONNAME = ''
|
state.queryParams.params.LOCATIONNAME = ''
|
||||||
state.queryParamsLocation.params.ERPLOCATION = e
|
state.queryParamsLocation.params.ERPLOCATION = e
|
||||||
LocationQuery()
|
// LocationQuery()
|
||||||
}
|
}
|
||||||
//货位查询
|
//货位查询
|
||||||
function LocationQuery() {
|
function LocationQuery() {
|
||||||
|
@ -39,11 +39,13 @@
|
|||||||
<el-form-item label="货位" prop="params.LOCATION">
|
<el-form-item label="货位" prop="params.LOCATION">
|
||||||
<el-select v-model="state.ChangeLocation" multiple clearable collapse-tags placeholder="请选择货位"
|
<el-select v-model="state.ChangeLocation" multiple clearable collapse-tags placeholder="请选择货位"
|
||||||
popper-class="custom-header" :max-collapse-tags="1" style="width: 240px"
|
popper-class="custom-header" :max-collapse-tags="1" style="width: 240px"
|
||||||
@visible-change="JudgeMentERPLocation" filterable>
|
remote :remote-method="handleInput" filterable>
|
||||||
<template #header>
|
<template #header>
|
||||||
</template>
|
</template>
|
||||||
<el-option v-for="item in LocationList" :key="item.STORAGENAME" :label="item.DESCRIPTION"
|
<el-option v-for="item in LocationList"
|
||||||
:value="item.STORAGENAME" />
|
:key="item.storageName"
|
||||||
|
:label="item.storageName"
|
||||||
|
:value="item.storageName" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
@ -208,6 +210,7 @@
|
|||||||
import { updateCareerAssistance, updateRemark } from '@/api/label'
|
import { updateCareerAssistance, updateRemark } from '@/api/label'
|
||||||
import { bTableHeight } from "../../../composables/calcTableHeight";
|
import { bTableHeight } from "../../../composables/calcTableHeight";
|
||||||
import { getORG } from '@/api/auth';
|
import { getORG } from '@/api/auth';
|
||||||
|
import { search } from '@/api/wareHouse'
|
||||||
|
|
||||||
const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(310);
|
const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(310);
|
||||||
|
|
||||||
@ -446,6 +449,23 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
function handleInput(val: any) {
|
||||||
|
let index = [1, 3, 4, 7, 8]
|
||||||
|
if (index.indexOf(val.length) > -1) {
|
||||||
|
state.LocationList = []
|
||||||
|
search({
|
||||||
|
storageName: val,
|
||||||
|
orgNo: JSON.parse(localStorage.get('orgNo'))
|
||||||
|
}).then((res:any) => {
|
||||||
|
if (res.resultObj) {
|
||||||
|
state.LocationList = res.resultObj
|
||||||
|
} else {
|
||||||
|
proxy.$ElMessage.warning(res.message);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
function isChinese(text : any) {
|
function isChinese(text : any) {
|
||||||
const reg = /^[\u4e00-\u9fa5]+$/;
|
const reg = /^[\u4e00-\u9fa5]+$/;
|
||||||
@ -679,7 +699,7 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH
|
|||||||
if (!areAllNotEmpty(state.ChangeERPLocation)) {
|
if (!areAllNotEmpty(state.ChangeERPLocation)) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (!value) {
|
/*if (!value) {
|
||||||
let ERPLOCATIONList = state.ChangeERPLocation;
|
let ERPLOCATIONList = state.ChangeERPLocation;
|
||||||
getQueryList({
|
getQueryList({
|
||||||
queryId: "GetLocationListForSomeERPLocation",
|
queryId: "GetLocationListForSomeERPLocation",
|
||||||
@ -696,7 +716,7 @@ const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableH
|
|||||||
});
|
});
|
||||||
})
|
})
|
||||||
.catch(() => { });
|
.catch(() => { });
|
||||||
}
|
}*/
|
||||||
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
@ -44,14 +44,16 @@
|
|||||||
<el-select
|
<el-select
|
||||||
size="small"
|
size="small"
|
||||||
filterable
|
filterable
|
||||||
|
remote
|
||||||
|
:remote-method="handleInput"
|
||||||
v-model="queryParams.params.LOCATIONNAME"
|
v-model="queryParams.params.LOCATIONNAME"
|
||||||
placeholder="下拉选择货位"
|
placeholder="下拉选择货位"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in LocationList"
|
v-for="item in LocationList"
|
||||||
:key="item.ENUMVALUE"
|
:key="item.storageName"
|
||||||
:label="item.DESCRIPTION"
|
:label="item.storageName"
|
||||||
:value="item.ENUMVALUE"
|
:value="item.storageName"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -252,6 +254,7 @@ import type { CascaderProps } from 'element-plus'
|
|||||||
import { IFTRUE } from '@/utils/CommonUtil'
|
import { IFTRUE } from '@/utils/CommonUtil'
|
||||||
import { bTableHeight } from '../../../composables/calcTableHeight'
|
import { bTableHeight } from '../../../composables/calcTableHeight'
|
||||||
import { getORG } from '@/api/auth'
|
import { getORG } from '@/api/auth'
|
||||||
|
import { search } from '@/api/wareHouse'
|
||||||
|
|
||||||
const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(240)
|
const { tableContainer, tableHeight, updateTableHeight, handleResize } = bTableHeight(240)
|
||||||
const queryFormRef = ref(ElForm)
|
const queryFormRef = ref(ElForm)
|
||||||
@ -391,6 +394,23 @@ const {
|
|||||||
checkResultOptions
|
checkResultOptions
|
||||||
} = toRefs(state)
|
} = toRefs(state)
|
||||||
|
|
||||||
|
function handleInput(val: any) {
|
||||||
|
let index = [1, 3, 4, 7, 8]
|
||||||
|
if (index.indexOf(val.length) > -1) {
|
||||||
|
state.LocationList = []
|
||||||
|
search({
|
||||||
|
storageName: val,
|
||||||
|
orgNo: JSON.parse(localStorage.getItem('orgNo'))
|
||||||
|
}).then((res:any) => {
|
||||||
|
if (res.resultObj) {
|
||||||
|
state.LocationList = res.resultObj
|
||||||
|
} else {
|
||||||
|
proxy.$ElMessage.warning(res.message);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
state.column = [
|
state.column = [
|
||||||
{ header: '工厂', field: 'SITENAME', hide: true },
|
{ header: '工厂', field: 'SITENAME', hide: true },
|
||||||
@ -473,7 +493,7 @@ function changeERPLocation(e: any) {
|
|||||||
// console.log(e)
|
// console.log(e)
|
||||||
state.queryParams.params.LOCATIONNAME = ''
|
state.queryParams.params.LOCATIONNAME = ''
|
||||||
state.queryParamsLocation.params.ERPLOCATION = e
|
state.queryParamsLocation.params.ERPLOCATION = e
|
||||||
LocationQuery()
|
// LocationQuery()
|
||||||
}
|
}
|
||||||
//货位查询
|
//货位查询
|
||||||
function LocationQuery() {
|
function LocationQuery() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user