From fd3724b55c385af544b1b769e9821f1447bb1b0a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 16 一月 2026 10:27:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/logistics/transportGPS/WL_YayBill.vue | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 168 insertions(+), 8 deletions(-)
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index 4657d43..31ccd13 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -132,7 +132,7 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="handleEdit(row = rowForm, OperationType = 3)">缂栬緫</el-button>
+ @click="handleEdit(row = rowForm, OperationType = 3, copyType = 0)">缂栬緫</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
@@ -141,6 +141,34 @@
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
</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-circle-check" size="mini" :disabled="single"
+ @click="set_ConfirmOtherBill(1)">鍒板巶纭</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
+ @click="set_ConfirmOtherBill(2)">鎻愯揣纭</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
+ @click="set_ConfirmOtherBill(3)">鍑哄巶杩愯緭纭</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <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" :disabled="single"
@@ -172,9 +200,9 @@
<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-col :span="1.5">
<el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">鎵撳嵃</el-button>
- </el-col>
+ </el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single"
@click="get_BarCodeDetail">鏉＄爜鏄庣粏</el-button>
@@ -182,7 +210,7 @@
<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-col>-->
</el-row>
<div class="tableBox" v-loading="loading">
<el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
@@ -228,6 +256,21 @@
<PrintList :linterid=this.rowForm.HInterID :MyMsg=this.rowForm.HInterID :Type='HBillType'
: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" />
@@ -304,7 +347,7 @@
rowHideShow: false, //鍒楄缃粍浠跺鍣ㄦ樉绀烘爣璁�
barCodeDetailShow: false, //鏉＄爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
packStockDetailShow: false, //鍖呰瀹瑰櫒鍑哄叆搴撴槑缁嗗鍣ㄦ樉绀烘爣璁�
-
+ openVolume: false, //缁存姢闆跺崟鍗犵敤浣撶Н寮圭獥鏍囪
// 鏌ヨ鍙傛暟
@@ -342,7 +385,8 @@
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
selectedRow: null, // 褰撳墠閫変腑鐨勮
rowForm: {}, // 褰撻�変腑鐨勫彧鏈変竴琛屾椂锛屾洿鏂版暟鎹负璇ラ�変腑鐨勮銆�
-
+ formVolume: {}, // 缁存姢闆跺崟鍗犵敤浣撶Н琛ㄥ崟銆�
+ rulesVolume: {}, // 缁存姢闆跺崟鍗犵敤浣撶Н琛ㄥ崟楠岃瘉銆�
tyResList: [], // 鍒楄〃鏁版嵁锛岀敤浜庡鍑�
titleData: ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HPreventErrMouldID", "HOrgID"], // 涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
btResList: [], // 鍒楄〃琛ㄥご鏁版嵁銆傜敤浜庡垪璁剧疆
@@ -512,7 +556,6 @@
if (this.queryParams.sTime) {
this.queryParams.sTime = moment(this.queryParams.sTime).format('YYYY-MM-DD')
this.queryParams.eTime = moment(this.queryParams.eTime).format('YYYY-MM-DD')
- console.log(this.queryParams.sTime, this.queryParams.eTime)
this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.queryParams.sTime + "'" + " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.queryParams.eTime + "'";
}
if (this.queryParams.HBillNo) {
@@ -648,12 +691,129 @@
this.$modal.msgError("閿欒:" + result.code + result.Message);
}
}).catch(error => {
+ console.log(error)
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
}).catch(() => { })
},
//#endregion
+ //#region 鎵胯繍鍟嗙‘璁�
+ set_ConfirmBill() {
+ var confirmMes = "";
+ if (this.rowForm["鎵胯繍鍟嗙‘璁ゆ椂闂�"] != null) {
+ confirmMes = "鏄惁鏇存柊鎵胯繍鍟嗙‘璁ゆ椂闂�?"
+ } else {
+ confirmMes = "鏄惁纭鎵胯繍鍟嗙‘璁ゆ椂闂�?"
+
+ }
+ this.$modal.confirm(confirmMes).then(() => {
+ axios.get(this.baseURL + "/WLYayBillController/ConfrimBillNo", {
+ params: { 'HInterID': this.rowForm.HInterID.toString(), "IsAudit": 0, 'CurUserName': sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.count == 1) {
+ this.handleQuery()
+ this.$modal.msgSuccess(result.Message)
+ } else {
+ this.$modal.msgError(result.code + result.Message);
+ }
+ }).catch(error => {
+ console.log(error)
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }).catch(() => { })
+
+ },
+ //#endregion
+ //#region 鍏朵粬纭
+ set_ConfirmOtherBill(nums) {
+ var confirmMes = "";
+ if (nums === 1) {
+ confirmMes = "鏄惁纭鍒板巶?"
+ }
+ else if (nums === 2) {
+ confirmMes = "鏄惁纭鎻愯揣?"
+ }
+ else if (nums === 3) {
+ confirmMes = "鏄惁纭鍑哄巶杩愯緭?"
+ }
+ else if (nums === 4) {
+ confirmMes = "鏄惁纭鍒拌揣绛炬敹?"
+ } else {
+ confirmMes = "鏄惁纭鎵胯繍鍟嗙‘璁ゆ椂闂�?"
+ }
+ this.$modal.confirm(confirmMes).then(() => {
+ axios.get(this.baseURL + "/WLYayBillController/ConfrimOtherBillNo", {
+ params: { 'HInterID': this.rowForm.HInterID.toString(), "IsAudit": nums, 'CurUserName': sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.count == 1) {
+ this.handleQuery()
+ this.$modal.msgSuccess(result.Message)
+ } else {
+ this.$modal.msgError(result.code + result.Message);
+ }
+ }).catch(error => {
+ console.log(error)
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }).catch(() => { })
+ },
+ //#endregion
+ //#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() {
+ axios.get(this.baseURL + "/WLYayBillController/updateBillMEs", {
+ params: {
+ 'HInterID': this.formVolume.HInterID.toString(),
+ "HEntryID": this.formVolume.HEntryID.toString(),
+ "ScatteredVolume": this.formVolume.currentVolume,
+ 'CurUserName': sessionStorage["HUserName"]
+ }
+ }).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
@@ -876,7 +1036,7 @@
get_PrintReport() {
if (this.ids.length != 1) {
this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
- } else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
+ } else if (this.rowForm.鍗曟嵁鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
} else {
axios.get(this.$baseUrl + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
--
Gitblit v1.9.1