From 5d9c10700069de1e146f175623beb691d4c1bb17 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期二, 09 十二月 2025 16:37:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
index 33a7ad1..34dbef5 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.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>
@@ -697,7 +697,7 @@
, "HMaterNumber": result.data[i].HMaterNumber
, "HMaterName": result.data[i].HMaterName
, "HMaterModel": result.data[i].HMaterModel
- , "HPropertyID": result.data[i].HProcID
+ , "HPropertyID": result.data[i].HPropertyID
, "HSecUnitID": result.data[i].HSecUnitID
, "HSecUnitRate": result.data[i].HSecUnitRate
, "HUnitID": result.data[i].HUnitID
@@ -932,12 +932,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_MouldInRequestBillController/GetSc_MouldInRequestBill_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