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

qq_41295110

2026-01-16 cbc2fe74fb54aad814695982c2987e064696f540

 src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue

@@ -333,7 +333,7 @@
  methods: {
    //重新同步
    set_ResCnz() {
      axios.get(this.baseURL + "/Cg_POOrderBill/Resynchronize", {
      axios.get(this.$baseUrl + "/Cg_POOrderBill/Resynchronize", {
        params: { "HBillNo": '', "HBillType": 1243 }
      }).then(response => {
        let result = response.data
@@ -415,7 +415,7 @@
        this.pageSize = 50
      }
      // 销售出库单列表
      axios.get(this.baseURL + '/Kf_MoveStockRequestBill/GetMoveStockRequestBillList', {
      axios.get(this.$baseUrl + '/Kf_MoveStockRequestBill/GetMoveStockRequestBillList', {
        params: {
          "sWhere": this.sWhere,
          "user": sessionStorage["HUserName"],
@@ -465,7 +465,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,
@@ -795,7 +795,7 @@
    handleDelete() {
      this.$modal.confirm('确认要删除吗，删除后不能恢复').then(() => {
        if (this.rowForm.状态 == "创建") {
          axios.get(this.baseURL + "/Kf_MoveStockRequestBill/DeltetKf_MoveStockRequestBill", {
          axios.get(this.$baseUrl + "/Kf_MoveStockRequestBill/DeltetKf_MoveStockRequestBill", {
            params: { 'HInterID': this.rowForm.hmainid.toString() }
          }).then(response => {
            if (response.data.count == 1) {
@@ -818,7 +818,7 @@
    set_CheckBill(num, form) {
      var InterID = form.hmainid || form.HInterID
      //逻辑审核方法
      axios.get(this.baseURL + "/Kf_MoveStockRequestBill/AuditKf_MoveStockRequestBill", {
      axios.get(this.$baseUrl + "/Kf_MoveStockRequestBill/AuditKf_MoveStockRequestBill", {
        params: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] }
      }).then(response => {
        let result = response.data
@@ -836,7 +836,7 @@
    },
    set_CloseBill(num) {
      //逻辑关闭方法
      axios.get(this.baseURL + "/Kf_MoveStockRequestBill/CloseKf_MoveStockRequestBill", {
      axios.get(this.$baseUrl + "/Kf_MoveStockRequestBill/CloseKf_MoveStockRequestBill", {
        params: { "HInterID": this.rowForm.hmainid, "Type": num, "user": sessionStorage["HUserName"] }
      }).then(response => {
        let result = response.data
@@ -855,7 +855,7 @@
    },
    set_DropBill(num) {
      //逻辑作废方法
      axios.get(this.baseURL + "/Kf_MoveStockRequestBill/DropKf_MoveStockRequestBill", {
      axios.get(this.$baseUrl + "/Kf_MoveStockRequestBill/DropKf_MoveStockRequestBill", {
        params: { "HInterID": this.rowForm.hmainid.toString(), "Type": num, "user": sessionStorage["HUserName"] }
      }).then(response => {
        let result = response.data
@@ -894,7 +894,7 @@
    //#region 获取公司名，根据公司进行定制化开发
    defaintOperationByCompanyName() {
      var result = false;
      axios.get(this.baseURL + '/Xt_getInfo/getCompanyName').then(response => {
      axios.get(this.$baseUrl + '/Xt_getInfo/getCompanyName').then(response => {
        var data1 = response.data
        if (data1.count == 1) {
          if (data1.data == "水务") {