MES-WEB-VUEUI.git

			@@ -150,7 +150,7 @@
			@click="set_CloseBill(1)">反关闭
			</el-button>
			</el-col>
			<el-col :span="1.5">
			<el-col :span="1.5">
			<el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
			@click="set_DropBill(0)">作废
			</el-button>
			@@ -215,6 +215,12 @@
			export default {
			name: "Kf_StockOutRequestBillList",
			components: { RowSettings, Edit, PrintList, BarCodeDetail },
			props: {
			openPage: { type: String, },
			propHMaterID: {},
			propHOrgID: {},
			propMarkVal: {},
			},
			data() {
			return {
			activeSeach: "",
			@@ -389,8 +395,22 @@
			if (this.pageSize == 0) {
			this.pageSize = 50;
			}
			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", {
			axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/Gy_MaterialPackingRelationList", {
			params: {
			sWhere: this.sWhere,
			user: sessionStorage["HUserName"],
			@@ -400,6 +420,7 @@
			},
			})
			.then((response) => {
			console.log(response)
			this.tyResList = response.data.data; //总数据
			let data1 = response.data;
			let option = [];
			@@ -493,7 +514,7 @@
			DisPlay_HideColumn(HModName, user, option, dataOption) {
			this.totalNameList = [];
			axios
			.get(this.baseURL + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
			.get(this.$baseUrl + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
			params: {
			HModName: HModName,
			user: user,
			@@ -641,6 +662,9 @@
			this.selectedRow = row; // 记录当前选中的行
			this.lastSelectedRowIndex = this.tableData.indexOf(row);
			this.$refs.tableData.toggleRowSelection(row);
			if (this.openPage) {
			this.$emit('deptEmit', row, 17)
			}
			},
			//选中行高亮样式
			rowStyle({ row, rowIndex }) {
			@@ -651,7 +675,12 @@
			//双击行
			handleDblclick(row, column, cell, event) {
			this.OperationType = 3;
			this.handleEdit();
			if (this.openPage) {
			this.$emit('deptEmitDb', row, 17)
			}
			else {
			this.handleEdit();
			}
			},
			// 多选框选中数据
			handleSelectionChange(selection) {
			@@ -764,22 +793,22 @@
			this.sWhere += " and 物料代码 like '%" + this.queryParams.MaterialCode + "%'";
			}
			if (this.queryParams.MaterialName) {
			this.sWhere += " and 物料名称 like '%" + MaterialName + "%'";
			this.sWhere += " and 物料名称 like '%" + this.queryParams.MaterialName + "%'";
			}
			if (this.queryParams.SpecificationModel) {
			this.sWhere += " and 规格型号 like '%" + SpecificationModel + "%'";
			this.sWhere += " and 规格型号 like '%" + this.queryParams.SpecificationModel + "%'";
			}
			if (this.queryParams.HSourceBillNo) {
			this.sWhere += " and 源单单号 like '%" + HSourceBillNo + "%'";
			this.sWhere += " and 源单单号 like '%" + this.queryParams.HSourceBillNo + "%'";
			}
			if (this.queryParams.Warehouse) {
			this.sWhere += " and 发货仓库 like '%" + Warehouse + "%'";
			this.sWhere += " and 发货仓库 like '%" + this.queryParams.Warehouse + "%'";
			}
			if (this.queryParams.Hmaker) {
			this.sWhere += " and 制单人 like '%" + Hmaker + "%'";
			this.sWhere += " and 制单人 like '%" + this.queryParams.Hmaker + "%'";
			}
			if (this.queryParams.HUSEORGID) {
			this.sWhere += " and HOrgID like '%" + HUSEORGID + "%'";
			this.sWhere += " and HOrgID like '%" + this.queryParams.HUSEORGID + "%'";
			}
			this.getList();
			},
			@@ -838,7 +867,7 @@
			/** 删除按钮操作 */
			handleDelete() {
			this.$modal.confirm("确认要删除吗，删除后不能恢复").then(() => {
			axios.get(this.baseURL + "/Gy_MaterialPackingRelation/DeleteGy_MaterialPackingRelation", {
			axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/DeleteGy_MaterialPackingRelation", {
			params: {
			HInterID: this.rowForm.hmainid.toString(),
			user: sessionStorage["HUserName"],
			@@ -857,7 +886,7 @@
			},
			set_CheckBill(num) {
			//逻辑审核方法
			axios.get(this.baseURL + "/Sc_MouldinventoryBill/CheckGy_MaterialMouldBillMain", {
			axios.get(this.$baseUrl + "/Sc_MouldinventoryBill/CheckGy_MaterialMouldBillMain", {
			params: { "HInterID": this.rowForm.hmainid, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
			}).then(response => {
			let result = response.data
			@@ -875,7 +904,7 @@
			},
			set_CloseBill(num) {
			//逻辑关闭方法
			axios.get(this.baseURL + "/Gy_MaterialPackingRelation/CloseGy_MaterialPackingRelation", {
			axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/CloseGy_MaterialPackingRelation", {
			params: { "HInterID": this.rowForm.hmainid, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
			}).then(response => {
			let result = response.data
			@@ -893,7 +922,7 @@
			},
			set_DropBill(num) {
			//逻辑作废方法
			axios.get(this.baseURL + "/Gy_MaterialPackingRelation/DeleteGy_MaterialPackingRelation", {
			axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/DeleteGy_MaterialPackingRelation", {
			params: { "HInterID": this.rowForm.hmainid, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
			}).then(response => {
			let result = response.data