update 出入库记录,查询事件名
This commit is contained in:
parent
d4d784886b
commit
f7a9da6a83
@ -342,6 +342,10 @@ function handleQuery() {
|
|||||||
FROMDATE: state.queryParams.FROMDATE,
|
FROMDATE: state.queryParams.FROMDATE,
|
||||||
TODATE: state.queryParams.TODATE,
|
TODATE: state.queryParams.TODATE,
|
||||||
SITENAME: '',
|
SITENAME: '',
|
||||||
|
//'BarCodeToTransferIn','调拨出库','MES消耗','auxiliaryStockOut','CompletedShipRequest'
|
||||||
|
EVENTOUT: ['BarCodeToTransferIn','调拨出库','MES消耗','auxiliaryStockOut','CompletedShipRequestZL','CompletedShipRequestBL','CompletedShipRequestLL','CompletedShipRequestNLCC'],
|
||||||
|
//'AlloctionStockIn','FGStockIn','ReturnStockIn','NormalStockInForSDK','NoChargeStockIn'
|
||||||
|
EVENTIN: ['AlloctionStockIn','FGStockIn','ReturnStockIn','NormalStockInForSDK','NoChargeStockIn','NoChargeStockIn',],
|
||||||
/*
|
/*
|
||||||
UNDOID: state.queryParams.UNDOID,
|
UNDOID: state.queryParams.UNDOID,
|
||||||
STOCKSTATE: state.queryParams.STOCKSTATE,
|
STOCKSTATE: state.queryParams.STOCKSTATE,
|
||||||
|
@ -589,7 +589,7 @@ function handleStockOut() {
|
|||||||
function confimStockOut() {
|
function confimStockOut() {
|
||||||
console.log(state.commitDate)
|
console.log(state.commitDate)
|
||||||
if(state.commitDate == null){
|
if(state.commitDate == null){
|
||||||
ElMessageBox.alert('辅材出库失败,过账时间不可清空', {
|
ElMessageBox.alert('辅材出库失败,过账时间不可为空', {
|
||||||
confirmButtonText: 'OK',
|
confirmButtonText: 'OK',
|
||||||
})
|
})
|
||||||
return;
|
return;
|
||||||
|
@ -1041,7 +1041,9 @@ function handleStockOut() {
|
|||||||
CompleteShipRequestStockUp(params).then((res: any) => {
|
CompleteShipRequestStockUp(params).then((res: any) => {
|
||||||
|
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
|
ElMessageBox.alert("出库成功", '', {
|
||||||
|
confirmButtonText: 'OK',
|
||||||
|
})
|
||||||
handleQuery();
|
handleQuery();
|
||||||
//state.loading = false;
|
//state.loading = false;
|
||||||
state.buttonOut_loading = false;
|
state.buttonOut_loading = false;
|
||||||
|
@ -132,19 +132,25 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<el-row class="page-search" justify="end" align="middle">
|
<el-row class="page-search" justify="end" align="middle">
|
||||||
|
<el-col :span="4" style="padding-top: 12px">
|
||||||
<div class="block" style="float: right">
|
<div class="block" style="float: right">
|
||||||
<el-form-item label="备注" prop="state.REMARK">
|
<el-form-item label="备注" prop="state.REMARK">
|
||||||
<el-Input v-model="state.REMARK" />
|
<el-Input v-model="state.REMARK" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</div>
|
</div>
|
||||||
<div class="block" style="float: right">
|
</el-col>
|
||||||
|
<el-col :span="4" style="padding-top: 12px">
|
||||||
|
<div class="block">
|
||||||
<el-form-item label="过账日期" prop="state.commitDate">
|
<el-form-item label="过账日期" prop="state.commitDate">
|
||||||
<el-date-picker :clearable="true" :editable="true" v-model="state.commitDate" type="date" placeholder="选择过账时间" value-format="YYYY-MM-DD"/>
|
<el-date-picker :clearable="true" :editable="true" v-model="state.commitDate" type="date" placeholder="选择过账时间" value-format="YYYY-MM-DD"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</div>
|
</div>
|
||||||
<div class="page-search-btns">
|
</el-col>
|
||||||
|
<el-col :span="2" >
|
||||||
|
<div class="page-search-btns" style="float: right">
|
||||||
<el-button type="primary" @click="handleStockOut" :disabled="state.buttonOut_state" v-loading="state.buttonOut_loading">转换</el-button>
|
<el-button type="primary" @click="handleStockOut" :disabled="state.buttonOut_state" v-loading="state.buttonOut_loading">转换</el-button>
|
||||||
</div>
|
</div>
|
||||||
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
@ -41,6 +41,22 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item label="库存货位" prop="LOCATIONNAME">
|
<el-form-item label="库存货位" prop="LOCATIONNAME">
|
||||||
|
<el-select
|
||||||
|
size="small"
|
||||||
|
filterable
|
||||||
|
v-model="queryParams.params.LOCATIONNAME"
|
||||||
|
placeholder="下拉选择货位"
|
||||||
|
:filter-method="getLocationList"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="item in LocationList"
|
||||||
|
:key="item.STORAGENAME"
|
||||||
|
:label="item.DESCRIPTION"
|
||||||
|
:value="item.STORAGENAME"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<!-- <el-form-item label="库存货位" prop="LOCATIONNAME">
|
||||||
<el-select
|
<el-select
|
||||||
size="small"
|
size="small"
|
||||||
filterable
|
filterable
|
||||||
@ -56,7 +72,7 @@
|
|||||||
:value="item.storageName"
|
:value="item.storageName"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>-->
|
||||||
</el-col>
|
</el-col>
|
||||||
<!-- <el-col :span="6">
|
<!-- <el-col :span="6">
|
||||||
<el-form-item label="货位代码" prop="params.LOCATIONNAME">
|
<el-form-item label="货位代码" prop="params.LOCATIONNAME">
|
||||||
@ -717,6 +733,20 @@ async function getStorageSpecLocationList() {
|
|||||||
state.StorageSelectAll = res.resultObj;
|
state.StorageSelectAll = res.resultObj;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getLocationList(query: any) {
|
||||||
|
let arr = state.StorageSelectAll.filter((item: any) => {
|
||||||
|
return item.DESCRIPTION.includes(query) || item.STORAGENAME.includes(query)
|
||||||
|
})
|
||||||
|
if (arr.length > 50) {
|
||||||
|
state.LocationList = arr.slice(0, 50)
|
||||||
|
} else {
|
||||||
|
state.LocationList = arr
|
||||||
|
}
|
||||||
|
state.LocationList.unshift({
|
||||||
|
ENUMVALUE: ''
|
||||||
|
})
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user