MES-WEB-VUEUI.git

			@@ -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();
			},