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

zss

2025-03-04 b64d6db597d332c699f84e4928f6d3e5551851f1

 src/views/business/materialOrder/copperOrder.vue

@@ -617,12 +617,19 @@
  mounted() {
    this.active = this.$route.query.active
    this.currentId = this.$route.query.currentId
  },
  activated() {
    if (this.active==1) {
      this.getInfoRow();
    }
  },
  methods: {
    getInfoRow() {
    this.getUserNowInfo()
    this.selectStandardTreeList()
    this.selectStandardMethods()
    this.getInfo() // 获取数据
  },
  methods: {
    // 拆分
    handleSplitCountNum () {
      this.sample.joinName = null
@@ -1782,7 +1789,11 @@

    },
    goBack () {
      if (this.active == 1) {
      this.$router.go(-1)
      } else {
        this.closeOpenPage()
      }
    },
    closeOpenPage() {
      this.$router.go(-1)