From b8781fb399bcb6d2d0ba97c1ad1b3791dc6b1788 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 29 Aug 2024 10:50:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inout/splitCode.js                    |  8 +++++
 .../CollectOrderAllotCardComponents.vue       | 34 +++++++++++++++++++
 src/views/collect/CollectOrderEnd.vue         | 22 +++++++++---
 src/views/collect/DealOrderBlank.vue          |  2 +-
 src/views/collect/PanelOrderEndSearch.vue     |  3 +-
 5 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/src/api/inout/splitCode.js b/src/api/inout/splitCode.js
index 50879d3b..41923fb5 100644
--- a/src/api/inout/splitCode.js
+++ b/src/api/inout/splitCode.js
@@ -44,5 +44,13 @@ export function findInvRemind(query) {
   });
 }
 
+export function findInvRemindByBillNo(query) {
+  return axios({
+    url: "/udiwms/ioSplit/findInvRemindByBillNo",
+    method: "get",
+    params: query
+  });
+}
+
 
 
diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue
index b115f738..96506f15 100644
--- a/src/views/collect/CollectOrderAllotCardComponents.vue
+++ b/src/views/collect/CollectOrderAllotCardComponents.vue
@@ -2,6 +2,15 @@
   <div>
 
     <el-card v-if="!changeViewDisabled">
+
+      <el-alert
+        style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"
+        :title="msgTip"
+        :closable="false"
+        type="warning">
+      </el-alert>
+
+
       <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
                size="mini" label-width="100px">
         <el-row style=" display:flex;  flex-wrap: wrap; ">
@@ -215,6 +224,14 @@
 
 
     <el-card v-if="changeViewDisabled">
+
+      <el-alert
+        style="margin-top: 1px;margin-bottom: 10px;font-size: 20px;"
+        :title="msgTip"
+        :closable="false"
+        type="warning">
+      </el-alert>
+
       <div style="min-height: 400px;">
         <!-- 分割线 -->
         <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" :inline="true"
@@ -367,6 +384,7 @@
 </template>
 
 <script>
+import {findInvRemindByBillNo} from "@/api/inout/splitCode";
 import addOrder from "@/views/inout/DialogCreateOrder";
 import errOrder from "@/views/inout/IoCreateErrorOrder";
 import {executeFuc, getHead} from "@/utils/customConfig";
@@ -399,6 +417,7 @@ export default {
   },
   data() {
     return {
+      msgTip: "库存预警提醒：",
       isLinkDisabled: false,
       changeViewDisabled: true,
       userInfo: {
@@ -474,6 +493,17 @@ export default {
     addOrder, errOrder, bindWorkDialog, prescribeOriginPanel, prescribeOriginDiPanel
   },
   methods: {
+    changeInvRemind(val) {
+      let post = {
+        workPlaceCode: val
+      }
+      findInvRemindByBillNo(post).then((response) => {
+        if (response.code === 20000) {
+          this.msgTip = response.data
+        }
+      }).catch(() => {
+      });
+    },
     changeView() {
       this.changeViewDisabled = !this.changeViewDisabled
     },
@@ -578,6 +608,10 @@ export default {
         this.loading = false
         this.list = res.data.list || []
         this.total = res.data.total || 0
+        if (this.filterQuery.workPlaceCode != null){
+          this.changeInvRemind(this.filterQuery.workPlaceCode)
+        }
+
       }).catch(() => {
         this.loading = false
         this.list = []
diff --git a/src/views/collect/CollectOrderEnd.vue b/src/views/collect/CollectOrderEnd.vue
index 46643b92..7c5e52ea 100644
--- a/src/views/collect/CollectOrderEnd.vue
+++ b/src/views/collect/CollectOrderEnd.vue
@@ -2,13 +2,21 @@
   <div>
 
 
-    <prescribePanel
-      :RowType="type"
+    <el-tabs type="border-card" style="margin: 15px">
 
-    ></prescribePanel>
+      <el-tab-pane label="已完成单据">
+        <prescribePanel
+          style="margin: -15px"
+          :RowType="type"
+          :workPlaceCode="workPlaceCode"
+        ></prescribePanel>
+      </el-tab-pane>
 
 
 
+    </el-tabs>
+
+
   </div>
 </template>
 
@@ -27,7 +35,13 @@ export default {
   },
   data() {
     return {
-      type: 1
+      type: 1,
+      workPlaceCode: null,
+    }
+  },
+  created() {
+    if (this.$route.query.workplaceId != null){
+      this.workPlaceCode = Number(this.$route.query.workplaceId);
     }
   }
 }
diff --git a/src/views/collect/DealOrderBlank.vue b/src/views/collect/DealOrderBlank.vue
index c0fcede9..b3e83b33 100644
--- a/src/views/collect/DealOrderBlank.vue
+++ b/src/views/collect/DealOrderBlank.vue
@@ -100,7 +100,7 @@
                   <span style="float: right; color: #8492a6; font-size: 13px">{{ item.documentTypeCode }}</span>
                 </el-option>
               </el-select>
-              <el-button type="primary" @click="toggleBusType">切换业务</el-button>
+              <el-button style="margin-left: 5px" type="primary" @click="toggleBusType">切换业务</el-button>
             </el-form-item>
           </el-col>
 
diff --git a/src/views/collect/PanelOrderEndSearch.vue b/src/views/collect/PanelOrderEndSearch.vue
index 216e3d83..f8e53b9d 100644
--- a/src/views/collect/PanelOrderEndSearch.vue
+++ b/src/views/collect/PanelOrderEndSearch.vue
@@ -275,7 +275,7 @@ export default {
       required: false
     },
     workPlaceCode: {
-      type: String,
+      type: Number,
       default: null,
       required: true
     }
@@ -424,7 +424,6 @@ export default {
       this.showType = 2
     }
     this.findWorkPlace(this, '')
-    this.filterQuery.workPlaceCode = this.workPlaceCode + ''
     getHead('prescribePanel', '1').then((re) => {
       // 处理返回的数据
       this.tableObj = re.data