From 50e0ec470aa41649849c248342545e4daa67e421 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期四, 02 四月 2026 19:07:06 +0800
Subject: [PATCH] 运单，承运合同选择赋值修改
---
.env.development | 6 +-
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue | 20 +++---
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 136 ++++++++++++++++++++++++++++-----------------
3 files changed, 97 insertions(+), 65 deletions(-)
diff --git a/.env.development b/.env.development
index f6c8b8d..317b137 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/寮�鍙戠幆澧�
# VUE_APP_BASE_API = http://localhost:81/API/
-VUE_APP_BASE_API = 'http://47.96.97.237/API/'
+# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
# VUE_APP_BASE_API = 'http://localhost:8082/API/'
@@ -14,8 +14,8 @@
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# 瀹佹尝 鍥涚淮灏�
-# VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
-# VUE_APP_BASE_API = http://220.189.218.155:9010/API/
+VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
+VUE_APP_BASE_API = http://220.189.218.155:9010/API/
#鏉滆春
# VUE_APP_BASE_API = http://localhost:8082/API/
# 鍐呯綉鍦板潃娴嬭瘯
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
index 3575ea6..60cee36 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
@@ -379,16 +379,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.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
}
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index 50b929b..cad00a6 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -105,12 +105,30 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="杩愯緭绾胯矾" prop="HTransLine">
- <el-select v-model="form.HTransLine" placeholder="璇烽�夋嫨杩愯緭绾胯矾"
+ <el-form-item label="杩愯緭绾胯矾" prop="HTransportLineName">
+ <el-select v-model="form.HTransportLineName" placeholder="璇烽�夋嫨杩愯緭绾胯矾" filterable
@change="checkAndCallGetTransCost" @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="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>
@@ -243,7 +261,7 @@
</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">
@@ -613,7 +631,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 },
@@ -664,7 +682,7 @@
temp: undefined, //涓存椂鍙橀噺
btResList: [], // 鍒楄缃�
- transportList: [], //杩愯緭绾胯矾閫夋嫨鍒楄〃
+ transportList: [], //杩愯緭绾胯矾閫夋嫨鍒楄〃
form: {}, // 琛ㄥ崟鍙傛暟
rules: { // 琛ㄥ崟鏍￠獙
HCarrierName: [
@@ -691,7 +709,7 @@
HTransType: [
{ required: true, message: "杩愯緭鏂瑰紡涓嶈兘涓虹┖", trigger: "blur" }
],
- HTransLine: [
+ HTransportLineName: [
{ required: true, message: "杩愯緭绾胯矾涓嶈兘涓虹┖", trigger: "blur" }
]
},
@@ -796,7 +814,7 @@
HPickAddr: "",
HArriverAddr: "",
HTransType: "",
- HTransLine: "",
+ HTransportLineName: "",
HCarTypeID: 0,
HCarTypeName: "",
HCarTypeMaxVolume: 0,
@@ -934,7 +952,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;
@@ -1149,44 +1167,31 @@
console.log(deptRow)
this.form.HContractTransportBillNo = deptRow.鍗曟嵁鍙�
this.form.HContractTransportInterID = deptRow.HInterID
- this.form.HContractTransportEntryID = deptRow.HInterID
this.transportList = []
- // axios.get(this.$baseUrl + '/WLYayBillController/page', {
- // params: {
- // "HInterID": deptRow.HInterID,
- // "user": sessionStorage["HUserName"],
- // },
- // }).then(response => {
- // if (response.data.count == 1) {
- // this.form.HCarrierID = response.data.HSupID
- // this.form.HCarrierName = response.data.渚涘簲鍟嗗悕绉�
- // this.form.HCurID = response.data.甯佸埆
- // this.form.HCurName = response.data.璐у竵鍚嶇О
- // this.form.HExRate = response.data.姹囩巼 == null ? 0 : response.data.姹囩巼
- // this.form.HSSID = response.data.缁撶畻鏂瑰紡
- // this.form.HSSName = response.data.缁撶畻鏂瑰紡鍚嶇О
- // this.transportList=[]
- // } else {
- // this.$modal.msgError("閿欒:" + response.data.code + response.data.Message);
- // }
- // }).catch(error => {
- // this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- // });
- // 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.渚涘簲鍟嗗悕绉�
+ axios.get(this.$baseUrl + '/WLYayBillController/initDataForSelectContractTransportBill', {
+ params: {
+ "hmainid": deptRow.HInterID,
+ },
+ }).then(res => {
+ let response = res.data
+ if (response.code == 1) {
+ this.form.HContractTransportEntryID = response.data[0].HEntryID
+ 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.姹囩巼
+ this.form.HSSID = response.data[0].缁撶畻鏂瑰紡
+ this.form.HSSName = response.data[0].缁撶畻鏂瑰紡鍚嶇О
+ response.data.map(item => {
+ this.transportList.push(item.杩愯緭璺嚎鍚嶇О)
+ })
+ } 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) {
@@ -2111,28 +2116,55 @@
}
},
checkAndCallGetTransCost() {
- const { HContractTransportBillNo, HCarTypeName, HTransType, HTransLine } = this.form
+ const { HContractTransportBillNo, HCarTypeName, HTransType, HTransportLineName } = this.form
if (!HContractTransportBillNo) {
this.$message.warning('璇峰厛閫夋嫨鎵胯繍鍚堝悓')
- return
- }
- if (!HCarTypeName) {
- this.$message.warning('璇峰厛閫夋嫨杞﹀瀷')
return
}
if (!HTransType) {
this.$message.warning('璇峰厛閫夋嫨杩愯緭鏂瑰紡')
return
}
- if (!HTransLine) {
+ if (HTransType !== '闆跺崟' && !HCarTypeName) {
+ this.$message.warning('璇峰厛閫夋嫨杞﹀瀷')
+ return
+ }
+ if (!HTransportLineName) {
this.$message.warning('璇峰厛閫夋嫨杩愯緭绾胯矾')
return
}
this.getTransCost()
},
- getTransCost() { },
+ getTransCost() {
+ axios.get(this.$baseUrl + '/WLYayBillController/getSelectContractTransportBillEntryData', {
+ params: {
+ HSupID: this.form.HSupID,
+ HTransportLineName: this.form.HTransportLineName,
+ HCarTypeID: this.form.HCarTypeID,
+ HTransportType: 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.杩愯緭璺嚎鍚嶇О + this.form.杞﹀瀷鍚嶇О + this.form.HTransType + "銆戝搴旂殑鎵胯繍鍚堝悓鏄惁缁存姢锛侊紒锛�");
+ this.form.HMoney = 0
+ return
+ }
+ this.form.HDistance = response.data[0].璺濈
+ this.form.HTransportTimes = response.data[0].杩愯緭鏃舵晥
+ this.form.HTransportTyep = response.data[0].杩愯緭绫诲瀷
+ this.form.HMoney = response.data[0].杩愯緭璐圭敤
+ } else {
+ this.$modal.msgError("閿欒:" + response.code + response.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+
+ },
}
};
</script>
--
Gitblit v1.9.1