From 7b849f06f0b0986b3955c1d1d91a0b2a79fa7ea6 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期二, 31 三月 2026 08:40:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
index cff47b0..f9ea0f3 100644
--- a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
+++ b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
@@ -219,6 +219,7 @@
openPage: { type: String, },
propHMaterID: {},
propHOrgID: {},
+ propMarkVal: {},
},
data() {
return {
@@ -397,12 +398,17 @@
if (this.propHOrgID) {
this.sWhere += " and HOrgID like '%" + this.propHOrgID + "%'";
}
+ console.log(this.propHMaterID)
if (this.propHMaterID) {
this.sWhere += " and HMaterID like '%" + this.propHMaterID + "%'";
}
+ // if(this.propMarkVal){
+ // this.sWhere += " and 榛樿鍙戣揣瀹瑰櫒鏍囪 = 'Y'"
+ // }
if (this.openPage) {
- this.sWhere += " and HUseFlag == 1 and HSendPackFlag == 'Y' and ISNULL(瀹℃牳浜�,'') != ''"
+ this.sWhere += " and 浣跨敤鏍囪 = 'Y' and 鍙戣揣瀹瑰櫒鏍囪 = 'Y' and ISNULL(瀹℃牳浜�,'') != ''"
}
+ console.log(this.sWhere)
// 鍒楄〃
axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/Gy_MaterialPackingRelationList", {
params: {
@@ -414,6 +420,7 @@
},
})
.then((response) => {
+ console.log(response)
this.tyResList = response.data.data; //鎬绘暟鎹�
let data1 = response.data;
let option = [];
@@ -879,7 +886,7 @@
},
set_CheckBill(num) {
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.$baseUrl + "/Sc_MouldinventoryBill/CheckGy_MaterialMouldBillMain", {
+ axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/AuditGy_MaterialPackingRelation", {
params: { "HInterID": this.rowForm.hmainid, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
--
Gitblit v1.9.1