From cbb58dcbf6d0e19e4c6eb1a0846a683d07af2100 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Wed, 28 Aug 2024 10:26:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=84=A6=E7=82=B9=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/collect/CollectOrderTabs.vue | 46 +++-------------
src/views/collect/DealOrder.vue | 23 ++++++--
src/views/collect/DealOrderBlank.vue | 67 ++++++++----------------
src/views/collect/IoCreateOrder.vue | 51 ++++++++++--------
src/views/collect/IoCreateOrderBlank.vue | 65 ++++++++++++-----------
5 files changed, 112 insertions(+), 140 deletions(-)
diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue
index 1c816a47..f6ad18c4 100644
--- a/src/views/collect/CollectOrderTabs.vue
+++ b/src/views/collect/CollectOrderTabs.vue
@@ -60,7 +60,7 @@
+ @tab-click="upodateMenuActive" >
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -213,7 +176,8 @@ export default {
}
],
tabIndex: 0,
- menuActive: 0
+ menuActive: 0,
+ resetKeys:{}
}
},
methods: {
@@ -222,6 +186,7 @@ export default {
if (foundTab) {
// 如果找到了，执行一些操作
this.menuActive = foundTab.number
+ this.$set(this.resetKeys, foundTab.name, Date.now());
}
},
clickMenuItem(val) {
@@ -231,6 +196,7 @@ export default {
if (foundTab) {
// 如果找到了，执行一些操作
this.editableTabsValue = foundTab.name
+ this.$set(this.resetKeys, foundTab.name, Date.now());
} else {
// 如果没有找到，执行其他操作
this.addTab(item)
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 27a5745d..94aba70e 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -306,12 +306,19 @@ import {delDrugLevel} from "@/api/basic/product/drugUdiinfos";
import {getCurOrder, getNextOrder, findByBill} from "@/api/collect/collectOrder";
import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import A from '../../plugins/KeyScaner'
export default {
/**
* 处理处方
*/
name: "prescribeTagCodeDeal",
+ props: {
+ resetKey: {
+ type: Function,
+ required: true
+ },
+ },
data() {
return {
fromInvOptions: [],
@@ -394,8 +401,12 @@ export default {
PannelOrderBiz,
PanelOrderAllDetail
},
+ watch: {
+ resetKey(newVal, oldVal) {
+ this.$refs.inputRef.focus();
+ }
+ },
methods: {
-
getBillNo(billNo) {
let post = {
billNo: billNo,
@@ -440,6 +451,7 @@ export default {
this.findCurOrder();
} else {
this.formData.busType = null
+ this.$refs.inputRef.focus();
}
}
@@ -797,13 +809,13 @@ export default {
},
startDeal() {
- debugger
- this.$message.error("开始处理单据")
+
this.curRow = this.formData;
this.dealSplitOrder()
this.formData.tagStatus = 2;
this.updateOrder();
this.refreshCodesPanel(this);
+ this.$refs.inputRef.focus();
},
//开始拆零
@@ -871,8 +883,9 @@ export default {
this.formData.confirmFinish = false;
this.refreshCodesPanel(this)
},
-
-
+ },
+ mounted() {
+ this.$refs.inputRef.focus();
},
created() {
getHead("prescribeTagCodeDeal", "1").then((re) => {
diff --git a/src/views/collect/DealOrderBlank.vue b/src/views/collect/DealOrderBlank.vue
index 8aedc760..94aba70e 100644
--- a/src/views/collect/DealOrderBlank.vue
+++ b/src/views/collect/DealOrderBlank.vue
@@ -1,26 +1,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -100,17 +82,13 @@
-
+
+ placeholder="请选择业务类型" clearable style="width: 90%">
{{ item.documentTypeCode }}
- 切换业务
@@ -131,8 +108,7 @@
filterable
remote
reserve-keyword
- placeholder="请选择往来单位" clearable style="width: 90%"
- >
+ placeholder="请选择往来单位" clearable style="width: 90%">
+ :description="result">
@@ -331,12 +306,19 @@ import {delDrugLevel} from "@/api/basic/product/drugUdiinfos";
import {getCurOrder, getNextOrder, findByBill} from "@/api/collect/collectOrder";
import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import A from '../../plugins/KeyScaner'
export default {
/**
* 处理处方
*/
name: "prescribeTagCodeDeal",
+ props: {
+ resetKey: {
+ type: Function,
+ required: true
+ },
+ },
data() {
return {
fromInvOptions: [],
@@ -419,8 +401,12 @@ export default {
PannelOrderBiz,
PanelOrderAllDetail
},
+ watch: {
+ resetKey(newVal, oldVal) {
+ this.$refs.inputRef.focus();
+ }
+ },
methods: {
-
getBillNo(billNo) {
let post = {
billNo: billNo,
@@ -465,6 +451,7 @@ export default {
this.findCurOrder();
} else {
this.formData.busType = null
+ this.$refs.inputRef.focus();
}
}
@@ -499,11 +486,6 @@ export default {
}
this.findCurOrder();
},
- toggleBusType(){
- //隐藏下拉框内容
- this.$refs.selectHeadEmpId.blur();
- this.selectBusTypeDisabled = true
- },
handleClick(blankName) {
// let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId
@@ -827,11 +809,13 @@ export default {
},
startDeal() {
+
this.curRow = this.formData;
this.dealSplitOrder()
this.formData.tagStatus = 2;
this.updateOrder();
this.refreshCodesPanel(this);
+ this.$refs.inputRef.focus();
},
//开始拆零
@@ -899,10 +883,9 @@ export default {
this.formData.confirmFinish = false;
this.refreshCodesPanel(this)
},
- focusInput() {
- this.$refs.inputRef.focus();
- }
-
+ },
+ mounted() {
+ this.$refs.inputRef.focus();
},
created() {
getHead("prescribeTagCodeDeal", "1").then((re) => {
@@ -928,11 +911,7 @@ export default {
this.getWorkBindBusTypes(this.formData.workPlaceCode);
}
- },
- mounted() {
- this.$nextTick(() => {
- this.focusInput();
- });
+
}
}
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index 72bdc26a..68f033f8 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -8,26 +8,26 @@
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
- this.focusInput();
- })
+ this.$refs.inputRef.focus();
},
created() {
this.splitType = this.$route.query.splitType;