From f57543e1704e90460474c6170578e00206fca052 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期一, 30 三月 2026 13:54:14 +0800
Subject: [PATCH] 运单列表添加分配车辆和司机
---
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 70 +++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 27 deletions(-)
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index 4cd5adf..0860ba9 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -38,15 +38,14 @@
<el-col :span="6"></el-col>
</el-row>
<el-row>
-
- <el-col :span="6">
+ <!-- <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-input>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="6">
<el-form-item label="甯佸埆" prop="HCurName">
<el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�" />
@@ -166,18 +165,18 @@
</div>
<!-- 绗笁鍧楋細鎻愯揣鍦板潃銆佸埌璐у湴鍧�銆佺粍缁囥�佽姹傛彁璐ф棩鏈熴�佹壙杩愬晢纭鏃ユ湡銆佺墿娴佺姸鎬� -->
<div class="form-group">
- <el-row>
- <el-col :span="6">
+ <!-- <el-row>
+ <el-col :span="6">
<el-form-item label="鎻愯揣鍦板潃" prop="HPickAddr">
<el-input v-model="form.HPickAddr" placeholder="璇疯緭鍏ユ彁璐у湴鍧�" />
</el-form-item>
- </el-col>
+ </el-col>
<el-col :span="6">
<el-form-item label="鍒拌揣鍦板潃" prop="HArriverAddr">
<el-input v-model="form.HArriverAddr" placeholder="璇疯緭鍏ュ埌璐у湴鍧�" />
</el-form-item>
</el-col>
- </el-row>
+ </el-row>-->
<el-row>
<el-col :span="6">
<el-form-item label="瑕佹眰鍒拌揪鏃ユ湡" prop="HDataForRequestedArrived">
@@ -426,6 +425,17 @@
<el-table-column align="center" label="婧愬崟鍗曟嵁鍙�" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HSourceBillNo }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="瀹㈡埛" prop="HCusName" width="120" />
+ <el-table-column align="center" label="鎻愯揣鍦板潃" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HPickAddr" placeholder="璇疯緭鍏ユ彁璐у湴鍧�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍒拌揣鍦板潃" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HArriverAddr" placeholder="璇疯緭鍏ュ埌璐у湴鍧�" />
</template>
</el-table-column>
<el-table-column align="center" label="鐗╂枡浠ｇ爜" width="120">
@@ -853,14 +863,14 @@
this.form.HInnerBillNo = data.鍐呴儴鍗曟嵁鍙�
this.form.HCarrierID = data.鎵胯繍鍟咺D
this.form.HCarrierName = data.鎵胯繍鍟嗗悕绉�
- this.form.HCusID = data.HCusID
- this.form.HCusName = data.瀹㈡埛鍚嶇О
+ // this.form.HCusID = data.HCusID
+ // this.form.HCusName = data.瀹㈡埛鍚嶇О
this.form.HBeginAddr = data.濮嬪彂鍦�
this.form.HBeginAddrName = data.濮嬪彂鍦板悕绉�
this.form.HEndAddr = data.鐩殑鍦�
this.form.HEndAddrName = data.鐩殑鍦板悕绉�
- this.form.HPickAddr = data.鎻愯揣鍦板潃
- this.form.HArriverAddr = data.鍒拌揣鍦板潃
+ // this.form.HPickAddr = data.鎻愯揣鍦板潃
+ // this.form.HArriverAddr = data.鍒拌揣鍦板潃
this.form.HTransType = data.杩愯緭鏂瑰紡
this.form.HCarTypeID = data.杞﹀瀷ID
this.form.HCarTypeName = data.杞﹀瀷鍚嶇О
@@ -904,6 +914,10 @@
"HSourceInterID": result.data[i].婧愬崟涓诲唴鐮�,
"HSourceEntryID": result.data[i].婧愬崟瀛愬唴鐮�,
"HSourceBillNo": result.data[i].婧愬崟鍗曟嵁,
+ "HCusID": result.data[i].HCusID,
+ "HCusName": result.data[i].瀹㈡埛鍚嶇О,
+ "HPickAddr": result.data[i].鎻愯揣鍦板潃,
+ "HArriverAddr": result.data[i].鍒拌揣鍦板潃,
"HMaterID": result.data[i].HMaterID,
"HMaterNumber": result.data[i].鐗╂枡浠ｇ爜,
"HMaterName": result.data[i].鐗╂枡鍚嶇О,
@@ -1182,27 +1196,27 @@
async processSourceDataAsync(deptRow) {
try {
// 璁剧疆瀹㈡埛淇℃伅
- if (!this.form.HCusID && deptRow.length > 0) {
- this.form.HCusID = deptRow[0]["HCusID"];
- this.form.HCusName = deptRow[0]["瀹㈡埛"];
- }
+ // if (!this.form.HCusID && deptRow.length > 0) {
+ // this.form.HCusID = deptRow[0]["HCusID"];
+ // this.form.HCusName = deptRow[0]["瀹㈡埛"];
+ // }
console.log(deptRow)
this.form.HMainSourceInterID = deptRow[0]["hmainid"]
this.form.HMainSourceEntryID = deptRow[0]["hsubid"]
this.form.HMainSourceBillType = deptRow[0]["HBillType"]
this.form.HMainSourceBillNo = deptRow[0]["鍗曟嵁鍙�"]
- this.form.HCurName = deptRow[0]["甯佸埆"]
- this.form.HCurID = deptRow[0]["HCurID"]
- this.form.HExRate = deptRow[0]["姹囩巼"]
+ // this.form.HCurName = deptRow[0]["甯佸埆"]
+ // this.form.HCurID = deptRow[0]["HCurID"]
+ // this.form.HExRate = deptRow[0]["姹囩巼"]
// 妫�鏌ユ槸鍚︽墍鏈夎褰曞睘浜庡悓涓�瀹㈡埛
- //for (var i = 0; i < deptRow.length; i++) {
+ // 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);
@@ -1295,16 +1309,14 @@
"ListMaterial": ListMaterial
},
});
- console.log(response)
let result = response.data;
if (result.count == 1) {
let res = result.data;
+ console.log(res)
var newRows = [];
// 涓烘瘡涓簮鍗曡鍒涘缓瀵瑰簲鐨勫瓙琛ㄨ
for (var materialId in materialMap) {
var sourceInfos = materialMap[materialId];
- console.log("鍙戣揣閫氱煡鍗曟暟鎹�", dataArray)
- console.log("1鍙戣揣閫氱煡鍗曟暟鎹�", dataArray[0])
if (res.length === 0) {
// 涓烘瘡涓簮鍗曡鍒涘缓涓�鏉¤褰�
for (var j = 0; j < sourceInfos.length; j++) {
@@ -1332,16 +1344,18 @@
var HPackQTY = 0;
var rowVolume = 0;
// if
- // console.log(dataArray[j].瀹瑰櫒鏁伴噺 / 鎵�)
newRows.push({
"HSourceInterID": sourceInfo.hmainid,
"HSourceEntryID": sourceInfo.hsubid,
"HSourceBillNo": sourceInfo.鍗曟嵁鍙�,
+ "HCusID": dataArray[j].HCusID,
+ "HCusName": dataArray[j].瀹㈡埛,
"HMaterID": dataArray[j].HMaterID,
"HMaterNumber": dataArray[j].鐗╂枡浠ｇ爜,
"HMaterName": dataArray[j].鐗╂枡鍚嶇О,
"HUnitID": dataArray[j].HUnitID,
-
+ // "HPackV": dataArray[j].鎵樺崟浣嶄綋绉�,
+ // "HStandardQtyForMouldInPack": dataArray[j].瀹瑰櫒鏁伴噺 / 鎵�,
"HMouldID": 0,
"HMouldNumber": '',
"HMouldName": '',
@@ -1405,13 +1419,15 @@
"HSourceInterID": sourceInfo.hmainid,
"HSourceEntryID": sourceInfo.hsubid,
"HSourceBillNo": sourceInfo.鍗曟嵁鍙�,
+ "HCusID": materialInfo.HCusID,
+ "HCusName": materialInfo.瀹㈡埛,
"HMaterID": materialInfo.HMaterID,
"HMaterNumber": materialInfo.鐗╂枡浠ｇ爜,
"HMaterName": materialInfo.鐗╂枡鍚嶇О,
"HUnitID": materialInfo.HUnitID,
"HMouldID": materialInfo.HMouldID,
- "HPackV": dataArray[j].鎵樺崟浣嶄綋绉�,
- "HStandardQtyForMouldInPack": dataArray[j].瀹瑰櫒鏁伴噺 / 鎵�,
+ // "HPackV": materialInfo.鎵樺崟浣嶄綋绉�,
+ // "HStandardQtyForMouldInPack": materialInfo.瀹瑰櫒鏁伴噺 / 鎵�,
"HMouldNumber": materialInfo.HMouldNumber,
"HMouldName": materialInfo.HMouldName,
"HMouldLength": materialInfo.闀垮害,
--
Gitblit v1.9.1