From 2e2b0700a25ce13c7a3eb113c577375da87bc0f3 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期二, 24 三月 2026 17:44:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
index 485caa3..4b508cc 100644
--- a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
+++ b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
@@ -179,7 +179,7 @@
<div :style="item.style">
<span v-if="column.property.includes('鏃ユ湡')">{{
parseTime(row[column.property], "{y}-{m}-{d}")
- }}</span>
+ }}</span>
<el-button type="text" @click="handleEdit(row, (OperationType = 3))"
v-else-if="column.property == '鍗曟嵁鍙�'">{{ row.鍗曟嵁鍙� }}</el-button>
<span v-else>{{ row[column.label] }}</span>
@@ -217,8 +217,9 @@
components: { RowSettings, Edit, PrintList, BarCodeDetail },
props: {
openPage: { type: String, },
- propHMaterID: { },
+ propHMaterID: {},
propHOrgID: {},
+ propMarkVal: {},
},
data() {
return {
@@ -394,12 +395,20 @@
if (this.pageSize == 0) {
this.pageSize = 50;
}
- if (this.propHOrgID) {
+ 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 浣跨敤鏍囪 = 'Y' and 鍙戣揣瀹瑰櫒鏍囪 = 'Y' and ISNULL(瀹℃牳浜�,'') != ''"
+ }
+ console.log(this.sWhere)
// 鍒楄〃
axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/Gy_MaterialPackingRelationList", {
params: {
@@ -411,6 +420,7 @@
},
})
.then((response) => {
+ console.log(response)
this.tyResList = response.data.data; //鎬绘暟鎹�
let data1 = response.data;
let option = [];
@@ -783,22 +793,22 @@
this.sWhere += " and 鐗╂枡浠ｇ爜 like '%" + this.queryParams.MaterialCode + "%'";
}
if (this.queryParams.MaterialName) {
- this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.MaterialName + "%'";
+ this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.MaterialName + "%'";
}
if (this.queryParams.SpecificationModel) {
- this.sWhere += " and 瑙勬牸鍨嬪彿 like '%" + this.queryParams.SpecificationModel + "%'";
+ this.sWhere += " and 瑙勬牸鍨嬪彿 like '%" + this.queryParams.SpecificationModel + "%'";
}
if (this.queryParams.HSourceBillNo) {
- this.sWhere += " and 婧愬崟鍗曞彿 like '%" + this.queryParams.HSourceBillNo + "%'";
+ this.sWhere += " and 婧愬崟鍗曞彿 like '%" + this.queryParams.HSourceBillNo + "%'";
}
if (this.queryParams.Warehouse) {
this.sWhere += " and 鍙戣揣浠撳簱 like '%" + this.queryParams.Warehouse + "%'";
}
if (this.queryParams.Hmaker) {
- this.sWhere += " and 鍒跺崟浜� like '%" + this.queryParams.Hmaker + "%'";
+ this.sWhere += " and 鍒跺崟浜� like '%" + this.queryParams.Hmaker + "%'";
}
if (this.queryParams.HUSEORGID) {
- this.sWhere += " and HOrgID like '%" + this.queryParams.HUSEORGID + "%'";
+ this.sWhere += " and HOrgID like '%" + this.queryParams.HUSEORGID + "%'";
}
this.getList();
},
--
Gitblit v1.9.1