From 481fd648572b4e1c08380947aad0f1aa866bc5d5 Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期二, 07 四月 2026 13:55:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
.env.development | 8 ++--
/dev/null | 1
src/views/logistics/transportGPS/WL_YayBill.vue | 6 +-
package.json | 2
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 55 +++++++++++++++++++++++++--
5 files changed, 59 insertions(+), 13 deletions(-)
diff --git a/.env.development b/.env.development
index 7a73476..8353400 100644
--- a/.env.development
+++ b/.env.development
@@ -5,18 +5,18 @@
ENV = 'development'
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/寮�鍙戠幆澧�
-VUE_APP_BASE_API = http://localhost:81/API/
+# VUE_APP_BASE_API = http://localhost:81/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/'
+# VUE_APP_BASE_API = 'http://localhost:8082/API/'
#VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
#閿﹂殕
# 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/RuoYi-Vue b/RuoYi-Vue
deleted file mode 160000
index 8a1cf9e..0000000
--- a/RuoYi-Vue
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8a1cf9ed55747229ce4149ddacf8596fa0995814
diff --git a/package.json b/package.json
index 2b9f146..2e26225 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
},
"devDependencies": {
"@vue/cli-plugin-babel": "~5.0.0",
- "@vue/cli-service": "^4.5.15",
+ "@vue/cli-service": "^4.5.19",
"ant-design-vue": "^1.7.8",
"babel-loader": "^8.1.0",
"babel-plugin-dynamic-import-node": "2.3.3",
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index dee3a6d..e4014cc 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -988,6 +988,11 @@
this.formShow = true
this.formLoading = false
+ // 鍔犺浇杩愯緭绾胯矾銆佽繍杈撶被鍨嬨�佽溅鍨嬪垪琛�
+ if (this.form.HContractTransportInterID) {
+ this.loadTransportData()
+ }
+
// 鍔犺浇宸蹭笂浼犵殑鏂囦欢鍒楄〃
this.getFileList();
@@ -1171,12 +1176,11 @@
this.form.HMoney = 0
return
}
- 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[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.杩愯緭璺嚎鍚嶇О))]
@@ -1497,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",
@@ -2091,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() {
},
@@ -2128,7 +2171,10 @@
this.HCarTypeNameList = []
this.getTransCost('type')
},
- transHCarChange() {
+ transHCarChange(val) {
+ let item = this.HCarTypeNameList.find(item => item.id === val);
+ this.form.HCarTypeName = item.value
+ this.form.HCarTypeID = val
this.getTransCost('car')
},
checkAndCallGetTransCost() {
@@ -2185,11 +2231,12 @@
})
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.HCarTypeMaxVolume = response.data[0].杞﹀瀷鏈�澶у绉�
this.form.HDistance = response.data[0].璺濈
this.form.HTransportTimes = response.data[0].杩愯緭鏃舵晥
this.form.HTransportTyep = response.data[0].杩愯緭绫诲瀷
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index 6b42ca1..35f8fa2 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -788,9 +788,9 @@
this.sWhere += " and 鐗╂祦鐘舵�� like '%" + this.queryParams.HBillStatus + "%'";
}
- // if (this.queryParams.HOrgID) {
- // this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
- // }
+ if (this.queryParams.HOrgID) {
+ this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
+ }
console.log("swhere", this.sWhere)
this.clearData()
this.getList()
--
Gitblit v1.9.1