Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

wangyi

2026-02-28 a1cc3f87d24ae2a19295c7b38faa17228cd863ec

 src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue

@@ -400,6 +400,10 @@
            if (this.propHMaterID) {
                this.sWhere += " and HMaterID like '%" + this.propHMaterID + "%'";
            }
              if (this.openPage) {
                this.sWhere += " and HUseFlag != '0' and HSendPackFlag != '0' and ISNULL(审核人,'')  != ''"
            }
            console.log(this.sWhere)
            // 列表
            axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/Gy_MaterialPackingRelationList", {
                params: {
@@ -411,6 +415,7 @@
                },
            })
                .then((response) => {
                    console.log(response)
                    this.tyResList = response.data.data; //总数据
                    let data1 = response.data;
                    let option = [];