From 2a5daa00047f316ffd99f9038b09650ef18bf965 Mon Sep 17 00:00:00 2001
From: yangzhicheng <dayu123@qq.com>
Date: Mon, 22 Jul 2024 14:19:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A1=E6=A3=80=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=8F=82=E6=95=B0=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wel/index.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 747e1f4..4a9366c 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -21,7 +21,7 @@
             <div class="overflowList">
               <el-skeleton :rows="3" animated v-show="skeleton"/>
               <div class="el-collapse-item" v-for="(item, index) in homePageData.inspectionTasksAudit" :key="index">
-                <div class="el-collapse-item__header" @click="skip('/inspection/inspectiontasksDetail', item.id)"><span class="el-collapse-span">☆巡检任务：{{item.taskName}}</span></div>
+                <div class="el-collapse-item__header" @click="skip3('/inspection/inspectiontasksDetail', item.id, item.taskNo)"><span class="el-collapse-span">☆巡检任务：{{item.taskName}}</span></div>
               </div>
             </div>
           </div>
@@ -148,6 +148,7 @@
           },
         });
       },
+      // 入库出库路用
       skip2(path, materialNo, mode){
         this.$router.push({
           path: path,
@@ -157,6 +158,17 @@
             mode: mode
           },
         });
+      },
+      // 巡检任务用
+      skip3(path, id, taskNo){
+        this.$router.push({
+          path: path,
+          query: {
+            frameMode:"search",
+            id: id,
+            taskNo: taskNo
+          },
+        });
       }
     }
   };

From 5122fd4eef5cbf14960244820d8e72b1cd4ff68d Mon Sep 17 00:00:00 2001
From: zhen <1173776308@qq.com>
Date: Mon, 22 Jul 2024 14:22:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=9C=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/release/productioninformation.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/release/productioninformation.vue b/src/views/release/productioninformation.vue
index d919a2f..5d84fb4 100644
--- a/src/views/release/productioninformation.vue
+++ b/src/views/release/productioninformation.vue
@@ -383,7 +383,7 @@
       },
       //驳回
       reject(row) {
-        this.$confirm("是否将数据驳回?", "提示", {
+        this.$confirm("是否将数据审核?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -440,7 +440,7 @@
           this.$message.warning("请选择至少一条数据");
           return;
         }
-        this.$confirm("是否将选择数据驳回?", {
+        this.$confirm("是否将选择数据审核?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"