fix: 提交

20240912_adapter_z
chenhc 10 months ago
parent cbf3a4b623
commit 60083984f9

@ -59,6 +59,10 @@
<i class="el-icon-s-claim"></i> <i class="el-icon-s-claim"></i>
<span slot="title">单据上传</span> <span slot="title">单据上传</span>
</el-menu-item> </el-menu-item>
<el-menu-item :index=7 @click="clickMenuItem(7)">
<i class="el-icon-s-claim"></i>
<span slot="title">损耗出库</span>
</el-menu-item>
</el-menu> </el-menu>
</el-col> </el-col>
@ -91,6 +95,7 @@ import IoCreateOrderReturn from '@/views/collect/IoCreateOrder.vue'
import IoCreateOrderOut from '@/views/collect/IoCreateOrder.vue' import IoCreateOrderOut from '@/views/collect/IoCreateOrder.vue'
import ioSplitFifoCode from '@/views/collect/ioSplitFifoCode.vue' import ioSplitFifoCode from '@/views/collect/ioSplitFifoCode.vue'
import CollectOrderUpload from '@/views/collect/CollectOrderUpload.vue' import CollectOrderUpload from '@/views/collect/CollectOrderUpload.vue'
import IoDestroyOrder from '@/views/collect/IoDestroyOrder.vue'
export default { export default {
components: { components: {
@ -100,7 +105,8 @@ export default {
ioSplitFifoCode, ioSplitFifoCode,
CollectOrderAllot, CollectOrderAllot,
CollectOrderEnd, CollectOrderEnd,
CollectOrderUpload CollectOrderUpload,
IoDestroyOrder
}, },
name: 'CollectOrderTabs', name: 'CollectOrderTabs',
data() { data() {
@ -178,6 +184,14 @@ export default {
component: CollectOrderUpload, component: CollectOrderUpload,
// //
componentProps: {} componentProps: {}
},
{
number: 7,
title: '损耗出库',
name: 'IoDestroyOrder',
component: IoDestroyOrder,
//
componentProps: {}
}], }],
editableTabs: [{ editableTabs: [{
number: 0, number: 0,

@ -343,7 +343,7 @@ export default {
findCurWorkPlaces(val) { findCurWorkPlaces(val) {
let query = { let query = {
workplaceCode: val, workplaceCode: val,
userId: this.userInfo.userId, userId: this.$store.getters.userId,
page: 1, page: 1,
limit: 100, limit: 100,
} }
@ -423,10 +423,59 @@ export default {
}); });
}, },
getDMHotskeyValue(str) {
if (str.includes("DMHotskey")) {
try {
const jsonObj = JSON.parse(str);
if (jsonObj.hasOwnProperty("DMHotskey")) {
const dmhotskey = jsonObj.DMHotskey;
if (dmhotskey.hasOwnProperty("workPlace")) {
this.scanCode = ""
this.orderFormData.workPlaceCode = dmhotskey.workPlace
return true
} else if (dmhotskey.hasOwnProperty("fifoSplit")) {
this.scanCode = ""
this.orderFormData.fifoSplit = dmhotskey.fifoSplit;
return true;
}
}
} catch (error) {
console.log("字符串不是有效的 JSON 格式");
}
}
return false;
},
printCodeResult(data, isSuccess) {
const resultParts = ["扫码解析结果:" + data.code];
if (data.udi) {
resultParts.push("层级标识: " + data.udi);
}
if (data.batchNo) {
resultParts.push("批次号: " + data.batchNo);
}
if (data.produceDate) {
resultParts.push("生产日期: " + data.produceDate);
}
if (data.expireDate) {
resultParts.push("失效日期: " + data.expireDate);
}
if (data.serialNo) {
resultParts.push("序列号: " + data.serialNo);
}
this.result = resultParts.join(" , ");
},
getInputFocus(event) { getInputFocus(event) {
event.currentTarget.select(); event.currentTarget.select();
}, },
selectProductFunction() {
if (this.$isBlank(this.orderFormData.workPlaceCode)) {
this.$message.error("作业工位不能为空!")
return;
}
this.selectInvProductVisible = true;
},
}, },
filters: {}, filters: {},
mounted() { mounted() {
@ -457,7 +506,7 @@ export default {
this.$refs.inputRef.focus(); this.$refs.inputRef.focus();
}, },
created() { created() {
this.findCurWorkPlaces();
if (this.$route.query.billNo != null) { if (this.$route.query.billNo != null) {
this.orderFormData.billNo = this.$route.query.billNo this.orderFormData.billNo = this.$route.query.billNo
} }
@ -465,7 +514,6 @@ export default {
this.corpOrderIdDisabled = true this.corpOrderIdDisabled = true
this.workplaceId = Number(this.$route.query.workplaceId); this.workplaceId = Number(this.$route.query.workplaceId);
this.orderFormData.workPlaceCode = Number(this.$route.query.workplaceId); this.orderFormData.workPlaceCode = Number(this.$route.query.workplaceId);
this.findCurWorkPlaces(this.formData.workPlaceCode);
} }
}, },

Loading…
Cancel
Save