更新注释

快乐的昕的电脑

2025-10-24 b377351789728be6a804daf38de524abae8eab83

 components/WorkOrderPrint.vue

@@ -21,26 +21,45 @@
                     </tr>
                  </thead>
                  <tbody>
                     <tr>
                     <!-- 当前实时统计(保持原来单行) -->
                     <tr class="summary-row">
                        <td>{{ nowTime }}</td>
                        <td>{{ staffDisplay || '-' }}</td>
                        <td>{{ orderNo || '-' }}</td>
                        <td>{{ order.daa003 || '-' }}</td>
                        <td>{{ planQtyDisplay }}</td>
                        <td>{{ machineNo || '-' }}</td>
                        <td>{{ initialValue }}</td>
                        <td>{{ productionCount }}</td>
                        <td>{{ calculatedTotalProduction }}</td>
                        <td>{{ calculatedDefectiveCount }}</td>
                        <td>{{ sQuantity }}</td>
                        <td>{{ order.initCjNum }}</td><!--初始采集数-->
                        <td>{{ order.currentCjNum }}</td><!--报工时采集数-->
                        <td>{{ order.currentCjNum - order.initCjNum }}</td><!--报工数（计算）-->
                        <td>{{ realTimeDefectiveCount }}</td><!--不良数-->
                        <td>{{ realTimeOkCount }}</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><!--良品数（计算）-->
                     </tr>
                     <tr v-if="!reportingHistory.length">
                        <td colspan="11" class="no-data">暂无历史报工记录</td>
                     </tr>
                  </tbody>
               </table>
            </div>
         </view>

         <!-- 下面原有内容保持不变 -->
         <view class="status-row">
            <view class="status-box">
            <!--<view class="status-box">
               <text>机台面板数：</text>
               <input v-model="productionCount" class="highlight" disabled />
            </view>
@@ -61,7 +80,7 @@
            <view class="status-box result-box">
               <text>已生产数：</text>
               <input v-model="calculatedTotalProduction" class="highlight" disabled />
            </view>
            </view>-->
            <view class="btn-group">
               <button class="refresh-btn-inline" @click="refresh">刷新</button>
               <button v-if="isGeneratingBarcode" class="reset-btn-inline" @click="resetGenerateState">重置</button>
@@ -88,17 +107,35 @@
            </view>
         </view>

         <!-- 选人弹窗 -->
         <view v-if="isShowUserSelect" class="overlay">
            <view class="popup user-select-popup">
               <!-- 搜索栏 -->
               <view class="user-search-bar">
                  <input v-model.trim="userSearch"
                        type="text"
                        class="user-search-input"
                        placeholder="输入工号或姓名搜索"
                        @keydown.enter.prevent />
                  <button v-if="userSearch" class="user-search-clear" @click="userSearch=''">清空</button>
                  <view class="user-search-info">
                     匹配：{{ filteredUsers.length }} / {{ users.length }}
                  </view>
               </view>
               <view class="user-list-scroll">
                  <view class="user-list-grid">
                     <button v-for="(u, index) in users"
                           :key="index"
                           :class="['user-list-btn', {'selected': u===staffNo}]"
                           @click="selectUser(u)">
                        <span class="user-code">{{ u.split(':')[0] }}</span>
                        <span class="user-name">{{ u.split(':')[1] }}</span>
                     </button>
                  <template v-if="filteredUsers.length">
                     <view class="user-list-grid">
                        <button v-for="(u, index) in filteredUsers"
                              :key="index"
                              :class="['user-list-btn', {'selected': u===staffNo}]"
                              @click="selectUser(u)">
                           <span class="user-code">{{ u.split(':')[0] }}</span>
                           <span class="user-name">{{ u.split(':')[1] }}</span>
                        </button>
                     </view>
                  </template>
                  <view v-else class="no-user-result">
                     未找到匹配人员
                  </view>
               </view>
               <view class="user-popup-footer">
@@ -107,11 +144,13 @@
            </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">
               <view class="bottom-section1">
@@ -171,27 +210,48 @@
            staffNo: '', printStr: '', printMac: '', bluetoothSocket: {}, device: '', uuid: '',
            printNum: 1, reportingList: [], printLoading: false, customAmount: '',
            isGeneratingBarcode: false, lastGenerateTime: 0, generateRequestId: null,
            nowTimeTimer: null, nowTime: ''
            nowTimeTimer: null, nowTime: '',
            userSearch: '',
            /* 新增：历史报工记录数组 */
            reportingHistory: []
         }
      },
      computed: {
         calculatedCurrentCount() { return (this.productionCount || 0) - (this.initialValue || 0); },
         calculatedTotalProduction() { return (this.kgQty || 0) + this.calculatedCurrentCount; },
         calculatedDefectiveCount() { return this.calculatedTotalProduction - (this.sQuantity || 0); },
         planQtyDisplay() { return this.order.planQty || this.order.planQuantity || this.order.daa007 || this.order.daa010 || 0; },
         staffDisplay() {
            if (!this.staffNo) return '';
            const segs = this.staffNo.split(':');
            return segs.length > 1 ? `${segs[0]} ${segs[1]}` : this.staffNo;
         }
      },
      created() {
         this.initializeData();
         this.fetchData(true);
         this.init();
         this.getXS0101();
         this.updateNowTime();
         this.nowTimeTimer = setInterval(this.updateNowTime, 60000);
           //良品数实时计算
            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: {
@@ -200,28 +260,29 @@
            const segs = u.split(':');
            return segs.length > 1 ? `${segs[0]} ${segs[1]}` : u;
         },
         selectUser(u) { this.staffNo = u; this.isShowUserSelect = false; },
         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())}`;
         },
         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("同步失败"); });
         },
         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/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;
@@ -234,6 +295,7 @@
            if (!this.orderId && !this.orderNo) return;
            this.getOrderById();
            this.getWomdaaPrintById();
            this.getReportingHistory(); // 新增：每次刷新同步历史
            if (flag) {
               this.$post({ url: "/Womdaa/GetWomdaasByShow", data: { machineNo: this.machineNo } })
                  .then(res => {
@@ -242,27 +304,71 @@
                  });
            }
         },
         /* 新增：获取历史报工记录 */
            /* 修改：规范历史时间到秒 */
            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//良品数（计算）
                  }
               });
            }).catch(() => { this.reportingHistory = []; });
         },
         toggleUser(u) {
            if (!u) return;
            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; }
            const staffNo = this.staffNo.split(':')[0];
            const amount = Number(this.customAmount);
            this.$post({
               url: "/MesInvItemBarcodes/AddBFToBarcodes",
               data: { orderNo: this.orderNo, orderId: this.orderId, bf: amount }
                    data: {
                        orderNo: this.orderNo,
                        orderId: this.orderId,
                        bf: amount,
                        staffNo: staffNo,
                        initCjNum: this.order.initCjNum,        // 初始采集数
                        currentCjNum: this.order.currentCjNum   // 报工时采集数
                    }
            }).then(res => {
               if (res.status == 1) { this.$showMessage(res.message); return; }
               this.$showMessage('报废数量填写成功');
               this.fetchData(true);
               this.fetchData(true); // 自动刷新历史
               this.customAmount = '';
            }).catch(() => this.$showMessage('报废数量填写失败，请重试'));
         },
         save() {
            if (!this.staffNo) { this.$showMessage('请选择报工人'); return; }
            uni.showToast({ title: '保存成功', icon: 'success' });
            this.getReportingHistory(); // 保存后也可刷新
         },
         cancel() { uni.showToast({ title: '取消操作', icon: 'none' }); },
         getOrderById() {
@@ -355,6 +461,19 @@
</script>

<style scoped>
   /* 原样式保持，新增几行辅助样式 */
   .report-table .summary-row {
      background: #f0f8ff;
      font-weight: 600;
   }

   .report-table .no-data {
      text-align: center;
      color: #777;
      font-size: 14px;
   }
   /* 其余样式保持不变 */

   .page {
      padding: 1.2vh 2vw;
      display: flex;
@@ -622,11 +741,53 @@
      display: flex;
      flex-direction: column;
   }
   /* 搜索条样式 */
   .user-search-bar {
      display: flex;
      align-items: center;
      gap: 12px;
      padding: 18px 32px 0 32px;
      background: #fff;
      flex-wrap: wrap;
   }

   .user-search-input {
      flex: 1 1 260px;
      padding: 10px 14px;
      font-size: 16px;
      border: 1px solid #bbb;
      border-radius: 8px;
      outline: none;
   }

      .user-search-input:focus {
         border-color: #007aff;
         box-shadow: 0 0 0 2px rgba(0,122,255,.15);
      }

   .user-search-clear {
      padding: 10px 18px;
      background: #ff9f43;
      color: #fff;
      border: none;
      border-radius: 8px;
      font-size: 14px;
      cursor: pointer;
   }

      .user-search-clear:hover {
         background: #ff8920;
      }

   .user-search-info {
      font-size: 14px;
      color: #555;
   }

   .user-list-scroll {
      flex: 1 1 auto;
      overflow-y: auto;
      padding: 34px 32px 0 32px;
      padding: 24px 32px 0 32px;
   }

   .user-list-grid {
@@ -671,6 +832,13 @@
         background: #008ed0;
      }

   .no-user-result {
      padding: 40px 0;
      text-align: center;
      font-size: 18px;
      color: #666;
   }

   .user-popup-footer {
      flex-shrink: 0;
      padding: 22px 32px 32px 32px;