|
|
|
|
@ -165,7 +165,7 @@
|
|
|
|
|
<div style="border: 1px solid #ebeef5;border-radius: 2px;margin-top: 15px;padding: 15px">
|
|
|
|
|
<el-row :gutter="0" style="margin-top: 5px">
|
|
|
|
|
<el-col :span="20">
|
|
|
|
|
<el-form-item prop="code" :label="labels[labelName]" label-width="80px">
|
|
|
|
|
<el-form-item prop="code" :label="scanTip" label-width="80px">
|
|
|
|
|
<el-input
|
|
|
|
|
id="inputer"
|
|
|
|
|
@focus="getInputFocus($event)"
|
|
|
|
|
@ -408,7 +408,7 @@ import {
|
|
|
|
|
vailOrderFinish
|
|
|
|
|
} from "@/api/collect/splitCreateOrder";
|
|
|
|
|
import {selectCorpList} from "@/api/basic/basicUnitMaintain";
|
|
|
|
|
import { getCurOrder, getNextOrder, findByBill, findFromCorp, removeByScanCode } from '@/api/collect/collectOrder'
|
|
|
|
|
import {getCurOrder, getNextOrder, findByBill, findFromCorp, orderDetail} from "@/api/collect/collectOrder";
|
|
|
|
|
import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
|
|
|
|
|
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
|
|
|
|
|
import {getInvListByUser} from "@/api/system/invWarehouse";
|
|
|
|
|
@ -517,7 +517,8 @@ export default {
|
|
|
|
|
errVisible: false,
|
|
|
|
|
workplaceId: null,
|
|
|
|
|
ws: null,
|
|
|
|
|
|
|
|
|
|
scanTip: "扫码录入:",
|
|
|
|
|
scanSplit: false,
|
|
|
|
|
//
|
|
|
|
|
labels: {
|
|
|
|
|
1: '扫码录入:',
|
|
|
|
|
@ -704,7 +705,7 @@ export default {
|
|
|
|
|
_this.$nextTick(() => {
|
|
|
|
|
_this.panelALive = true;
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
_this.getBizDetailList();
|
|
|
|
|
_this.vailOrderFinish();
|
|
|
|
|
},
|
|
|
|
|
refreshCodesPanelP() {
|
|
|
|
|
@ -719,8 +720,51 @@ export default {
|
|
|
|
|
getInputFocus(event) {
|
|
|
|
|
event.currentTarget.select();
|
|
|
|
|
},
|
|
|
|
|
getBizDetailList() {
|
|
|
|
|
let preQuery = {}
|
|
|
|
|
if (this.formData == null)
|
|
|
|
|
return
|
|
|
|
|
if (this.formData != null) {
|
|
|
|
|
preQuery = {
|
|
|
|
|
orderIdFk: this.formData.billNo
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
orderDetail(preQuery).then(res => {
|
|
|
|
|
if (res.code != 20000) {
|
|
|
|
|
this.$message.error(res.message)
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
this.splitBizList = res.data.list
|
|
|
|
|
let tip = "";
|
|
|
|
|
this.splitBizList.forEach((item) => {
|
|
|
|
|
if (item.splitUnCheck) {
|
|
|
|
|
tip = tip + item.cpmctymc + ","
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
if (this.$isNotBlank(tip)) {
|
|
|
|
|
tip = "请扫码确认以下产品" + tip + "需拆零的追溯码！"
|
|
|
|
|
this.$alert(tip, "提示", {
|
|
|
|
|
confirmButtonText: "确定",
|
|
|
|
|
type: "warning",
|
|
|
|
|
closeOnClickModal: true,
|
|
|
|
|
callback: (action) => {
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
this.scanTip = "扫码拆零确认:"
|
|
|
|
|
this.$refs.inputRef.focus();
|
|
|
|
|
this.$refs.inputRef.select();
|
|
|
|
|
this.scanSplit = true
|
|
|
|
|
return;
|
|
|
|
|
} else {
|
|
|
|
|
this.overdeleteCode();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}).catch(() => {
|
|
|
|
|
this.$message.error("数据加载失败")
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
enterKey() {
|
|
|
|
|
if (this.formData.billNo == null && this.formDataVisible.scanType != 1) {
|
|
|
|
|
this.enterBillNoKey()
|
|
|
|
|
@ -750,15 +794,15 @@ export default {
|
|
|
|
|
busType: this.formData.busType,
|
|
|
|
|
code: this.filterQuery.code.trim(),
|
|
|
|
|
};
|
|
|
|
|
if (this.scanStatus == 1){
|
|
|
|
|
if (this.scanStatus == 1) {
|
|
|
|
|
const codeArray = this.filterQuery.code.split(";");
|
|
|
|
|
let query = {
|
|
|
|
|
orderId :this.formData.billNo,
|
|
|
|
|
orderId: this.formData.billNo,
|
|
|
|
|
codeList: codeArray
|
|
|
|
|
}
|
|
|
|
|
//剔除码
|
|
|
|
|
this.removeCodesTemp(query)
|
|
|
|
|
}else {
|
|
|
|
|
} else {
|
|
|
|
|
enterCodeWeb(tQuery).then((response) => {
|
|
|
|
|
if (response.code === 20000) {
|
|
|
|
|
this.$refs.inputRef.focus();
|
|
|
|
|
@ -957,7 +1001,7 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
saveDraftOrder() {
|
|
|
|
|
if (this.scanStatus == 1){
|
|
|
|
|
if (this.scanStatus == 1) {
|
|
|
|
|
this.overdeleteCode()
|
|
|
|
|
}
|
|
|
|
|
this.$confirm('此操作将挂起当前正在处理单据，是否继续?', '提示', {
|
|
|
|
|
@ -1330,16 +1374,16 @@ export default {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
batchVailCode(params) {
|
|
|
|
|
if (this.scanStatus == 1){
|
|
|
|
|
if (this.scanStatus == 1) {
|
|
|
|
|
//剔除
|
|
|
|
|
// const codeArray = this.codeFormData.code.split(';')
|
|
|
|
|
let query = {
|
|
|
|
|
orderId : this.formData.billNo,
|
|
|
|
|
orderId: this.formData.billNo,
|
|
|
|
|
codeList: params
|
|
|
|
|
}
|
|
|
|
|
//剔除码
|
|
|
|
|
this.removeCodesTemp(query)
|
|
|
|
|
}else {
|
|
|
|
|
} else {
|
|
|
|
|
batchVailCode(params).then((res) => {
|
|
|
|
|
if (res.code === 20000) {
|
|
|
|
|
this.valiCodes = [];
|
|
|
|
|
@ -1386,9 +1430,9 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
removeCodesTemp(query){
|
|
|
|
|
removeCodesTemp(query) {
|
|
|
|
|
removeByScanCode(query).then(res => {
|
|
|
|
|
if (res.code == 20000){
|
|
|
|
|
if (res.code == 20000) {
|
|
|
|
|
this.$message.success("剔除成功")
|
|
|
|
|
this.scanCode = ""
|
|
|
|
|
this.panelALive = false
|
|
|
|
|
@ -1396,7 +1440,7 @@ export default {
|
|
|
|
|
this.panelALive = true;
|
|
|
|
|
});
|
|
|
|
|
this.result = ""
|
|
|
|
|
}else {
|
|
|
|
|
} else {
|
|
|
|
|
this.result = ""
|
|
|
|
|
this.scanCode = ""
|
|
|
|
|
this.$message.error(res.message)
|
|
|
|
|
@ -1521,7 +1565,8 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
//扫码剔除操作
|
|
|
|
|
deleteCode(){
|
|
|
|
|
deleteCode() {
|
|
|
|
|
this.scanTip = "扫码剔除:"
|
|
|
|
|
this.labelName = 2
|
|
|
|
|
this.placeholder = "请点击输入框进行扫码剔除"
|
|
|
|
|
this.scanStatus = 1
|
|
|
|
|
@ -1529,7 +1574,8 @@ export default {
|
|
|
|
|
overdeleteCode() {
|
|
|
|
|
this.labelName = 1
|
|
|
|
|
this.scanStatus = null
|
|
|
|
|
this.placeholder = '请点击输入框进行选择单据'
|
|
|
|
|
this.scanTip = "扫码录入:"
|
|
|
|
|
this.placeholder = '请点击输入框进行选扫码'
|
|
|
|
|
},
|
|
|
|
|
},
|
|
|
|
|
mounted() {
|
|
|
|
|
|
yewj
5 months ago