From 8f75af47bca0667d94e57d024c5cc35c500dcb53 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 24 三月 2026 15:33:21 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
.env.development | 4 +-
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 88 ++++++++++++++++++++++++++++---------------
2 files changed, 59 insertions(+), 33 deletions(-)
diff --git a/.env.development b/.env.development
index dd7fb3c..22d5afc 100644
--- a/.env.development
+++ b/.env.development
@@ -10,8 +10,8 @@
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
#閿﹂殕
-VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
-VUE_APP_BASE_API = http://61.174.29.234:8880/API/
+# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
+# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# 瀹佹尝 鍥涚淮灏�
# VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
# VUE_APP_BASE_API = http://220.189.218.155:9010/API/
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index d81e8b5..95e7ce5 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -474,7 +474,9 @@
</el-table-column>
<el-table-column align="center" label="浣撶Н" width="120">
<template slot-scope="scope">
- <span>{{ scope.row.HVolume }}</span>
+ <el-input-number v-model="scope.row.HVolume" :min="0" style="width: 90px;"
+ controls-position="right"
+ @change="changeHVolume(scope.row)"></el-input-number>
</template>
</el-table-column>
<el-table-column align="center" label="闆跺崟鍗犵敤浣撶Н" width="120">
@@ -999,7 +1001,7 @@
this.ContractTransportShow = true
this.openData = true
} else if (num == 17) {
- this.dialogTitle = '瀹瑰櫒鍖呰鍒楄〃'
+ this.dialogTitle = '浜у搧鍖呰瀹瑰櫒鍏宠仈淇℃伅琛�'
this.gyMaterialPackingRelationShow = true
this.openData = true
}
@@ -1779,14 +1781,17 @@
this.zbIndex = row.index - 1
let HPackQty = 0;
- if(this.editData[row.index - 1].HStandardQtyForMouldInPack > 0)
- {
- HPackQty = Math.ceil(row.HMouldQty / this.editData[row.index - 1].HStandardQtyForMouldInPack);
+ const standardQty = parseFloat(this.editData[row.index - 1].HStandardQtyForMouldInPack) || 0;
+ const mouldQty = parseFloat(row.HMouldQty) || 0;
+
+ if (standardQty > 0 && mouldQty > 0) {
+ HPackQty = Math.ceil(mouldQty / standardQty);
}
- if (!HPackQty||HPackQty=='Infinity') {
- this.editData[row.index - 1].HPackQTY = 0
+
+ if (!HPackQty || HPackQty == 'Infinity') {
+ this.editData[row.index - 1].HPackQTY = 0;
} else {
- this.editData[row.index - 1].HPackQTY = HPackQty
+ this.editData[row.index - 1].HPackQTY = HPackQty;
}
this.changeHPackQty(row);
@@ -1796,17 +1801,37 @@
changeHPackQty(row) {
this.zbIndex = row.index - 1
- // let Volume = ((this.editData[this.zbIndex].HMouldLength * this.editData[this.zbIndex].HMouldWidth * this.editData[this.zbIndex].HMouldHeight * this.editData[this.zbIndex].HMouldQty).toFixed(2)) - 0
- let Volume = ((this.editData[this.zbIndex].HPackQTY * this.editData[this.zbIndex].HPackV).toFixed(2)) - 0
+ const packQty = parseFloat(this.editData[this.zbIndex].HPackQTY) || 0;
+ const packV = parseFloat(this.editData[this.zbIndex].HPackV) || 0;
+ let Volume = ((packQty * packV).toFixed(2)) - 0;
+
if (!Volume) {
- this.editData[this.zbIndex].HVolume = 0
+ this.editData[this.zbIndex].HVolume = 0;
} else {
- this.editData[this.zbIndex].HVolume = Volume
+ this.editData[this.zbIndex].HVolume = Volume;
}
- this.form.HTotalVolume = 0
+
+ this.form.HTotalVolume = 0;
this.editData.map(item => {
- this.form.HTotalVolume = Number(item.HVolume) + this.form.HTotalVolume
- })
+ this.form.HTotalVolume = Number(item.HVolume) + this.form.HTotalVolume;
+ });
+ this.calculateLoadingRate(parseFloat(this.form.HTotalVolume || 0));
+ },
+ //#region 浣撶Н鍊煎彉鍖栧鐞�
+ changeHVolume(row) {
+ this.zbIndex = row.index - 1;
+
+ // 纭繚浣撶Н鍊兼湁鏁�
+ const volume = parseFloat(row.HVolume) || 0;
+ this.editData[this.zbIndex].HVolume = volume;
+
+ // 鏇存柊琛ㄥご鎬讳綋绉�
+ this.form.HTotalVolume = 0;
+ this.editData.map(item => {
+ this.form.HTotalVolume = Number(item.HVolume) + this.form.HTotalVolume;
+ });
+
+ // 鏇存柊瑁呰浇鐜�
this.calculateLoadingRate(parseFloat(this.form.HTotalVolume || 0));
},
//#endregion
@@ -1824,6 +1849,10 @@
checkTotalQtyExceed(selRow) {
var tableData = this.editData
if (!tableData || tableData.length === 0) return;
+
+ // 淇濆瓨淇敼鍓嶇殑鍊�
+ var originalQty = selRow.HQty;
+
var sourceQtyMap = {};
var currentQtyMap = {};
tableData.forEach(function (row) {
@@ -1871,40 +1900,37 @@
}
}
if (exceedSources.length > 0) {
- let num = null
var message = '鐗╂枡鏁伴噺涔嬪拰瓒呰繃婧愬崟鏁伴噺锛�';
exceedSources.forEach(function (item, index) {
- num = item.sourceQty
message += (index + 1) + '. 婧愬崟鍙凤細' + item.sourceBillNo +
'锛屾簮鍗曟暟閲忥細' + item.sourceQty +
'锛屽綋鍓嶆暟閲忥細' + item.currentTotal;
-
});
this.$nextTick(() => {
- this.editData[selRow.index - 1].HQty = num
- this.changeHMouldQty(selRow)
- })
+ // 鎭㈠鍒颁慨鏀瑰墠鐨勫��
+ this.editData[selRow.index - 1].HQty = originalQty;
+ this.changeHMouldQty(selRow);
+ });
this.$modal.msgError(message);
return true; // 琛ㄧず鏈夎秴鍑�
}
- let MouldQty = Math.ceil(selRow.HQty / this.editData[selRow.index - 1].HSNP)
- if (!MouldQty||MouldQty=='Infinity') {
- this.editData[selRow.index - 1].HMouldQty = 0
+ let MouldQty = Math.ceil(selRow.HQty / this.editData[selRow.index - 1].HSNP);
+ if (!MouldQty || MouldQty == 'Infinity') {
+ this.editData[selRow.index - 1].HMouldQty = 0;
} else {
- this.editData[selRow.index - 1].HMouldQty = MouldQty
+ this.editData[selRow.index - 1].HMouldQty = MouldQty;
}
let HPackQty = 0;
- if(this.editData[selRow.index - 1].HStandardQtyForMouldInPack > 0)
- {
+ if (this.editData[selRow.index - 1].HStandardQtyForMouldInPack > 0) {
HPackQty = Math.ceil(MouldQty / this.editData[selRow.index - 1].HStandardQtyForMouldInPack);
}
- if (!HPackQty||HPackQty=='Infinity') {
- this.editData[selRow.index - 1].HPackQTY = 0
+ if (!HPackQty || HPackQty == 'Infinity') {
+ this.editData[selRow.index - 1].HPackQTY = 0;
} else {
- this.editData[selRow.index - 1].HPackQTY = HPackQty
+ this.editData[selRow.index - 1].HPackQTY = HPackQty;
}
- this.changeHMouldQty(selRow)
+ this.changeHMouldQty(selRow);
return false; // 琛ㄧず娌℃湁瓒呭嚭
},
//#region 闄勪欢涓婁紶鐩稿叧鏂规硶
--
Gitblit v1.9.1