From 18a0aa073a27fcd7da2d65d8aa5c9850bf7524c7 Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期二, 24 三月 2026 21:57:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/logistics/transportGPS/WL_YayBill.vue | 51 +++++++++----------------
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 20 +++++-----
2 files changed, 28 insertions(+), 43 deletions(-)
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index 4210f65..3de404e 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -249,15 +249,15 @@
<el-col :span="6">
<el-form-item label="鐗╂祦鐘舵��" prop="HCarryStatus">
<el-select v-model="form.HCarryStatus" placeholder="璇烽�夋嫨鐗╂祦鐘舵��" disabled>
- <el-option label="鐢宠涓�" value="1"></el-option>
- <el-option label="宸插鏍�" value="2"></el-option>
- <el-option label="鎵胯繍鍟嗙‘璁�" value="3"></el-option>
- <el-option label="寰呮彁璐�" value="4"></el-option>
- <el-option label="宸插埌鍘�" value="5"></el-option>
- <el-option label="宸叉彁璐�" value="6"></el-option>
- <el-option label="杩愯緭涓�" value="7"></el-option>
- <el-option label="宸茬鏀�" value="8"></el-option>
- <el-option label="宸叉牳绠�" value="9"></el-option>
+ <el-option label="鐢宠涓�" value="鐢宠涓�"></el-option>
+ <el-option label="寰呬緵搴斿晢纭" value="寰呬緵搴斿晢纭"></el-option>
+ <el-option label="鎸囧畾椹鹃┒鍛樸�佽溅杈嗕腑" value="鎸囧畾椹鹃┒鍛樸�佽溅杈嗕腑"></el-option>
+ <el-option label="姝ｅ湪鍓嶅線濮嬪彂鍦�" value="姝ｅ湪鍓嶅線濮嬪彂鍦�"></el-option>
+ <el-option label="鎻愯揣涓�" value="鎻愯揣涓�"></el-option>
+ <el-option label="鍑嗗绂诲巶" value="鍑嗗绂诲巶"></el-option>
+ <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>
@@ -850,7 +850,7 @@
this.form.HEndAddr = data.鐩殑鍦�
this.form.HEndAddrName = data.鐩殑鍦板悕绉�
this.form.HPickAddr = data.鎻愯揣鍦板潃
- this.form.HArriverAddr = data.鍒拌揣鏂瑰紡
+ this.form.HArriverAddr = data.鍒拌揣鍦板潃
this.form.HTransType = data.杩愯緭鏂瑰紡
this.form.HCarTypeID = data.杞﹀瀷ID
this.form.HCarTypeName = data.杞﹀瀷鍚嶇О
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index 399c9f1..4e539c0 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -143,8 +143,24 @@
</el-button>
</el-col>
<el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+ @click="set_CheckBill(0, form = rowForm)">瀹℃牳</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+ @click="set_CheckBill(1, form = rowForm)">鍙嶅鏍�</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
+ @click="handleVolume(rowForm)">缁存姢闆跺崟鍗犵敤浣撶Н</el-button>
+ </el-col>
+ <el-col :span="1.5">
<el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
@click="set_ConfirmBill">渚涘簲鍟嗙‘璁�</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+ @click="openDataDialog(14, form = rowForm)">鍒嗛厤鍙告満</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
@@ -162,29 +178,9 @@
<el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
@click="set_ConfirmOtherBill(4)">鍒拌揣绛炬敹纭</el-button>
</el-col>
- <!-- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
- @click="set_CheckBill(0, form = rowForm)">鍒嗛厤鍙告満</el-button>
- </el-col> -->
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
- @click="handleVolume(rowForm)">缁存姢闆跺崟鍗犵敤浣撶Н</el-button>
- </el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini"
@click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堣垂鐢ㄧ粨绠楀崟锛�</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="openDataDialog(14, form = rowForm)">鍒嗛厤鍙告満</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CheckBill(0, form = rowForm)">瀹℃牳</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CheckBill(1, form = rowForm)">鍙嶅鏍�</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
@@ -208,17 +204,6 @@
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-date" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
</el-col>
- <!-- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">鎵撳嵃</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single"
- @click="get_BarCodeDetail">鏉＄爜鏄庣粏</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single"
- @click="get_PackStockDetail">鍖呰瀹瑰櫒鍑哄叆搴撴槑缁�</el-button>
- </el-col>-->
</el-row>
<div class="tableBox" v-loading="loading">
<el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
@@ -734,8 +719,8 @@
//#region 鍒犻櫎
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- axios.get(this.$baseUrl + "/Cg_ContractTransportBillListController/DeleteBill", {
- params: { 'HInterID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
+ axios.get(this.$baseUrl + "/WLYayBillController/deleteBill", {
+ params: { 'HItemID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
}).then(response => {
if (response.data.count == 1) {
this.handleQuery()
--
Gitblit v1.9.1