qq_41295110
2025-12-05 5531f195f7170bce54145c5b07689a32bb63b093
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
3个文件已修改
21 ■■■■■ 已修改文件
src/views/GyCustomer/index.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/ICMO/ScICMOBillList.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/component/material/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/GyCustomer/index.vue
@@ -351,7 +351,7 @@
        title: "导入",
        isUploading: false,
        updateSupport: 0,
        url: "http://47.96.97.237/API/Gy_Customer/Gy_Customer_Excel",
        url: "",
      },
      uploadData: [],
      uploadTableLoading: false,
@@ -366,14 +366,19 @@
    }
  },
  created() {
    this.upload.url = this.baseURL + "Gy_Customer/Gy_Customer_Excel";
    this.fetchData();
  },
  methods: {
    fetchData() {
      axios
        .get(
          "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
        )
        .get(this.baseURL + "Web/GetUser", {
          params: {
            UserName: sessionStorage.getItem("UserName") || "admin",
            PassWord: "123456",
            HOrgName: sessionStorage.getItem("OrganizationID") || "100038"
          }
        })
        .then((response) => {
          let data = response.data.data[0];
          this.user = data.Czymc;
src/views/ICMO/ScICMOBillList.vue
@@ -884,8 +884,7 @@
        updateSupport: 0,
        // 设置上传的请求头部
        // headers: { Authorization: "Bearer " + getToken() },
        // 上传的地址
        url: "http://47.96.97.237/API/Gy_Source/Gy_Source_Excel",
        url: "",
      },
      uploadData: [],
      alluploadList: [],
@@ -902,6 +901,8 @@
    };
  },
  created() {
    // set upload URL from configured baseURL
    this.upload.url = this.baseURL + "Gy_Source/Gy_Source_Excel";
    this.riqiChange();
    this.get_HProjectList();
    this.get_HDeptNameList();
src/views/component/material/index.vue
@@ -26,7 +26,8 @@
      subDisabled: false,//编辑页面保存按钮是否禁用(true禁用,false可用)
      OperationType: null,//保存类型(新增1修改3)
      HInterID: null,
      baseURL: 'http://47.96.97.237/API',
      //baseURL: 'http://47.96.97.237/API',
        baseURL: process.env.VUE_APP_BASE_API,
      user: 'admin',
      currentRow: [],
      lastSelectedRowIndex: null, // 用于记录上次点击的行索引