From 9cbf7cdb2d4d48eac1878651668055b7e6d1dd1a Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 02 十二月 2025 16:14:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue | 2 +-
.env.development | 4 ++--
src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue | 14 ++++++++------
src/views/sell/XsSeOutStockBill.vue | 2 ++
src/views/basic/gyEmployee/gyEmployeeEdit.vue | 2 --
src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue | 4 ++--
6 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/.env.development b/.env.development
index f8c6509..ae352ff 100644
--- a/.env.development
+++ b/.env.development
@@ -5,8 +5,8 @@
ENV = 'development'
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/寮�鍙戠幆澧�
-# VUE_APP_BASE_API = 'http://localhost:81/API/'
-VUE_APP_BASE_API = 'http://47.96.97.237/API/'
+VUE_APP_BASE_API = 'http://localhost:81/API/'
+# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# 璺敱鎳掑姞杞�
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/views/basic/gyEmployee/gyEmployeeEdit.vue b/src/views/basic/gyEmployee/gyEmployeeEdit.vue
index 5c0ca2c..481d622 100644
--- a/src/views/basic/gyEmployee/gyEmployeeEdit.vue
+++ b/src/views/basic/gyEmployee/gyEmployeeEdit.vue
@@ -1702,8 +1702,6 @@
window.open(row.url, "_self");
},
async uploadDataUpload(row, index) {
- console.log(row.raw instanceof File);
- console.log(row.raw);
try {
let blob = await this.fileToBlob(row.raw);
console.log(blob);
diff --git a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
index cfe0447..a0cb67c 100644
--- a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
+++ b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
@@ -1388,6 +1388,7 @@
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
+ console.log("this.rowForm", this.rowForm)
this.$modal
.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
.then(() => {
@@ -1395,20 +1396,21 @@
axios
.get(this.baseURL + "Cg_POInStockBill/DeltetPOInStockBill", {
params: {
- HInter: this.rowForm.hmainid.toString(),
- HsupId: this.rowForm.HsupId,
- HQty: this.rowForm.HQty,
- HSourceInterID: this.rowForm.HSourceInterID,
- HSourceEntryID: this.rowForm.HSourceEntryID,
+ HInterID: this.rowForm.hmainid.toString(),
+ HsupId: this.rowForm.HSupID,
+ HQty: this.rowForm['鏁伴噺'],
+ HSourceInterID: this.rowForm['婧愬崟涓诲唴鐮�'],
+ HSourceEntryID: this.rowForm['婧愬崟瀛愬唴鐮�'],
user: sessionStorage["HUserName"],
},
})
.then((res) => {
+
if (res.data.count == 1) {
this.handleQuery();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
} else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
+ this.$modal.msgError("閿欒:" + res.data.code + res.data.Message);
}
})
.catch((error) => {
diff --git a/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
index 85b2c9f..d564df0 100644
--- a/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
+++ b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
@@ -62,8 +62,8 @@
<el-option
v-for="(item, index) in organizationList"
:key="index"
- :label="item.label"
- :value="item.value"
+ :label="item.Name"
+ :value="item.ID"
>
</el-option>
</el-select>
diff --git a/src/views/sell/XsSeOutStockBill.vue b/src/views/sell/XsSeOutStockBill.vue
index 9e3d514..2686f05 100644
--- a/src/views/sell/XsSeOutStockBill.vue
+++ b/src/views/sell/XsSeOutStockBill.vue
@@ -300,6 +300,7 @@
>澶嶅埗</el-button
>
</el-col>
+ -->
<el-col :span="1.5">
<el-button
type="primary"
@@ -310,6 +311,7 @@
>鍒犻櫎
</el-button>
</el-col>
+ <!--
<el-col :span="1.5">
<el-button
type="primary"
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
index 6f69c43..cf3437d 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
@@ -9,7 +9,7 @@
<el-button type="primary" @click="ToolBatch">鎵规</el-button>
<el-button type="primary" @click="close">閫� 鍑�</el-button>
</div>
- <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鍣ㄥ叿妗ｆ缂栬緫</div>
+ <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鏉＄爜鐢熸垚</div>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="6">
--
Gitblit v1.9.1