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>
			@@ -285,7 +295,7 @@
			<GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
			<GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
			<GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
			<GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
			<GyMould ref="gyMouldRef" @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
			<GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
			<ScICMOBillList @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="ScICMOBillShow" />
			<div slot="footer" class="dialog-footer">
			@@ -338,6 +348,7 @@
			hSupTypeList: [{name:'供应商',id:1,},{name:'客户',id:2},{name:'车间部门',id:3}],
			HSourceBillTypes:[],
			addBtnShow: false,
			HBillSubType: '',
			zbIndex: null,
			zbSelForm: {},//子表选中数据
			dialogTypeNum: null,//部门弹窗1，仓库弹窗2
			@@ -415,6 +426,9 @@
			],
			HStockOrgID: [
			{ required: true, message: "组织不能为空", trigger: "blur" }
			],
			HBillSubType: [
			{ required: true, message: "子单据类型不能为空", trigger: "blur" }
			],
			HEmpName: [
			{ required: true, message: "业务员不能为空", trigger: "blur" }
			@@ -549,6 +563,61 @@
			} else {
			this.$modal.msgError("请选择数据!");
			}

			}else if(deptRow.length > 1 && num == 8) {
			var rowdata = [];
			for (let i = 0; i < deptRow.length; i++) {
			rowdata.push({
			"HMaterID": deptRow[i].hmainid \|\| 0,
			"HMaterNumber": deptRow[i].模具编号 \|\| "",
			"HMaterName": deptRow[i].模具名称 \|\| "",
			"HMaterModel": deptRow[i].模具型号 \|\| "",
			"HUnitID": deptRow[i].HUnitID \|\| 0,
			"HUnitNumber": deptRow[i].计量单位代码 \|\| "",
			"HUnitName": deptRow[i].计量单位 \|\| "",
			"HQty": "1", // 默认数量
			"HWHID": this.form.HWHID \|\| "0",
			"HWHNumber": this.form.HWHNumber \|\| "",
			"HWHName": this.form.HWHName \|\| "",
			"HSPID": "0",
			"HSPNumber": "",
			"HSPName": "",
			"KuHQty": "0", // 库存数量
			"HSourceInterID": "0",
			"HSourceEntryID": "0",
			"HSourceBillType": "",
			"HSourceBillNo": "",
			"HRelationQty": "0",
			"HRelationMoney": "0",
			"HRemark": "",
			"HPropertyID": "0",
			"HSecUnitID": "0",
			"HSecUnitRate": "0",
			"HQtyMust": "0",
			"HPrice": "0",
			"HMoney": "0",
			"HERPInterID": "0",
			"HERPEntryID": "0",
			"HPOOrderInterID": "0",
			"HPOOrderEntryID": "0",
			"HPOOrderBillNo": "",
			"HSeOrderInterID": "0",
			"HSeOrderEntryID": "0",
			"HSeOrderBillNo": "",
			"HICMOInterID": "0",
			"HICMOEntryID": "0",
			"HICMOBillNo": "",
			"HSTOCKORGID": this.form.HStockOrgID,
			"HOWNERID": this.form.HStockOrgID,
			"HOWNERTYPEID": "",
			"HSEQ": "0",
			"HSTOCKSTATUSID": "0"
			})
			}
			this.editData.splice(this.zbIndex, 1, ...rowdata)
			this.ScICMOBillShow = false
			this.openData = false
			this.gyMouldShow = false
			}else{
			if (deptRow.HItemID \|\| deptRow.hmainid) {
			if (num == 1) {
			@@ -637,8 +706,17 @@
			this.deptform = deptRow
			},
			deptClickSub() {
			this.dbEmitData(this.deptform, this.dialogTypeNum)
			this.deptform = {}
			if(this.dialogTypeNum==8){
			const selectedData = this.$refs.gyMouldRef.rowForm;
			if(selectedData.length>1){
			this.dbEmitData(selectedData, this.dialogTypeNum);
			}else{
			this.dbEmitData(this.deptform, this.dialogTypeNum);
			}
			}else{
			this.dbEmitData(this.deptform, this.dialogTypeNum);
			}
			this.deptform = {};
			},
			deptClose() {
			this.deptform = {}
			@@ -653,6 +731,7 @@
			HDate: new Date(),
			HStockOrgID:sessionStorage["OrganizationID"] - 0,
			HSupTypeID:1,
			HBillSubType: '',
			HSupName:'',
			HSupID:0,
			HDeptName: '',
			@@ -822,7 +901,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()
			}
			@@ -859,7 +938,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.单据号
			@@ -882,6 +961,7 @@
			, "HExplanation": data.摘要
			, "HRemark": data.表头备注
			, "HStockOrgID": data.HStockOrgID
			, "HBillSubType": data.子单据类型

			, "HMaker": data.制单人
			, "HMakeDate": data.制单日期 == null ? "" : data.制单日期
			@@ -1189,6 +1269,14 @@
			// 打开数据列表弹窗
			openDataDialog(num, row) {
			//num1部门，2出库仓库，3物料，4销售员
			if (num == 8) {
			if (this.$refs.gyMouldRef) {
			this.$refs.gyMouldRef.clearSelection()
			}
			this.dialogTitle = '容器列表'
			this.gyMouldShow = true
			this.openData = true
			}
			if (row) {
			this.zbIndex = row.index - 1
			}