MES-WEB-VUEUI.git

			@@ -51,7 +51,7 @@
			<el-col :span="6">
			<el-form-item label="选单号" prop="HSourceBillNo">
			<el-input v-model="form.HSourceBillNo" placeholder="请输入选单号" disabled>
			<el-button class="input-search-btn" slot="append" icon="el-icon-search" @click="openDataDialog(openNum)"></el-button>
			<el-button class="input-search-btn" slot="append" icon="el-icon-search" @click="openDataDialog(null)"></el-button>
			</el-input>
			</el-form-item>
			</el-col>
			@@ -188,7 +188,11 @@
			</el-table-column>
			<el-table-column align="center" label="辅助属性代码" prop="HAuxPropNumber" width="120"
			show-overflow-tooltip>
			<template slot-scope="scope"><el-input v-model="scope.row.HAuxPropNumber" /></template>
			<template slot-scope="scope">
			<el-input v-model="scope.row.HAuxPropNumber"
			@keyup.native.f7="openDataDialog(1, scope.row)"
			@dblclick.native="openDataDialog(1, scope.row)" />
			</template>
			</el-table-column>
			<el-table-column align="center" label="辅助属性名称" prop="HAuxPropName" width="120"
			show-overflow-tooltip>
			@@ -256,6 +260,13 @@
			<el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body @close="closeBill">
			<HSourceReportHtml @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName"
			:HOrgID='this.form.HOrgID' :HSouceBillType="HSouceBillType" v-if="ScICMOBillShow" />

			<GyProperty
			@deptEmitDb="dbEmitData"
			@deptEmit="emitData"
			:openPage="HModName"
			v-if="propertyShow"
			/>
			<div slot="footer" class="dialog-footer">
			<el-button type="primary" @click="deptClickSub">确定</el-button>
			<el-button @click="deptClose">取消</el-button>
			@@ -273,10 +284,11 @@
			import HSourceReportHtml from '@/views/component/HSourceReportHtml'
			import PrintList from "@/views/component/printList";
			import moment from 'moment';
			import GyProperty from "@/views/basic/gyProperty/gyPropertyList.vue";

			export default {
			name: 'Gy_BarCodeBill',
			components: { HSourceReportHtml, PrintList },
			components: { HSourceReportHtml, PrintList, GyProperty },
			props: {
			OperationType: { type: Number, },
			linterid: { type: Number, },
			@@ -451,6 +463,7 @@
			materialShow: false,//物料数据组件
			gyEmployeeShow: false,//销售员数据组件
			ScICMOBillShow: false,
			propertyShow: false,
			deptform: {},//弹窗选中数据
			openData: false,//数据弹窗
			dialogTitle: '',
			@@ -770,6 +783,17 @@
			},
			//弹窗赋值
			dbEmitData(deptRow, num) {
			if(num) {
			if(num == 'gyProperty') {
			this.editWlxxData[this.zbIndex].HAuxPropID = deptRow.HItemID;
			this.editWlxxData[this.zbIndex]["HAuxPropName"] = deptRow["辅助属性名称"];
			this.editWlxxData[this.zbIndex]["HAuxPropNumber"] = deptRow["辅助属性代码"];
			this.propertyShow = false;
			this.openData = false;
			}

			return
			}
			console.log(deptRow)
			if (deptRow.length > 0) {
			this.zbDataShow = false
			@@ -1041,8 +1065,9 @@
			, 'HPOOrderInterID': result.data[i].采购订单内码
			, 'HPOOrderEntryID': result.data[i].采购订单子内码
			, 'HPOOrderBillNo': result.data[i].采购订单号
			, 'HPropertyID': result.data[i].HPropertyID
			, 'HPropertyName': result.data[i].辅助属性
			, 'HAuxPropID': result.data[i].HPropertyID
			, 'HAuxPropName': result.data[i].辅助属性
			, 'HAuxPropNumber': result.data[i].辅助属性代码
			, 'HSecUnitID': result.data[i].HSecUnitID
			, 'HSecUnitName': result.data[i].辅助计量单位
			, 'HSecUnitRate': result.data[i].换算率
			@@ -1195,11 +1220,21 @@
			if (row) {
			this.zbIndex = row.index - 1
			}
			this.showReset()
			this.HSouceBillType = this.getSupType()
			this.dialogTitle = this.getSupType() + '列表'
			this.ScICMOBillShow = true
			this.openData = true
			if(num) {
			switch(num) {
			case 1:
			this.dialogTitle = '辅助属性列表'
			this.propertyShow = true
			this.openData = true
			;break;
			}
			}else {
			this.showReset()
			this.HSouceBillType = this.getSupType()
			this.dialogTitle = this.getSupType() + '列表'
			this.ScICMOBillShow = true
			this.openData = true
			}

			},
			}