MES-WEB-VUEUI.git

			@@ -93,8 +93,8 @@
			</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 qty = orginHQTY \|\| 0;
			var snp = 0;
			var mouldQty = 0;
			var length = 0;
			var width = 0;
			var height = 0;
			var rowVolume = (length * width * height * mouldQty).toFixed(2);

			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,23 +1380,19 @@
			}

			// 计算相关数量
			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);
			var qty = orginHQTY \|\| 0;
			var snp = materialInfo.HSNP \|\| 0;
			var mouldQty = 0;

			//HPackQTY=HMouldQty/HStandardQtyForMouldInPack
			var HPackQTY = 0;
			if(materialInfo.HStandardQtyForMouldInPack===0)
			{
			HPackQTY=0
			}else
			{
			HPackQTY=Math.ceil(mouldQty/materialInfo.HStandardQtyForMouldInPack)
			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,

	src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue	58 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -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
			}