From bb40eba5dd2ec75a6fa2cd2c8eb41d769c092fca Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 05 十二月 2025 09:33:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
index b98806c..b6c4171 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -3,7 +3,7 @@
<div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
<!-- <el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button> -->
<el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
- <!-- <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button> -->
+ <el-button type="primary" @click="set_CheckBill(1, form)">瀹� 鏍�</el-button>
<el-button type="primary" @click="close">閫� 鍑�</el-button>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
@@ -334,7 +334,7 @@
name: 'Sc_MouldMoveStockRequestBillEdit',
components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
props: {
- OperationType: { type: Number, },
+ OperationType: { type: Number, },//鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫銆�3澶嶅埗銆�4涓嬫帹锛�
linterid: { type: Number, },
HSouceBillType: { type: String, },
propsData: { type: String, },
@@ -862,6 +862,12 @@
, "HSCSPID": "0"
, "HSCSPNumber": ""
, "HSCSPName": ""
+ , "HSourceInterID": "0"
+ , "HSourceEntryID": "0"
+ , "HSourceBillType": ""
+ , "HSourceBillNo": ""
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
, "HRemark": ""
, "HPropertyID": "0"
, "HSecUnitID": "0"
@@ -882,11 +888,11 @@
, "HICMOInterID": "0"
, "HICMOEntryID": "0"
, "HICMOBillNo": ""
- , "HSTOCKORGID": "0"
- , "HOWNERID": "0"
+ , "HSTOCKORGID": this.form.HStockOutOrgID
+ , "HOWNERID": this.form.HStockOutOrgID
, "HOWNERTYPEID": ""
- , "HSTOCKORGINID": "0"
- , "HOWNERINID": "0"
+ , "HSTOCKORGINID": this.form.HStockInOrgID
+ , "HOWNERINID": this.form.HStockInOrgID
, "HOWNERTYPEINID": ""
, "HBASEUNITID": "0"
, "HEXTAUXUNITID": "0"
@@ -1021,12 +1027,13 @@
set_CheckBill(num, form) {
var InterID = form.hmainid || form.HInterID
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.baseURL + "/Sc_MouldProdMoveBill/AuditMouldProdMoveBill", {
- params: { "HInterID": InterID, "flag": num, "user": sessionStorage["HUserName"] }
+ axios.get(this.baseURL + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Check_Json", {
+ params: { "HInterID": InterID, "Type": num, "HMaker": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
if (result.code == 1) {
this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.close()
}
else {
this.$modal.msgError("閿欒:" + result.code + result.Message,);
--
Gitblit v1.9.1