diff --git a/src/api/basic/sysWorkplaceManage.js b/src/api/basic/sysWorkplaceManage.js
index 89aaa659..ec50a090 100644
--- a/src/api/basic/sysWorkplaceManage.js
+++ b/src/api/basic/sysWorkplaceManage.js
@@ -48,6 +48,15 @@ export function createWorkplaceId(query) {
});
}
+export function filterWorkOptimize(query) {
+ return axios({
+ url: "/udiwms/sysWorkplace/page/filterOptimize",
+ method: "get",
+ params: query
+ });
+}
+
+
export function printWorkLabel(query) {
return axios({
url: "/udiwms/sysWorkplace/label/print",
diff --git a/src/api/collect/collectOrder.js b/src/api/collect/collectOrder.js
new file mode 100644
index 00000000..9229d8a0
--- /dev/null
+++ b/src/api/collect/collectOrder.js
@@ -0,0 +1,28 @@
+import axios from "@/utils/request"
+
+
+export function orderPage(query) {
+ return axios({
+ url: "/udiwms/basic/collect/order/filter",
+ method: "get",
+ params: query
+ });
+}
+
+export function orderDetail(query) {
+ return axios({
+ url: "/udiwms/basic/collect/order/detail",
+ method: "get",
+ params: query
+ });
+}
+
+
+export function deleteByOrder(query) {
+ return axios({
+ url: "/udiwms/basic/collect/order/deleteOrder",
+ method: "post",
+ data: query
+ });
+}
+
diff --git a/src/views/collect/CollectOrderAllot.vue b/src/views/collect/CollectOrderAllot.vue
index ffe15a7c..34f7a5a6 100644
--- a/src/views/collect/CollectOrderAllot.vue
+++ b/src/views/collect/CollectOrderAllot.vue
@@ -210,18 +210,18 @@
>
-
+
-
-
-
+
+
+
+
+
+
@@ -253,6 +253,8 @@ import {page as prescribePage, deleteDataByCode} from "@/api/basic/sicker/prescr
import bindWorkDialog from "@/views/collect/bindWorkDialog";
import prescribeOriginPanel from "./PannelOrderBiz";
import prescribeOriginDiPanel from "./PannelOrderBiz";
+import {filterWorkOptimize} from "@/api/basic/sysWorkplaceManage";
+import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
export default {
name: "prescribePanel",
@@ -311,6 +313,10 @@ export default {
multiplePreSelection: [],
curRow: null,
panelALive: false,
+
+ options: {
+ findWorkPlace: [],
+ },
}
},
@@ -370,7 +376,7 @@ export default {
getList() {
this.loading = true;
- prescribePage(this.filterQuery).then(res => {
+ orderPage(this.filterQuery).then(res => {
this.loading = false
this.list = res.data.list || []
this.total = res.data.total || 0
@@ -410,8 +416,8 @@ export default {
},
deleteOrders(data) {
this.loading = true;
- this.deleteData.code = data;
- deleteDataByCode(this.deleteData)
+ this.deleteData.billNo = data;
+ deleteByOrder(this.deleteData)
.then((response) => {
if (response.code == 20000) {
this.getList();
@@ -436,6 +442,24 @@ export default {
this.multiplePreSelection = val;
},
+ findWorkPlace(_this, val) {
+ let query = {
+ invCode: _this.$store.getters.locInvCode,
+ key: val,
+ page: 1,
+ limit: 10,
+ }
+ filterWorkOptimize(query)
+ .then((response) => {
+ _this.loading = false;
+ _this.options.findWorkPlace = response.data || [];
+ })
+ .catch(() => {
+ _this.loading = false;
+ _this.options.findWorkPlace = [];
+ });
+ },
+
},
created() {
getHead("prescribeAllot", "1").then((re) => {
diff --git a/src/views/collect/CollectOrderEnd.vue b/src/views/collect/CollectOrderEnd.vue
index 40f5eca1..32e56f9e 100644
--- a/src/views/collect/CollectOrderEnd.vue
+++ b/src/views/collect/CollectOrderEnd.vue
@@ -1,19 +1,24 @@
-
-
-
-
-
-
-
+
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -444,7 +452,9 @@ export default {
showSearch: false,
scanCode: "",
isSuccess: false,
- result: "扫码解析结果："
+ result: "",
+ scanResultType: "success",
+ msgTip: "工位存量提醒：",
};
},
components: {
diff --git a/src/views/collect/PanelOrderDeal.vue b/src/views/collect/PanelOrderDeal.vue
index 2b07383d..ba9bd361 100644
--- a/src/views/collect/PanelOrderDeal.vue
+++ b/src/views/collect/PanelOrderDeal.vue
@@ -209,38 +209,32 @@
-
-
-
-
-
-
-
+
-
+
-
+
+
+
+
@@ -255,6 +249,7 @@ import {page as prescribePage, deleteDataByCode} from "@/api/basic/sicker/prescr
import prescribeCodePanel from "@/views/collect/prescribe/prescribeCodePanel";
import prescribeOriginPanel from "@/views/collect/prescribe/prescribeOriginPanel";
import prescribeOriginDiPanel from "@/views/collect/prescribe/prescribeOriginDiPanel";
+import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
export default {
name: "prescribeAllotIngPanel",
@@ -369,7 +364,7 @@ export default {
getList() {
this.loading = true;
- prescribePage(this.filterQuery).then(res => {
+ orderPage(this.filterQuery).then(res => {
this.loading = false
this.list = res.data.list || []
this.total = res.data.total || 0
@@ -410,8 +405,8 @@ export default {
},
deleteOrders(data) {
this.loading = true;
- this.deleteData.code = data;
- deleteDataByCode(this.deleteData)
+ this.deleteData.billNo = data;
+ deleteByOrder(this.deleteData)
.then((response) => {
if (response.code == 20000) {
this.getList();
diff --git a/src/views/collect/PanelOrderEndCodeSearch.vue b/src/views/collect/PanelOrderEndCodeSearch.vue
index 56bfeefa..0f4b7b80 100644
--- a/src/views/collect/PanelOrderEndCodeSearch.vue
+++ b/src/views/collect/PanelOrderEndCodeSearch.vue
@@ -220,7 +220,7 @@
>
-
+
diff --git a/src/views/collect/PanelOrderEndSearch.vue b/src/views/collect/PanelOrderEndSearch.vue
index f33c3d9a..24c6faea 100644
--- a/src/views/collect/PanelOrderEndSearch.vue
+++ b/src/views/collect/PanelOrderEndSearch.vue
@@ -207,21 +207,34 @@
-
-
+
+ >
-
-
+
+
+
+
-
+
+
+
+
@@ -236,6 +249,7 @@ import {convertDate} from "@/utils/date";
import {detail, page as prescribePage} from "@/api/basic/sicker/prescribeApi";
import prescribeCodePanel from "./PanelOrderTagCode";
import prescribeOriginPanel from "@/views/collect/prescribe/prescribeOriginPanel";
+import {orderPage} from "@/api/collect/collectOrder";
export default {
name: "prescribePanel",
@@ -325,7 +339,7 @@ export default {
getList() {
this.loading = true;
- prescribePage(this.filterQuery).then(res => {
+ orderPage(this.filterQuery).then(res => {
this.loading = false
this.list = res.data.list || []
this.total = res.data.total || 0
@@ -352,12 +366,6 @@ export default {
},
- preHandleCurrentChange(val) {
- this.filterQuery.page = val.page;
- this.getPrescribeDetail(this, null);
- },
-
-
},
created() {
getHead("prescribePanel", "1").then((re) => {
diff --git a/src/views/collect/PannelOrderBiz.vue b/src/views/collect/PannelOrderBiz.vue
index 9feabcdf..3b738d9c 100644
--- a/src/views/collect/PannelOrderBiz.vue
+++ b/src/views/collect/PannelOrderBiz.vue
@@ -127,6 +127,7 @@
import {convertDate} from "@/utils/date";
import {detail} from "@/api/basic/sicker/prescribeApi";
import {executeFuc, getHead} from "@/utils/customConfig";
+import {orderDetail} from "@/api/collect/collectOrder";
/**
* 原始处方明细
@@ -145,6 +146,13 @@ export default {
default: null,
required: true
},
+ dealStatus: {
+ type: Number,
+ default: 1,
+ required: true
+ },
+
+
},
data() {
return {
@@ -161,11 +169,13 @@ export default {
preDetailList: [],
preTotal: 0,
preQuery: {
- prescribeCode: null,
+ orderIdFk: null,
page: 1,
limit: 10,
},
+ countVisible: false,
+
}
},
methods: {
@@ -201,10 +211,10 @@ export default {
return
if (_this.prescribeData != null) {
_this.preQuery.page = 1
- _this.preQuery.prescribeCode = this.prescribeData.code
+ _this.preQuery.orderIdFk = this.prescribeData.billNo
}
_this.preLoading = true;
- detail(_this.preQuery).then(res => {
+ orderDetail(_this.preQuery).then(res => {
_this.preLoading = false
if (res.code != 20000) {
_this.$message.error(res.message)
@@ -228,6 +238,11 @@ export default {
this.fromList1 = re.data.fromList;
this.getPrescribeDetail(this);
});
+ if (this.dealStatus == 1) {
+ this.countVisible = false;
+ } else {
+ this.countVisible = true;
+ }
}
diff --git a/src/views/collect/selectCollectOrderDialog.vue b/src/views/collect/selectCollectOrderDialog.vue
index d9561c90..e0f0f352 100644
--- a/src/views/collect/selectCollectOrderDialog.vue
+++ b/src/views/collect/selectCollectOrderDialog.vue
@@ -214,7 +214,7 @@
>
-
+
{
+ getHead("prescribeDownload", "1").then((re) => {
// 处理返回的数据
this.tableObj = re.data;
this.tableHeader = re.data.tableList;