From 5b6cfccdde7fc1fd386b0378a41492057cda5d39 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期一, 30 三月 2026 09:35:04 +0800
Subject: [PATCH] 运单
---
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 302 ++++++++++++++++++++++++++------------------------
1 files changed, 158 insertions(+), 144 deletions(-)
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index 4210f65..5a43663 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -12,7 +12,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-tabs v-model="activeName" type="card">
<el-tab-pane label="鍩烘湰淇℃伅" name="first">
- <!-- 绗竴鍧楋細鍗曟嵁鍙枫�佹棩鏈熴�佹簮鍗曞彿銆佹壙杩愬晢銆佸鎴� -->
+ <!-- 绗竴鍧楋細鍗曟嵁鍙枫�佹棩鏈熴�佹簮鍗曞彿銆佹壙杩愬晢銆佸鎴� -->
<div class="form-group">
<el-row>
<el-col :span="6">
@@ -29,7 +29,8 @@
<el-col :span="6">
<el-form-item label="婧愬崟鍙�" prop="HMainSourceBillNo">
<el-input v-model="form.HMainSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞彿">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(12)"></el-button>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(12)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -37,11 +38,12 @@
<el-col :span="6"></el-col>
</el-row>
<el-row>
-
+
<el-col :span="6">
<el-form-item label="瀹㈡埛" prop="HCusName">
<el-input v-model="form.HCusName" placeholder="璇疯緭鍏ュ鎴�">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(7)"></el-button>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(7)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -61,24 +63,27 @@
<!-- 绗簩鍧楋細鎵胯繍鍚堝悓銆佸鍙戝湴銆佺洰鐨勫湴銆佽溅鍨嬨�佽溅鍨嬫渶澶у绉�佽窛绂汇�佽繍杈撴椂鏁堛�佽繍杈撶被鍨嬨�佺粨绠楁柟寮忋�佸竵鍒�佹眹鐜囥�佽繍璐广�佹�讳綋绉�佽杞界巼銆佽繍杈撴柟寮� -->
<div class="form-group">
<el-row>
- <el-col :span="6">
+ <el-col :span="6">
<el-form-item label="濮嬪彂鍦�" prop="HBeginAddrName">
<el-input v-model="form.HBeginAddrName" placeholder="璇疯緭鍏ュ鍙戝湴">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(3, areaType = 'b')"></el-button>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(3, areaType = 'b')"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鐩殑鍦�" prop="HEndAddrName">
<el-input v-model="form.HEndAddrName" placeholder="璇疯緭鍏ョ洰鐨勫湴">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(3, areaType = 'e')"></el-button>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(3, areaType = 'e')"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="杞﹀瀷" prop="HCarTypeName">
<el-input v-model="form.HCarTypeName" placeholder="璇疯緭鍏ヨ溅鍨�">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(13)"></el-button>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(13)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -86,8 +91,9 @@
<el-row>
<el-col :span="6">
<el-form-item label="鎵胯繍鍚堝悓" prop="HContractTransportBillNo">
- <el-input v-model="form.HContractTransportBillNo" placeholder="璇疯緭鍏ユ壙杩愬悎鍚�" >
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(16)"></el-button>
+ <el-input v-model="form.HContractTransportBillNo" placeholder="璇疯緭鍏ユ壙杩愬悎鍚�">
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(16)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -114,12 +120,12 @@
<el-input v-model="form.HTransportTyep" placeholder="璇疯緭鍏ヨ繍杈撶被鍨�" readonly />
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="6">
<el-form-item label="璺濈锛堝叕閲岋級" prop="HDistance">
<el-input v-model="form.HDistance" placeholder="璇疯緭鍏ヨ窛绂�" readonly />
</el-form-item>
</el-col>
-
+
<el-col :span="6">
<el-form-item label="杩愯緭鏃舵晥" prop="HTransportTimes">
<el-input v-model="form.HTransportTimes" placeholder="璇疯緭鍏ヨ繍杈撴椂鏁�" readonly />
@@ -129,7 +135,8 @@
<el-row>
<el-col :span="6">
<el-form-item label="缁勭粐" prop="HOrgID">
- <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" @change="organizationChange" disabled>
+ <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐"
+ @change="organizationChange" disabled>
<el-option v-for="(item, index) in organizationList" :key="index"
:label="item.Name" :value="item.ID">
</el-option>
@@ -138,7 +145,7 @@
</el-col>
</el-row>
</div>
- <div class="form-group">
+ <div class="form-group">
<el-row>
<el-col :span="6">
<el-form-item label="杞﹀瀷鏈�澶у绉�" prop="HCarTypeMaxVolume">
@@ -147,12 +154,12 @@
</el-col>
<el-col :span="6">
<el-form-item label="鎬讳綋绉紙绔嬫柟绫筹級" prop="HTotalVolume">
- <el-input v-model="form.HTotalVolume" placeholder="璇疯緭鍏ユ�讳綋绉�" disabled/>
+ <el-input v-model="form.HTotalVolume" placeholder="璇疯緭鍏ユ�讳綋绉�" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="瑁呰浇鐜�" prop="HLoadingRate">
- <el-input v-model="form.HLoadingRate" placeholder="璇疯緭鍏ヨ杞界巼" disabled/>
+ <el-input v-model="form.HLoadingRate" placeholder="璇疯緭鍏ヨ杞界巼" disabled />
</el-form-item>
</el-col>
</el-row>
@@ -217,11 +224,12 @@
<el-col :span="6">
<el-form-item label="缁撶畻鏂瑰紡" prop="HSSName">
<el-input v-model="form.HSSName" placeholder="璇疯緭鍏ョ粨绠楁柟寮�">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog('鏆傛棤')"></el-button>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog('鏆傛棤')"></el-button>
</el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="6">
<el-form-item label="杩愯垂" prop="HMoney">
<el-input v-model="form.HMoney" placeholder="璇疯緭鍏ヨ繍璐�" />
</el-form-item>
@@ -244,7 +252,7 @@
</div>
</el-tab-pane>
<el-tab-pane label="鐗╂祦淇℃伅" name="forth">
- <div class="form-group">
+ <div class="form-group">
<el-row>
<el-col :span="6">
<el-form-item label="鐗╂祦鐘舵��" prop="HCarryStatus">
@@ -262,12 +270,12 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鎵胯繍鍟嗙‘璁ゆ棩鏈�" prop="HDate_CarrierSure">
- <el-date-picker v-model="form.HDate_CarrierSure" type="date" placeholder="閫夋嫨鎵胯繍鍟嗙‘璁ゆ棩鏈�"
- format="yyyy-MM-dd hh:mm:ss" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
+ <el-form-item label="鎵胯繍鍟嗙‘璁ゆ棩鏈�" prop="HDate_CarrierSure">
+ <el-date-picker v-model="form.HDate_CarrierSure" type="date"
+ placeholder="閫夋嫨鎵胯繍鍟嗙‘璁ゆ棩鏈�" format="yyyy-MM-dd hh:mm:ss" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
<el-col :span="6">
<el-form-item label="鍒嗛厤鍙告満鏃ユ湡" prop="HDate_AllocationDriver">
<el-date-picker v-model="form.HDate_AllocationDriver" type="date"
@@ -301,22 +309,22 @@
<el-row>
<el-col :span="6">
<el-form-item label="鍒板巶纭鏃堕棿" prop="HDate_Arrive">
- <el-date-picker v-model="form.HDate_Arrive" type="date" format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鍒板巶纭鏃堕棿" disabled>
+ <el-date-picker v-model="form.HDate_Arrive" type="date"
+ format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鍒板巶纭鏃堕棿" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鎻愯揣纭鏃堕棿" prop="HDate_Pick">
- <el-date-picker v-model="form.HDate_Pick" type="date" format="yyyy-MM-dd hh:mm:ss"
- placeholder="閫夋嫨鎻愯揣纭鏃堕棿" disabled>
+ <el-date-picker v-model="form.HDate_Pick" type="date"
+ format="yyyy-MM-dd hh:mm:ss" placeholder="閫夋嫨鎻愯揣纭鏃堕棿" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鍑哄巶杩愯緭纭鏃堕棿" prop="HDate_Trans">
- <el-date-picker v-model="form.HDate_Trans" type="date" format="yyyy-MM-dd hh:mm:ss"
- placeholder="閫夋嫨鍒板嚭鍘傝繍杈撶‘璁ゆ椂闂�" disabled>
+ <el-date-picker v-model="form.HDate_Trans" type="date"
+ format="yyyy-MM-dd hh:mm:ss" placeholder="閫夋嫨鍒板嚭鍘傝繍杈撶‘璁ゆ椂闂�" disabled>
</el-date-picker>
</el-form-item>
</el-col>
@@ -357,7 +365,8 @@
<el-row>
<el-col :span="6">
<el-form-item label="鍒跺崟鏃ユ湡" prop="HMakeDate">
- <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡"
+ disabled>
</el-date-picker>
</el-form-item>
</el-col>
@@ -370,13 +379,15 @@
</el-col>
<el-col :span="6">
<el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckDate">
- <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+ disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鍏抽棴鏃ユ湡" prop="HCloseDate">
- <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡"
+ disabled>
</el-date-picker>
</el-form-item>
</el-col>
@@ -440,7 +451,7 @@
<span>{{ scope.row.HStandardQtyForMouldInPack }}</span>
</template>
</el-table-column>
-
+
<el-table-column align="center" label="鐗╂枡鏁伴噺" width="150">
<template slot-scope="scope">
<el-input-number v-model="scope.row.HQty" :min="0" style="width: 120px;"
@@ -461,10 +472,9 @@
</template>
</el-table-column>
<el-table-column align="center" label="鎵樻暟" width="120">
- <template slot-scope="scope"> <!--HPackQTY=HMouldQty/HStandardQtyForMouldInPack -->
+ <template slot-scope="scope"> <!--HPackQTY=HMouldQty/HStandardQtyForMouldInPack -->
<el-input-number v-model="scope.row.HPackQTY" :min="0" style="width: 90px;"
- controls-position="right"
- @change="changeHPackQty(scope.row)"></el-input-number>
+ controls-position="right" @change="changeHPackQty(scope.row)"></el-input-number>
</template>
</el-table-column>
<el-table-column align="center" label="鎵樺崟浣嶄綋绉�" width="120">
@@ -474,9 +484,8 @@
</el-table-column>
<el-table-column align="center" label="浣撶Н" width="120">
<template slot-scope="scope">
- <el-input-number v-model="scope.row.HVolume" :min="0" style="width: 90px;"
- controls-position="right"
- @change="changeHVolume(scope.row)"></el-input-number>
+ <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">
@@ -533,7 +542,8 @@
<GyCar @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCarShow" />
<GyDriver @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyDriverShow" />
<ContractTransport @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName"
- v-if="ContractTransportShow" :propHBeginAddrName="form.HBeginAddr" :propHBeginHEndAddrName="form.HEndAddr" :propHCarTypeName="form.HCarTypeID"/>
+ v-if="ContractTransportShow" :propHBeginAddrName="form.HBeginAddr"
+ :propHBeginHEndAddrName="form.HEndAddr" :propHCarTypeName="form.HCarTypeID" />
<GyMaterialPackingRelation @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName"
:propHMaterID="editData[zbIndex].HMaterID" :propHOrgID="form.HOrgID"
v-if="gyMaterialPackingRelationShow" />
@@ -1185,14 +1195,14 @@
this.form.HCurID = deptRow[0]["HCurID"]
this.form.HExRate = deptRow[0]["姹囩巼"]
// 妫�鏌ユ槸鍚︽墍鏈夎褰曞睘浜庡悓涓�瀹㈡埛
- for (var i = 0; i < deptRow.length; i++) {
- if (deptRow[i]["HCusID"] != this.form.HCusID) {
- this.$modal.msgError("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛锛岃纭繚閫夋嫨鐨勬簮鍗曞睘浜庡悓涓�瀹㈡埛!");
- this.xsSeOutStockBillShow = false;
- this.openData = false;
- return;
- }
- }
+ //for (var i = 0; i < deptRow.length; i++) {
+ // if (deptRow[i]["HCusID"] != this.form.HCusID) {
+ // this.$modal.msgError("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛锛岃纭繚閫夋嫨鐨勬簮鍗曞睘浜庡悓涓�瀹㈡埛!");
+ // this.xsSeOutStockBillShow = false;
+ // this.openData = false;
+ // return;
+ // }
+ //}
// 妫�鏌ユ柊閫夋嫨鐨勬簮鍗曟槸鍚﹀凡缁忓湪瀛愯〃涓瓨鍦�
var isDuplicate = this.checkDuplicateSource(deptRow);
@@ -1260,7 +1270,7 @@
materialMap[materialId] = [];
}
materialMap[materialId].push({
- HMaterID:dataArray[i].HMaterID,
+ HMaterID: dataArray[i].HMaterID,
hmainid: dataArray[i].hmainid,
hsubid: dataArray[i].hsubid,
鍗曟嵁鍙�: dataArray[i].鍗曟嵁鍙�
@@ -1285,19 +1295,17 @@
"ListMaterial": ListMaterial
},
});
-
+ console.log(response)
let result = response.data;
if (result.count == 1) {
let res = result.data;
- console.log(11,res)
var newRows = [];
// 涓烘瘡涓簮鍗曡鍒涘缓瀵瑰簲鐨勫瓙琛ㄨ
for (var materialId in materialMap) {
var sourceInfos = materialMap[materialId];
- console.log("鍙戣揣閫氱煡鍗曟暟鎹�",dataArray)
- console.log("1鍙戣揣閫氱煡鍗曟暟鎹�",dataArray[0])
- if(res.length===0)
- {
+ console.log("鍙戣揣閫氱煡鍗曟暟鎹�", dataArray)
+ console.log("1鍙戣揣閫氱煡鍗曟暟鎹�", dataArray[0])
+ if (res.length === 0) {
// 涓烘瘡涓簮鍗曡鍒涘缓涓�鏉¤褰�
for (var j = 0; j < sourceInfos.length; j++) {
var sourceInfo = sourceInfos[j];
@@ -1323,6 +1331,8 @@
var mouldQty = 0;
var HPackQTY = 0;
var rowVolume = 0;
+ // if
+ // console.log(dataArray[j].瀹瑰櫒鏁伴噺 / 鎵�)
newRows.push({
"HSourceInterID": sourceInfo.hmainid,
"HSourceEntryID": sourceInfo.hsubid,
@@ -1331,8 +1341,7 @@
"HMaterNumber": dataArray[j].鐗╂枡浠ｇ爜,
"HMaterName": dataArray[j].鐗╂枡鍚嶇О,
"HUnitID": dataArray[j].HUnitID,
- "HPackV": dataArray[j].鎵樺崟浣嶄綋绉�,
- "HStandardQtyForMouldInPack": dataArray[j].瀹瑰櫒鏁伴噺/鎵�,
+
"HMouldID": 0,
"HMouldNumber": '',
"HMouldName": '',
@@ -1348,9 +1357,7 @@
HScatteredVolume: 0,
});
}
- }
- else
- {
+ } else {
// 鏌ユ壘璇ョ墿鏂橧D瀵瑰簲鐨勫寘瑁呭鍣ㄤ俊鎭�
var materialInfo = null;
for (var i = 0; i < res.length; i++) {
@@ -1360,71 +1367,73 @@
}
}
if (materialInfo) {
- // 涓烘瘡涓簮鍗曡鍒涘缓涓�鏉¤褰�
- for (var j = 0; j < sourceInfos.length; j++) {
- var sourceInfo = sourceInfos[j];
+ // 涓烘瘡涓簮鍗曡鍒涘缓涓�鏉¤褰�
+ for (var j = 0; j < sourceInfos.length; j++) {
+ var sourceInfo = sourceInfos[j];
- // 鍐嶆妫�鏌ユ槸鍚﹀凡瀛樺湪锛堝弻閲嶄繚闄╋級
- var isExist = false;
- for (var k = 0; k < existingData.length; k++) {
- if (existingData[k].HSourceInterID == sourceInfo.hmainid &&
- existingData[k].HSourceEntryID == sourceInfo.hsubid) {
- isExist = true;
- break;
+ // 鍐嶆妫�鏌ユ槸鍚﹀凡瀛樺湪锛堝弻閲嶄繚闄╋級
+ var isExist = false;
+ for (var k = 0; k < existingData.length; k++) {
+ if (existingData[k].HSourceInterID == sourceInfo.hmainid &&
+ existingData[k].HSourceEntryID == sourceInfo.hsubid) {
+ isExist = true;
+ break;
+ }
}
- }
- if (isExist) {
- this.$modal.msgError(`婧愬崟${sourceInfo.鍗曟嵁鍙穧宸插瓨鍦紝璺宠繃`);
- continue;
- }
+ if (isExist) {
+ this.$modal.msgError(`婧愬崟${sourceInfo.鍗曟嵁鍙穧宸插瓨鍦紝璺宠繃`);
+ continue;
+ }
- // 璁＄畻鐩稿叧鏁伴噺
- var qty = orginHQTY || 0;
- var snp = materialInfo.HSNP || 0;
- var mouldQty = 0;
-
- if (snp > 0) {
- mouldQty = Math.ceil(qty / snp);
- }
-
- var HPackQTY = 0;
- if (materialInfo.HStandardQtyForMouldInPack > 0 && mouldQty > 0) {
- HPackQTY = Math.ceil(mouldQty / materialInfo.HStandardQtyForMouldInPack);
- }
-
- var rowVolume = (HPackQTY * materialInfo.HPackV).toFixed(2);
- newRows.push({
- "HSourceInterID": sourceInfo.hmainid,
- "HSourceEntryID": sourceInfo.hsubid,
- "HSourceBillNo": sourceInfo.鍗曟嵁鍙�,
- "HMaterID": materialInfo.HMaterID,
- "HMaterNumber": materialInfo.鐗╂枡浠ｇ爜,
- "HMaterName": materialInfo.鐗╂枡鍚嶇О,
- "HUnitID": materialInfo.HUnitID,
- "HMouldID": materialInfo.HMouldID,
- "HMouldNumber": materialInfo.HMouldNumber,
- "HMouldName": materialInfo.HMouldName,
- "HMouldLength": materialInfo.闀垮害,
- "HMouldWidth": materialInfo.瀹藉害,
- "HMouldHeight": materialInfo.楂樺害,
- "HMouldFoldHeight": materialInfo.鎶樺彔楂樺害,
- "HQty": orginHQTY,
- "HQty_origin": orginHQTY,
- "HMouldQty": mouldQty,
- "HVolume": rowVolume,
- "HSNP": materialInfo.HSNP,
- HScatteredVolume: 0,
- "HPackV": materialInfo.HPackV,
- "HStandardQtyForMouldInPack": materialInfo.HStandardQtyForMouldInPack,
- "HPackQTY": HPackQTY,
- });
- this.form.HTotalVolume=this.form.HTotalVolume*1+rowVolume *1
+ // 璁＄畻鐩稿叧鏁伴噺
+ var qty = orginHQTY || 0;
+ var snp = materialInfo.HSNP || 0;
+ var mouldQty = 0;
+ if (snp > 0) {
+ mouldQty = Math.ceil(qty / snp);
+ }
+
+ var HPackQTY = 0;
+ if (materialInfo.HStandardQtyForMouldInPack > 0 && mouldQty > 0) {
+ HPackQTY = Math.ceil(mouldQty / materialInfo.HStandardQtyForMouldInPack);
+ }
+
+ var rowVolume = (HPackQTY * materialInfo.HPackV).toFixed(2);
+ newRows.push({
+ "HSourceInterID": sourceInfo.hmainid,
+ "HSourceEntryID": sourceInfo.hsubid,
+ "HSourceBillNo": sourceInfo.鍗曟嵁鍙�,
+ "HMaterID": materialInfo.HMaterID,
+ "HMaterNumber": materialInfo.鐗╂枡浠ｇ爜,
+ "HMaterName": materialInfo.鐗╂枡鍚嶇О,
+ "HUnitID": materialInfo.HUnitID,
+ "HMouldID": materialInfo.HMouldID,
+ "HPackV": dataArray[j].鎵樺崟浣嶄綋绉�,
+ "HStandardQtyForMouldInPack": dataArray[j].瀹瑰櫒鏁伴噺 / 鎵�,
+ "HMouldNumber": materialInfo.HMouldNumber,
+ "HMouldName": materialInfo.HMouldName,
+ "HMouldLength": materialInfo.闀垮害,
+ "HMouldWidth": materialInfo.瀹藉害,
+ "HMouldHeight": materialInfo.楂樺害,
+ "HMouldFoldHeight": materialInfo.鎶樺彔楂樺害,
+ "HQty": orginHQTY,
+ "HQty_origin": orginHQTY,
+ "HMouldQty": mouldQty,
+ "HVolume": rowVolume,
+ "HSNP": materialInfo.HSNP,
+ HScatteredVolume: 0,
+ "HPackV": materialInfo.HPackV,
+ "HStandardQtyForMouldInPack": materialInfo.HStandardQtyForMouldInPack,
+ "HPackQTY": HPackQTY,
+ });
+ this.form.HTotalVolume = this.form.HTotalVolume * 1 + rowVolume * 1
+
+ }
}
}
- }
-
+
}
@@ -1562,11 +1571,11 @@
this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
} else {
let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
- copyRow.HPackQTY=0,
- copyRow.HMouldQty=0,
- copyRow.HQty=0,
- copyRow.HVolume=0
- copyRow.HScatteredVolume=0
+ copyRow.HPackQTY = 0,
+ copyRow.HMouldQty = 0,
+ copyRow.HQty = 0,
+ copyRow.HVolume = 0
+ copyRow.HScatteredVolume = 0
this.editData.push(copyRow);
}
},
@@ -1776,7 +1785,7 @@
let HPackQty = 0;
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);
} else {
@@ -1784,7 +1793,7 @@
this.$message.warning('瀹瑰櫒鏁伴噺/鎵樹负0锛屾墭鏁板皢琚缃负0');
}
}
-
+
if (!HPackQty || HPackQty == 'Infinity') {
this.editData[row.index - 1].HPackQTY = 0;
} else {
@@ -1801,13 +1810,13 @@
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;
} else {
this.editData[this.zbIndex].HVolume = Volume;
}
-
+
this.form.HTotalVolume = 0;
this.editData.map(item => {
this.form.HTotalVolume = Number(item.HVolume) + this.form.HTotalVolume;
@@ -1817,17 +1826,17 @@
//#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));
},
@@ -1843,7 +1852,7 @@
}
},
//#endregion
- checkTotalQtyExceed(selRow) {
+ checkTotalQtyExceed(selRow) {
var tableData = this.editData
if (!tableData || tableData.length === 0) return;
var sourceQtyMap = {};
@@ -1912,7 +1921,7 @@
const SNP = parseFloat(this.editData[selRow.index - 1].HSNP) || 0;
const HQty = parseFloat(selRow.HQty) || 0;
let warningMessages = [];
-
+
if (SNP > 0) {
let MouldQty = Math.ceil(HQty / SNP);
if (!MouldQty || MouldQty == 'Infinity') {
@@ -1924,10 +1933,10 @@
this.editData[selRow.index - 1].HMouldQty = 0;
warningMessages.push('鏍囧噯鍖呰鏁伴噺涓�0锛屽寘瑁呭鍣ㄦ暟閲忓皢琚缃负0');
}
-
+
const standardQtyForMouldInPack = parseFloat(this.editData[selRow.index - 1].HStandardQtyForMouldInPack) || 0;
const HMouldQty = parseFloat(this.editData[selRow.index - 1].HMouldQty) || 0;
-
+
if (standardQtyForMouldInPack > 0 && HMouldQty > 0) {
let HPackQTY = Math.ceil(HMouldQty / standardQtyForMouldInPack);
if (!HPackQTY || HPackQTY == 'Infinity') {
@@ -1941,11 +1950,11 @@
}
this.editData[selRow.index - 1].HPackQTY = 0;
}
-
+
if (warningMessages.length > 0) {
this.$message.warning(warningMessages.join('锛�'));
}
-
+
const HPackQTY = parseFloat(this.editData[selRow.index - 1].HPackQTY) || 0;
const HPackV = parseFloat(this.editData[selRow.index - 1].HPackV) || 0;
let HVolume = ((HPackQTY * HPackV).toFixed(2)) - 0;
@@ -1954,13 +1963,13 @@
} else {
this.editData[selRow.index - 1].HVolume = HVolume;
}
-
+
this.form.HTotalVolume = 0;
this.editData.map(item => {
this.form.HTotalVolume = Number(item.HVolume) + this.form.HTotalVolume;
});
this.calculateLoadingRate(parseFloat(this.form.HTotalVolume || 0));
-
+
return false; // 琛ㄧず娌℃湁瓒呭嚭
},
//#region 闄勪欢涓婁紶鐩稿叧鏂规硶
@@ -2087,10 +2096,15 @@
.xsckdBox .el-date-editor.el-input {
width: 100%;
}
+
.form-group {
- border: 1px solid #ddd; /* 鐏拌壊杈规 */
- padding: 15px; /* 鍐呰竟璺濓紝璁╁唴瀹逛笌杈规鏈夐棿璺� */
- border-radius: 4px; /* 鍙�夊渾瑙� */
- margin-bottom: 20px; /* 淇濇寔鍘熸湁鐨勪笅杈硅窛 */
+ border: 1px solid #ddd;
+ /* 鐏拌壊杈规 */
+ padding: 15px;
+ /* 鍐呰竟璺濓紝璁╁唴瀹逛笌杈规鏈夐棿璺� */
+ border-radius: 4px;
+ /* 鍙�夊渾瑙� */
+ margin-bottom: 20px;
+ /* 淇濇寔鍘熸湁鐨勪笅杈硅窛 */
}
</style>
--
Gitblit v1.9.1