MES-WEB-VUEUI.git

			@@ -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>
			@@ -41,7 +42,8 @@
			<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>
			@@ -64,21 +66,24 @@
			<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>
			@@ -87,7 +92,8 @@
			<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-button slot="append" icon="el-icon-search"
			@click="openDataDialog(16)"></el-button>
			</el-input>
			</el-form-item>
			</el-col>
			@@ -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>
			@@ -217,7 +224,8 @@
			<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>
			@@ -263,8 +271,8 @@
			</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 v-model="form.HDate_CarrierSure" type="date"
			placeholder="选择承运商确认日期" format="yyyy-MM-dd hh:mm:ss" disabled>
			</el-date-picker>
			</el-form-item>
			</el-col>
			@@ -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>
			@@ -463,8 +474,7 @@
			<el-table-column align="center" label="托数" width="120">
			<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">
			@@ -475,8 +485,7 @@
			<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>
			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);
			@@ -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)
			{
			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 {
			// 查找该物料ID对应的包装容器信息
			var materialInfo = null;
			for (var i = 0; i < res.length; i++) {
			@@ -1403,6 +1410,8 @@
			"HMaterName": materialInfo.物料名称,
			"HUnitID": materialInfo.HUnitID,
			"HMouldID": materialInfo.HMouldID,
			"HPackV": dataArray[j].托单位体积,
			"HStandardQtyForMouldInPack": dataArray[j].容器数量 / 托,
			"HMouldNumber": materialInfo.HMouldNumber,
			"HMouldName": materialInfo.HMouldName,
			"HMouldLength": materialInfo.长度,
			@@ -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>