MES-WEB-VUEUI.git

			@@ -8,7 +8,7 @@
			</el-select>
			</el-form-item>
			<el-form-item label="开始日期">
			<el-date-picker v-model="query.HBeginDate" type="date" placeholder="开始日期" style="width:160px" :disabled="timeCycleDisabled" value-formate="yyyy-mm-dd" format="yyyy-mm-dd"/>
			<el-date-picker v-model="query.HBeginDate" type="date" placeholder="开始日期" style="width:160px" :disabled="timeCycleDisabled" value-formate="yyyy-MM-dd" format="yyyy-MM-dd"/>
			</el-form-item>
			<el-form-item label="结束日期">
			<el-date-picker v-model="query.HEndDate" type="date" placeholder="结束日期" style="width:160px" :disabled="timeCycleDisabled" value-format="yyyy-MM-dd" format="yyyy-MM-dd"/>
			@@ -175,6 +175,7 @@
			<el-button size="mini" @click="get_PrintReport">打印</el-button>
			<el-button size="mini" @click="get_Refresh">刷新</el-button>
			<el-button size="mini" @click="get_BarCodeDetail">条码明细</el-button>
			<el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single" @click="get_PackStockDetail">包装容器出入库明细</el-button>
			</el-col>
			</el-row>

			@@ -210,7 +211,7 @@
			:visible.sync="barcodeDetailVisible"
			ref="barcodeDetail"
			/>

			<PackStockDetail :visible.sync="packStockDetailShow" ref="packStockDetail"/>

			</div>
			</template>
			@@ -220,23 +221,24 @@
			//import FbStepFoldinBillEdit from './fbStepFoldinBillEdit'
			import FbStepFoldinBillEdit from '@/views/FbStepFoldOutBillList/fbStepFoldOutBillListEdit'
			import BarCodeDetail from '@/views/component/BarCodeDetail'

			import dayjs from 'dayjs';
			import PackStockDetail from '@/views/component/PackStockDetail'

			export default {
			name: 'FbStepFoldinBillList',
			components: {
			FbStepFoldinBillEdit,
			BarCodeDetail
			BarCodeDetail,PackStockDetail

			},
			data() {
			return {

			rowForm: {},
			editDialogVisible:false,
			operationType:'1',
			currentId : '',
			barcodeDetailVisible: false,// 条码明细弹窗显示控制

			packStockDetailShow:false,
			query: {
			HInitTimeCycle: 29,
			HBeginDate: '',
			@@ -283,7 +285,7 @@
			selectedRows: [],
			currentFilterName: '',
			activeCollapse: [],
			baseURL: process.env.VUE_APP_BASE_URL \|\| "http://47.96.97.237/API/",
			baseURL: process.env.VUE_APP_BASE_API,
			};
			},
			created() {
			@@ -322,6 +324,7 @@
			const yyyy = d.getFullYear();
			const mm = String(d.getMonth() + 1).padStart(2, '0');
			const dd = String(d.getDate()).padStart(2, '0');

			return `${yyyy}-${mm}-${dd}`;
			},
			onTimeCycleChange() {
			@@ -392,8 +395,8 @@
			if (q.ColName2 && q.Comparator2 && q.Comparator2 !== '0' && q.ColContent2)
			sWhereParts.push(buildComparator(q.ColName2, q.Comparator2, q.ColContent2));

			if (q.HBeginDate) sWhereParts.push(` and CONVERT(varchar(100),日期, 23) >= '${q.HBeginDate}'`);
			if (q.HEndDate) sWhereParts.push(` and CONVERT(varchar(100),日期, 23) <= '${q.HEndDate}'`);
			if (q.HBeginDate) sWhereParts.push(` and CONVERT(varchar(100),日期, 23) >= '${dayjs(q.HBeginDate).format("YYYY-MM-DD")}'`);
			if (q.HEndDate) sWhereParts.push(` and CONVERT(varchar(100),日期, 23) <= '${dayjs(q.HEndDate).format("YYYY-MM-DD")}'`);
			if (q.HBillNo) sWhereParts.push(` and 单据号 like '%${q.HBillNo}%'`);
			if (q.HDeptID) sWhereParts.push(` and 部门 like '%${q.HDeptID}%'`);
			if (q.MaterialCode) sWhereParts.push(` and 物料代码 like '%${q.MaterialCode}%'`);
			@@ -668,6 +671,10 @@
			},
			onSelectionChange(selection) {
			this.selectedRows = selection;
			this.ids = selection.map(item => item.hmainid)
			console.log('选择的行:', selection,"选择的ids:",this.ids);
			if (selection.length > 0)
			this.rowForm = selection[0]
			},
			onBillNoClick(row) {
			const table = this.$refs.mainTable;
			@@ -689,11 +696,24 @@
			this.$message.warning('请选择一行数据查看条码明细！')
			return
			}

			this.barcodeDetailVisible = true
			this.$nextTick(() => {
			this.$refs.barcodeDetail.open(this.selectedRows[0])
			})
			},
			//#region 包装容器出入库明细
			get_PackStockDetail() {
			// if (this.selectedRow.length !== 1) {
			// this.$message.warning('请选择一行数据查看条码明细！')
			// return
			// }
			this.packStockDetailShow = true
			this.$nextTick(() => {
			this.$refs.packStockDetail.open(this.rowForm)
			})
			},
			//#endregion
			get_ViewReport() {
			if (this.selectedRows.length !== 1) {
			this.$message.warning('请选择一行数据打印！');