From 6c9b93c0586c0db3fe2f99113b166cb36af0c340 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 30 Sep 2024 15:12:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/collect/DealOrder.vue                |  2 +-
 src/views/collect/relCode/relCodeEdit.vue      | 16 +++++++++-------
 src/views/collect/selectCollectOrderDialog.vue |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index a309753d..03fa3d83 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -954,7 +954,7 @@ export default {
         this.loading = false
         if (res.code == 20000) {
           this.resetWork()
-          this.nextCollectOrder()
+          this.findCurOrder()
         } else if (res.code == 502) {
           this.$confirm(res.message, '提示', {
             confirmButtonText: '确定',
diff --git a/src/views/collect/relCode/relCodeEdit.vue b/src/views/collect/relCode/relCodeEdit.vue
index f4a9fdd8..94f3f27c 100644
--- a/src/views/collect/relCode/relCodeEdit.vue
+++ b/src/views/collect/relCode/relCodeEdit.vue
@@ -15,7 +15,7 @@
             <el-button size="mini" type="primary" @click.native="submit()" :loading="submitLoading"
                        style="margin-right: 8px;border-radius: 5%;"
             >添加完成
-            </el-button>        
+            </el-button>
           </el-button-group>
         </el-row>
         <el-row>
@@ -171,8 +171,8 @@
           <el-text tag="b" size="large">父级编码：<span>{{ a || '暂未录入'}}</span></el-text>
         </div>
         <div>
-            <el-table v-loading="loading" 
-            :data="detailList" 
+            <el-table v-loading="loading"
+            :data="detailList"
             style="width: 100%;" max-height="350" height="350"
             border
             :row-style="rowStyle"
@@ -190,6 +190,7 @@
 
 <script>
 import {addRelCode,scanCodeRelCode} from "@/api/collect/relCode";
+// import relCodeDetail from "@/views/collect/relCode/relCodeDetail";
 import A from "@/plugins/KeyScaner";
 
 export default {
@@ -276,7 +277,7 @@ export default {
         ],
         validateDate: [
           {required: true, message: "请选入有效日期", trigger: "blur"},
-        ],      
+        ],
       },
       isScan: true,
       scanText: "扫码录入：",
@@ -312,6 +313,7 @@ export default {
     };
   },
   components: {
+    // relCodeDetail
   },
   methods: {
     splitChange() {
@@ -342,7 +344,7 @@ export default {
       });
     },
 
-  
+
     refreshCodesPanel() {
       this.warnVisible = false;
       this.errVisible = false;
@@ -479,10 +481,10 @@ export default {
     this.$refs.inputRef.focus();
   },
   beforeDestroy() {
-    
+
   },
   created() {
-    
+
   },
 };
 </script>
diff --git a/src/views/collect/selectCollectOrderDialog.vue b/src/views/collect/selectCollectOrderDialog.vue
index 61a5758e..50fba3ba 100644
--- a/src/views/collect/selectCollectOrderDialog.vue
+++ b/src/views/collect/selectCollectOrderDialog.vue
@@ -780,7 +780,7 @@ export default {
   created() {
     if (this.$route.query.workplaceId != null) {
       this.isLinkDisabled = true
-      this.filterQuery.workPlaceCode = this.$route.query.workplaceId
+      // this.filterQuery.workPlaceCode = this.$route.query.workplaceId
     }
     this.findWorkPlace(this, "");
     getHead("prescribeSelect", "1").then((re) => {