MES-WEB-VUEUI.git

			@@ -114,6 +114,16 @@
			<el-input v-model="form.HInnerBillNo" placeholder="请输入" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item v-show="HIsShow" 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-col>
			</el-row>
			<el-row>
			<el-col :span="12">
			@@ -409,6 +419,7 @@
			formShow: false,
			temp: undefined,
			formLoading: true,
			HBillSubType: '',
			zzSelDis: false,
			rowHideShow: false,
			openRowHide: false,
			@@ -493,6 +504,9 @@
			],
			HStockOrgID: [
			{ required: true, message: "组织不能为空", trigger: "blur" }
			],
			HBillSubType: [
			{ required: true, message: "子单据类型不能为空", trigger: "blur" }
			],
			HSecManagerName: [
			{ required: true, message: "验收员不能为空", trigger: "blur" }
			@@ -601,6 +615,7 @@
			this.form.HSecManagerName = data.HSecManagerName
			this.form.HDeptID = data.HDeptID
			this.form.HDeptName = data.HDeptName
			this.form.HBillSubType = data.HBillSubType
			this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
			this.ifOrganizationEdit = true
			//子表赋值
			@@ -796,6 +811,7 @@
			HDate: new Date(),
			HStockOrgID:sessionStorage["OrganizationID"] - 0,
			HSupTypeID: 1,
			HBillSubType: '',
			HSupName:'',
			HSupID:0,
			HDeptName: '',
			@@ -978,6 +994,7 @@
			, "HRemark": data[0].表头备注
			, "HInnerBillNo": data[0].内部单据号
			, "HStockOrgID": data[0].HMainStockOrgID
			, "HBillSubType": data[0].子单据类型
			, "HMaker": data[0].制单人
			, "HChecker": data[0].审核人
			, "HCloseMan": data[0].关闭人
			@@ -1261,10 +1278,12 @@
			}else if(!item.HWHID){
			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！");
			}