调试

快乐的昕的电脑

2025-11-14 a71edf6dc172d0ef2510557a207ec9db7568c89c

 components/WorkOrderPrint.vue

@@ -1,8 +1,55 @@
<template>
   <view class="page wide-layout" :class="{'has-overlay': (isShowUserSelect || isShow || barcodeIsShow)}">
      <view class="status-section">
         <!-- 报工记录表部分，在标题行添加刷新按钮 -->
         <view class="report-table-wrapper">
            <view class="report-title">报工记录表</view>
            <view class="report-header">
               <view class="report-title">报工记录表</view>
               <view class="header-buttons">
                  <button class="refresh-btn-header" @click="refresh">刷新</button>
                  <button v-if="isGeneratingBarcode" class="reset-btn-header" @click="resetGenerateState">重置</button>
               </view>
            </view>

            <!-- 数采总产量 -->
            <view class="section-title">当前数采产量报工记录</view>
            <div class="table-scroll">
               <table class="report-table">
                  <thead>
                     <tr>
                        <th>时间</th>
                        <th>报工人</th>
                        <th>工单号</th>
                        <th>产品名称</th>
                        <th>计划生产数</th>
                        <th>机台号</th>
                        <th>初始采集数</th>
                        <th>报工时采集数</th>
                        <th>基于数采的报工数</th>
                        <th>不良数</th>
                        <th>良品数（计算）</th>
                     </tr>
                  </thead>
                  <tbody>
                     <tr class="summary-row highlight-row">
                        <td>{{ nowTime }}</td>
                        <td>{{ staffDisplay || '-' }}</td>
                        <td>{{ orderNo || '-' }}</td>
                        <td>{{ order.daa003 || '-' }}</td>
                        <td>{{ planQtyDisplay }}</td>
                        <td>{{ machineNo || '-' }}</td>
                        <td>{{ order.initCjNum }}</td>
                        <td>{{ order.currentCjNum }}</td>
                        <td>{{ order.currentCjNum - order.initCjNum }}</td>
                        <td>{{ realTimeDefectiveCount }}</td>
                        <td>{{ realTimeOkCount }}</td>
                     </tr>
                  </tbody>
               </table>
            </div>

            <!-- 历史报工记录 -->
            <view class="section-title history-title">历史报工记录</view>
            <div class="table-scroll">
               <table class="report-table">
                  <thead>
@@ -21,33 +68,18 @@
                     </tr>
                  </thead>
                  <tbody>
                     <!-- 当前实时统计(保持原来单行) -->
                     <tr class="summary-row">
                        <td>{{ nowTime }}</td>
                        <td>{{ staffDisplay || '-' }}</td>
                        <td>{{ orderNo || '-' }}</td>
                     <tr v-for="(r, idx) in reportingHistory" :key="idx">
                        <td>{{ r.bgDate }}</td>
                        <td>{{ r.staff || '-' }}</td>
                        <td>{{ r.orderNo || '-' }}</td>
                        <td>{{ order.daa003 || '-' }}</td>
                        <td>{{ planQtyDisplay }}</td>
                        <td>{{ machineNo || '-' }}</td>
                        <td>{{ initCjNum }}</td><!--初始采集数-->
                        <td>{{ currentCjNum }}</td><!--报工时采集数-->
                        <td>{{ calculatedTotalProduction }}</td><!--报工数（计算）-->
                        <td>{{ calculatedDefectiveCount }}</td><!--不良数-->
                        <td>{{ sQuantity }}</td><!--良品数（计算）-->
                     </tr>
                     <!-- 历史报工记录行 -->
                     <tr v-for="(r, idx) in reportingHistory" :key="idx">
                        <td>{{ r.bgDate }}</td><!--时间-->
                        <td>{{ r.staff || '-' }}</td><!--报工人-->
                        <td>{{ r.orderNo || '-' }}</td><!--工单号-->
                        <td>{{ order.daa003 || '-' }}</td><!--产品名称-->
                        <td>{{ planQtyDisplay }}</td><!--计划生产数-->
                        <td>{{ r.machineNo || '-' }}</td><!--机台号-->
                        <td>{{ r.initialValue }}</td><!--初始采集数-->
                        <td>{{ r.productionCount }}</td><!--报工时采集数-->
                        <td>{{ r.totalProduction }}</td><!--报工数（计算）-->
                        <td>{{ r.BfQty }}</td><!--不良数-->
                        <td>{{ r.OkQty }}</td><!--良品数（计算）-->
                        <td>{{ r.machineNo || '-' }}</td>
                        <td>{{ r.initialValue }}</td>
                        <td>{{ r.productionCount }}</td>
                        <td>{{ r.totalProduction }}</td>
                        <td>{{ r.BfQty }}</td>
                        <td>{{ r.OkQty }}</td>
                     </tr>
                     <tr v-if="!reportingHistory.length">
                        <td colspan="11" class="no-data">暂无历史报工记录</td>
@@ -57,9 +89,9 @@
            </div>
         </view>

         <!-- 下面原有内容保持不变 -->
         <!-- 移除了原来的状态行中的按钮组 -->
         <view class="status-row">
            <view class="status-box">
            <!--<view class="status-box">
               <text>机台面板数：</text>
               <input v-model="productionCount" class="highlight" disabled />
            </view>
@@ -80,30 +112,26 @@
            <view class="status-box result-box">
               <text>已生产数：</text>
               <input v-model="calculatedTotalProduction" class="highlight" disabled />
            </view>
            <view class="btn-group">
               <button class="refresh-btn-inline" @click="refresh">刷新</button>
               <button v-if="isGeneratingBarcode" class="reset-btn-inline" @click="resetGenerateState">重置</button>
            </view>
            </view>-->
         </view>

         <view class="flex-row gap-lg">
            <view class="print-section flex-grow">
               <view class="barcode-info">
                  <view class="user-select">
                     <text>不良数量：</text>
                     <input v-model="customAmount" class="inp bad-input" placeholder="请输入数量" />
                  </view>
                  <view class="user-select">
                     <button class="details-btn" @click="confirmCustomAmount">确认提交</button>
                  </view>
               </view>
            </view>

            <view class="current-user-section fill-width">
            <!-- 当前报工人部分 -->
            <view class="current-user-section">
               <text>当前报工人：</text>
               <text class="current-user-name">{{ staffDisplay || '未选择' }}</text>
               <button class="select-user-btn" @click="isShowUserSelect = true">选人</button>
            </view>

            <!-- 不良数量部分 -->
            <view class="defective-section">
               <text>不良数量：</text>
               <input v-model="customAmount" class="inp bad-input" placeholder="请输入数量" />
            </view>

            <!-- 确认提交按钮 -->
            <view class="submit-section">
               <button class="details-btn" @click="confirmCustomAmount">确认提交</button>
            </view>
         </view>

@@ -120,7 +148,7 @@
                  <button v-if="userSearch" class="user-search-clear" @click="userSearch=''">清空</button>
                  <view class="user-search-info">
                     匹配：{{ filteredUsers.length }} / {{ users.length }}
                  </view>
         </view>
               </view>
               <view class="user-list-scroll">
                  <template v-if="filteredUsers.length">
@@ -144,11 +172,11 @@
            </view>
         </view>

         <view class="bottom-section">
         <!-- 禁用按钮：‘保存并生效'、‘取消’ -->
         <!--<view class="bottom-section">
            <button class="save-btn" @click="save">保存并生效</button>
            <button class="cancel-btn" @click="cancel">取消</button>
         </view>

         </view>-->
         <!-- 保留旧弹窗 -->
         <view v-if="isShow" class="overlay">
            <view class="popup">
@@ -215,30 +243,42 @@
            reportingHistory: []
         }
      },
        computed: {
            calculatedCurrentCount() { return (this.productionCount || 0) - (this.initialValue || 0); },
            calculatedTotalProduction() { return (this.kgQty || 0); }, // 若需恢复旧逻辑可用 (this.kgQty||0)+this.calculatedCurrentCount
            calculatedDefectiveCount() { return this.calculatedTotalProduction - (this.sQuantity || 0); },
            planQtyDisplay() { return this.order.planQty || this.order.planQuantity || this.order.daa008 || 0; },
            staffDisplay() {
                if (!this.staffNo) return '';
                const segs = this.staffNo.split(':');
                return segs.length > 1 ? `${segs[0]} ${segs[1]}` : this.staffNo;
            },
            filteredUsers() {
                if (!this.userSearch) return this.users;
                const kw = this.userSearch.trim().toLowerCase();
                return this.users.filter(u => u.toLowerCase().includes(kw));
            }
        },
        created() {
            this.initializeData();
            this.fetchData(true);
            this.init();
            this.getXS0101();
            this.updateNowTime();
            // 秒级刷新；如不需动态跳秒可改为 60000
            this.nowTimeTimer = setInterval(this.updateNowTime, 1000);
      computed: {
         //良品数实时计算
         realTimeDefectiveCount() {
            // 优先用输入框的值，否则用接口数据
            const val = Number(this.customAmount);
            if (!isNaN(val) && this.customAmount !== '') return val;
            return this.calculatedDefectiveCount;
         },
         realTimeOkCount() {
            // 良品数 = 报工数（计算） - 不良数
            const total = (this.order.currentCjNum || 0) - (this.order.initCjNum || 0);
            return total - this.realTimeDefectiveCount;
         },
         calculatedCurrentCount() { return (this.productionCount || 0) - (this.initialValue || 0); },
         calculatedTotalProduction() { return (this.kgQty || 0); }, // 若需恢复旧逻辑可用 (this.kgQty||0)+this.calculatedCurrentCount
         calculatedDefectiveCount() { return this.calculatedTotalProduction - (this.sQuantity || 0); },
         planQtyDisplay() { return this.order.planQty || this.order.planQuantity || this.order.daa008 || 0; },
         staffDisplay() {
            if (!this.staffNo) return '';
            const segs = this.staffNo.split(':');
            return segs.length > 1 ? `${segs[0]} ${segs[1]}` : this.staffNo;
         },
         filteredUsers() {
            if (!this.userSearch) return this.users;
            const kw = this.userSearch.trim().toLowerCase();
            return this.users.filter(u => u.toLowerCase().includes(kw));
         }
      },
      created() {
         this.initializeData();
         this.fetchData(true);
         this.init();
         this.getXS0101();
         this.updateNowTime();
         // 秒级刷新；如不需动态跳秒可改为 60000
         this.nowTimeTimer = setInterval(this.updateNowTime, 1000);
      },
      beforeDestroy() { if (this.nowTimeTimer) clearInterval(this.nowTimeTimer); },
      methods: {
@@ -248,28 +288,28 @@
            return segs.length > 1 ? `${segs[0]} ${segs[1]}` : u;
         },
         selectUser(u) { this.staffNo = u; this.isShowUserSelect = false; this.userSearch = ''; },
            /* 修改：增加秒 */
            updateNowTime() {
                const d = new Date(), p = n => n.toString().padStart(2, '0');
                this.nowTime = `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
            },
            initializeData() {
                this.productionCount = this.printedCount = this.defectiveCount = 0;
                this.icount = 1; this.bqty = 0; this.sQuantity = 0; this.kgQty = 0;
                this.initialValue = 0; this.qqty = 0;
                this.isGeneratingBarcode = false; this.lastGenerateTime = 0; this.generateRequestId = null;
            },
            resetGenerateState() {
                this.isGeneratingBarcode = false; this.generateRequestId = null; this.lastGenerateTime = 0;
                this.$showMessage("已重置条码生成状态");
            },
            refresh() {
                this.$sendPostRequest({
                    url: "http://192.168.0.94:9095/Numerical/RefreshDev",
                    data: { machineNo: this.order.machineNo },
                    contentType: "application/json"
                }).then(r => { r.code == 200 ? this.fetchData(true) : this.$showMessage("同步失败"); });
            },
         /* 修改：增加秒 */
         updateNowTime() {
            const d = new Date(), p = n => n.toString().padStart(2, '0');
            this.nowTime = `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
         },
         initializeData() {
            this.productionCount = this.printedCount = this.defectiveCount = 0;
            this.icount = 1; this.bqty = 0; this.sQuantity = 0; this.kgQty = 0;
            this.initialValue = 0; this.qqty = 0;
            this.isGeneratingBarcode = false; this.lastGenerateTime = 0; this.generateRequestId = null;
         },
         resetGenerateState() {
            this.isGeneratingBarcode = false; this.generateRequestId = null; this.lastGenerateTime = 0;
            this.$showMessage("已重置条码生成状态");
         },
         refresh() {
            this.$sendPostRequest({
               url: "http://192.168.0.94:9095/Numerical/RefreshDevBycl",
               data: { machineNo: this.order.machineNo },
               contentType: "application/json"
            }).then(r => { r.code == 200 ? this.fetchData(true) : this.$showMessage("同步失败"); });
         },
         onDaa003Change(v) {
            let o = this.lineList[this.DAA003List.indexOf(v)];
            this.orderId = o.id; this.orderNo = o.daa001;
@@ -292,34 +332,34 @@
            }
         },
         /* 新增：获取历史报工记录 */
            /* 修改：规范历史时间到秒 */
            getReportingHistory() {
                if (!this.orderNo) { this.reportingHistory = []; return; }
                const fmtSec = v => {
                    if (!v) return '';
                    // 兼容后端可能返回的不同格式
                    const d = new Date(typeof v === 'string' ? v.replace(/-/g, '/') : v);
                    if (isNaN(d.getTime())) return v; // 无法解析则原样返回
                    const p = n => n.toString().padStart(2, '0');
                    return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
                };
                this.$post({
                    url: "/Womdaa/GetByBillNoBG",
                    data: { billNo: this.orderNo, machineNo: this.machineNo || null }
         /* 修改：规范历史时间到秒 */
         getReportingHistory() {
            if (!this.orderNo) { this.reportingHistory = []; return; }
            const fmtSec = v => {
               if (!v) return '';
               // 兼容后端可能返回的不同格式
               const d = new Date(typeof v === 'string' ? v.replace(/-/g, '/') : v);
               if (isNaN(d.getTime())) return v; // 无法解析则原样返回
               const p = n => n.toString().padStart(2, '0');
               return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}:${p(d.getSeconds())}`;
            };
            this.$post({
               url: "/Womdaa/GetByBillNoBG",
               data: { billNo: this.orderNo, machineNo: this.machineNo || null }
            }).then(res => {
               const list = res?.data?.tbBillList || res?.data || [];
               this.reportingHistory = list.map(r => {
                  // 依据你数据库字段做映射（下面字段名按常见命名举例，需要按实际改）
                  return {
                            bgDate: r.bgDate || '', // 报工时间
                            staff: (r.staffNo ? (r.staffNo + ' ' + (r.staffName || '')) : (r.staffName || '')),//报工人
                            orderNo: r.billNo,//工单号
                            machineNo: r.machineNo ,//机台号
                            initialValue: r.csQty ?? 0,//初始采集数
                            productionCount: r.cjQty ?? 0,//报工时采集数
                            totalProduction: (r.cjQty - r.csQty) ?? 0,//报工数（计算）
                            BfQty: r.bfQty,//不良数
                            OkQty: r.okQty//良品数（计算）
                     bgDate: r.bgDate || '', // 报工时间
                     staff: (r.staffNo ? (r.staffNo + ' ' + (r.staffName || '')) : (r.staffName || '')),//报工人
                     orderNo: r.billNo,//工单号
                     machineNo: r.machineNo,//机台号
                     initialValue: r.csQty ?? 0,//初始采集数
                     productionCount: r.cjQty ?? 0,//报工时采集数
                     totalProduction: (r.cjQty - r.csQty) ?? 0,//报工数（计算）
                     BfQty: r.bfQty,//不良数
                     OkQty: r.okQty//良品数（计算）
                  }
               });
            }).catch(() => { this.reportingHistory = []; });
@@ -329,6 +369,7 @@
            this.user = this.user === u ? null : u;
            this.staffNo = this.user;
         },
         //选择报工人
         confirmCustomAmount() {
            if (!this.customAmount || isNaN(Number(this.customAmount))) { this.$showMessage('请输入有效的数量'); return; }
            if (!this.staffNo) { this.$showMessage('请选择报工人'); return; }
@@ -340,7 +381,9 @@
                  orderNo: this.orderNo,
                  orderId: this.orderId,
                  bf: amount,
                  staffNo: staffNo
                  staffNo: staffNo,
                  initCjNum: this.order.initCjNum,        // 初始采集数
                  currentCjNum: this.order.currentCjNum   // 报工时采集数
               }
            }).then(res => {
               if (res.status == 1) { this.$showMessage(res.message); return; }
@@ -445,7 +488,26 @@
</script>

<style scoped>
   /* 原样式保持，新增几行辅助样式 */
   .section-title {
      font-size: 20px;
      font-weight: bold;
      margin: 18px 0 8px 0;
      color: #fff;
      background: #007aff;
      padding: 8px 18px;
      border-radius: 8px 8px 0 0;
      display: inline-block;
   }

   .history-title {
      background: #555;
   }

   .highlight-row {
      background: #ffe9b3 !important;
      font-weight: bold;
   }

   .report-table .summary-row {
      background: #f0f8ff;
      font-weight: 600;
@@ -456,7 +518,47 @@
      color: #777;
      font-size: 14px;
   }
   /* 其余样式保持不变 */

   .report-header {
      display: flex;
      justify-content: space-between;
      align-items: center;
      margin-bottom: 8px;
   }

   .header-buttons {
      display: flex;
      align-items: center;
      gap: 12px;
   }

   .refresh-btn-header {
      background: #00A2E9;
      color: #fff;
      border: none;
      font-size: 16px;
      border-radius: 8px;
      padding: 8px 20px;
      transition: background 0.15s;
   }

      .refresh-btn-header:hover {
         background: #0086c0;
      }

   .reset-btn-header {
      background: #ff6b6b;
      color: #fff;
      border: none;
      font-size: 14px;
      border-radius: 8px;
      padding: 8px 16px;
      transition: background 0.15s;
   }

      .reset-btn-header:hover {
         background: #e94d4d;
      }

   .page {
      padding: 1.2vh 2vw;
@@ -478,28 +580,57 @@
      pointer-events: auto;
   }

   .report-table-wrapper {
      margin-bottom: 12px;
   }
    .report-table-wrapper {
        width: 100%;
        max-width: none;
    }

   .table-scroll {
      overflow-x: auto;
   }
    .table-scroll {
        width: 100%;
        overflow-x: auto;
    }

   .report-title {
      font-size: 24px;
      font-size: 32px;
      font-weight: 600;
      text-align: center;
      margin: 0 0 8px;
      margin: 0;
   }

   .report-table {
      min-width: 1080px;
      width: 100%;
      border-collapse: collapse;
      font-size: 14px;
      background: #fff;
   }
    /* 2. 区块标题 */
    .section-title, .history-title {
        font-size: 26px;
    }

    /* 3. 表格字体 */
    .report-table, .report-table th, .report-table td {
        font-size: 22px;
    }

    /* 4. 当前报工人、不良数量等输入区 */
    .current-user-section,
    .defective-section,
    .submit-section {
        font-size: 22px;
    }

    /* 5. 输入框字体 */
    .inp, .bad-input {
        font-size: 28px;
    }

    /* 6. 按钮字体 */
    .details-btn,
    .select-user-btn,
    .refresh-btn-header,
    .reset-btn-header {
        font-size: 22px;
    }

    .report-table {
        min-width: 1800px; /* 原来是1080px，改大即可 */
        width: 100%;
    }

      .report-table th, .report-table td {
         border: 1px solid #555;
@@ -601,7 +732,7 @@
      display: flex;
      flex-wrap: wrap;
      gap: 20px;
      align-items: flex-start;
      align-items: stretch;
   }

   .flex-grow {
@@ -612,17 +743,16 @@
      gap: 30px;
   }

   .print-section {
      padding: 6px 0 14px;
      margin-bottom: 0;
      flex: 1;
   .defective-section {
      display: flex;
      align-items: center;
      gap: 14px;
      font-size: 18px;
   }

   .barcode-info {
   .submit-section {
      display: flex;
      flex-wrap: wrap;
      align-items: flex-start;
      gap: 30px;
      align-items: center;
   }

   .inp {
@@ -665,10 +795,7 @@
      padding: 14px 22px;
      background: #fff;
      gap: 14px;
   }

   .fill-width {
      flex: 0 1 380px;
      flex: 0 0 auto;
   }

   .current-user-name {
@@ -725,7 +852,7 @@
      display: flex;
      flex-direction: column;
   }
   /* 搜索条样式 */

   .user-search-bar {
      display: flex;
      align-items: center;
@@ -776,8 +903,8 @@

   .user-list-grid {
      display: grid;
      grid-template-columns: repeat(auto-fill,minmax(150px,1fr));
      gap: 24px 24px;
      grid-template-columns: repeat(auto-fill,minmax(110px,1fr));
      gap: 12px 12px;
   }

   .user-list-btn {
@@ -785,14 +912,14 @@
      flex-direction: column;
      justify-content: center;
      align-items: center;
      gap: 6px;
      padding: 16px 10px;
      height: 120px;
      font-size: 18px;
      gap: 4px;
      padding: 10px 8px;
      height: 75px;
      font-size: 14px;
      background: #00a2e9;
      color: #fff;
      border: none;
      border-radius: 10px;
      border-radius: 8px;
      cursor: pointer;
      box-sizing: border-box;
      word-break: break-word;
@@ -800,11 +927,11 @@

      .user-list-btn .user-code {
         font-weight: 600;
         font-size: 18px;
         font-size: 14px;
      }

      .user-list-btn .user-name {
         font-size: 16px;
         font-size: 13px;
      }

      .user-list-btn.selected {
@@ -908,12 +1035,30 @@
      }

      .user-list-btn {
         height: 110px;
         font-size: 16px;
         height: 70px;
         font-size: 13px;
      }

         .user-list-btn .user-code {
            font-size: 13px;
         }

         .user-list-btn .user-name {
            font-size: 12px;
         }

      .reason-btn {
         font-size: 12px;
      }

      .refresh-btn-header {
         font-size: 14px;
         padding: 6px 16px;
      }

      .reset-btn-header {
         font-size: 12px;
         padding: 6px 12px;
      }
   }
</style>