|
|
|
|
@ -1,23 +1,32 @@
|
|
|
|
|
<template>
|
|
|
|
|
<el-form :model="formData" label-width="100px">
|
|
|
|
|
<el-button-group style="display: flex;margin: 0px 0 10px 80%; height: 35px">
|
|
|
|
|
<el-button size="mini" type="primary" @click.native="saveData()">提交</el-button>
|
|
|
|
|
<el-button size="mini" type="primary" @click.native="closePlaceDialog(1)">关闭</el-button>
|
|
|
|
|
<el-button-group
|
|
|
|
|
style="display: flex; margin: 0px 0 10px 80%; height: 35px"
|
|
|
|
|
>
|
|
|
|
|
<el-button size="mini" type="primary" @click.native="saveData()"
|
|
|
|
|
>提交</el-button
|
|
|
|
|
>
|
|
|
|
|
<el-button size="mini" type="primary" @click.native="closePlaceDialog(1)"
|
|
|
|
|
>关闭</el-button
|
|
|
|
|
>
|
|
|
|
|
</el-button-group>
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="10">
|
|
|
|
|
<el-form-item prop="invWarehouseCode" label="当前仓库:">
|
|
|
|
|
<el-select v-model="formData.invCode"
|
|
|
|
|
placeholder="当前仓库信息"
|
|
|
|
|
:disabled="list.length>0"
|
|
|
|
|
@change="invChange"
|
|
|
|
|
style="width: 90%"
|
|
|
|
|
clearable>
|
|
|
|
|
<el-select
|
|
|
|
|
v-model="formData.invCode"
|
|
|
|
|
placeholder="当前仓库信息"
|
|
|
|
|
:disabled="list.length > 0"
|
|
|
|
|
@change="invChange"
|
|
|
|
|
style="width: 90%"
|
|
|
|
|
clearable
|
|
|
|
|
>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in invList"
|
|
|
|
|
:key="item.name"
|
|
|
|
|
:label="item.name"
|
|
|
|
|
:value="item.code">
|
|
|
|
|
:value="item.code"
|
|
|
|
|
>
|
|
|
|
|
<span style="float: left">{{ item.name }}</span>
|
|
|
|
|
</el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
@ -31,7 +40,7 @@
|
|
|
|
|
:fetch-suggestions="querySearchAsync"
|
|
|
|
|
placeholder="请输入内容"
|
|
|
|
|
ref="spaceInputRef"
|
|
|
|
|
:disabled="list.length>0"
|
|
|
|
|
:disabled="list.length > 0"
|
|
|
|
|
@select="handleSelect"
|
|
|
|
|
@keypress.enter.native="spaceEnterKey($event)"
|
|
|
|
|
clearable
|
|
|
|
|
@ -64,8 +73,8 @@
|
|
|
|
|
id="inputer"
|
|
|
|
|
@focus="getInputFocus($event)"
|
|
|
|
|
@keypress.enter.native="enterKey($event)"
|
|
|
|
|
ref='inputRef'
|
|
|
|
|
style="ime-mode:disabled"
|
|
|
|
|
ref="inputRef"
|
|
|
|
|
style="ime-mode: disabled"
|
|
|
|
|
type="tel"
|
|
|
|
|
v-model="formData.code"
|
|
|
|
|
></el-input>
|
|
|
|
|
@ -77,43 +86,94 @@
|
|
|
|
|
size="mini"
|
|
|
|
|
@click.native.stop="addCode()"
|
|
|
|
|
style="margin-left: 15px"
|
|
|
|
|
>添加
|
|
|
|
|
</el-button
|
|
|
|
|
>
|
|
|
|
|
>添加
|
|
|
|
|
</el-button>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
<el-table v-loading="loading" :data="list" style="width: 100%;margin-top: 20px;"
|
|
|
|
|
highlight-current-row
|
|
|
|
|
border max-height="300" height="300">
|
|
|
|
|
<el-table
|
|
|
|
|
v-loading="loading"
|
|
|
|
|
:data="list"
|
|
|
|
|
style="width: 100%; margin-top: 20px"
|
|
|
|
|
highlight-current-row
|
|
|
|
|
border
|
|
|
|
|
max-height="300"
|
|
|
|
|
height="300"
|
|
|
|
|
>
|
|
|
|
|
<el-table-column label="序号" type="index" width="50"></el-table-column>
|
|
|
|
|
<el-table-column label="DI/物资编码" prop="relId" width="150"></el-table-column>
|
|
|
|
|
<el-table-column label="物资名称" prop="productName" width="150" show-tooltip-when-overflow></el-table-column>
|
|
|
|
|
<el-table-column label="规格型号" prop="ggxh" width="150"></el-table-column>
|
|
|
|
|
<el-table-column label="批次号" prop="batchNo" width="150"></el-table-column>
|
|
|
|
|
<el-table-column label="序列号" prop="serialNo" width="150"></el-table-column>
|
|
|
|
|
<el-table-column label="计量单位" prop="measname" width="150"></el-table-column>
|
|
|
|
|
<el-table-column label="货位" prop="invSpaceName" width="150"></el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="DI/物资编码"
|
|
|
|
|
prop="relId"
|
|
|
|
|
width="150"
|
|
|
|
|
></el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="物资名称"
|
|
|
|
|
prop="productName"
|
|
|
|
|
width="150"
|
|
|
|
|
show-tooltip-when-overflow
|
|
|
|
|
></el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="规格型号"
|
|
|
|
|
prop="ggxh"
|
|
|
|
|
width="150"
|
|
|
|
|
></el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="批次号"
|
|
|
|
|
prop="batchNo"
|
|
|
|
|
width="150"
|
|
|
|
|
></el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="序列号"
|
|
|
|
|
prop="serialNo"
|
|
|
|
|
width="150"
|
|
|
|
|
></el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="计量单位"
|
|
|
|
|
prop="measname"
|
|
|
|
|
width="150"
|
|
|
|
|
></el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="货位"
|
|
|
|
|
prop="invSpaceName"
|
|
|
|
|
width="150"
|
|
|
|
|
></el-table-column>
|
|
|
|
|
<el-table-column label="数量" prop="count" width="150"></el-table-column>
|
|
|
|
|
<el-table-column label="注册备案号" prop="zczbhhzbapzbh" width="150" show-tooltip-when-overflow></el-table-column>
|
|
|
|
|
<el-table-column label="生产厂家" prop="manufactory" width="150"></el-table-column>
|
|
|
|
|
<el-table-column label="供应商" prop="supName" width="150"></el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="注册备案号"
|
|
|
|
|
prop="zczbhhzbapzbh"
|
|
|
|
|
width="150"
|
|
|
|
|
show-tooltip-when-overflow
|
|
|
|
|
></el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="生产厂家"
|
|
|
|
|
prop="manufactory"
|
|
|
|
|
width="150"
|
|
|
|
|
></el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="供应商"
|
|
|
|
|
prop="supName"
|
|
|
|
|
width="150"
|
|
|
|
|
></el-table-column>
|
|
|
|
|
</el-table>
|
|
|
|
|
</el-form>
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
<script>
|
|
|
|
|
import {getInvListByUser} from "@/api/system/invWarehouse";
|
|
|
|
|
import {getInvSpaceList} from "@/api/inventory/invSpace";
|
|
|
|
|
import {isBlank} from "@/utils/strUtil";
|
|
|
|
|
import {bindInvSpace, getInvPlaceOrderDetailList, getCheckInvProductInfo} from "@/api/inventory/invPlace";
|
|
|
|
|
import { getInvListByUser } from "@/api/system/invWarehouse";
|
|
|
|
|
import { getInvSpaceList } from "@/api/inventory/invSpace";
|
|
|
|
|
import { isBlank } from "@/utils/strUtil";
|
|
|
|
|
import {
|
|
|
|
|
bindInvSpace,
|
|
|
|
|
getInvPlaceOrderDetailList,
|
|
|
|
|
getCheckInvProductInfo,
|
|
|
|
|
} from "@/api/inventory/invPlace";
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
|
props: {
|
|
|
|
|
closePlaceDialog: {
|
|
|
|
|
type: Function,
|
|
|
|
|
required: true
|
|
|
|
|
}
|
|
|
|
|
required: true,
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
name: "InvProductPlaceModify",
|
|
|
|
|
data() {
|
|
|
|
|
@ -135,7 +195,7 @@ export default {
|
|
|
|
|
loading: false,
|
|
|
|
|
spaceSearchResult: [],
|
|
|
|
|
spaceChangeSearchResult: [],
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
methods: {
|
|
|
|
|
saveData() {
|
|
|
|
|
@ -151,30 +211,33 @@ export default {
|
|
|
|
|
this.$message.error("请录入需要上架的物资数据");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
this.$confirm('是否确认保存当前数据?', '提示', {
|
|
|
|
|
confirmButtonText: '确定',
|
|
|
|
|
cancelButtonText: '取消',
|
|
|
|
|
type: 'warning'
|
|
|
|
|
}).then(() => {
|
|
|
|
|
let params = {
|
|
|
|
|
invCode: this.formData.invCode,
|
|
|
|
|
invSpaceCode: this.formData.invSpaceCode,
|
|
|
|
|
changeSpaceCode: this.formData.changeSpaceCode,
|
|
|
|
|
type: 3, //按物资上架
|
|
|
|
|
orderId: this.orderId,
|
|
|
|
|
};
|
|
|
|
|
bindInvSpace(params).then((res) => {
|
|
|
|
|
if (res.code === 20000) {
|
|
|
|
|
this.$message.success("上架成功");
|
|
|
|
|
this.clearFormData();
|
|
|
|
|
} else {
|
|
|
|
|
this.$message.error(res.message);
|
|
|
|
|
}
|
|
|
|
|
}).catch((error) => {
|
|
|
|
|
this.$message.error(error.message);
|
|
|
|
|
});
|
|
|
|
|
}).catch(() => {
|
|
|
|
|
});
|
|
|
|
|
this.$confirm("是否确认保存当前数据?", "提示", {
|
|
|
|
|
confirmButtonText: "确定",
|
|
|
|
|
cancelButtonText: "取消",
|
|
|
|
|
type: "warning",
|
|
|
|
|
})
|
|
|
|
|
.then(() => {
|
|
|
|
|
let params = {
|
|
|
|
|
invCode: this.formData.invCode,
|
|
|
|
|
invSpaceCode: this.formData.invSpaceCode,
|
|
|
|
|
changeSpaceCode: this.formData.changeSpaceCode,
|
|
|
|
|
type: 3, //按物资上架
|
|
|
|
|
orderId: this.orderId,
|
|
|
|
|
};
|
|
|
|
|
bindInvSpace(params)
|
|
|
|
|
.then((res) => {
|
|
|
|
|
if (res.code === 20000) {
|
|
|
|
|
this.$message.success("上架成功");
|
|
|
|
|
this.clearFormData();
|
|
|
|
|
} else {
|
|
|
|
|
this.$message.error(res.message);
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
.catch((error) => {
|
|
|
|
|
this.$message.error(error.message);
|
|
|
|
|
});
|
|
|
|
|
})
|
|
|
|
|
.catch(() => {});
|
|
|
|
|
},
|
|
|
|
|
clearFormData() {
|
|
|
|
|
//清空表单数据
|
|
|
|
|
@ -195,7 +258,7 @@ export default {
|
|
|
|
|
this.list.forEach((item) => {
|
|
|
|
|
item.invSpaceCode = null;
|
|
|
|
|
item.invSpaceName = null;
|
|
|
|
|
})
|
|
|
|
|
});
|
|
|
|
|
this.getSpaceList();
|
|
|
|
|
},
|
|
|
|
|
//查询当前货位
|
|
|
|
|
@ -203,9 +266,11 @@ export default {
|
|
|
|
|
let restaurants = this.spaceList;
|
|
|
|
|
restaurants.forEach((item) => {
|
|
|
|
|
item.value = item.name;
|
|
|
|
|
})
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
let results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants;
|
|
|
|
|
let results = queryString
|
|
|
|
|
? restaurants.filter(this.createStateFilter(queryString))
|
|
|
|
|
: restaurants;
|
|
|
|
|
if (!isBlank(queryString)) {
|
|
|
|
|
this.spaceSearchResult = results;
|
|
|
|
|
}
|
|
|
|
|
@ -216,9 +281,11 @@ export default {
|
|
|
|
|
let restaurants = this.changeSpaceList;
|
|
|
|
|
restaurants.forEach((item) => {
|
|
|
|
|
item.value = item.name;
|
|
|
|
|
})
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
let results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants;
|
|
|
|
|
let results = queryString
|
|
|
|
|
? restaurants.filter(this.createStateFilter(queryString))
|
|
|
|
|
: restaurants;
|
|
|
|
|
if (!isBlank(queryString)) {
|
|
|
|
|
this.spaceChangeSearchResult = results;
|
|
|
|
|
}
|
|
|
|
|
@ -227,9 +294,11 @@ export default {
|
|
|
|
|
|
|
|
|
|
createStateFilter(queryString) {
|
|
|
|
|
return (state) => {
|
|
|
|
|
const {value, code} = state;
|
|
|
|
|
return value === queryString.toLowerCase()
|
|
|
|
|
|| code === queryString.toLowerCase();
|
|
|
|
|
const { value, code } = state;
|
|
|
|
|
return (
|
|
|
|
|
value === queryString.toLowerCase() ||
|
|
|
|
|
code === queryString.toLowerCase()
|
|
|
|
|
);
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
handleSelect(item) {
|
|
|
|
|
@ -258,34 +327,33 @@ export default {
|
|
|
|
|
this.getSpaceList();
|
|
|
|
|
this.getList();
|
|
|
|
|
})
|
|
|
|
|
.catch(() => {
|
|
|
|
|
});
|
|
|
|
|
.catch(() => {});
|
|
|
|
|
},
|
|
|
|
|
getSpaceList() {
|
|
|
|
|
let params = {
|
|
|
|
|
invWarehouseCode: this.formData.invCode,
|
|
|
|
|
status: 1
|
|
|
|
|
status: 1,
|
|
|
|
|
};
|
|
|
|
|
getInvSpaceList(params).then((res) => {
|
|
|
|
|
this.spaceList = res.data.list || [];
|
|
|
|
|
})
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
getChangeSpaceList() {
|
|
|
|
|
let params = {
|
|
|
|
|
invWarehouseCode: this.formData.invCode,
|
|
|
|
|
status: 1
|
|
|
|
|
status: 1,
|
|
|
|
|
};
|
|
|
|
|
getInvSpaceList(params).then((res) => {
|
|
|
|
|
var list=[];
|
|
|
|
|
console.log(this.formData.invSpaceName)
|
|
|
|
|
for (var i=0;i<res.data.list.length;i++){
|
|
|
|
|
if(res.data.list[i].name!=this.formData.invSpaceName){
|
|
|
|
|
var list = [];
|
|
|
|
|
console.log(this.formData.invSpaceName);
|
|
|
|
|
for (var i = 0; i < res.data.list.length; i++) {
|
|
|
|
|
if (res.data.list[i].name != this.formData.invSpaceName) {
|
|
|
|
|
list.push(res.data.list[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
this.changeSpaceList = list || [];
|
|
|
|
|
})
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
addCode(event) {
|
|
|
|
|
@ -294,17 +362,17 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
this.$refs.inputRef.select();
|
|
|
|
|
if (isBlank(this.formData.invCode)) {
|
|
|
|
|
this.$message.error('当前仓库不能为空');
|
|
|
|
|
this.$message.error("当前仓库不能为空");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (isBlank(this.formData.invSpaceCode)) {
|
|
|
|
|
this.$message.error('当前货位不能为空');
|
|
|
|
|
this.$message.error("当前货位不能为空");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (isBlank(this.formData.changeSpaceName)) {
|
|
|
|
|
this.$message.error('变更后货位不能为空');
|
|
|
|
|
this.$message.error("变更后货位不能为空");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -320,18 +388,18 @@ export default {
|
|
|
|
|
invSpaceCode: this.formData.invSpaceCode,
|
|
|
|
|
changeSpaceCode: this.formData.changeSpaceCode,
|
|
|
|
|
code: this.formData.code,
|
|
|
|
|
type:3
|
|
|
|
|
type: 3,
|
|
|
|
|
};
|
|
|
|
|
getCheckInvProductInfo(params).then((res) => {
|
|
|
|
|
if (res.code == 20000) {
|
|
|
|
|
this.orderId=res.data;
|
|
|
|
|
getInvPlaceOrderDetailList({orderId:this.orderId}).then((res) => {
|
|
|
|
|
this.list=res.data.list;
|
|
|
|
|
this.orderId = res.data;
|
|
|
|
|
getInvPlaceOrderDetailList({ orderId: this.orderId }).then((res) => {
|
|
|
|
|
this.list = res.data.list;
|
|
|
|
|
});
|
|
|
|
|
} else {
|
|
|
|
|
this.$message.warning(res.message);
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
getInputFocus(event) {
|
|
|
|
|
event.currentTarget.select();
|
|
|
|
|
@ -363,14 +431,15 @@ export default {
|
|
|
|
|
event.target.select();
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
created() {
|
|
|
|
|
this.getInvList();
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
mounted() {
|
|
|
|
|
//默认获取上架货物光标
|
|
|
|
|
this.$refs.spaceInputRef.focus();
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
</script>
|
|
|
|
|
|
|
|
|
|
<style scoped>
|
|
|
|
|
|
|
|
|
|
</style>
|
|
|
|
|
<style scoped></style>
|
|
|
|
|
|
CTP
2 years ago