From 4a27630ba2817a31bd842e023b16134da00c8d96 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期四, 15 一月 2026 16:50:10 +0800
Subject: [PATCH] 出运单
---
src/views/logistics/transportGPS/WL_YayBill.vue | 169 +++++++++++++++++++++++--------------------------------
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 8 +-
2 files changed, 75 insertions(+), 102 deletions(-)
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index bcdbb23..2fa0fc6 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -784,9 +784,9 @@
if (this.copyType == 1) {
this.getHBillNo()
} else {
- this.form.HInterID = this.linterid
+ this.form.HInterID = this.linterid.toString()
this.form.HBillNo = data.鍗曟嵁鍙�
- this.form.HDate = data.鏃ユ湡
+ this.form.HDate = data.鏃ユ湡 //moment(data.鏃ユ湡moment).format('YYYY-MM-DD')
this.form.HMaker = data.鍒跺崟浜�
this.form.HUpDater = data.淇敼浜�
this.form.HChecker = data.瀹℃牳浜�
@@ -808,7 +808,7 @@
this.form.HSurer_Accounting = data.鏍哥畻浜�
this.form.HDate_Accounting = data.鏍哥畻鏃堕棿
}
- this.form.HOrgID = data.HOrgID
+ this.form.HOrgID = data.HOrgID.toString()
this.form.HExRate = !data.姹囩巼 ? 0 : data.姹囩巼
this.form.HMainSourceInterID = data.HMainSourceInterID
this.form.HMainSourceEntryID = data.HMainSourceEntryID
@@ -824,7 +824,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 2e23abd..1b12d54 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -168,7 +168,7 @@
</el-col> -->
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
- @click="set_HScatteredVolumeList">缁存姢闆跺崟鍗犵敤浣撶Н</el-button>
+ @click="handleVolume(rowForm)">缁存姢闆跺崟鍗犵敤浣撶Н</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
@@ -257,6 +257,21 @@
:HModName="HModName" @rowEditClose="rowSetClose" v-if="printListShow" />
<!-- <div>111</div> -->
</el-dialog>
+
+ <el-dialog title="缁存姢闆跺崟鍗犵敤浣撶Н" :visible.sync="openVolume" width="580px" append-to-body>
+ <el-form ref="form" :model="formVolume" :rules="rulesVolume" label-width="130px">
+ <el-form-item label="鍗曟嵁鍙�">
+ <el-input v-model="formVolume.鍗曟嵁鍙�" placeholder="璇疯緭鍏ュ崟鎹彿" disabled />
+ </el-form-item>
+ <el-form-item label="闆跺崟鍗犵敤浣撶Н">
+ <el-input-number v-model="formVolume.currentVolume" placeholder="璇疯緭鍏ラ浂鍗曞崰鐢ㄤ綋绉�" />
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="set_HScatteredVolumeList">纭� 瀹�</el-button>
+ <el-button @click="cancelVolume">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
<!-- 鏉＄爜鏄庣粏 -->
<BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail" />
<!-- 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁� -->
@@ -332,7 +347,7 @@
rowHideShow: false, //鍒楄缃粍浠跺鍣ㄦ樉绀烘爣璁�
barCodeDetailShow: false, //鏉＄爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
packStockDetailShow: false, //鍖呰瀹瑰櫒鍑哄叆搴撴槑缁嗗鍣ㄦ樉绀烘爣璁�
-
+ openVolume: false, //缁存姢闆跺崟鍗犵敤浣撶Н寮圭獥鏍囪
// 鏌ヨ鍙傛暟
@@ -370,7 +385,8 @@
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
selectedRow: null, // 褰撳墠閫変腑鐨勮
rowForm: {}, // 褰撻�変腑鐨勫彧鏈変竴琛屾椂锛屾洿鏂版暟鎹负璇ラ�変腑鐨勮銆�
-
+ formVolume: {}, // 缁存姢闆跺崟鍗犵敤浣撶Н琛ㄥ崟銆�
+ rulesVolume: {}, // 缁存姢闆跺崟鍗犵敤浣撶Н琛ㄥ崟楠岃瘉銆�
tyResList: [], // 鍒楄〃鏁版嵁锛岀敤浜庡鍑�
titleData: ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HPreventErrMouldID", "HOrgID"], // 涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
btResList: [], // 鍒楄〃琛ㄥご鏁版嵁銆傜敤浜庡垪璁剧疆
@@ -710,7 +726,7 @@
},
//#endregion
- //#region 鍏朵粬纭
+ //#region 鍏朵粬纭
set_ConfirmOtherBill(nums) {
var confirmMes = "";
if (nums === 1) {
@@ -745,102 +761,59 @@
}).catch(() => { })
},
//#endregion
- //#region 缁存姢闆跺崟鍗犵敤浣撶Н
+ //#region 缁存姢闆跺崟鍗犵敤浣撶Н
+ //#region 缁存姢闆跺崟鍗犵敤浣撶Н閲嶇疆
+ resetVolume() {
+ this.formVolume = {
+ HInterID: 0,
+ HEntryID0: 0,
+ currentVolume: 0,
+ 鍗曟嵁鍙�: ''
+ }
+ },
+ //#endregion
+ //#region 缁存姢闆跺崟鍗犵敤浣撶Н閲嶇疆
+ handleVolume(form) {
+ this.resetVolume()
+ axios.get(this.baseURL + "/WLYayBillController/WL_YayBillDetail", {
+ params: { 'HID': form.HInterID }
+ }).then(response => {
+ console.log(response.data.data.h_v_WL_YayBillEdit)
+ // this.formVolume = response.data.data.h_v_WL_YayBillEdit[form.HEntryID-1]
+ this.formVolume=form
+ this.openVolume = true
+ })
+ },
+ //#endregion
+ cancelVolume() {
+ this.openVolume = false
+ this.resetVolume()
+ },
+ //#region 缁存姢闆跺崟鍗犵敤浣撶Н鎻愪氦
set_HScatteredVolumeList() {
- var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
-
- if (checkStatus.data.length === 1) {
- var InterID = data[0].HInterID.toString();
- var HEntryID = data[0].HEntryID.toString();
- var currentVolume = data[0]["闆跺崟鍗犵敤浣撶Н"] || 0; // 鑾峰彇褰撳墠闆跺崟鍗犵敤浣撶Н锛屽鏋滄病鏈夊垯涓�0
-
- // 寮瑰嚭灞傦紝鍖呭惈label鍜岃緭鍏ユ
- layer.open({
- type: 1,
- title: '缁存姢闆跺崟鍗犵敤浣撶Н',
- area: ['400px', '250px'],
- content:
- '<div style="padding: 20px;">' +
- ' <div class="layui-form-item">' +
- ' <label class="layui-form-label">鍗曟嵁鍙凤細</label>' +
- ' <div class="layui-input-block">' +
- ' <input type="text" class="layui-input" value="' + (data[0].鍗曟嵁鍙� || '') + '" readonly style="background-color: #f2f2f2;">' +
- ' </div>' +
- ' </div>' +
- ' <div class="layui-form-item">' +
- ' <label class="layui-form-label">闆跺崟鍗犵敤浣撶Н锛�</label>' +
- ' <div class="layui-input-block">' +
- ' <input type="number" id="scatteredVolume" class="layui-input" value="' + currentVolume + '" placeholder="璇疯緭鍏ラ浂鍗曞崰鐢ㄤ綋绉�" step="0.01" min="0">' +
- ' </div>' +
- ' </div>' +
- ' <div class="layui-form-item" style="margin-top: 30px; text-align: center;">' +
- ' <span style="color: #666; font-size: 12px;">娉細璇疯緭鍏ユ暟瀛楋紝鏀寔涓や綅灏忔暟</span>' +
- ' </div>' +
- '</div>',
- btn: ['纭畾', '鍙栨秷'],
- yes: function (index, layero) {
- var volume = $('#scatteredVolume').val();
-
-
- if (!volume || volume === '') {
- layer.msg('璇疯緭鍏ラ浂鍗曞崰鐢ㄤ綋绉�', { icon: 2 });
- return;
- }
-
- if (isNaN(volume) || parseFloat(volume) < 0) {
- layer.msg('璇疯緭鍏ユ湁鏁堢殑姝ｆ暟', { icon: 2 });
- return;
- }
-
- var wait = layer.load();
-
-
- $.ajax({
- url: GetWEBURL() + '/WLYayBillController/updateBillMEs',
- type: "GET",
- data: {
- "HInterID": InterID,
- "HEntryID": HEntryID,
- "ScatteredVolume": volume,
- "CurUserName": sessionStorage["HUserName"]
- },
- success: function (result) {
- layer.close(wait);
-
- if (result.count == 1) {
- layer.msg(result.Message, { icon: 1 }, function () {
- layer.close(index);
- get_FastQuery();
- });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- },
- error: function (xhr, status, error) {
- layer.close(wait);
- layer.alert("鎺ュ彛璇锋眰澶辫触: " + error, { icon: 5 });
- }
- });
- },
- btn2: function (index, layero) {
-
- },
- success: function (layero, index) {
- // 寮圭獥鎴愬姛鎵撳紑鍚庯紝缁戝畾enter閿彁浜�
- $('#scatteredVolume').on('keypress', function (e) {
- if (e.keyCode === 13) {
- layero.find('.layui-layer-btn0').click();
- }
- });
- $('#scatteredVolume').focus().select();
- }
- });
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紒', { icon: 2 });
+ axios.get(this.baseURL + "/WLYayBillController/updateBillMEs", {
+ params: {
+ 'HInterID': this.formVolume.HInterID.toString(),
+ "HEntryID": this.formVolume.HEntryID.toString(),
+ "ScatteredVolume": this.formVolume.currentVolume,
+ 'CurUserName': sessionStorage["HUserName"]
}
- },
- //#endregion
+ }).then(response => {
+ let result = response.data
+ if (result.count == 1) {
+ this.handleQuery()
+ this.openVolume = true
+ this.$modal.msgSuccess(result.Message)
+ } else {
+ this.$modal.msgError(result.code + result.Message);
+ }
+ }).catch(error => {
+ console.log(error)
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+ //#endregion
//#region 瀹℃牳/鍙嶅鏍�
set_CheckBill(num, form) {
var InterID = form.hmainid || form.HInterID
--
Gitblit v1.9.1