From 9e06ca6dc649be48ac292c3447673f2425833828 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期四, 02 四月 2026 18:17:07 +0800
Subject: [PATCH] 运单未完成
---
.env.development | 6 +-
src/views/sell/XsSeOutStockBill.vue | 7 +
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 152 ++++++++++++++++++++++++++++++++++++++------------
3 files changed, 124 insertions(+), 41 deletions(-)
diff --git a/.env.development b/.env.development
index 317b137..f6c8b8d 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/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index 823fcfc..50b929b 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -52,7 +52,7 @@
<!-- 绗簩鍧楋細鎵胯繍鍚堝悓銆佸鍙戝湴銆佺洰鐨勫湴銆佽溅鍨嬨�佽溅鍨嬫渶澶у绉�佽窛绂汇�佽繍杈撴椂鏁堛�佽繍杈撶被鍨嬨�佺粨绠楁柟寮忋�佸竵鍒�佹眹鐜囥�佽繍璐广�佹�讳綋绉�佽杞界巼銆佽繍杈撴柟寮� -->
<div class="form-group">
<el-row>
- <el-col :span="6">
+ <!-- <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"
@@ -67,20 +67,11 @@
@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> -->
<el-col :span="6">
<el-form-item label="鎵胯繍鍚堝悓" prop="HContractTransportBillNo">
- <el-input v-model="form.HContractTransportBillNo" placeholder="璇疯緭鍏ユ壙杩愬悎鍚�">
+ <el-input v-model="form.HContractTransportBillNo" placeholder="璇疯緭鍏ユ壙杩愬悎鍚�"
+ @change="transChange">
<el-button slot="append" icon="el-icon-search"
@click="openDataDialog(16)"></el-button>
</el-input>
@@ -94,11 +85,31 @@
</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="HTransType">
- <el-select v-model="form.HTransType" placeholder="璇烽�夋嫨杩愯緭鏂瑰紡">
+ <el-select v-model="form.HTransType" placeholder="璇烽�夋嫨杩愯緭鏂瑰紡"
+ @change="checkAndCallGetTransCost">
<el-option label="闆跺崟" value="闆跺崟"></el-option>
<el-option label="鍗曠▼" value="鍗曠▼"></el-option>
<el-option label="寰�杩�" value="寰�杩�"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="杩愯緭绾胯矾" prop="HTransLine">
+ <el-select v-model="form.HTransLine" placeholder="璇烽�夋嫨杩愯緭绾胯矾"
+ @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>
@@ -235,7 +246,7 @@
<el-input v-model="form.HMoney" placeholder="璇疯緭鍏ヨ繍璐�" />
</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,7 +470,7 @@
<el-table-column align="center" label="鐗╂枡瑙勬牸" width="120">
<template slot-scope="scope">{{ scope.row.HModel }} </template>
</el-table-column>
- <el-table-column v-if="false" 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)"
@@ -491,7 +502,7 @@
@change="changeHMouldQty(scope.row)"></el-input-number>
</template>
</el-table-column>
- <el-table-column v-if="false" 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>
@@ -519,7 +530,7 @@
controls-position="right"></el-input-number> -->
</template>
</el-table-column>
- <el-table-column v-if="false" 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>
@@ -529,7 +540,7 @@
<span>{{ scope.row.HMouldWidth }}</span>
</template>
</el-table-column>
- <el-table-column v-if="false" 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>
@@ -653,6 +664,7 @@
temp: undefined, //涓存椂鍙橀噺
btResList: [], // 鍒楄缃�
+ transportList: [], //杩愯緭绾胯矾閫夋嫨鍒楄〃
form: {}, // 琛ㄥ崟鍙傛暟
rules: { // 琛ㄥ崟鏍￠獙
HCarrierName: [
@@ -661,7 +673,7 @@
HCusName: [
{ required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
],
- HCarTypeName:[
+ HCarTypeName: [
{ required: true, message: "杞﹀瀷涓嶈兘涓虹┖", trigger: "blur" }
],
HDate: [
@@ -672,6 +684,15 @@
],
HCarrierName: [
{ required: true, message: "鎵胯繍鍚堝悓涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HContractTransportBillNo: [
+ { required: true, message: "鎵胯繍鍚堝悓涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HTransType: [
+ { required: true, message: "杩愯緭鏂瑰紡涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HTransLine: [
+ { required: true, message: "杩愯緭绾胯矾涓嶈兘涓虹┖", trigger: "blur" }
]
},
@@ -775,6 +796,7 @@
HPickAddr: "",
HArriverAddr: "",
HTransType: "",
+ HTransLine: "",
HCarTypeID: 0,
HCarTypeName: "",
HCarTypeMaxVolume: 0,
@@ -950,9 +972,9 @@
"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,
}
)
}
@@ -1112,6 +1134,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
@@ -1127,18 +1150,43 @@
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 = []
+ // 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.渚涘簲鍟嗗悕绉�
this.ContractTransportShow = false
this.openData = false
} else if (num == 17) {
@@ -1377,7 +1425,7 @@
"HMouldWidth": res[j].瀹藉害,
"HMouldHeight": res[j].楂樺害,
"HMouldFoldHeight": res[j].鎶樺彔楂樺害,
- "HModel":res[j].鐗╂枡瑙勬牸,
+ "HModel": res[j].鐗╂枡瑙勬牸,
"HQty": res[j].鐗╂枡鏁伴噺,
"HQty_origin": orginHQTY,
"HMouldQty": mouldQty,
@@ -2053,6 +2101,38 @@
},
//#endregion
//#endregion
+ transChange(val) {
+ console.log(val)
+ this.checkAndCallGetTransCost()
+ },
+ checkTransportList() {
+ if (this.transportList.length === 0) {
+ this.$message.warning('璇峰厛閫夋嫨鎵胯繍鍚堝悓')
+ }
+ },
+ checkAndCallGetTransCost() {
+ const { HContractTransportBillNo, HCarTypeName, HTransType, HTransLine } = this.form
+
+ if (!HContractTransportBillNo) {
+ this.$message.warning('璇峰厛閫夋嫨鎵胯繍鍚堝悓')
+ return
+ }
+ if (!HCarTypeName) {
+ this.$message.warning('璇峰厛閫夋嫨杞﹀瀷')
+ return
+ }
+ if (!HTransType) {
+ this.$message.warning('璇峰厛閫夋嫨杩愯緭鏂瑰紡')
+ return
+ }
+ if (!HTransLine) {
+ this.$message.warning('璇峰厛閫夋嫨杩愯緭绾胯矾')
+ return
+ }
+
+ this.getTransCost()
+ },
+ getTransCost() { },
}
};
</script>
diff --git a/src/views/sell/XsSeOutStockBill.vue b/src/views/sell/XsSeOutStockBill.vue
index b0f12f8..56ee72c 100644
--- a/src/views/sell/XsSeOutStockBill.vue
+++ b/src/views/sell/XsSeOutStockBill.vue
@@ -103,7 +103,7 @@
<el-col :span="7">
<el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange"
class="ForFilteringSchemes">
- <span v-for="(item, index) in btList" :key="index">
+ <span v-for="(item, index) in btList" :key="index">
<el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
</span>
</el-select>
@@ -696,7 +696,7 @@
if (this.pageSize == 0) {
this.pageSize = 50;
}
- if (this.openPage && this.propsHOrgID && this.queryParams.HOrgID == "" ) {
+ if (this.openPage && this.propsHOrgID && this.queryParams.HOrgID == "") {
this.queryParams.HOrgID = this.propsHOrgID
}
// this.queryParams.HOrgID = 100038
@@ -993,6 +993,9 @@
this.rowForm = selection[0];
}
this.selRowList = selection
+ if (this.openPage) {
+ this.$emit('deptEmit', this.selRowList, 12)
+ }
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
handleSearch() {
--
Gitblit v1.9.1