Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

wangyi

昨天 c9086dd79b5f0e7dfe49582c9b9c91180bee22b5

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

 .env.production

@@ -5,11 +5,11 @@
ENV = 'production'

# 宁波 四维尔
# VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
# VUE_APP_BASE_API = http://220.189.218.155:9010/API/
VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
VUE_APP_BASE_API = http://220.189.218.155:9010/API/
# 余姚 锦隆 智能家居
VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# 智云迈思L-MOM管理系统/生产环境
# VUE_APP_BASE_API = http://47.96.97.237/API/
#杜贺

 src/views/basic/gy/gySupplier.vue

@@ -360,8 +360,29 @@
  created() {
    this.getList()
    this.getTreeselect()
    console.log(this.treeOptions)
    if (this.openPage) {
      this.autoSelectCarrierTree()
    }
  },
  methods: {
    autoSelectCarrierTree() {
      setTimeout(() => {
        if (this.$refs.tree && this.treeOptions) {
          // 👇 这里换成你真实的【承运商分类ID】
          const carrierId = "1"

          // 自动选中节点
          this.$refs.tree.setCurrentKey(carrierId)

          // 自动触发节点点击，执行筛选
          let node = this.$refs.tree.getNode(carrierId)
          if (node) {
            this.handleNodeClick(node.data)
          }
        }
      }, 300)
    },
    getSummaries(param) {
      const { columns, data } = param;
      const sums = [];

 src/views/component/CurrencyDialog/index.vue

@@ -596,32 +596,20 @@
    },
    //双击行
    handleDblclick(row, column, cell, event) {
      if (this.checkIsIframe()) {
        window.parent.iframeCurrencyCallBack(row);
        return;
      }
      this.OperationType = 3;
      this.OperationType = 3
      if (this.openPage) {
        this.$emit('deptEmitDb', row, 2)
        this.closeDialog();
        if(this.openPage == 'Kf_StockOutRequestBill'){
          this.$emit('deptEmitDb', row, 10)
          this.closeDialog();
        }
        else{
          this.$emit('deptEmitDb', row, 2)
          this.closeDialog();
        }
      } else {
        this.handleEdit();
      }
    },
    // handleDblclick(row, column, cell, event) {
    //   this.OperationType = 3
    //   if (this.openPage) {
    //     if(this.openPage='Kf_StockOutRequestBill')
    //   {
    //     this.$emit('deptEmitDb', row, 10)
    //   }
    //   else{
    //     this.$emit('deptEmitDb', row, 2)
    //   }
    //   } else {
    //     this.handleEdit();
    //   }
    // },
    // 多选框选中数据
    handleSelectionChange(selection) {
      // this.rowForm = {}