From 7ba3f1d7b7e89d4a14f299180937a72012c3d1f5 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期三, 01 四月 2026 01:10:52 +0800
Subject: [PATCH] 出运单修改和承运单修改
---
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue | 2 +-
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 53 ++++++++++++++++++++++++++++++-----------------------
2 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
index 06d03f6..3078fb0 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
@@ -258,7 +258,7 @@
queryParams: {
HBillNo: '',
HBillno2: '',
- HInitTimeCycle: 29,
+ HInitTimeCycle: 0,
HDeptID: '',
HSourceBillNo: '',
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index 6607205..8de1664 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -46,16 +46,6 @@
</el-input>
</el-form-item>
</el-col> -->
- <el-col :span="6">
- <el-form-item label="甯佸埆" prop="HCurName">
- <el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="姹囩巼" prop="HExRate">
- <el-input v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" readonly />
- </el-form-item>
- </el-col>
</el-row>
</div>
@@ -243,6 +233,16 @@
<el-col :span="6">
<el-form-item label="杩愯垂" prop="HMoney">
<el-input v-model="form.HMoney" placeholder="璇疯緭鍏ヨ繍璐�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="甯佸埆" prop="HCurName">
+ <el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="姹囩巼" prop="HExRate">
+ <el-input v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" readonly />
</el-form-item>
</el-col>
</el-row>
@@ -434,7 +434,7 @@
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" label="搴忓彿" type="index" width="80" />
- <el-table-column align="center" label="婧愬崟鍗曟嵁鍙�" width="120">
+ <el-table-column align="center" label="鍙戣揣閫氱煡鍗�" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HSourceBillNo }}</span>
</template>
@@ -456,6 +456,9 @@
<el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
<template slot-scope="scope">{{ scope.row.HMaterName }} </template>
</el-table-column>
+ <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">
<template slot-scope="scope">
<el-input v-model="scope.row.HMouldNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�"
@@ -466,11 +469,6 @@
<el-table-column align="center" label="瀹瑰櫒鍚嶇О" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HMouldName }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瀹瑰櫒鏁伴噺/鎵�" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HStandardQtyForMouldInPack }}</span>
</template>
</el-table-column>
@@ -486,11 +484,16 @@
<span>{{ scope.row.HSNP }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="鍖呰瀹瑰櫒鏁伴噺" width="120">
+ <el-table-column align="center" label="鍖呰瀹瑰櫒鏁伴噺" width="170">
<template slot-scope="scope">
<el-input-number v-model="scope.row.HMouldQty" :min="0" style="width: 90px;"
controls-position="right"
@change="changeHMouldQty(scope.row)"></el-input-number>
+ </template>
+ </el-table-column>
+ <el-table-column 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">
@@ -658,17 +661,17 @@
HCusName: [
{ required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
],
- HBeginAddrName: [
- { required: true, message: "濮嬪彂鍦颁笉鑳戒负绌�", trigger: "blur" }
- ],
- HEndAddrName: [
- { required: true, message: "鐩殑鍦颁笉鑳戒负绌�", trigger: "blur" }
+ HCarTypeName:[
+ { required: true, message: "杞﹀瀷涓嶈兘涓虹┖", trigger: "blur" }
],
HDate: [
{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
],
HExRate: [
{ required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HCarrierName: [
+ { required: true, message: "鎵胯繍鍚堝悓涓嶈兘涓虹┖", trigger: "blur" }
]
},
@@ -946,7 +949,10 @@
"HQty": result.data[i].鐗╂枡鏁伴噺,
"HQty_origin": result.data[i].HQty,
"HVolume": rowVolume,
- "HScatteredVolume": result.data[i].闆跺崟鍗犵敤浣撶Н
+ "HScatteredVolume": result.data[i].闆跺崟鍗犵敤浣撶Н,
+ "HStandardQtyForMouldInPack":result.data[i].HStandardQtyForMouldInPack,
+ "HPackV":result.data[i].HPackV,
+ "HPackQTY":result.data[i].HPackQTY,
}
)
}
@@ -1371,6 +1377,7 @@
"HMouldWidth": res[j].瀹藉害,
"HMouldHeight": res[j].楂樺害,
"HMouldFoldHeight": res[j].鎶樺彔楂樺害,
+ "HModel":res[j].鐗╂枡瑙勬牸,
"HQty": res[j].鐗╂枡鏁伴噺,
"HQty_origin": orginHQTY,
"HMouldQty": mouldQty,
--
Gitblit v1.9.1