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

陈婷婷

2 天以前 2e2b0700a25ce13c7a3eb113c577375da87bc0f3

 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 == 1 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 = [];