From a1cc3f87d24ae2a19295c7b38faa17228cd863ec Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期六, 28 二月 2026 15:11:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/logistics/transportGPS/WL_YayBill.vue | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 167 insertions(+), 10 deletions(-)
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index 4e5b7a5..f1a6b7a 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -171,8 +171,12 @@
@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="SelectPayWayBill()">涓嬫帹杩愬崟璐圭敤</el-button>
+ <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"
@@ -281,10 +285,18 @@
<!-- 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁� -->
<PackStockDetail :visible.sync="packStockDetailShow" ref="packStockDetail" />
<!-- 涓嬫帹 -->
- <el-dialog title="涓嬫帹" :visible.sync="selectEdit" width="1480px" append-to-body class="xsckdBox"
+ <el-dialog title="涓嬫帹杩愬崟缁撶畻鍗�" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox"
@close="close">
- <edit :OperationType=OperationType :linterid=this.rowForm.HInterID :HEntryID=this.rowForm.HEntryID
- :copyType="copyType" @editClose="editClose" v-if="TranEditShow" />
+ <PayMentOtherBillTranEdit :OperationType='4' :propsData='pushData'
+ :HSouceBillType=this.rowForm.HSourceBillType @editClose="pushClose" v-if="pushShow" />
+ </el-dialog>
+ <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
+ <GyCar @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCarShow" />
+ <GyDriver @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyDriverShow" />
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+ <el-button @click="deptClose">鍙� 娑�</el-button>
+ </div>
</el-dialog>
</div>
</div>
@@ -296,12 +308,14 @@
import RowSettings from '@/views/component/rowSettings' //鍒楄缃粍浠�
import PrintList from '@/views/component/printList' //鎵撳嵃缁勪欢
import BarCodeDetail from '@/views/component/BarCodeDetail' //鏉＄爜鏄庣粏缁勪欢
-import PackStockDetail from '@/views/component/PackStockDetail' //鏉＄爜鏄庣粏缁勪欢
+import PackStockDetail from '@/views/component/PackStockDetail' //鏉＄爜鏄庣粏缁勪欢
import Edit from '@/views/logistics/transportGPS/Add_Edit_WL_YayBill' //缂栬緫椤甸潰缁勪欢
import PayMentOtherBillTranEdit from "@/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillEdit.vue"; //缂栬緫椤甸潰缁勪欢
+import GyCar from "@/views/basic/gyCar/gyCarList.vue"
+import GyDriver from "@/views/system/user/GyDriver.vue"
export default {
name: 'WL_YayBill',
- components: { BarCodeDetail,PackStockDetail,Edit,PayMentOtherBillTranEdit,RowSettings,PrintList},
+ components: { BarCodeDetail, PackStockDetail, Edit, RowSettings, PrintList, PayMentOtherBillTranEdit, GyCar, GyDriver },
data() {
return {
baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣╥p鍦板潃)
@@ -344,11 +358,14 @@
title: "", // 寮瑰嚭灞傛爣棰�
open: false, // 鏄惁鏄剧ず寮瑰嚭灞�
loading: true, // 閬僵灞�
-
+ rowList: [], // 閫変腑琛屾暟鎹泦鍚�
activeSeach: '',
// addBtnShow: false, //缂栬緫缁勪欢瀹瑰櫒鏄剧ず鏍囪
editShow: false, //缂栬緫缁勪欢瀹瑰櫒鏄剧ず鏍囪
openEdit: false, //缂栬緫缁勪欢鏄剧ず鏍囪
+ pushShow: false,
+ openPush: false,
+ pushData: '',
openPrintList: false, //鎵撳嵃缁勪欢瀹瑰櫒鏄剧ず鏍囪
printListShow: false, //鎵撳嵃缁勪欢鏄剧ず鏍囪
openBtnHide: false, //鎸夐挳缁勪欢瀹瑰櫒鏄剧ず鏍囪
@@ -358,8 +375,11 @@
barCodeDetailShow: false, //鏉＄爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
packStockDetailShow: false, //鍖呰瀹瑰櫒鍑哄叆搴撴槑缁嗗鍣ㄦ樉绀烘爣璁�
openVolume: false, //缁存姢闆跺崟鍗犵敤浣撶Н寮圭獥鏍囪
- selectEdit: false,
- TranEditShow: false,
+ openData: false, //鏁版嵁寮圭獥
+ dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+ gyCarShow: false, //杞﹁締鏁版嵁缁勪欢鏄剧ず鏍囪
+ gyDriverShow: false, //鍙告満鏁版嵁缁勪欢鏄剧ず鏍囪
+ deptform: {}, //寮圭獥閫変腑鏁版嵁
// 鏌ヨ鍙傛暟
sWhere: '', // 鎷兼帴杩囨护鏉′欢
queryParams: { // form鏁版嵁
@@ -447,6 +467,7 @@
//#region 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
+ this.rowList = selection
this.ids = selection.map(item => item.HInterID)
this.single = selection.length != 1
this.multiple = !selection.length
@@ -574,6 +595,7 @@
// if (this.queryParams.HOrgID) {
// this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
// }
+ this.clearData()
this.getList()
},
//#endregion
@@ -801,6 +823,14 @@
this.openEdit = true
this.OperationType = 4
},
+ //鍏抽棴涓嬫帹椤甸潰
+ pushClose(val) {
+ this.open = val
+ this.pushShow = false
+ this.openPush = val
+ this.clearData()
+ this.getList()
+ },
//#endregion
cancelVolume() {
this.openVolume = false
@@ -849,6 +879,38 @@
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
+ },
+ //#endregion
+ //#region 鎵撳紑涓嬫帹缁勪欢寮圭獥
+ handlePush() {
+
+ if (this.rowList && this.rowList.length > 0) {
+ var dataArray = [];
+ for (var i = 0; i < this.rowList.length; i++) {
+ if (this.rowList[i].鍗曟嵁鐘舵�� != "宸插鏍�") {
+ this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戜笉涓哄凡瀹℃牳鐘舵��,涓嶅厑璁镐笅鎺紒")
+ return;
+ }
+ if (this.rowList[i].HQtyMust <= 0) {
+ this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戝搴斿彲涓嬫帹鏁伴噺蹇呴』澶т簬 0 锛�")
+ return;
+ }
+ var temp = {
+ "HInterID": this.rowList[i].HInterID
+ , "HEntryID": this.rowList[i].HEntryID
+ , "HBillStatus": this.rowList[i].鍗曟嵁鐘舵��
+ }
+ dataArray.push(temp);
+ }
+ var datajson = {
+ "data": dataArray
+ };
+ this.pushData = JSON.stringify(datajson)
+ this.pushShow = true
+ this.openPush = true
+ } else {
+ this.$modal.msgError("璇烽�夋嫨鏁版嵁涓嬫帹锛�")
+ }
},
//#endregion
//#region 鍏抽棴/鍙嶅叧闂�
@@ -1109,6 +1171,8 @@
this.tableShow = true
this.openEdit = false
this.editShow = false
+ this.pushShow = false
+ this.openPush = false
this.handleQuery()
},
//#endregion
@@ -1129,6 +1193,99 @@
return result;
},
//#endregion
+ //#region 鏁版嵁寮圭獥
+ //#region 鎵撳紑鏁版嵁鍒楄〃寮圭獥
+ openDataDialog(num, row) {
+ this.showReset()
+ if (num == 14) {
+ this.dialogTitle = '杞﹁締鍒楄〃'
+ this.gyCarShow = true
+ this.openData = true
+ } else if (num == 15) {
+ this.dialogTitle = '鍙告満鍒楄〃'
+ this.gyDriverShow = true
+ this.openData = true
+ }
+ },
+ //#region 灏嗘暟鎹脊绐楀叏閮ㄥ彇娑堝姞杞�
+ showReset() {
+ this.gyCarShow = false
+ this.gyDriverShow = false
+ },
+ //#endregion
+ //#endregion
+
+ //#region 寮圭獥鏁版嵁鍙屽嚮杩斿洖琛ㄥ崟璧嬪�间簨浠�
+ async dbEmitData(deptRow, num) {
+ let IsAudit = null
+ if (num == 14) {
+ IsAudit = 1
+ } else if (num == 15) {
+ IsAudit = 2
+ }
+ try {
+ const response = await axios.get(this.baseURL + '/WLYayBillController/selectDriver', {
+ params: {
+ "HInterID": this.rowForm.HInterID.toString(),
+ "HcheckID": deptRow.HItemID,
+ "IsAudit": IsAudit,
+ "CurUserName": sessionStorage["HUserName"]
+ },
+ });
+ if (response.data.code == 1) {
+ // return response.data.data[0];
+ if (num == 14) {
+ this.gyCarShow = false
+ this.openData = false
+ this.$modal.msgSuccess(response.data.msg || "杞﹁締娣诲姞鎴愬姛");
+ num = 15
+ this.$nextTick(() => {
+ this.gyDriverShow = true
+ this.openData = true
+ })
+
+ } else if (num == 15) {
+ this.gyDriverShow = false
+ this.openData = false
+ this.$modal.msgSuccess(response.data.msg || "鍙告満娣诲姞鎴愬姛");
+ }
+ } else {
+ this.$modal.msgError(response.data.msg || "鑾峰彇婧愬崟鏁版嵁澶辫触");
+ }
+ } catch (error) {
+ this.$modal.msgError("鑾峰彇婧愬崟鏁版嵁鏃跺彂鐢熼敊璇紝璇风◢鍚庨噸璇�!");
+ }
+ },
+ //#endregion
+ //#region 寮圭獥鏁版嵁鍗曞嚮浜嬩欢
+ emitData(deptRow, num) {
+ this.dialogTypeNum = num
+ this.deptform = deptRow
+ },
+ //#endregion
+ //#region 寮圭獥纭畾浜嬩欢
+ deptClickSub() {
+ this.dbEmitData(this.deptform, this.dialogTypeNum)
+ this.deptform = {}
+ },
+ //#endregion
+
+ //#region 寮圭獥鍙栨秷浜嬩欢
+ deptClose() {
+ this.deptform = {}
+ this.openData = false
+ },
+ //#endregion
+ //#endregion
+ //娓呴櫎閫変腑鏁版嵁鐨勭紦瀛�
+ clearData() {
+ this.ids = []
+ this.multiple = true
+ this.single = true
+ this.OperationType = 0
+ this.copyType = 0
+ },
+
}
};
</script>
--
Gitblit v1.9.1