MES-WEB-VUEUI.git

			@@ -53,32 +53,6 @@
			<div class="form-group">
			<el-row>
			<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-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-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-input>
			</el-form-item>
			</el-col>
			</el-row>
			<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"
			@@ -93,13 +67,55 @@
			</el-input>
			</el-form-item>
			</el-col>
			<el-col :span="12">
			<el-form-item label="运输线路" prop="HTransportLineName">
			<el-select v-model="form.HTransportLineName" placeholder="请选择运输线路" filterable
			@change="transLineNameChange" @focus="checkTransportList">
			<el-option v-for="(item, index) in transportList" :key="index" :label="item"
			:value="item"></el-option>
			</el-select>
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="6">
			<el-form-item label="运输方式" prop="HTransType">
			<el-select v-model="form.HTransType" placeholder="请选择运输方式">
			<el-option label="零单" value="零单"></el-option>
			<el-option label="单程" value="单程"></el-option>
			<el-option label="往返" value="往返"></el-option>
			<el-select v-model="form.HTransType" placeholder="请选择运输方式"
			@change="transTypeChange" @focus="checkTransTypeList">
			<el-option v-for="(item, index) in transTypeList" :key="index" :label="item"
			:value="item"></el-option>
			</el-select>
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="车型" prop="HCarTypeName">
			<el-select v-model="form.HCarTypeName" placeholder="请选择车型"
			@change="transHCarChange" @focus="checkHCarTypeNameList">
			<el-option v-for="(item, index) in HCarTypeNameList" :key="index"
			:label="item.value" :value="item.id"></el-option>
			</el-select>
			<!-- <el-input v-model="form.HCarTypeName" placeholder="请输入车型">
			<el-button slot="append" icon="el-icon-search"
			@click="openDataDialog(13)"></el-button>
			</el-input> -->
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<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-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-input>
			</el-form-item>
			</el-col>
			</el-row>
			@@ -232,10 +248,10 @@
			</el-col>
			<el-col :span="6">
			<el-form-item label="运费" prop="HMoney">
			<el-input v-model="form.HMoney" placeholder="请输入运费" />
			<el-input v-model="form.HMoney" placeholder="请输入运费" disabled />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-col :span="6">
			<el-form-item label="币别" prop="HCurName">
			<el-input v-model="form.HCurName" placeholder="请输入币别" />
			</el-form-item>
			@@ -459,14 +475,14 @@
			<el-table-column align="center" label="物料规格" width="120">
			<template slot-scope="scope">{{ scope.row.HModel }} </template>
			</el-table-column>
			<el-table-column align="center" label="容器代码" width="120">
			<el-table-column v-if="false" align="center" label="容器代码" width="120">
			<template slot-scope="scope">
			<el-input v-model="scope.row.HMouldNumber" placeholder="请输入器具代码"
			@keyup.native.f7="openDataDialog(17, scope.row)"
			@dblclick.native="openDataDialog(17, scope.row)" />
			</template>
			</el-table-column>
			<el-table-column align="center" label="容器名称" width="120">
			<el-table-column v-if="false" align="center" label="容器名称" width="120">
			<template slot-scope="scope">
			<span>{{ scope.row.HMouldName }}</span>
			</template>
			@@ -479,30 +495,30 @@
			@change="checkTotalQtyExceed(scope.row)"></el-input-number>
			</template>
			</el-table-column>
			<el-table-column align="center" label="标准包装数量" width="120">
			<el-table-column v-if="false" align="center" label="标准包装数量" width="120">
			<template slot-scope="scope">
			<span>{{ scope.row.HSNP }}</span>
			</template>
			</el-table-column>
			<el-table-column align="center" label="包装容器数量" width="170">
			<el-table-column v-if="false" align="center" label="包装容器数量" width="170">
			<template slot-scope="scope">
			<el-input-number v-model="scope.row.HMouldQty" :min="0" style="width: 90px;"
			<el-input-number v-model="scope.row.HMouldQty" :min="0" style="width: 150px;"
			controls-position="right"
			@change="changeHMouldQty(scope.row)"></el-input-number>
			</template>
			</el-table-column>
			<el-table-column align="center" label="容器数量/托" width="120">
			<el-table-column v-if="false" align="center" label="容器数量/托" width="120">
			<template slot-scope="scope">
			<span>{{ scope.row.HStandardQtyForMouldInPack }}</span>
			</template>
			</el-table-column>
			<el-table-column align="center" label="托数" width="120">
			<el-table-column v-if="false" 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>
			</template>
			</el-table-column>
			<el-table-column align="center" label="托单位体积" width="120">
			<el-table-column v-if="false" align="center" label="托单位体积" width="120">
			<template slot-scope="scope">
			<span>{{ scope.row.HPackV }}</span>
			</template>
			@@ -519,22 +535,22 @@
			controls-position="right"></el-input-number> -->
			</template>
			</el-table-column>
			<el-table-column align="center" label="容器长度" width="120">
			<el-table-column v-if="false" align="center" label="容器长度" width="120">
			<template slot-scope="scope">
			<span>{{ scope.row.HMouldLength }}</span>
			</template>
			</el-table-column>
			<el-table-column align="center" label="容器宽度" width="120">
			<el-table-column v-if="false" align="center" label="容器宽度" width="120">
			<template slot-scope="scope">
			<span>{{ scope.row.HMouldWidth }}</span>
			</template>
			</el-table-column>
			<el-table-column align="center" label="容器高度" width="120">
			<el-table-column v-if="false" align="center" label="容器高度" width="120">
			<template slot-scope="scope">
			<span>{{ scope.row.HMouldHeight }}</span>
			</template>
			</el-table-column>
			<el-table-column align="center" label="折叠高度" width="120">
			<el-table-column v-if="false" align="center" label="折叠高度" width="120">
			<template slot-scope="scope">
			<span>{{ scope.row.HMouldFoldHeight }}</span>
			</template>
			@@ -602,7 +618,7 @@
			import ContractTransport from "@/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue"
			import GyMaterialPackingRelation from '@/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue'
			import AreaDialog from "@/views/component/AreaDialog"
			import { watch } from 'vue';

			export default {
			name: 'Add_Edit_WL_YayBill.vue',
			components: { Dept, Warehouse, Material, RowSettings, XsSeOutStockBill, GyCustomer, GySupplier, GyCartype, GyCar, GyDriver, ContractTransport, GyMaterialPackingRelation, AreaDialog },
			@@ -653,6 +669,9 @@

			temp: undefined, //临时变量
			btResList: [], // 列设置
			transportList: [], //运输线路选择列表
			transTypeList: [],
			HCarTypeNameList: [],
			form: {}, // 表单参数
			rules: { // 表单校验
			HCarrierName: [
			@@ -661,7 +680,7 @@
			HCusName: [
			{ required: true, message: "客户不能为空", trigger: "blur" }
			],
			HCarTypeName:[
			HCarTypeName: [
			{ required: true, message: "车型不能为空", trigger: "blur" }
			],
			HDate: [
			@@ -672,6 +691,15 @@
			],
			HCarrierName: [
			{ required: true, message: "承运合同不能为空", trigger: "blur" }
			],
			HContractTransportBillNo: [
			{ required: true, message: "承运合同不能为空", trigger: "blur" }
			],
			HTransType: [
			{ required: true, message: "运输方式不能为空", trigger: "blur" }
			],
			HTransportLineName: [
			{ required: true, message: "运输线路不能为空", trigger: "blur" }
			]
			},

			@@ -775,6 +803,7 @@
			HPickAddr: "",
			HArriverAddr: "",
			HTransType: "",
			HTransportLineName: "",
			HCarTypeID: 0,
			HCarTypeName: "",
			HCarTypeMaxVolume: 0,
			@@ -912,7 +941,7 @@
			this.form.HCarName = data.车辆名称
			this.form.HDriverID = data.司机ID
			this.form.HDriverName = data.司机名称

			this.form.HTransportLineName = data.运输路线名称
			//子表赋值
			for (var i = 0; i < result.data.length; i++) {
			var qty = parseFloat(result.data[i].HQty) \|\| 0;
			@@ -950,14 +979,19 @@
			"HQty_origin": result.data[i].HQty,
			"HVolume": rowVolume,
			"HScatteredVolume": result.data[i].零单占用体积,
			"HStandardQtyForMouldInPack":result.data[i].HStandardQtyForMouldInPack,
			"HPackV":result.data[i].HPackV,
			"HPackQTY":result.data[i].HPackQTY,
			"HStandardQtyForMouldInPack": result.data[i].HStandardQtyForMouldInPack,
			"HPackV": result.data[i].HPackV,
			"HPackQTY": result.data[i].HPackQTY,
			}
			)
			}
			this.formShow = true
			this.formLoading = false

			// 加载运输线路、运输类型、车型列表
			if (this.form.HContractTransportInterID) {
			this.loadTransportData()
			}

			// 加载已上传的文件列表
			this.getFileList();
			@@ -1112,6 +1146,7 @@
			this.calculateLoadingRate(parseFloat(this.form.HTotalVolume \|\| 0));
			this.gyCartypeShow = false
			this.openData = false
			this.checkAndCallGetTransCost()
			} else if (num == 14) {
			this.form.HCarName = deptRow.车辆名称
			this.form.HCarID = deptRow.HItemID
			@@ -1126,19 +1161,36 @@
			console.log(deptRow)
			this.form.HContractTransportBillNo = deptRow.单据号
			this.form.HContractTransportInterID = deptRow.HInterID
			this.form.HContractTransportEntryID = deptRow.HInterID
			this.form.HDistance = deptRow.距离
			this.form.HTransportTimes = deptRow.运输时效
			this.form.HTransportTyep = deptRow.运输类型
			this.form.HTransType = deptRow.运输类型
			this.form.HSSID = deptRow.结算方式
			this.form.HSSName = deptRow.结算方式名称
			this.form.HCurID = deptRow.币别
			this.form.HCurName = deptRow.货币名称
			this.form.HMoney = deptRow.运输费用
			this.form.HExRate = deptRow.汇率 == null ? 0 : deptRow.汇率
			this.form.HCarrierID = deptRow.HSupID
			this.form.HCarrierName = deptRow.供应商名称
			this.transportList = []
			this.transTypeList = []
			this.HCarTypeNameList = []
			axios.get(this.$baseUrl + '/WLYayBillController/initDataForSelectContractTransportBill', {
			params: {
			"hmainid": deptRow.HInterID,
			},
			}).then(res => {
			let response = res.data
			if (response.code == 1) {
			if (response.data.length == 0) {
			this.$modal.msgError("请检查【" + this.form.HContractTransportBillNo + "】对应的承运合同是否维护！！！");
			this.form.HMoney = 0
			return
			}
			this.form.HCarrierID = response.data[0].HSupID
			this.form.HCarrierName = response.data[0].供应商名称
			this.form.HCurID = response.data[0].币别
			this.form.HCurName = response.data[0].货币名称
			this.form.HExRate = response.data[0].汇率 == null ? 0 : response.data[0].汇率 - 0
			this.form.HSSID = response.data[0].结算方式
			this.form.HSSName = response.data[0].结算方式名称
			this.transportList = [...new Set(response.data.map(item => item.运输路线名称))]
			// this.checkAndCallGetTransCost()
			} else {
			this.$modal.msgError("错误:" + response.data.code + response.data.Message);
			}
			}).catch(error => {
			this.$modal.msgError("接口请求失败!");
			});
			this.ContractTransportShow = false
			this.openData = false
			} else if (num == 17) {
			@@ -1377,7 +1429,7 @@
			"HMouldWidth": res[j].宽度,
			"HMouldHeight": res[j].高度,
			"HMouldFoldHeight": res[j].折叠高度,
			"HModel":res[j].物料规格,
			"HModel": res[j].物料规格,
			"HQty": res[j].物料数量,
			"HQty_origin": orginHQTY,
			"HMouldQty": mouldQty,
			@@ -1440,6 +1492,7 @@
			submitForm() {
			this.$refs["form"].validate(valid => {
			if (valid) {
			this.form.HCarryStatus = 0;
			var loadingRate = this.form.HLoadingRate;
			if (loadingRate && typeof loadingRate === 'string') {
			this.form.HLoadingRate = parseFloat(loadingRate.replace('%', '')) / 100;
			@@ -1448,6 +1501,7 @@
			var sSubStr = JSON.stringify(this.editData);
			// var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
			var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"]
			console.log(sMainSub)
			axios({
			method: 'post',
			url: this.baseURL + "/WLYayBillController/SaveBill",
			@@ -2042,6 +2096,44 @@
			});
			},

			// 加载运输相关数据
			loadTransportData() {
			axios.get(this.$baseUrl + '/WLYayBillController/initDataForSelectContractTransportBill', {
			params: {
			"hmainid": this.form.HContractTransportInterID,
			},
			}).then(res => {
			let response = res.data
			if (response.code == 1) {
			// 运输线路去重
			this.transportList = [...new Set(response.data.map(item => item.运输路线名称))]
			// this.$nextTick(()=>{

			// })
			this.getTransCost('line')
			this.getTransCost('type')
			this.getTransCost('car')


			// // 运输类型去重
			// this.transTypeList = [...new Set(response.data.map(item => item.运输类型))]

			// // 车型去重
			// const carTypeMap = new Map()
			// response.data.forEach(item => {
			// const key = item.运输方式名称
			// if (!carTypeMap.has(key)) {
			// carTypeMap.set(key, { value: item.运输方式名称, id: item.运输方式 })
			// }
			// })
			// this.HCarTypeNameList = Array.from(carTypeMap.values())
			} else {
			this.$modal.msgError("错误:" + response.data.code + response.data.Message);
			}
			}).catch(error => {
			this.$modal.msgError("接口请求失败!");
			});
			},
			// 获取已上传文件列表
			getFileList() {
			},
			@@ -2051,7 +2143,148 @@
			this.uploadFiles.splice(index, 1)
			},
			//#endregion
			//#endregion
			//#endregion
			checkTransportList() {
			if (this.transportList.length === 0) {
			this.$message.warning('请先选择承运合同')
			}
			},
			checkTransTypeList() {
			if (this.transTypeList.length === 0) {
			this.$message.warning('请先选择运输线路')
			}
			},
			checkHCarTypeNameList() {
			if (this.HCarTypeNameList.length === 0) {
			this.$message.warning('请先选择运输方式')
			}
			},
			transLineNameChange() {
			this.form.HTransType = ''
			this.form.HCarTypeName = ''
			this.form.HCarTypeID = 0
			this.form.HContractTransportEntryID = 0
			this.form.HBeginAddrName = ''
			this.form.HBeginAddr = 0
			this.form.HEndAddrName = ''
			this.form.HEndAddr = 0
			this.form.HCarTypeMaxVolume = 0
			this.form.HDistance = 0
			this.form.HTransportTimes = ''
			this.form.HTransportTyep = ''
			this.form.HMoney = 0
			this.transTypeList = []
			this.HCarTypeNameList = []
			this.getTransCost('line')
			},
			transTypeChange() {
			this.form.HCarTypeName = ''
			this.form.HCarTypeID = 0
			this.form.HContractTransportEntryID = 0
			this.form.HBeginAddrName = ''
			this.form.HBeginAddr = 0
			this.form.HEndAddrName = ''
			this.form.HEndAddr = 0
			this.form.HCarTypeMaxVolume = 0
			this.form.HDistance = 0
			this.form.HTransportTimes = ''
			this.form.HTransportTyep = ''
			this.form.HMoney = 0
			this.HCarTypeNameList = []
			this.getTransCost('type')
			},
			transHCarChange(val) {
			this.form.HContractTransportEntryID = 0
			this.form.HBeginAddrName = ''
			this.form.HBeginAddr = 0
			this.form.HEndAddrName = ''
			this.form.HEndAddr = 0
			this.form.HCarTypeMaxVolume = 0
			this.form.HDistance = 0
			this.form.HTransportTimes = ''
			this.form.HTransportTyep = ''
			this.form.HMoney = 0
			let item = this.HCarTypeNameList.find(item => item.id === val);
			this.form.HCarTypeName = item.value
			this.form.HCarTypeID = val
			this.getTransCost('car')
			},
			checkAndCallGetTransCost() {
			const { HContractTransportBillNo, HCarTypeName, HTransType, HTransportLineName, HCarrierID } = this.form

			if (!HContractTransportBillNo) {
			this.$message.warning('请先选择承运合同')
			return
			}
			if (!HTransportLineName) {
			this.$message.warning('请先选择运输线路')
			return
			}
			if (!HTransType) {
			this.$message.warning('请先选择运输方式')
			return
			}
			if (!HCarTypeName) {
			this.$message.warning('请先选择车型')
			return
			}
			if (!HCarrierID) {
			this.$message.warning('供应商不能为空')
			return
			}
			this.getTransCost()
			},
			getTransCost(val) {
			axios.get(this.$baseUrl + '/WLYayBillController/getSelectContractTransportBillEntryData', {
			params: {
			Cg_ContractTransportBillInterID: this.form.HContractTransportInterID,
			HSupID: this.form.HCarrierID,
			HTransportLineName: this.form.HTransportLineName,
			HCarTypeID: this.form.HCarTypeID,
			HTransportTyep: this.form.HTransType,
			},
			}).then(res => {
			let response = res.data
			if (response.code == 1) {
			if (response.data.length == 0) {
			this.$modal.msgError("未获取到指定承运合同数据，请检查【" + this.form.HCarrierName + '-' + this.form.HTransportLineName + '-' + this.form.HCarTypeName + '-' + this.form.HTransType + "】对应的承运合同是否维护！！！");
			this.form.HMoney = 0
			return
			}
			if (val == 'line') {
			this.transTypeList = [...new Set(response.data.map(item => item.运输类型))]
			} else if (val == 'type') {
			const carTypeMap = new Map()
			response.data.forEach(item => {
			const key = item.运输方式名称
			if (!carTypeMap.has(key)) {
			carTypeMap.set(key, { value: item.运输方式名称, id: item.运输方式 })
			}
			})
			this.HCarTypeNameList = Array.from(carTypeMap.values())
			} else if (val == 'car') {
			this.form.HContractTransportEntryID = response.data[0].HEntryID
			this.form.HBeginAddrName = response.data[0].始发地名称
			this.form.HBeginAddr = response.data[0].始发地
			this.form.HEndAddrName = response.data[0].目的地名称
			this.form.HEndAddr = response.data[0].目的地
			this.form.HCarTypeMaxVolume = response.data[0].车型最大容积
			this.form.HDistance = response.data[0].距离
			this.form.HTransportTimes = response.data[0].运输时效
			this.form.HTransportTyep = response.data[0].运输类型
			this.form.HMoney = response.data[0].运输费用
			if (this.form.HMoney == 0) {
			this.$modal.msgError("当前运费为0");
			}
			}
			} else {
			this.$modal.msgError("错误:" + response.code + response.Message);
			}
			}).catch(error => {
			this.$modal.msgError("接口请求失败!");
			});

			},
			}
			};
			</script>