MES-WEB-VUEUI.git

			@@ -552,7 +552,7 @@
			}
			this.printListShow = true;
			this.openPrintList = true;
			// axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
			// axios.get(this.$baseUrl + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
			// params: { HInterID: this.rowForm.hmainid },
			// })
			// .then((response) => {
			@@ -578,7 +578,7 @@
			},
			ToolBatch() {
			if (this.HMinQty2 == 0 && this.HMaterID) {
			axios.get(this.baseURL + '/Sc_BarCode/Batch', {
			axios.get(this.$baseUrl + '/Sc_BarCode/Batch', {
			params: {
			"HMaterID": this.HMaterID, "HBatchNo": this.HBatchNo
			},
			@@ -668,7 +668,7 @@
			SaveBarCodeCreate(sMainSub, CampanyName) {
			axios({
			method: 'post',
			url: this.baseURL + "/Sc_BarCode/Sub_SaveBill",
			url: this.$baseUrl + "/Sc_BarCode/Sub_SaveBill",
			data: {
			"msg": sMainSub, "CampanyName": CampanyName
			},
			@@ -701,7 +701,7 @@
			},
			set_HBarCodeType() {
			//获取条码类型代码
			axios.get(this.baseURL + '/Sc_BarCode/GetHBarCodeTypeBill').then(response => {
			axios.get(this.$baseUrl + '/Sc_BarCode/GetHBarCodeTypeBill').then(response => {
			let result = response.data
			if (result.count == 1) {
			this.HBarCodeTypeList = result.list
			@@ -709,7 +709,7 @@
			}).catch(error => {
			this.$modal.msgError("接口请求失败!");
			});
			axios.get(this.baseURL + '/Sc_BarCode/GetHWorksNumberBill').then(response => {
			axios.get(this.$baseUrl + '/Sc_BarCode/GetHWorksNumberBill').then(response => {
			let result = response.data
			if (result.count == 1) {
			this.HWorksNumberList = result.list
			@@ -786,6 +786,7 @@
			},
			//弹窗赋值
			dbEmitData(deptRow, num) {
			console.log(deptRow)
			if (num) {
			if (num == 'gyProperty') {
			this.editWlxxData[this.zbIndex].HAuxPropID = deptRow.HItemID;
			@@ -793,27 +794,34 @@
			this.editWlxxData[this.zbIndex]["HAuxPropNumber"] = deptRow["辅助属性代码"];
			this.propertyShow = false;
			this.openData = false;

			} else if (num == 3) {
			this.editWlxxData[this.zbIndex].HMaterID = deptRow.HItemID;
			this.editWlxxData[this.zbIndex].HMaterNumber = deptRow.物料代码;
			this.editWlxxData[this.zbIndex].HMaterName = deptRow.物料名称;
			this.editWlxxData[this.zbIndex].HMaterModel = deptRow.规格型号
			this.editWlxxData[this.zbIndex].HUnitID = deptRow.HUnitID;
			this.editWlxxData[this.zbIndex].HUnitName = deptRow.计量单位名称
			this.editWlxxData[this.zbIndex].HUnitNumber = deptRow.计量单位代码
			this.editWlxxData = []
			for (var i = 0; i < deptRow.length; i++) {
			this.editWlxxData.push({
			"HMaterID": deptRow[i].HItemID,
			"HMaterNumber": deptRow[i].物料代码,
			"HMaterName": deptRow[i].物料名称,
			"HMaterModel": deptRow[i].规格型号,
			"HUnitID": deptRow[i].HUnitID,
			"HUnitNumber": deptRow[i].计量单位代码,
			"HUnitName": deptRow[i].计量单位,
			"HAuxQty": 0,
			})
			}
			this.materialShow = false
			this.openData = false
			}
			return
			}
			console.log(deptRow)

			if (deptRow.length > 0) {
			this.zbDataShow = false
			this.editWlxxData = []
			var list = []
			var BillSelect = []
			for (var i = 0; i < deptRow.length; i++) {
			if (deptRow[i].部门 != "" && deptRow[i].部门 != null) {
			if (!deptRow[i].部门) {
			list.push(deptRow[i].部门)
			}
			BillSelect.push({
			@@ -840,7 +848,7 @@
			//通过选择的源单主子内码查找详细信息
			axios({
			method: 'post',
			url: this.baseURL + "/Sc_BarCode/SelectReportFromBillList",
			url: this.$baseUrl + "/Sc_BarCode/SelectReportFromBillList",
			data: {
			"msg": Str
			},
			@@ -928,7 +936,7 @@
			},
			//根据用户获取对应职员、部门、销售主管
			getCzyglByUser() {
			axios.get(this.baseURL + '/Xs_SeOrderBill/getCzyglByUser', {
			axios.get(this.$baseUrl + '/Xs_SeOrderBill/getCzyglByUser', {
			params: { "CurUserName": sessionStorage["HUserName"] }
			}).then(response => {
			let dataForm = response.data.data[0]
			@@ -955,7 +963,7 @@
			handleUpdate() {
			this.reset()
			let rowHmainid = this.linterid
			axios.get(this.baseURL + "/Kf_SellOutBill/cx", {
			axios.get(this.$baseUrl + "/Kf_SellOutBill/cx", {
			params: { 'HInterID': rowHmainid }
			}).then(response => {
			if (response.data.count == 1) {
			@@ -1106,7 +1114,7 @@
			},
			//根据客户带出联系人、联系电话
			getCustomerByCusID(HCusID) {
			axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
			axios.get(this.$baseUrl + "/Xs_SeOrderBill/getCustomerByCusID", {
			params: {
			HCusID: HCusID
			}