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>
			@@ -90,6 +90,16 @@
			<el-input v-model="form.HKeeperName" placeholder="请选择" disabled>
			<el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=4)"></el-button>
			</el-input>
			</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>
			@@ -184,7 +194,7 @@
			size="mini">上移</el-button>
			<el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
			size="mini">下移</el-button>
			<el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">容器库存</el-button>
			<el-button type="success" plain icon="el-icon-printer" @click="get_ICInvget_ContainerInstantStockentoryMould(zbSelForm)">容器库存</el-button>
			<el-button type="success" plain icon="el-icon-printer" @click="get_ContainerInstantStock(zbSelForm)">容器即时库存</el-button>
			</div>
			<el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
			@@ -305,6 +315,7 @@
			HIsShow: true,
			HIsHide: false,
			HModName: "Sc_MouldInRequestBill",
			HBillSubType:'',
			formShow: false,
			temp: undefined,
			formLoading: true,
			@@ -388,6 +399,9 @@
			],
			HStockOrgID: [
			{ required: true, message: "组织不能为空", trigger: "blur" }
			],
			HBillSubType: [
			{ required: true, message: "子单据类型不能为空", trigger: "blur" }
			],
			HEmpName: [
			{ required: true, message: "业务员不能为空", trigger: "blur" }
			@@ -558,6 +572,7 @@
			HInterID: 0,
			HDate: new Date(),
			HStockOrgID:sessionStorage["OrganizationID"] - 0,
			HBillSubType: '',
			HSupTypeID:1,
			HSupName:'',
			HSupID:0,
			@@ -643,7 +658,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()
			}
			@@ -764,7 +779,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.单据号
			@@ -787,6 +802,7 @@
			, "HExplanation": data.摘要
			, "HRemark": data.表头备注
			, "HStockOrgID": data.HStockOrgID
			, "HBillSubType": data.子单据类型

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