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

duhe

7 天以前 70a0ddfff13ca0cf225a636d21164714bff5f0af

 src/views/scMould/basicModeling/Gy_MouldFileList.vue

@@ -406,7 +406,7 @@
      this.getList()
    },
    getTreeselect() {
      axios.get(this.baseURL + '/Gy_Mould/TreeList', {
      axios.get(this.$baseUrl + '/Gy_Mould/TreeList', {
        params: {
          "sWhere": this.sWhere,
          "user": sessionStorage["HUserName"],
@@ -483,7 +483,7 @@
      }
      this.sWhere += " and HUSEORGID = '" + this.queryParams.HUSEORGID + "'"
      //生产资料列表
      axios.get(this.baseURL + '/Gy_Mould/page', {
      axios.get(this.$baseUrl + '/Gy_Mould/page', {
        params: {
          "sWhere": this.sWhere,
          "ModRightNameSelect": this.HModName,
@@ -597,7 +597,7 @@
    },
    DisPlay_HideColumn(HModName, user, option, dataOption) {
      this.totalNameList = []
      axios.get(this.baseURL + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
      axios.get(this.$baseUrl + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
        params: {
          "HModName": HModName,
          "user": user,
@@ -876,7 +876,7 @@
    //根据用户获取用户关联组织的过滤条件
    getOrgIDByUser() {
      var res = "";
      axios.get(this.baseURL + '/Xt_User/getOrgIDListByUser', {
      axios.get(this.$baseUrl + '/Xt_User/getOrgIDListByUser', {
        params: {
          HModName: this.HModName,
          user: sessionStorage["HUserName"],
@@ -951,7 +951,7 @@
      this.$modal.confirm('确认要删除吗，删除后不能恢复').then(() => {
        var ModRightNameDelete = 'Gy_MouldFile_Delete'
        if (!this.rowForm.审核人) {
          axios.get(this.baseURL + "/Gy_Mould_Edit/Delete_Json", {
          axios.get(this.$baseUrl + "/Gy_Mould_Edit/Delete_Json", {
            params: { 'HItemID': this.rowForm.hmainid.toString(), "ModRightNameDelete": ModRightNameDelete, 'user': sessionStorage["HUserName"] }
          }).then(response => {
            if (response.data.count == 1) {
@@ -975,7 +975,7 @@
      if (form.HBillStatus == 0 && num == 1) {
        this.$modal.msgSuccess('单据已为未审核状态,无需反审核！');
      } else {
        axios.get(this.baseURL + "/Gy_Mould/AuditProcessReportList", {
        axios.get(this.$baseUrl + "/Gy_Mould/AuditProcessReportList", {
          params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
        }).then(response => {
          let result = response.data
@@ -996,7 +996,7 @@
    set_De_Stop(num, form) {
      var InterID = form.hmainid || form.HInterID
      //逻辑审核方法
      axios.get(this.baseURL + "/Gy_Source/StopGy_Source", {
      axios.get(this.$baseUrl + "/Gy_Source/StopGy_Source", {
        params: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] }
      }).then(response => {
        let result = response.data
@@ -1060,7 +1060,7 @@
      var sMainSub = sSubStr + '&和' + sessionStorage["HUserName"];
      axios({
        method: 'post',
        url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
        url: this.$baseUrl + "/Gy_Source/Gy_Source_btnSave",
        data: {
          'sMainSub': sMainSub
        },