From b63d096b24ad28ce7c9f4dfc7112046a4f854be7 Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期一, 30 三月 2026 21:35:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/component/printList/index.vue | 5 +++--
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue | 2 +-
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 5 +++++
src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/views/component/printList/index.vue b/src/views/component/printList/index.vue
index 788bd9d..54d0aaa 100644
--- a/src/views/component/printList/index.vue
+++ b/src/views/component/printList/index.vue
@@ -8,7 +8,7 @@
<el-table v-loading="loading" :data="printdata" ref="printTable" max-height="540"
@selection-change="handleSelectionChange" :row-class-name="rowSysIndex" border>
<el-table-column type="selection" width="55" align="center" />
- <el-table-column align="center" label="妯″潡浠ｇ爜" prop="HNumber" />
+ <el-table-column align="center" label="妯″潡浠ｇ爜" prop="HNumber" v-if="hideFlag" />
<el-table-column align="center" label="妯℃澘鍚嶇О" prop="妯℃澘鍚嶇О" />
</el-table>
</el-form>
@@ -57,7 +57,8 @@
colTitleName: '',
tableIns: null,
option: {},
- tableData: []
+ tableData: [],
+ hideFlag:false, //闅愯棌鏍囪銆傜敤浜庤缃煇浜涗笉甯屾湜鏄剧ず鐨勬爣绛� // 褰撳墠閫変腑鐨勮
}
},
created() {
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index 0860ba9..49297eb 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -1274,6 +1274,10 @@
var existingData = this.editData || [];
var orginHQTY = 0;
+
+
+
+
// 鍒涘缓鐗╂枡ID鏄犲皠
var materialMap = {};
for (var i = 0; i < dataArray.length; i++) {
@@ -1503,6 +1507,7 @@
return null;
}
},
+ //#endregion
//#region 宸ュ叿鏍忔寜閽搷浣�
//#region 缂栬緫鎻愪氦淇濆瓨
submitForm() {
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
index 5ce937e..64df014 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong.vue
@@ -83,7 +83,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏍囧噯鍖呰鏁�">
+ <el-form-item label="鏁伴噺/绠�">
<el-input-number v-model="initMainData.HMinQty" @change="onChangeForHMinQty" />
</el-form-item>
</el-col>
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
index 5c3d836..c968a9f 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill_JinLong_AutoLogin.vue
@@ -83,7 +83,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏍囧噯鍖呰鏁�">
+ <el-form-item label="鏁伴噺/绠�">
<el-input-number v-model="initMainData.HMinQty" @change="onChangeForHMinQty" />
</el-form-item>
</el-col>
--
Gitblit v1.9.1