chenhaozhe
2025-12-03 3e29ff0f7aedcc628e515cb79fdd214dc499207a
src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
@@ -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"/>
@@ -72,14 +72,14 @@
                           <el-col :span="6">
                              <el-form-item label="过滤">
                                 <el-select v-model="query.ColName" style="width:190px">
                                    <el-option value="0" label=""></el-option>
                                    <!-- <el-option value="0" label=""></el-option> -->
                                    <el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" />
                                 </el-select>
                              </el-form-item>
                           </el-col>
                           <el-col :span="6">
                              <el-select v-model="query.Comparator" style="width:190px">
                                 <el-option value="0" label=""></el-option>
                                 <!-- <el-option value="0" label=""></el-option> -->
                                 <el-option value="=" label="=" />
                                 <el-option value=">=" label=">=" />
                                 <el-option value=">" label=">" />
@@ -108,7 +108,7 @@
                           </el-col>
                           <el-col :span="6">
                              <el-select v-model="query.Comparator1" style="width:190px">
                                 <el-option value="0" label=""></el-option>
                                 <!-- <el-option value="0" label=""></el-option> -->
                                 <el-option value="=" label="=" />
                                 <el-option value=">=" label=">=" />
                                 <el-option value=">" label=">" />
@@ -137,7 +137,7 @@
                           </el-col>
                           <el-col :span="6">
                              <el-select v-model="query.Comparator2" style="width:190px">
                                 <el-option value="0" label=""></el-option>
                                 <!-- <el-option value="0" label=""></el-option> -->
                                 <el-option value="=" label="=" />
                                 <el-option value=">=" label=">=" />
                                 <el-option value=">" label=">" />
@@ -220,6 +220,7 @@
//import FbStepFoldinBillEdit from './fbStepFoldinBillEdit'
import FbStepFoldinBillEdit from '@/views/FbStepFoldOutBillList/fbStepFoldOutBillListEdit'
import BarCodeDetail from '@/views/component/BarCodeDetail'
import dayjs from 'dayjs';
export default {
@@ -249,14 +250,14 @@
            HSourceBillNo: '',
            Warehouse: '',
            Hmaker: '',
            ColName: '0',
            Comparator: '0',
            ColName: '',
            Comparator: '',
            ColContent: '',
            ColName1: '0',
            Comparator1: '0',
            ColName1: '',
            Comparator1: '',
            ColContent1: '',
            ColName2: '0',
            Comparator2: '0',
            ColName2: '',
            Comparator2: '',
            ColContent2: ''
         },
         timeCycles: [
@@ -322,6 +323,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 +394,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}%'`);
@@ -670,8 +672,19 @@
         this.selectedRows = selection;
      },
      onBillNoClick(row) {
         const id = row.hmainid || row.HInterID;
         window.open('./Fb_StepFoldinBillEdit.html?OperationType=3&linterid=' + id, '_blank');
         const table = this.$refs.mainTable;
         if (table) {
            try {
               table.clearSelection();
               table.toggleRowSelection(row, true);
            } catch (e) {
               if (table.setCurrentRow) table.setCurrentRow(row);
            }
         }
         this.selectedRows = [row];
         this.operationType = '3';
         this.currentId = row.hmainid || row.HInterID || row.HItemID || '';
         this.editDialogVisible = true;
      },
      get_BarCodeDetail() {
      if (this.selectedRows.length !== 1) {