UDI
/
udiwms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修改盘点功能bug

Browse Source
feature-order-fix
x_z 3 years ago
parent d07b537c81
commit 37f908f656
6 changed files with 68 additions and 25 deletions
Show Stats Download Patch File Download Diff File

29
src/views/inventory/InvGoodsPlacement.vue
Unescape Escape View File

@ -292,6 +292,7 @@ export default {
invWarehouseCode: null, invWarehouseCode: null,
invSpaceCode: null, invSpaceCode: null,
code: null, code: null,
codeArray: []
}, },
formRules: [], formRules: [],
codeArray: [], codeArray: [],
@ -376,7 +377,8 @@ export default {
this.spaceCodeList = []; this.spaceCodeList = [];
let params = { let params = {
invStorageCode: this.filterQuery.invStorageCode, invStorageCode: this.filterQuery.invStorageCode,
invWarehouseCode: this.filterQuery.invWarehouseCode invWarehouseCode: this.filterQuery.invWarehouseCode,
status: true
}; };
getSpaceCodeList(params).then((res) => { getSpaceCodeList(params).then((res) => {
this.spaceCodeList = res.data || []; this.spaceCodeList = res.data || [];
@ -393,8 +395,8 @@ export default {
this.codeArray = []; this.codeArray = [];
}, },
saveData() { saveData() {
if (isBlank(this.filterQuery.invStorageCode) || isBlank(this.filterQuery.invWarehouseCode) if (isBlank(this.formData.invStorageCode) || isBlank(this.formData.invWarehouseCode)
|| isBlank(this.filterQuery.invSpaceCode)) { || isBlank(this.formData.invSpaceCode)) {
this.$message.warning("请选择仓库和货位信息"); this.$message.warning("请选择仓库和货位信息");
return; return;
} }
@ -402,10 +404,14 @@ export default {
this.$message.warning("请扫描需要摆放的货物"); this.$message.warning("请扫描需要摆放的货物");
return; return;
} }
this.formData.codeArray = this.codeArray; this.formData.codeArray = [];
this.codeArray.forEach(item => {
this.formData.codeArray.push(item.code);
})
bindInvSpace(this.formData).then((res) => { bindInvSpace(this.formData).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.$message.success("绑定成功"); this.$message.success("绑定成功");
this.placeDialogVisible = false;
this.getList(); this.getList();
} else { } else {
this.$message.error("绑定失败"); this.$message.error("绑定失败");
@ -459,8 +465,6 @@ export default {
this.formData.code = this.formData.code.trim(); this.formData.code = this.formData.code.trim();
if (this.$isBlank(this.formData.code)) return; if (this.$isBlank(this.formData.code)) return;
this.loading = true;
let tQuery = Object.assign(JSON.parse(JSON.stringify(this.formData))); let tQuery = Object.assign(JSON.parse(JSON.stringify(this.formData)));
this.checkCode(tQuery); this.checkCode(tQuery);
this.$refs.inputRef.select(); this.$refs.inputRef.select();
@ -488,16 +492,21 @@ export default {
}, },
checkCode(tQuery) { checkCode(tQuery) {
//检验是否重复添加 //检验是否重复添加
this.codeArray.forEach(code => { let flag = false;
if (code === this.formData.code) { this.codeArray.forEach(item => {
if (item.code === this.formData.code) {
this.$message.error("重复条码！"); this.$message.error("重复条码！");
flag = true;
return; return;
} }
}) })
if (flag) {
return;
}
//校验此条码是否已经被绑定到其他货位，如已被绑定，则提示，点击确定之后，重置此库存数据的仓库和分库数据 //校验此条码是否已经被绑定到其他货位，如已被绑定，则提示，点击确定之后，重置此库存数据的仓库和分库数据
checkCodeSpace(tQuery).then((res) => { checkCodeSpace(tQuery).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.codeArray.push(this.formData.code); this.codeArray.push({code: this.formData.code});
} else if (res.code === 8) { } else if (res.code === 8) {
this.loading = false; this.loading = false;
this.$message.error(res.message); this.$message.error(res.message);
@ -516,7 +525,7 @@ export default {
}); });
}); });
} }
}) });
}, },
}, },
created() { created() {

30
src/views/inventory/addCountOrder.vue
Unescape Escape View File

@ -254,9 +254,12 @@
<el-table v-loading="loading" :data="productList" style="width: 100%" <el-table v-loading="loading" :data="productList" style="width: 100%"
highlight-current-row="false" highlight-current-row="false"
:row-key="getRowKeys"
@selection-change="handleSelectionChange"
ref="multipleTable"> ref="multipleTable">
<el-table-column <el-table-column
type="selection" type="selection"
:reserve-selection="true"
width="55"> width="55">
</el-table-column> </el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
@ -277,6 +280,7 @@
<el-pagination <el-pagination
:page-size="filterQuery.limit" :page-size="filterQuery.limit"
:current-page="filterQuery.page"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
layout="prev, pager, next" layout="prev, pager, next"
:total="total" :total="total"
@ -378,10 +382,12 @@ export default {
codeQuery: { codeQuery: {
productId: null, productId: null,
orderIdFk: null, orderIdFk: null,
batchNo: null,
edit: true edit: true
}, },
codesVisible: false, codesVisible: false,
disableSpace: false disableSpace: false,
multiProduct: []
}; };
}, },
methods: { methods: {
@ -506,12 +512,11 @@ export default {
this.getInvProducts(); this.getInvProducts();
}, },
combine() { combine() {
let selection = this.$refs.multipleTable.selection; if (this.multiProduct.length === 0) {
if (selection.length === 0) {
this.$message.warning("请选择产品"); this.$message.warning("请选择产品");
return; return;
} }
selection.forEach(product => { this.multiProduct.forEach(product => {
this.countProductList.push(product); this.countProductList.push(product);
}) })
if (this.codeArray.length === 0) { if (this.codeArray.length === 0) {
@ -537,6 +542,7 @@ export default {
getCountOrderDetailList(detailParam).then((result) => { getCountOrderDetailList(detailParam).then((result) => {
this.codeArray = result.data.list || []; this.codeArray = result.data.list || [];
}); });
this.getCountOrderCodesNum();
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
@ -549,6 +555,7 @@ export default {
this.codeQuery = { this.codeQuery = {
orderIdFk: row.orderIdFk, orderIdFk: row.orderIdFk,
productId: row.productId, productId: row.productId,
batchNo: row.batchNo,
edit: true edit: true
} }
}, },
@ -623,7 +630,7 @@ export default {
invWarehouseCode: this.formData.invWarehouseCode invWarehouseCode: this.formData.invWarehouseCode
}; };
getCountInvProductProduct(params).then((res) => { getCountInvProductProduct(params).then((res) => {
if (res.data.length !== 0) { if (res.data.total !== 0) {
let invProductList = res.data.list; let invProductList = res.data.list;
for (let product of invProductList) { for (let product of invProductList) {
this.countProductList.push(product); this.countProductList.push(product);
@ -642,7 +649,7 @@ export default {
invSpaceCode: this.formData.invSpaceCode invSpaceCode: this.formData.invSpaceCode
}; };
getCountInvProductProduct(params).then((res) => { getCountInvProductProduct(params).then((res) => {
if (res.data.length !== 0) { if (res.data.total !== 0) {
let invProductList = res.data.list; let invProductList = res.data.list;
for (let product of invProductList) { for (let product of invProductList) {
this.countProductList.push(product); this.countProductList.push(product);
@ -655,10 +662,21 @@ export default {
this.$message.warning("请先选盘点仓库"); this.$message.warning("请先选盘点仓库");
return; return;
} }
this.multiProduct = [];
this.selectInvProductVisible = true; this.selectInvProductVisible = true;
this.queryInvProducts(); this.queryInvProducts();
} }
}, },
getRowKeys(row) {
return row.id;
},
handleSelectionChange(selectedRows) {
this.multiProduct = [];
selectedRows.forEach(item => {
this.multiProduct.push(item);
});
},
}, },
components: { components: {
countOrderCodes countOrderCodes

2
src/views/inventory/countOrderCodes.vue
Unescape Escape View File

@ -74,6 +74,7 @@ export default {
query: { query: {
productId: null, productId: null,
orderIdFk: null, orderIdFk: null,
batchNo: null,
page: 1, page: 1,
limit: 20 limit: 20
}, },
@ -118,6 +119,7 @@ export default {
this.loading = true; this.loading = true;
this.query.productId = this.codeQuery.productId; this.query.productId = this.codeQuery.productId;
this.query.orderIdFk = this.codeQuery.orderIdFk; this.query.orderIdFk = this.codeQuery.orderIdFk;
this.query.batchNo = this.codeQuery.batchNo;
getCountCodesList(this.query).then((res) => { getCountCodesList(this.query).then((res) => {
this.loading = false; this.loading = false;
if (res.code === 20000) { if (res.code === 20000) {

18
src/views/inventory/invCountOrderAudit.vue
Unescape Escape View File

@ -3,6 +3,9 @@
<el-card> <el-card>
<el-form :inline="true" :model="filterQuery" size="mini"> <el-form :inline="true" :model="filterQuery" size="mini">
<el-row style="width: 100%"> <el-row style="width: 100%">
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.orderId" placeholder="盘点单号" clearable="true"></el-input>
</el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true" <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange" @change="invChange"
@ -65,9 +68,8 @@
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="盘点单号" prop="orderId" width="180"></el-table-column> <el-table-column label="盘点单号" prop="orderId" width="180"></el-table-column>
<el-table-column label="仓库" prop="invStorageName" width="180"></el-table-column> <el-table-column label="仓库" prop="invStorageName" width="180"></el-table-column>
<el-table-column label="分库" prop="invSubStorageName" width="180" <el-table-column label="分库" prop="invSubStorageName" width="180"></el-table-column>
show-overflow-tooltip></el-table-column> <el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="120"></el-table-column>
<el-table-column label="盘点人" prop="createUser" width="120"></el-table-column> <el-table-column label="盘点人" prop="createUser" width="120"></el-table-column>
<el-table-column label="盘点时间" prop="createTime" width="150"></el-table-column> <el-table-column label="盘点时间" prop="createTime" width="150"></el-table-column>
<el-table-column label="状态" prop="status" width="120"> <el-table-column label="状态" prop="status" width="120">
@ -191,6 +193,7 @@ export default {
data() { data() {
return { return {
filterQuery: { filterQuery: {
orderId: null,
invWarehouseCode: null, invWarehouseCode: null,
invStorageCode: null, invStorageCode: null,
invSpaceCode: null, invSpaceCode: null,
@ -239,6 +242,7 @@ export default {
path: "", path: "",
}); });
this.filterQuery = { this.filterQuery = {
orderId: null,
customerId: null, customerId: null,
invWarehouseCode: null, invWarehouseCode: null,
invStorageCode: null, invStorageCode: null,
@ -396,9 +400,9 @@ export default {
cancelButtonText: '驳回', cancelButtonText: '驳回',
type: 'warning', type: 'warning',
center: true, center: true,
closeOnPressEscape:false,//按下 ESC 键关闭弹窗 closeOnPressEscape: false,//按下 ESC 键关闭弹窗
closeOnClickModal:false,//点击遮罩关闭弹窗 closeOnClickModal: false,//点击遮罩关闭弹窗
distinguishCancelAndClose:true,//区分取消与关闭 distinguishCancelAndClose: true,//区分取消与关闭
}).then(() => { }).then(() => {
params.status = 2; //审核通过 params.status = 2; //审核通过
updateCountOrderStatus(params).then((res) => { updateCountOrderStatus(params).then((res) => {
@ -407,7 +411,7 @@ export default {
this.getList(); this.getList();
this.onRestDetail(); this.onRestDetail();
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.message);
} }
}).catch(() => { }).catch(() => {
}); });

9
src/views/inventory/invCountOrderCompleted.vue
Unescape Escape View File

@ -3,6 +3,9 @@
<el-card> <el-card>
<el-form :inline="true" :model="filterQuery" size="mini"> <el-form :inline="true" :model="filterQuery" size="mini">
<el-row style="width: 100%"> <el-row style="width: 100%">
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.orderId" placeholder="盘点单号" clearable="true"></el-input>
</el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true" <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange" @change="invChange"
@ -67,7 +70,7 @@
<el-table-column label="仓库" prop="invStorageName" width="180"></el-table-column> <el-table-column label="仓库" prop="invStorageName" width="180"></el-table-column>
<el-table-column label="分库" prop="invSubStorageName" width="180" <el-table-column label="分库" prop="invSubStorageName" width="180"
show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column label="货位" prop="invSpaceName" width="120"></el-table-column> <el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
<el-table-column label="盘点人" prop="createUser" width="120"></el-table-column> <el-table-column label="盘点人" prop="createUser" width="120"></el-table-column>
<el-table-column label="盘点时间" prop="createTime" width="150"></el-table-column> <el-table-column label="盘点时间" prop="createTime" width="150"></el-table-column>
<el-table-column label="状态" prop="status" width="120"> <el-table-column label="状态" prop="status" width="120">
@ -164,6 +167,7 @@ export default {
data() { data() {
return { return {
filterQuery: { filterQuery: {
orderId: null,
invWarehouseCode: null, invWarehouseCode: null,
invStorageCode: null, invStorageCode: null,
invSpaceCode: null, invSpaceCode: null,
@ -212,11 +216,12 @@ export default {
path: "", path: "",
}); });
this.filterQuery = { this.filterQuery = {
orderId: null,
customerId: null, customerId: null,
invWarehouseCode: null, invWarehouseCode: null,
invStorageCode: null, invStorageCode: null,
invSpaceCode: null, invSpaceCode: null,
status: 1, status: 2,
page: 1, page: 1,
limit: 20, limit: 20,
}; };

5
src/views/inventory/invCountOrderNew.vue
Unescape Escape View File

@ -3,6 +3,9 @@
<el-card> <el-card>
<el-form :inline="true" :model="filterQuery" size="mini"> <el-form :inline="true" :model="filterQuery" size="mini">
<el-row style="width: 100%"> <el-row style="width: 100%">
<el-form-item class="query-form-item">
<el-input v-model="filterQuery.orderId" placeholder="盘点单号" clearable="true"></el-input>
</el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true" <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange" @change="invChange"
@ -158,6 +161,7 @@ export default {
data() { data() {
return { return {
filterQuery: { filterQuery: {
orderId: null,
invWarehouseCode: null, invWarehouseCode: null,
invStorageCode: null, invStorageCode: null,
invSpaceCode: null, invSpaceCode: null,
@ -192,6 +196,7 @@ export default {
path: "", path: "",
}); });
this.filterQuery = { this.filterQuery = {
orderId: null,
customerId: null, customerId: null,
invWarehouseCode: null, invWarehouseCode: null,
invStorageCode: null, invStorageCode: null,

Write Preview
Loading…
Cancel
Save