Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

qq_41295110

2026-01-13 c466006a64f1cbbcbf04e0ae4a2d73de302aa92a

 src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue

@@ -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>
@@ -221,23 +222,23 @@
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: '',
@@ -284,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() {
@@ -670,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;
@@ -691,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('请选择一行数据打印！');