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

扫码问题

Browse Source
20240912_adapter_z
yewj 1 year ago
parent 2e38cfdc34
commit a116abc56d
2 changed files with 109 additions and 41 deletions
Show Stats Download Patch File Download Diff File

78
src/views/collect/DealOrder.vue
Unescape Escape View File

@ -9,12 +9,12 @@
<span <span
style="margin: 10px;color: #2d8cf0;font-size: 14px;" style="margin: 10px;color: #2d8cf0;font-size: 14px;"
>部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span> >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
<span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">{{ <!-- <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">{{-->
this.userInfo.companyName <!-- this.userInfo.companyName-->
}}</span> <!-- }}</span>-->
<span <span
style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px" style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
>(用户&nbsp:&nbsp{{ >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{
this.userInfo.userName this.userInfo.userName
}})</span> }})</span>
</div> </div>
@ -577,6 +577,9 @@ export default {
this.isSuccess = true; this.isSuccess = true;
this.printCodeResult(response.data, response.message) this.printCodeResult(response.data, response.message)
this.filterQuery.code = response.data.code; this.filterQuery.code = response.data.code;
this.scanCode = ""
this.originCode = ""
this.addCode(); this.addCode();
} else { } else {
if (response.code == 502) { if (response.code == 502) {
@ -584,15 +587,18 @@ export default {
this.isSuccess = false; this.isSuccess = false;
this.printCodeResult(response.data, response.message) this.printCodeResult(response.data, response.message)
this.filterQuery.code = response.data.code; this.filterQuery.code = response.data.code;
this.originCode = this.filterQuery.code; this.originCode = response.data.code;
this.scanCode = ""
} else if (response.code == 501) { } else if (response.code == 501) {
this.checkSuccess = false; this.checkSuccess = false;
this.$message.error(response.message); this.$message.error(response.message);
this.scanCode = ""
} else if (response.code == 503) { } else if (response.code == 503) {
this.checkSuccess = false; this.checkSuccess = false;
this.isSuccess = false; this.isSuccess = false;
this.printCodeResult(response.data, response.message) this.printCodeResult(response.data, response.message)
this.filterQuery.code = response.data.code; this.filterQuery.code = response.data.code;
this.scanCode = ""
this.$confirm(response.message, "提示", { this.$confirm(response.message, "提示", {
type: "warning", type: "warning",
}) })
@ -608,6 +614,7 @@ export default {
this.filterQuery.code = "01" + response.data.nameCode; this.filterQuery.code = "01" + response.data.nameCode;
this.originCode = this.filterQuery.code; this.originCode = this.filterQuery.code;
} else { } else {
this.scanCode = ""
this.$alert(response.message, "提示", { this.$alert(response.message, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
type: "warning", type: "warning",
@ -648,6 +655,7 @@ export default {
this.formData.insert = false; this.formData.insert = false;
this.formData = res.data; this.formData = res.data;
this.curRow = this.formData; this.curRow = this.formData;
this.$refs.inputRef.focus();
this.refreshCodesPanel(this); this.refreshCodesPanel(this);
} else { } else {
if (res.code == 502) { if (res.code == 502) {
@ -660,8 +668,11 @@ export default {
this.addCode(); this.addCode();
}).catch(() => { }).catch(() => {
}); });
} else } else {
this.$refs.inputRef.focus();
this.$message.error(res.message) this.$message.error(res.message)
}
} }
}).catch(() => { }).catch(() => {
this.loading = false this.loading = false
@ -677,9 +688,7 @@ export default {
draftOrder(this.formData).then(res => { draftOrder(this.formData).then(res => {
this.loading = false this.loading = false
if (res.code == 20000) { if (res.code == 20000) {
this.formData = {tagStatus: -1}; this.resetWork()
this.curRow = null
this.refreshCodesPanel(this)
} }
}).catch(() => { }).catch(() => {
this.loading = false this.loading = false
@ -688,27 +697,39 @@ export default {
}); });
}, },
finishOrder() { confirmFinishOrder() {
this.$confirm('是否确定完成此单据?', '提示', { this.$confirm('是否确定完成此单据?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
finishOrder(this.formData).then(res => { this.finishOrder()
this.loading = false
if (res.code == 20000) {
this.formData = {tagStatus: -1};
this.curRow = null
this.refreshCodesPanel(this)
}
}).catch(() => {
this.loading = false
})
}).catch(() => { }).catch(() => {
}); });
},
finishOrder() {
finishOrder(this.formData).then(res => {
this.loading = false
if (res.code == 20000) {
this.resetWork()
} else if (res.code == 502) {
this.$confirm(res.message, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.formData.confirmFinish = true;
this.finishOrder();
}).catch(() => {
});
}
}).catch(() => {
this.loading = false
})
}, },
updateOrder() { updateOrder() {
updateOrder(this.formData).then(res => { updateOrder(this.formData).then(res => {
this.loading = false this.loading = false
@ -818,7 +839,6 @@ export default {
printCodeResult(data, message) { printCodeResult(data, message) {
const resultParts = []; const resultParts = [];
if (data.udi) { if (data.udi) {
resultParts.push("层级标识: " + data.udi); resultParts.push("层级标识: " + data.udi);
} }
@ -850,6 +870,22 @@ export default {
this.originCode = ""; this.originCode = "";
this.formData.code = ""; this.formData.code = "";
this.scanCode = ""; this.scanCode = "";
this.scanTitle = "扫码结果：";
this.result = "";
},
/**
* 重置
*/
resetWork() {
this.formData = {
tagStatus: -1,
workPlaceCode: this.formData.workPlaceCode,
busType: this.formData.busType
};
this.curRow = null
this.formData.confirmFinish = false;
this.refreshCodesPanel(this)
}, },

72
src/views/collect/DealOrderBlank.vue
Unescape Escape View File

@ -9,9 +9,9 @@
<span <span
style="margin: 10px;color: #2d8cf0;font-size: 14px;" style="margin: 10px;color: #2d8cf0;font-size: 14px;"
>部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span> >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
<!-- <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">{{--> <!-- <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">{{-->
<!-- this.userInfo.companyName--> <!-- this.userInfo.companyName-->
<!-- }}</span>--> <!-- }}</span>-->
<span <span
style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px" style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
>&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{ >&nbsp&nbsp&nbsp&nbsp(用户&nbsp:&nbsp{{
@ -577,6 +577,9 @@ export default {
this.isSuccess = true; this.isSuccess = true;
this.printCodeResult(response.data, response.message) this.printCodeResult(response.data, response.message)
this.filterQuery.code = response.data.code; this.filterQuery.code = response.data.code;
this.scanCode = ""
this.originCode = ""
this.addCode(); this.addCode();
} else { } else {
if (response.code == 502) { if (response.code == 502) {
@ -584,15 +587,18 @@ export default {
this.isSuccess = false; this.isSuccess = false;
this.printCodeResult(response.data, response.message) this.printCodeResult(response.data, response.message)
this.filterQuery.code = response.data.code; this.filterQuery.code = response.data.code;
this.originCode = this.filterQuery.code; this.originCode = response.data.code;
this.scanCode = ""
} else if (response.code == 501) { } else if (response.code == 501) {
this.checkSuccess = false; this.checkSuccess = false;
this.$message.error(response.message); this.$message.error(response.message);
this.scanCode = ""
} else if (response.code == 503) { } else if (response.code == 503) {
this.checkSuccess = false; this.checkSuccess = false;
this.isSuccess = false; this.isSuccess = false;
this.printCodeResult(response.data, response.message) this.printCodeResult(response.data, response.message)
this.filterQuery.code = response.data.code; this.filterQuery.code = response.data.code;
this.scanCode = ""
this.$confirm(response.message, "提示", { this.$confirm(response.message, "提示", {
type: "warning", type: "warning",
}) })
@ -608,6 +614,7 @@ export default {
this.filterQuery.code = "01" + response.data.nameCode; this.filterQuery.code = "01" + response.data.nameCode;
this.originCode = this.filterQuery.code; this.originCode = this.filterQuery.code;
} else { } else {
this.scanCode = ""
this.$alert(response.message, "提示", { this.$alert(response.message, "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
type: "warning", type: "warning",
@ -661,7 +668,7 @@ export default {
this.addCode(); this.addCode();
}).catch(() => { }).catch(() => {
}); });
} else{ } else {
this.$refs.inputRef.focus(); this.$refs.inputRef.focus();
this.$message.error(res.message) this.$message.error(res.message)
} }
@ -681,9 +688,7 @@ export default {
draftOrder(this.formData).then(res => { draftOrder(this.formData).then(res => {
this.loading = false this.loading = false
if (res.code == 20000) { if (res.code == 20000) {
this.formData = {tagStatus: -1}; this.resetWork()
this.curRow = null
this.refreshCodesPanel(this)
} }
}).catch(() => { }).catch(() => {
this.loading = false this.loading = false
@ -692,27 +697,39 @@ export default {
}); });
}, },
finishOrder() { confirmFinishOrder() {
this.$confirm('是否确定完成此单据?', '提示', { this.$confirm('是否确定完成此单据?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
finishOrder(this.formData).then(res => { this.finishOrder()
this.loading = false
if (res.code == 20000) {
this.formData = {tagStatus: -1};
this.curRow = null
this.refreshCodesPanel(this)
}
}).catch(() => {
this.loading = false
})
}).catch(() => { }).catch(() => {
}); });
},
finishOrder() {
finishOrder(this.formData).then(res => {
this.loading = false
if (res.code == 20000) {
this.resetWork()
} else if (res.code == 502) {
this.$confirm(res.message, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.formData.confirmFinish = true;
this.finishOrder();
}).catch(() => {
});
}
}).catch(() => {
this.loading = false
})
}, },
updateOrder() { updateOrder() {
updateOrder(this.formData).then(res => { updateOrder(this.formData).then(res => {
this.loading = false this.loading = false
@ -822,7 +839,6 @@ export default {
printCodeResult(data, message) { printCodeResult(data, message) {
const resultParts = []; const resultParts = [];
if (data.udi) { if (data.udi) {
resultParts.push("层级标识: " + data.udi); resultParts.push("层级标识: " + data.udi);
} }
@ -854,6 +870,22 @@ export default {
this.originCode = ""; this.originCode = "";
this.formData.code = ""; this.formData.code = "";
this.scanCode = ""; this.scanCode = "";
this.scanTitle = "扫码结果：";
this.result = "";
},
/**
* 重置
*/
resetWork() {
this.formData = {
tagStatus: -1,
workPlaceCode: this.formData.workPlaceCode,
busType: this.formData.busType
};
this.curRow = null
this.formData.confirmFinish = false;
this.refreshCodesPanel(this)
}, },

Write Preview
Loading…
Cancel
Save