-
{{ info.remark }}
+
+ {{ info.remark }}
开始作业
@@ -224,8 +226,8 @@ export default {
data() {
return {
showContextMenu: false, // 控制上下文菜单的显示
- contextMenuPosition: { x: 0, y: 0 }, // 上下文菜单的位置
- selectBusTypeDisabled: false,
+ contextMenuPosition: {x: 0, y: 0}, // 上下文菜单的位置
+ selectBusTypeDisabled: false,
busQuery: {
busKey: '',
workplaceCode: null,
@@ -233,8 +235,8 @@ export default {
limit: 100
},
formData: {},
- curWorkPlaces:[],
- busTypeList:[],
+ curWorkPlaces: [],
+ busTypeList: [],
logo: logoImg,
isLinkDisabled: false,
showChild: true,
@@ -264,7 +266,7 @@ export default {
component: IoCreateOrderOut,
// 假设你需要传递的参数
componentProps: {
- fromSplitType: 'out'
+ fromSplitType: 'out',
}
},
{
@@ -330,21 +332,21 @@ export default {
],
tabIndex: 0,
menuActive: 0,
- resetKeys:{}
+ resetKeys: {}
}
},
methods: {
- toggleBusType(){
+ toggleBusType() {
//隐藏下拉框内容
// this.$refs.selectHeadEmpId.blur();
this.selectBusTypeDisabled = true
},
selectBusType(val) {
this.formData.busType = val
- let newQuery = { ...this.$route.query };
+ let newQuery = {...this.$route.query};
delete newQuery.billNo;
newQuery.busType = val
- this.$router.push({ query: newQuery, path: this.$route.path });
+ this.$router.push({query: newQuery, path: this.$route.path});
this.editableTabs = []
this.clickMenuItem(0)
this.showChild = false;
@@ -441,15 +443,15 @@ export default {
this.busTypeList = res.data.list
this.busTypeTotal = res.data.total
- if (this.$route.query.busType != null){
+ if (this.$route.query.busType != null) {
this.formData.busType = this.$route.query.busType
- }else if (this.busTypeList.length == 1) {
- this.formData.busType = this.busTypeList[0].documentTypeCode
- this.selectBusTypeDisabled = false
- } else {
- this.selectBusTypeDisabled = true
- this.formData.busType = null
- }
+ } else if (this.busTypeList.length == 1) {
+ this.formData.busType = this.busTypeList[0].documentTypeCode
+ this.selectBusTypeDisabled = false
+ } else {
+ this.selectBusTypeDisabled = true
+ this.formData.busType = null
+ }
}
return
@@ -459,7 +461,7 @@ export default {
handleContextMenu(event, tabItem) {
console.log("右击")
this.showContextMenu = true;
- this.contextMenuPosition = { x: event.clientX, y: event.clientY };
+ this.contextMenuPosition = {x: event.clientX, y: event.clientY};
// 这里可以显示一个自定义的菜单，例如使用 Element UI 的 Dialog 或 Popover
// 假设你有一个名为 showContextMenu 的方法来显示菜单，并传递 tabItem 作为参数
this.showContextMenu(tabItem, event.clientX, event.clientY);
@@ -467,7 +469,7 @@ export default {
showContextMenu(tabItem, x, y) {
// 显示你的自定义菜单逻辑，这里只是示例
this.contextMenuVisible = true;
- this.contextMenuPosition = { x, y };
+ this.contextMenuPosition = {x, y};
this.selectedTabItem = tabItem;
},
// 其他菜单操作的方法，如 closeCurrent, closeOthers, closeAll
@@ -518,6 +520,7 @@ export default {
vertical-align: middle;
margin-left: 25px;
}
+
.context-menu {
position: absolute;
z-index: 1000; /* 确保它在其他内容之上 */
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 32a0fc8e..4002d75d 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -56,53 +56,53 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -272,7 +272,8 @@
-
{{ info.remark }}
+
+ {{ info.remark }}
开始作业
@@ -442,8 +443,7 @@ export default {
if (this.formData.billNo != null) {
this.getBillNo(this.formData.billNo)
this.startDeal();
- }
- else {
+ } else {
if (this.busTypeList.length == 1 && this.$route.query.busType == null) {
let busType = this.busTypeList[0]
this.formData.busType = this.busTypeList[0].documentTypeCode
@@ -740,7 +740,7 @@ export default {
//选择单据
selectPrescribe() {
// console.log(this.formData.workPlaceCode)
- if (this.$route.query.busType != null){
+ if (this.$route.query.busType != null) {
this.formData.busType = this.$route.query.busType
}
this.selectPrescriptionVisible = true;
@@ -891,7 +891,7 @@ export default {
this.formData.confirmFinish = false;
this.refreshCodesPanel(this)
},
- toggleBusType(){
+ toggleBusType() {
//隐藏下拉框内容
// this.$refs.selectHeadEmpId.blur();
this.selectBusTypeDisabled = true
@@ -925,9 +925,6 @@ export default {
}
-
-
-
}
}
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 6af34fe2..046e0cec 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -407,6 +407,7 @@ export default {
sickerAdNum: null,
workPlaceCode: null,
fifoSplit: 1,
+ splitBusType: null,
},
detailList: [],
@@ -1081,7 +1082,7 @@ export default {
parseTime(date, "{y}{m}{d}{h}{i}{s}") +
Math.ceil(Math.random() * 89 + 10);
}
-
+ debugger
this.loading = true;
let tQuery = Object.assign(
JSON.parse(JSON.stringify(this.orderFormData))
@@ -1751,6 +1752,7 @@ export default {
preCurSpaceCode: null, //单据
sickerAdNum: null,
workPlaceCode: null,
+ splitBusType: null,
fifoSplit: 1,
}
this.scanCode = "";
@@ -1847,7 +1849,8 @@ export default {
this.corpOrderIdDisabled = true
this.isLinkDisabled = true
this.workplaceId = this.$route.query.workplaceId
- this.orderFormData.workPlaceCode = Number(this.$route.query.workplaceId)
+ this.orderFormData.workPlaceCode = Number(this.$route.query.workplaceId);
+ this.orderFormData.splitBusType = "YPCF002"
}
},