Merge remote-tracking branch 'origin/dev' into dev

zhuo

2025-03-13 6293f43343f43bfcea37dc12e26fb30292cf9fc4

Merge remote-tracking branch 'origin/dev' into dev

 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() {

 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"

 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}`