spring
2025-03-03 2aed532b09e606229dff5aec0164aa94131c2fbd
Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
已修改4个文件
30 ■■■■■ 文件已修改
src/views/business/inspectionTask/index.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/materialOrder/copperOrder.vue 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/materialOrder/customsInspection.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/productOrder/components/add.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/inspectionTask/index.vue
@@ -573,11 +573,13 @@
      this.inspectionTaskState = this.dictToValue(response.data);
    });
    this.refreshTable();
  },
  mounted() {
    this.queryParams.userId = this.userId;
  },
  activated() {
    this.refreshTable();
  },
  methods: {
    getList() {
      this.tableLoading = true;
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
src/views/business/materialOrder/customsInspection.vue
@@ -639,6 +639,13 @@
    this.currentId = this.$route.query.currentId
    this.isReport = this.$route.query.isReport
    this.customsInspection = this.$route.query.customsInspection
  },
  activated() {
    if (this.active==1) {
      this.getInfo();
    }
  },
  getInfo() {
    this.getUserNowList() // 获取当前用户信息
    this.selectStandardMethods() // 获取检验标准下拉框数据
    this.getInfo() // 获取数据
src/views/business/productOrder/components/add.vue
@@ -795,6 +795,15 @@
      this.active = this.$route.query.active
      this.tabIndex = this.$route.query.tabIndex
      this.currentId = this.$route.query.currentId
    this.getInfo()
  },
  activated() {
    if (this.active==1) {
      this.getInfo();
    }
  },
  methods: {
    getInfo() {
      this.getUserNowData()
      this.selectStandardTreeList()
      this.getAuthorizedPerson();
@@ -829,7 +838,6 @@
        this.isSpecial = false
      }
    },
    methods: {
      getPrepareUser () {
        // this.addObj.prepareUser = JSON.parse(localStorage.getItem("user")).name;
        // this.addObj.prepareUserEn = JSON.parse(localStorage.getItem("user")).nameEn