@@ -159,7 +206,7 @@ import {convertDate} from "@/utils/date";
import selectPrescribeDialog from "@/views/collect/selectCollectOrderDialog";
import prescribeCodePanel from "./PanelOrderTagCode";
import PannelOrderBiz from "./PannelOrderBiz";
-
+import {listPage} from "@/api/basic/sysWorkplaceManage";
import {enterCodeWeb} from "@/api/inout/order";
import {draftOrder, finishOrder, tagCode} from "@/api/collect/splitCreateOrder";
import {delDrugLevel} from "@/api/basic/product/drugUdiinfos";
@@ -173,7 +220,6 @@ export default {
return {
//界面配置相关
//患者处方
- workplaceId: this.$route.query.workplaceId,
loading: false,
tableHeader: [],
queryList: [],
@@ -192,10 +238,16 @@ export default {
total: 0,
defaultSort: {prop: 'createTime', order: 'desc'},
+ curWorkPlaces: [],
+ erpList: [],
formData: {
tagStatus: -1,
+ invCode:null,
+ workPlaceCode:null,
+ erpId:null,
},
selectPrescriptionVisible: false,
+ corpOrderIdDisabled: false,
curRow: null,
panelALive: false,
@@ -234,6 +286,22 @@ export default {
// this.$router.push( workplaceId)
window.open(url, '_blank');
},
+ //获取当前货位
+ findCurWorkPlaces(val) {
+ let query = {
+ key: val,
+ status: 1,
+ invCode: this.formData.invCode,
+ page: 1,
+ limit: 100,
+ }
+ listPage(query).then((res) => {
+ this.curWorkPlaces = res.data.list || [];
+ if (this.curWorkPlaces.length == 1 ) {
+ this.formData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
+ }
+ })
+ },
//界面配置相关------------
executeFuc(row, type, clickFuc, value) {
return executeFuc(this, row, type, clickFuc, value);
@@ -433,6 +501,13 @@ export default {
this.queryList = re.data.queryList;
this.fromList = re.data.fromList;
});
+ this.formData.invCode = this.$store.getters.locInvCode;
+ this.findCurWorkPlaces();
+ if (this.$route.query.workplaceId != null){
+ this.corpOrderIdDisabled = true
+ this.formData.workplaceCode = Number(this.$route.query.workplaceId);
+ }
+
}
diff --git a/src/views/collect/DealOrderBlank.vue b/src/views/collect/DealOrderBlank.vue
index 73bdd675..d9ff5b88 100644
--- a/src/views/collect/DealOrderBlank.vue
+++ b/src/views/collect/DealOrderBlank.vue
@@ -8,7 +8,6 @@
type="warning">
-
@@ -48,6 +47,54 @@
+
+
+
+
+
+
+ {{ item.workplaceName }}
+ {{
+ item.workplaceId
+ }}
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
@@ -127,7 +174,7 @@
{
+ this.curWorkPlaces = res.data.list || [];
+ if (this.curWorkPlaces.length == 1 ) {
+ this.formData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
+ }
+ })
+ },
//界面配置相关------------
executeFuc(row, type, clickFuc, value) {
return executeFuc(this, row, type, clickFuc, value);
@@ -462,6 +530,13 @@ export default {
this.queryList = re.data.queryList;
this.fromList = re.data.fromList;
});
+ this.formData.invCode = this.$store.getters.locInvCode;
+ this.findCurWorkPlaces();
+ if (this.$route.query.workplaceId != null){
+ this.corpOrderIdDisabled = true
+ this.formData.workplaceCode = Number(this.$route.query.workplaceId);
+ }
+
}
diff --git a/src/views/collect/PanelOrderDeal.vue b/src/views/collect/PanelOrderDeal.vue
index d85fd82c..9e99ed8c 100644
--- a/src/views/collect/PanelOrderDeal.vue
+++ b/src/views/collect/PanelOrderDeal.vue
@@ -308,7 +308,11 @@ export default {
addOrder, errOrder, prescribeOriginPanel, prescribeCodePanel
},
methods: {
+ linkPage(_this,row) {
+ let url = window.location.origin + `#/dept/use/prescribeDir/prescribe/tagCode` + `?billNo=` + row.billNo
+ window.open(url, '_blank');
+ },
//界面配置相关------------
executeFuc(row, type, clickFuc, value) {
return executeFuc(this, row, type, clickFuc, value);