Merge remote-tracking branch 'origin/main'

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"

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
+          },
+        });
       }
     }
   };