From 9620ca5caed59bd206dce701a04a5a4e4cfb9dc5 Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期二, 31 三月 2026 13:46:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/logistics/transportGPS/WL_YayBill.vue | 44 +++++++++++++++-----------------------------
1 files changed, 15 insertions(+), 29 deletions(-)
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index 4a67634..4ec5d85 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -164,10 +164,10 @@
<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-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
@click="hanleCarOrDriver(form = rowForm)">鍒嗛厤杞﹁締鍜屽徃鏈�</el-button>
- </el-col>
+ </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>
@@ -263,8 +263,8 @@
</el-dialog>
<!-- 鎵撳嵃 -->
<el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
- <PrintList :linterid=this.rowForm.HInterID :MyMsg=this.rowForm.HInterID :Type='HBillType'
- :HModName="HModName" @rowEditClose="rowSetClose" v-if="printListShow" />
+ <PrintList :linterid='printIds' :MyMsg='printIds' :Type='HBillType' :HModName="HBillType"
+ @rowEditClose="rowSetClose" v-if="printListShow" />
<!-- <div>111</div> -->
</el-dialog>
@@ -274,7 +274,8 @@
<el-input v-model="formVolume.鍗曟嵁鍙�" placeholder="璇疯緭鍏ュ崟鎹彿" disabled />
</el-form-item>
<el-form-item label="闆跺崟鍗犵敤浣撶Н">
- <el-input-number v-model="formVolume.currentVolume" :placeholder="`闆舵媴浣撶Н: ${formVolume.闆舵媴浣撶Н || 0}`" />
+ <el-input-number v-model="formVolume.currentVolume"
+ :placeholder="`闆舵媴浣撶Н: ${formVolume.闆舵媴浣撶Н || 0}`" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -344,7 +345,7 @@
baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣╥p鍦板潃)
HModName: "Cg_ContractTransportBillMainList",
- HBillType: "Cg_ContractTransportBillMainList",
+ HBillType: "WL_YayBill",
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
copyType: 0, //澶嶅埗鏍囪銆傛墦寮�缂栬緫缁勪欢鏃讹紝鐢ㄤ簬鍖哄垎缂栬緫杩樻槸澶嶅埗
HInterID: null,
@@ -445,6 +446,7 @@
totalNameList: [], // 闇�瑕佽缃悎璁¤鐨勫垪鏁扮粍
tableData: [], // 鍒楄〃鏁版嵁銆傜敤浜巘able鐩戝惉浜嬩欢
ids: [], // 閫変腑琛岀殑hmainid鏁扮粍
+ printIds: '', //鎵撳嵃閫夋嫨Id瀛楁
single: true, // 褰撻�変腑鐨勮鏁颁笉涓�1鏃朵负true銆傜敤浜庣鐢ㄧ浉鍏虫搷浣�
multiple: true, // 褰撻�変腑鐨勮鏁颁负0鏃朵负true銆傜敤浜庣鐢ㄧ浉鍏虫搷浣�
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
@@ -860,7 +862,7 @@
HInterID: 0,
HEntryID0: 0,
currentVolume: 0,
-
+
鍗曟嵁鍙�: ''
}
},
@@ -1175,29 +1177,13 @@
//#region 鎵撳嵃
get_PrintReport() {
- if (this.ids.length != 1) {
- this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
- } else if (this.rowForm.鍗曟嵁鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
- this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
+ if (this.ids.length == 0) {
+ this.$modal.msgError("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�")
} else {
- axios.get(this.$baseUrl + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
- params: { "HInterID": this.rowForm.HInterID }
- }).then(response => {
- var result = response.data
- if (result.count == 1) {
- this.printListShow = true
- this.openPrintList = true
- // this.$router.push({ path:'/printList', query: { linterid: this.rowForm.hmainid,MyMsg:this.rowForm.hmainid,Type:'Kf_SellOutBillList' }})
- } else {
- this.$modal.msgError(result.code + result.Message)
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
-
-
+ this.printIds = this.ids.join(',')
+ this.printListShow = true
+ this.openPrintList = true
}
- // var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
},
//#endregion
@@ -1356,7 +1342,7 @@
axios({
method: 'GET',
url: this.baseURL + "WLYayBillController/selectDriver1",
- params: {
+ params: {
"CarHNumber": this.carDriverForm.CarHNumber,
"CarHName": this.carDriverForm.CarHName,
"DriverHName": this.carDriverForm.DriverHName,
--
Gitblit v1.9.1