MES-WEB-VUEUI.git

			@@ -19,7 +19,7 @@
			</el-col>
			<el-col :span="6">
			<el-form-item v-show="HIsShow" label="日期" prop="HDate">
			<el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" format="yyyy-MM-dd">
			<el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" format="yyyy-MM-dd HH:mm:ss">
			</el-date-picker>
			</el-form-item>
			</el-col>
			@@ -31,6 +31,16 @@
			</el-select>
			</el-form-item>
			</el-col>
			<el-col :span="12">
			<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-col>
			</el-row>
			<el-row>
			<el-col :span="6">
			@@ -440,6 +450,9 @@
			HStockInOrgID: [
			{ required: true, message: "调入组织不能为空", trigger: "blur" }
			],
			HBillSubType: [
			{ required: true, message: "子单据类型不能为空", trigger: "blur" }
			],
			HStockOutOrgID: [
			{ required: true, message: "调出组织不能为空", trigger: "blur" }
			],
			@@ -625,6 +638,7 @@
			HInterID: 0,
			HDate: new Date(),
			HStockInOrgID:sessionStorage["OrganizationID"] - 0,
			HBillSubType: '',
			HSupTypeID:1,
			HSupName:'',
			HSupID:0,
			@@ -714,7 +728,7 @@
			//新增获取单据号
			this.getHBillNo()
			let date = new Date()
			this.form.HDate = moment(date).format('YYYY-MM-DD')
			this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
			if (this.OperationType == 1) {
			this.handleAddSysZb()
			}
			@@ -839,7 +853,7 @@
			if (this.copyType == 1) {
			this.getHBillNo()
			let date = new Date()
			this.form.HDate = moment(date).format('YYYY-MM-DD')
			this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
			} else {
			this.form = {
			"HBillNo": data.单据号
			@@ -865,6 +879,7 @@
			, "HRemark": data.表头备注
			, "HStockInOrgID": data.HStockInOrgID
			, "HStockOutOrgID": data.HStockOutOrgID
			,"HBillSubType": data.子单据类型

			, "HMaker": data.制单人
			, "HMakeDate": data.制单日期 == null ? "" : data.制单日期