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

chenhaozhe

2026-01-13 cfd0b53967daca92d98cd304e4d4e0577e2efbd3

 src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue

@@ -175,7 +175,9 @@
               <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>

         <el-table
@@ -184,11 +186,11 @@
            border
            style="width:100%"
            @row-click="onRowClick"
            @selection-change="onSelectionChange"
            @selection-change="onSelectionChange"	
            :loading="loading"
            ref="mainTable"
         >
            <el-table-column type="selection" width="55" />
            <el-table-column type="selection" width="55"  />
            <el-table-column v-for="(col, idx) in tableColumns" :key="idx" :prop="col.field" :label="col.title" :width="col.width" :formatter="col.formatter">
               <template v-if="col.field === '单据号'" #default="scope">
                  <span style="color: blue; cursor: pointer;" @click="onBillNoClick(scope.row)">{{ scope.row.单据号 }}</span>
@@ -210,6 +212,8 @@
         :visible.sync="barcodeDetailVisible"
         ref="barcodeDetail"
         />
            <!-- 包装容器出入库明细 -->
      <PackStockDetail :visible.sync="packStockDetailShow" ref="packStockDetail"/>
   </div>
</template>

@@ -218,21 +222,23 @@
//import FbStepFoldinBillEdit from './fbStepFoldinBillEdit'
import FbStepFoldinBillEdit from '@/views/FbStepFoldinBillList/fbStepFoldinBillListEdit'
import BarCodeDetail from '@/views/component/BarCodeDetail'

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: '',
@@ -293,7 +299,7 @@
         this.set_InitGrid();
         this.ColFilter();
         this.get_DefaultModule();
      },
      }, 
      setSelect_HInitTimeCycle() {
         this.query.HInitTimeCycle = 29;
      },
@@ -666,6 +672,11 @@
      },
      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;
@@ -708,6 +719,18 @@
         const hmainid = this.selectedRows.map(r => (r.hmainid * (10 ** 8)) + (r.hsubid || 0)).toString();
         window.open('../../BaseSet/SRM_OpenTmpList.html?linterid=' + hmainid + '&MyMsg=' + hmainid + '&Type=HSeOutStockBillList', '_blank');
      },
       //#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_Refresh() {
         this.onReset();
      },