From 39f090fcb0d8540763b3dce4615d1d16d8938e8e Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期二, 24 三月 2026 18:43:28 +0800
Subject: [PATCH] 运单
---
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue | 13 ++++++
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 66 ++++++++++++++++-----------------
2 files changed, 45 insertions(+), 34 deletions(-)
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
index 4af588b..f8b804e 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
@@ -194,6 +194,9 @@
components: { RowSettings, Edit, PrintList },
props: {
openPage: { type: String, },
+ propHBeginAddrName:{},
+ propHBeginHEndAddrName:{},
+ propHCarTypeName:{},
},
data() {
return {
@@ -377,6 +380,16 @@
this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'"
this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'"
}
+ if (this.propHBeginAddrName) {
+ this.sWhere += " and 濮嬪彂鍦� = '" + this.propHBeginAddrName + "'"
+ }
+ if (this.propHBeginHEndAddrName) {
+ this.sWhere += " and 鐩殑鍦� = '" + this.propHBeginHEndAddrName + "'"
+ }
+ if (this.propHCarTypeName) {
+ this.sWhere += " and 杩愯緭鏂瑰紡 = '" + this.propHCarTypeName + "'"
+ }
+ console.log(this.sWhere)
if (this.pageSize == 0) {
this.pageSize = 50
}
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index d84c2f0..4210f65 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -86,15 +86,15 @@
<el-row>
<el-col :span="6">
<el-form-item label="鎵胯繍鍚堝悓" prop="HContractTransportBillNo">
- <el-input v-model="form.HContractTransportBillNo" placeholder="璇疯緭鍏ユ壙杩愬悎鍚�">
+ <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>
<el-col :span="6">
<el-form-item label="鎵胯繍鍟�" prop="HCarrierName">
- <el-input v-model="form.HCarrierName" placeholder="璇疯緭鍏ユ壙杩愬晢">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(6)"></el-button>
+ <el-input v-model="form.HCarrierName" placeholder="璇疯緭鍏ユ壙杩愬晢" disabled>
+ <!-- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(6)"></el-button> -->
</el-input>
</el-form-item>
</el-col>
@@ -142,17 +142,17 @@
<el-row>
<el-col :span="6">
<el-form-item label="杞﹀瀷鏈�澶у绉�" prop="HCarTypeMaxVolume">
- <el-input v-model="form.HCarTypeMaxVolume" placeholder="璇疯緭鍏ヨ溅鍨嬫渶澶у绉�" readonly />
+ <el-input v-model="form.HCarTypeMaxVolume" placeholder="璇疯緭鍏ヨ溅鍨嬫渶澶у绉�" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鎬讳綋绉紙绔嬫柟绫筹級" prop="HTotalVolume">
- <el-input v-model="form.HTotalVolume" placeholder="璇疯緭鍏ユ�讳綋绉�" />
+ <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="璇疯緭鍏ヨ杞界巼" />
+ <el-input v-model="form.HLoadingRate" placeholder="璇疯緭鍏ヨ杞界巼" disabled/>
</el-form-item>
</el-col>
</el-row>
@@ -441,9 +441,9 @@
</template>
</el-table-column>
- <el-table-column align="center" label="鐗╂枡鏁伴噺" width="120">
+ <el-table-column align="center" label="鐗╂枡鏁伴噺" width="150">
<template slot-scope="scope">
- <el-input-number v-model="scope.row.HQty" :min="0" style="width: 90px;"
+ <el-input-number v-model="scope.row.HQty" :min="0" style="width: 120px;"
controls-position="right"
@change="checkTotalQtyExceed(scope.row)"></el-input-number>
</template>
@@ -533,7 +533,7 @@
<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" />
+ 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" />
@@ -1017,6 +1017,7 @@
this.gyCartypeShow = false
this.gyCarShow = false
this.gyDriverShow = false
+ this.AreaDialogShow = false
this.ContractTransportShow = false
this.gyMaterialPackingRelationShow = false
},
@@ -1252,6 +1253,7 @@
// 鍒涘缓鐗╂枡ID鏄犲皠
var materialMap = {};
for (var i = 0; i < dataArray.length; i++) {
+ console.log(dataArray)
orginHQTY = dataArray[i].鏁伴噺;
var materialId = dataArray[i].HMaterID;
if (!materialMap[materialId]) {
@@ -1287,6 +1289,7 @@
let result = response.data;
if (result.count == 1) {
let res = result.data;
+ console.log(11,res)
var newRows = [];
// 涓烘瘡涓簮鍗曡鍒涘缓瀵瑰簲鐨勫瓙琛ㄨ
for (var materialId in materialMap) {
@@ -1315,14 +1318,11 @@
}
// 璁＄畻鐩稿叧鏁伴噺
- var qty = 0;
- var snp = 1;
- var mouldQty = 0;
- var length = 0;
- var width = 0;
- var height = 0;
- var rowVolume = (length * width * height * mouldQty).toFixed(2);
-
+ var qty = orginHQTY || 0;
+ var snp = 0;
+ var mouldQty = 0;
+ var HPackQTY = 0;
+ var rowVolume = 0;
newRows.push({
"HSourceInterID": sourceInfo.hmainid,
"HSourceEntryID": sourceInfo.hsubid,
@@ -1331,6 +1331,8 @@
"HMaterNumber": dataArray[j].鐗╂枡浠ｇ爜,
"HMaterName": dataArray[j].鐗╂枡鍚嶇О,
"HUnitID": dataArray[j].HUnitID,
+ "HPackV": dataArray[j].鎵樺崟浣嶄綋绉�,
+ "HStandardQtyForMouldInPack": dataArray[j].瀹瑰櫒鏁伴噺/鎵�,
"HMouldID": 0,
"HMouldNumber": '',
"HMouldName": '',
@@ -1378,24 +1380,20 @@
}
// 璁＄畻鐩稿叧鏁伴噺
- var qty = materialInfo.HSNP || 0;
- var snp = materialInfo.HSNP || 1;
- var mouldQty = snp > 0 ? Math.ceil(qty / snp) : 0;
- var length = parseFloat(materialInfo.闀垮害) || 0;
- var width = parseFloat(materialInfo.瀹藉害) || 0;
- var height = parseFloat(materialInfo.楂樺害) || 0;
- // var rowVolume = (length * width * height * mouldQty).toFixed(2);
-
- //HPackQTY=HMouldQty/HStandardQtyForMouldInPack
- var HPackQTY = 0;
- if(materialInfo.HStandardQtyForMouldInPack===0)
- {
- HPackQTY=0
- }else
- {
- HPackQTY=Math.ceil(mouldQty/materialInfo.HStandardQtyForMouldInPack)
+ var qty = orginHQTY || 0;
+ var snp = materialInfo.HSNP || 0;
+ var mouldQty = 0;
+
+ if (snp > 0) {
+ mouldQty = Math.ceil(qty / snp);
}
- var rowVolume = (HPackQTY*materialInfo.HPackV).toFixed(2);
+
+ 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,
--
Gitblit v1.9.1