From 79c5246b53456ab8e94c6ec1d34759b53a9225b6 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 15 Aug 2024 16:14:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/DealOrder.vue                | 15 ++++++++-------
 src/views/collect/PanelOrderDeal.vue           |  8 +++-----
 src/views/collect/PanelOrderEndSearch.vue      |  3 +--
 src/views/collect/PanelOrderTagCode.vue        |  2 +-
 src/views/collect/PannelOrderBiz.vue           |  2 +-
 src/views/collect/selectCollectOrderDialog.vue |  3 ++-
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 9b35d13e..bf0334ec 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -38,11 +38,12 @@
                   更多功能<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item  divided @click.native="handleClick('IoCreateOrderBlank')">工位上货</el-dropdown-item>
-                  <el-dropdown-item  divided @click.native="handleClick('IoCreateOrderBlank')">工位退货</el-dropdown-item>
-                  <el-dropdown-item  divided @click.native="handleClick('ioSplitFifoCodeBlank')">工位存量</el-dropdown-item>
-                  <el-dropdown-item  divided @click.native="handleClick('CollectOrderAllotBlank')">待处理单</el-dropdown-item>
-                  <el-dropdown-item  divided @click.native="handleClick('CollectOrderEndBlank')">已完成单</el-dropdown-item>
+                  <el-dropdown-item divided @click.native="handleClick('IoCreateOrderBlank')">工位上货</el-dropdown-item>
+                  <el-dropdown-item divided @click.native="handleClick('IoCreateOrderBlank')">工位退货</el-dropdown-item>
+                  <el-dropdown-item divided @click.native="handleClick('ioSplitFifoCodeBlank')">工位存量</el-dropdown-item>
+                  <el-dropdown-item divided @click.native="handleClick('CollectOrderAllotBlank')">待处理单
+                  </el-dropdown-item>
+                  <el-dropdown-item divided @click.native="handleClick('CollectOrderEndBlank')">已完成单</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </el-button-group>
@@ -127,7 +128,7 @@
       </el-tabs>
 
       <el-dialog
-        title="选择处方"
+        title="选入业务单据"
         :visible.sync="selectPrescriptionVisible"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
@@ -207,7 +208,7 @@ export default {
   methods: {
     handleClick(blankName) {
       // let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId
-      let url = window.location.origin+`#/`+ blankName+`?workplaceId=`+ this.workplaceId
+      let url = window.location.origin + `#/` + blankName + `?workplaceId=` + this.workplaceId
       // this.$router.push( workplaceId)
       window.open(url, '_blank');
     },
diff --git a/src/views/collect/PanelOrderDeal.vue b/src/views/collect/PanelOrderDeal.vue
index ba9bd361..d85fd82c 100644
--- a/src/views/collect/PanelOrderDeal.vue
+++ b/src/views/collect/PanelOrderDeal.vue
@@ -245,10 +245,8 @@ import addOrder from "@/views/inout/DialogCreateOrder";
 import errOrder from "@/views/inout/IoCreateErrorOrder";
 import {executeFuc, getHead} from "@/utils/customConfig";
 import {convertDate} from "@/utils/date";
-import {page as prescribePage, deleteDataByCode} from "@/api/basic/sicker/prescribeApi";
-import prescribeCodePanel from "@/views/collect/prescribe/prescribeCodePanel";
-import prescribeOriginPanel from "@/views/collect/prescribe/prescribeOriginPanel";
-import prescribeOriginDiPanel from "@/views/collect/prescribe/prescribeOriginDiPanel";
+import prescribeOriginPanel from "@/views/collect/PannelOrderBiz";
+import prescribeCodePanel from "@/views/collect/PanelOrderTagCode";
 import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
 
 export default {
@@ -307,7 +305,7 @@ export default {
   },
 
   components: {
-    addOrder, errOrder, prescribeOriginPanel, prescribeOriginDiPanel, prescribeCodePanel
+    addOrder, errOrder, prescribeOriginPanel, prescribeCodePanel
   },
   methods: {
 
diff --git a/src/views/collect/PanelOrderEndSearch.vue b/src/views/collect/PanelOrderEndSearch.vue
index 24c6faea..b29651c0 100644
--- a/src/views/collect/PanelOrderEndSearch.vue
+++ b/src/views/collect/PanelOrderEndSearch.vue
@@ -246,9 +246,8 @@ import addOrder from "@/views/inout/DialogCreateOrder";
 import errOrder from "@/views/inout/IoCreateErrorOrder";
 import {executeFuc, getHead} from "@/utils/customConfig";
 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 prescribeOriginPanel from "@/views/collect/PannelOrderBiz";
 import {orderPage} from "@/api/collect/collectOrder";
 
 export default {
diff --git a/src/views/collect/PanelOrderTagCode.vue b/src/views/collect/PanelOrderTagCode.vue
index 74bc854e..fee90740 100644
--- a/src/views/collect/PanelOrderTagCode.vue
+++ b/src/views/collect/PanelOrderTagCode.vue
@@ -191,7 +191,7 @@ export default {
     },
     ///界面配置相关------------end
 
-    getCodeDetail(_this) {
+    getList(_this) {
       if (this.prescribeData == null)
         return
       if (this.prescribeData != null) {
diff --git a/src/views/collect/PannelOrderBiz.vue b/src/views/collect/PannelOrderBiz.vue
index 3b738d9c..cda2c91b 100644
--- a/src/views/collect/PannelOrderBiz.vue
+++ b/src/views/collect/PannelOrderBiz.vue
@@ -220,7 +220,7 @@ export default {
           _this.$message.error(res.message)
           return
         }
-        _this.preDetailList = res.data.items
+        _this.preDetailList = res.data.list
         _this.preLoading = false
       }).catch(() => {
         _this.preLoading = false
diff --git a/src/views/collect/selectCollectOrderDialog.vue b/src/views/collect/selectCollectOrderDialog.vue
index e0f0f352..a3a8b1b9 100644
--- a/src/views/collect/selectCollectOrderDialog.vue
+++ b/src/views/collect/selectCollectOrderDialog.vue
@@ -234,6 +234,7 @@ import {convertDate} from "@/utils/date";
 import {page as prescribePage} from "@/api/basic/sicker/prescribeApi";
 import prescribeDownloadDialog from "@/views/collect/prescribe/prescribeDownloadDialog";
 import prescribeOriginPanel from "./PannelOrderBiz";
+import {orderPage} from "@/api/collect/collectOrder";
 
 export default {
   name: "selectPrescribeDialog",
@@ -324,7 +325,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