MES-WEB-VUEUI.git

			@@ -56,6 +56,14 @@
			</el-select>
			</el-form-item>
			</el-col>
			<el-form-item label="子单据类型" prop="HBillSubType">
			<el-select v-model="form.HBillSubType" placeholder="请选择子单据类型">
			<el-option label="发货" value="发货"></el-option>
			<el-option label="客返" value="客返"></el-option>
			<el-option label="供应商租借" value="供应商租借"></el-option>
			<el-option label="供应商返还" value="供应商返还"></el-option>
			</el-select>
			</el-form-item>
			</el-row>
			<el-row>
			<el-col :span="6">
			@@ -447,6 +455,7 @@
			zzSelDis: false,
			rowHideShow: false,
			openRowHide: false,
			HBillSubType: '',
			hSupTypeList: [{name:'供应商',id:1,},{name:'客户',id:2},{name:'车间部门',id:3}],
			HSourceBillTypes:[],
			addBtnShow: false,
			@@ -532,6 +541,9 @@
			],
			HStockOutOrgID: [
			{ required: true, message: "调出组织不能为空", trigger: "blur" }
			],
			HBillSubType: [
			{ required: true, message: "子单据类型不能为空", trigger: "blur" }
			],
			HSecManagerName: [
			{ required: true, message: "验收员不能为空", trigger: "blur" }
			@@ -647,6 +659,7 @@
			this.form.HDeptID = data.HDeptID
			this.form.HDeptName = data.HDeptName
			this.form.HStockOrgID = data.HStockOutOrgID
			this.form.HBillSubType = data.HBillSubType
			this.form.HStockInOrgID = data.HStockInOrgID == null ? 0 : data.HStockInOrgID
			this.form.HStockOutOrgID = data.HStockOutOrgID == null ? 0 : data.HStockOutOrgID
			this.ifOrganizationEdit = true
			@@ -952,6 +965,7 @@
			HSupName:'',
			HSupID:0,
			HStockOutOrgID:sessionStorage["OrganizationID"] - 0,
			HBillSubType: '',
			HDeptName: '',
			HDeptID: 0,
			HWHName:'',
			@@ -1137,6 +1151,7 @@
			, "HInnerBillNo": data[0].内部单据号
			, "HStockInOrgID": data[0].HStockInOrgID
			, "HStockOutOrgID": data[0].HStockOutOrgID
			, "HBillSubType": data[0].子单据类型
			, "HMaker": data[0].制单人
			, "HChecker": data[0].审核人
			, "HCloseMan": data[0].关闭人
			@@ -1341,10 +1356,12 @@
			}else if(!item.HSCWHID){
			fhck = true
			this.$modal.msgError("第" + (index + 1) + "行：调出仓库未选择！");
			}else if(!item.HUnitID){
			fhck = true
			this.$modal.msgError("第" + (index + 1) + "行：计量单位为空！");
			}else if(item.HQty == 0){
			}
			// else if(!item.HUnitID){
			// fhck = true
			// this.$modal.msgError("第" + (index + 1) + "行：计量单位为空！");
			// }
			else if(item.HQty == 0){
			fhck = true
			this.$modal.msgError("第" + (index + 1) + "行：数量不能为0！");
			}