From 6293f43343f43bfcea37dc12e26fb30292cf9fc4 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 13 三月 2025 09:25:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/index.vue | 2 +-
src/views/business/reportPreparation/index.vue | 1 +
src/views/business/materialOrder/index.vue | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index 325eaf0..bba1f96 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -208,7 +208,7 @@
// import Inspection from "../do/b1-inspect-order-plan/Inspection.vue";
export default {
- name: "b1-material-inspection-order",
+ name: "MaterialOrder",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: { limsTable, DownFileDialog, FilesLookVisible, DataLookVisible, ShowInfo, PrintDialog },
data() {
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index 88a3833..01da7ac 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -734,6 +734,7 @@
},
// 鏌ョ湅鎶ュ憡
viewIssued(row) {
+ console.log('this.javaApi', this.javaApi)
this.currentInfo = row;
let fileName = (row.urlS === null || row.urlS === '') ? row.url : row.urlS
let fileType = "docx"
diff --git a/src/views/index.vue b/src/views/index.vue
index 7f0f7d8..c7ea871 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -194,7 +194,7 @@
methods: {
// 璺宠浆椤甸潰
goAddList(m) {
- this.$router.push(m.jumpPath)
+ this.$router.push({name: m.jumpPath})
},
getList(){
const key = `_${this.currentPage}`
--
Gitblit v1.9.3