From 76cca4b3bd9d7a1e62f421b215ca5efd8d975ee3 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期二, 20 一月 2026 16:11:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue b/src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue
index 10f0411..6f508d2 100644
--- a/src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue
+++ b/src/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue
@@ -188,7 +188,7 @@
<el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
<div :style="item.style">
<span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
- <el-button type="text" @click="handleEdit(row, OperationType = 3)"
+ <el-button type="text" @click.stop="handleEdit(row, OperationType = 3)"
v-else-if="column.property == '鍗曟嵁鍙�'">{{
row.鍗曟嵁鍙�
}}</el-button>
@@ -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 == "姘村姟") {
--
Gitblit v1.9.1