刷新表格 currentCjNum

快乐的昕的电脑

2025-12-03 22f79cc9003f5a62873ca144a38e8015da9f2b28

 components/mold.vue

@@ -2,45 +2,51 @@
    <view class="page">
        <!-- 刀具选择区 -->
        <view class="top-section-grid">
            <!-- 第一行 -->
            <!-- 第一行：移除刀具目录按钮 -->
            <view class="form-row">
                <view class="form-cell">
                    <label class="form-label">刀具编号：</label>
                    <input class="input small-font" v-model="selectedToolNo" placeholder="请通过刀具目录选择" disabled />
                    <button class="btn-blue" @click="openToolDialog" :disabled="loadingTools">刀具目录</button>
                </view>
                <view class="form-cell">
                    <label class="form-label">设置使用上限：</label>
                    <input class="input small-font" type="number" v-model="useLimitInput" placeholder="每次换刀后手填" :disabled="!selectedToolNo || loadingForm" />
                </view>
                <view class="form-cell">
                    <label class="form-label">寿命比预警值：</label>
                <view class="form-cell form-cell-flex">
                    <label class="form-label highlight-label">使用上限：</label>
                    <input class="input small-font input-use-limit" type="number" v-model="useLimitInput" placeholder="每次上刀时手填上限" :disabled="!selectedToolNo || loadingForm" />
                    <label class="form-label" style="margin-left:16px;">寿命比预警值：</label>
                    <view class="input-with-unit">
                        <input class="input small-font"
                        <input class="input small-font input-life-warn"
                               v-model="lifeWarnInput"
                               placeholder="如0.9或90"
                               placeholder="如90"
                               :disabled="!selectedToolNo || loadingForm" />
                        <span class="unit-text">%</span>
                    </view>
                </view>
            </view>

            <!-- 第二行 -->
            <!-- 第二行：在最后添加刀具目录按钮 -->
            <view class="form-row">
                <!-- 刀具名称 -->
                <view class="form-cell">
                    <label class="form-label">刀具名称：</label>
                    <input class="input small-font" v-model="toolName" placeholder="刀具带出" disabled />
                    <input class="input small-font input-tool-name" v-model="toolName" placeholder="刀具带出" disabled />
                </view>
                <!-- 规格型号 -->
                <view class="form-cell">
                    <label class="form-label">规格型号：</label>
                    <input class="input small-font" v-model="toolModel" placeholder="刀具带出" disabled />
                    <input class="input small-font input-tool-model" v-model="toolModel" placeholder="刀具带出" disabled />
                </view>
                <!-- 刀具目录按钮右移 -->
                <view class="form-cell tool-dir-cell">
                    <button class="btn-blue large-btn" @click="openToolDialog" :disabled="loadingTools">刀具目录</button>
                </view>
                <!-- 新增：刷新按钮 -->
                <view class="form-cell" style="flex:0 0 auto; margin-left:16px;">
                    <button class="btn-blue large-btn" @click="handleRefresh" :disabled="loadingForm || submitting">刷新</button>
                </view>
            </view>
        </view>

        <!-- 操作按钮 -->
        </view>  <!-- 这里闭合 top-section-grid -->
        <!-- 操作按钮 - 移出 top-section-grid -->
        <view class="button-row">
            <button class="save-btn" @click="handleUpTool" :disabled="submitting || loadingForm">上刀提交</button>
            <button class="save-btn" @click="handleUpTool" :disabled="submitting || loadingForm">上刀提交(=调机开始)</button>
            <button class="save-btn" @click="handleDownTool" :disabled="submitting || loadingForm">下刀提交</button>
            <button class="cancel-btn" @click="cancel" :disabled="submitting || loadingForm">取消</button>
        </view>
@@ -100,7 +106,9 @@
                        <td>{{ item.upTime }}</td>
                        <td class="num">{{ item.upCount != null ? item.upCount : '' }}</td>
                        <td>{{ item.downTime }}</td>
                        <td class="num">{{ item.downCount != null ? item.downCount : '' }}</td>
                        <!--<td class="num">{{ item.downCount != null ? item.downCount : '' }}</td>-->
                        <!-- 下刀计数改为实时显示 currentCjNum -->
                        <td class="num">{{ item.currentCjNum != null ? item.currentCjNum : '' }}</td>
                        <td class="num">{{ item.useCount != null ? item.useCount : '' }}</td>
                        <td class="num">{{ item.useLimit != null ? item.useLimit : '' }}</td>
                        <td class="num">{{ item.lifePercent }}</td>
@@ -173,6 +181,40 @@
            toolModel() { this.isDirty = true; }
        },
        methods: {
    //查询当前数采数，作为下刀计数实时显示
            async fetchCurrentCjNum(toolNo) {
                if (!this.machineNo) return null;
                try {
                    const res = await this.$post({
                        url: '/Womdaa/GetWomdaasByShow',
                        data: JSON.stringify({ machineNo: this.machineNo }),
                        headers: { 'Content-Type': 'application/json' }
                    });
                    if (res.status === 0 && Array.isArray(res.data?.tbBillList)) {
                        const found = res.data.tbBillList.find(x =>
                            x.cutterId === toolNo || x.cutteR_ID === toolNo
                        );
                        return found ? (found.CurrentCjNum ?? found.currentCjNum ?? null) : null;
                    }
                } catch (e) {
                    console.warn('获取currentCjNum失败', e);
                }
                return null;
            },

            // 新增：刷新按钮处理方法
            async handleRefresh() {
                this.fetchTools('');
                if (this.machineNo && this.workOrderNo) {
                    await this.fetchFormData();
                    await this.fetchDefaultToolFromWorkOrder();
                    // 新增：刷新表格 currentCjNum
                    for (const item of this.toolRecords) {
                        item.currentCjNum = await this.fetchCurrentCjNum(item.no);
                    }
                }
                this.$showMessage('刷新完成');
            },
            // 自动保存：启动
            startAutoSave() {
                if (!this.autoSaveEnabled) return;
@@ -346,10 +388,10 @@
                if (!this.workOrderNo) { this.$showMessage('工单号不能为空'); return; }
                if (!this.machineNo) { this.$showMessage('机台号不能为空'); return; }
                if (!this.selectedToolNo) { this.$showMessage('刀具编号不能为空'); return; }
                //上刀不强制录入使用上限
                //if (!this.useLimitInput) { this.$showMessage('使用上限不能为空'); return; }
                //上刀强制录入使用上限
                if (!this.useLimitInput) { this.$showMessage('使用上限不能为空'); return; }
                const useLimit = Number(this.useLimitInput);
                //if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('请输入有效的使用上限'); return; }
                if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('请输入有效的使用上限'); return; }

                // sdjs 使用工单 currentCjNum
                const sdjs = this.workOrderCurrentCjNum != null ? Number(this.workOrderCurrentCjNum) : null;
@@ -399,9 +441,10 @@
                if (!this.workOrderNo) { this.$showMessage('工单号不能为空'); return; }
                if (!this.machineNo) { this.$showMessage('机台号不能为空'); return; }
                if (!this.selectedToolNo) { this.$showMessage('刀具编号不能为空'); return; }
                if (!this.useLimitInput) { this.$showMessage('使用上限不能为空'); return; }
                //下刀不强制录入使用上限
                //if (!this.useLimitInput) { this.$showMessage('使用上限不能为空'); return; }
                const useLimit = Number(this.useLimitInput);
                if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('请输入有效的使用上限'); return; }
                //if (isNaN(useLimit) || useLimit <= 0) { this.$showMessage('请输入有效的使用上限'); return; }

                // 下刀计数同样取工单最新采集数
                const xdjs = this.workOrderCurrentCjNum != null ? Number(this.workOrderCurrentCjNum) : null;
@@ -632,7 +675,7 @@
            }

            // 启动自动保存定时器
            this.startAutoSave();
            //this.startAutoSave();
        },
        beforeDestroy() {
            // 清理定时器，防止内存泄漏
@@ -642,16 +685,15 @@
</script>

<style scoped>
    /* 优化顶部表单区域样式 */
    .top-section-grid {
        display: flex;
        flex-direction: column;
        justify-content: center;
        align-items: center;
        align-items: flex-start;
        gap: 12px;
        margin-bottom: 2vh;
        width: 95vw;
        max-width: 1600px;
        width: 99vw;
        max-width: 1920px;
        margin-left: auto;
        margin-right: auto;
        padding: 12px;
@@ -660,13 +702,13 @@
        border: 1px solid #e9ecef;
    }

    /* 表单行样式优化 */
    .form-row {
        display: flex;
        justify-content: space-between;
        flex-direction: row;
        justify-content: flex-start;
        align-items: center;
        width: 100%;
        margin-bottom: 8px;
        margin-bottom: 12px;
    }

        .form-row:last-child {
@@ -676,35 +718,51 @@
    .form-cell {
        display: flex;
        align-items: center;
        flex: 1;
        margin: 0 8px;
        min-height: 40px;
        min-width: 0;
        margin-right: 0;
    }

        .form-cell:nth-child(1) {
            flex: 0 0 28%;
            min-width: 180px;
        }

        .form-cell:nth-child(2) {
            flex: 0 0 32%;
            min-width: 180px;
            justify-content: flex-start;
        }

        .form-cell:nth-child(3) {
            flex: 0 0 auto;
            min-width: 0;
            max-width: 220px; /* 限制最大宽度，避免撑开 */
            justify-content: flex-end;
        }

    .form-label {
        width: 100px;
        width: auto;
        font-weight: bold;
        font-size: 14px;
        color: #333;
        white-space: nowrap;
        margin-right: 8px;
        margin-right: 4px;
        flex-shrink: 0;
    }

    .input {
        padding: 8px 12px;
        font-size: 14px;
        padding: 14px 20px;
        border: 1px solid #dcdfe6;
        flex: 1;
        margin-right: 8px;
        margin-right: 0;
        border-radius: 4px;
        background: #fff;
        min-width: 0;
        height: 36px;
        height: 56px !important;
        box-sizing: border-box;
    }

        .input.small-font {
            font-size: 13px;
            /* 不设置字体大小 */
        }

        .input:disabled {
@@ -713,20 +771,62 @@
            cursor: not-allowed;
        }

    .btn-blue {
    .input-with-unit {
        display: flex;
        align-items: center;
        gap: 0;
    }

        .input-with-unit .input {
            width: 60px !important;
            min-width: 0 !important;
            margin-right: 2px !important;
            text-align: center;
            padding-left: 2px;
            padding-right: 2px;
        }

        .input-with-unit .input {
            margin-right: 4px !important;
            width: 60px !important;
            min-width: 0 !important;
            text-align: center;
        }

    .unit-text {
        margin-left: 0 !important;
        padding-left: 0 !important;
        font-size: 22px !important;
    }

    .btn-blue, .btn-blue.large-btn {
        background-color: #1890ff;
        color: white;
        border: none;
        padding: 8px 16px;
        padding: 14px 32px;
        border-radius: 4px;
        cursor: pointer;
        font-size: 14px;
        font-weight: 500;
        white-space: nowrap;
        height: 36px;
        height: 70px !important;
        box-sizing: border-box;
        transition: all 0.3s;
        flex-shrink: 0;
        min-width: 140px;
        margin-left: 24px;
    }

        .btn-blue.large-btn {
            padding: 0 60px;
            min-width: 180px;
            height: 72px !important;
            margin-left: 0 !important;
            font-size: 1.3em;
            box-shadow: 0 2px 8px rgba(24,144,255,0.08);
            line-height: 72px; /* 垂直居中 */
            display: inline-block; /* 保证line-height生效 */
            vertical-align: middle;
        }

        .btn-blue:hover {
            background-color: #40a9ff;
@@ -745,50 +845,40 @@
    .button-row {
        display: flex;
        justify-content: center;
        gap: 16px;
        margin: 20px 0;
        padding: 0 20px;
        gap: 32px;
        margin: 2vh 0;
    }

    .save-btn, .cancel-btn {
        width: 120px;
        padding: 10px 20px;
        background-color: #1890ff;
        width: 28%;
        padding: 1.5vh;
        background-color: #00A2E9;
        color: white;
        font-size: 14px;
        border: none;
        text-align: center;
        border-radius: 4px;
        cursor: pointer;
        transition: all 0.3s;
        border-radius: 6px;
        transition: background 0.2s;
    }

        .save-btn:hover {
            background-color: #40a9ff;
        }

        .save-btn:active {
            background-color: #096dd9;
        }

    .cancel-btn {
        background-color: #f5f5f5;
        color: #666;
        border: 1px solid #d9d9d9;
        background-color: #eee;
        color: #333;
    }

        .cancel-btn:hover {
            background-color: #fff;
            border-color: #1890ff;
            color: #1890ff;
        }
    .save-btn:hover {
        background-color: #40a9ff;
    }

        .save-btn:disabled, .cancel-btn:disabled {
            opacity: 0.6;
            cursor: not-allowed;
        }
    .save-btn:active {
        background-color: #096dd9;
    }

    /* 弹窗样式保持原样 */
    .save-btn:disabled, .cancel-btn:disabled {
        opacity: 0.6;
        cursor: not-allowed;
    }

    /* 弹窗样式 */
    .dialog-overlay {
        position: fixed;
        top: 0;
@@ -806,42 +896,57 @@
        background: #fff;
        padding: 3vh 3vw;
        border-radius: 18px;
        width: 100vw;
        max-width: 1200px;
        min-height: 60vh;
        width: 90vw;
        max-width: 1600px;
        min-height: 70vh;
        max-height: 85vh;
        box-sizing: border-box;
        box-shadow: 0 8px 32px rgba(0,0,0,0.12);
        display: flex;
        flex-direction: column;
    }

    .form-group .input {
        width: 24vw;
        border-radius: 6px;
        background: #f8f8f8;
    .form-group {
        display: flex;
        gap: 12px;
        align-items: center;
        margin-bottom: 2vh;
        flex-shrink: 0;
    }

        .form-group .input {
            flex: 1;
            min-width: 300px;
            border-radius: 6px;
            background: #f8f8f8;
        }

    .tool-list {
        display: flex;
        flex-wrap: wrap;
        margin: 1vh 0;
        max-height: 40vh;
        flex: 1;
        overflow-y: auto;
        gap: 10px 0;
        gap: 12px;
        align-content: flex-start;
    }

    .tool-btn {
        flex: 0 0 24%;
        flex: 0 0 calc(20% - 10px);
        box-sizing: border-box;
        margin: 5px 1% 5px 0;
        padding: 12px 18px;
        padding: 10px 12px;
        background: #f5f5f5;
        border: 1px solid #d0d0d0;
        border-radius: 8px;
        cursor: pointer;
        color: #333;
        text-align: left;
        font-size: 1vw;
        min-height: 50px;
        transition: background 0.15s, color 0.15s;
        word-break: break-all;
        overflow: hidden;
        text-overflow: ellipsis;
        white-space: nowrap;
        line-height: 1.4;
    }

        .tool-btn.active {
@@ -854,10 +959,11 @@
    .dialog-actions {
        display: flex;
        justify-content: space-between;
        align-items: flex-end;
        align-items: center;
        margin-top: 2vh;
        padding-top: 2vh;
        border-top: 1px solid #eee;
        flex-shrink: 0;
    }

        .dialog-actions > div:first-child {
@@ -873,29 +979,34 @@
            align-items: center;
        }

        .dialog-actions .btn-blue {
            padding: 10px 24px;
            min-width: 120px;
        }

    .btn-disabled {
        background: #f2f2f2;
        color: #bbb;
        color: #999;
        border: none;
        padding: 14px 36px;
        border-radius: 10px;
        font-size: 1.1vw;
        font-weight: bold;
        padding: 10px 24px;
        border-radius: 4px;
        font-weight: 500;
        cursor: not-allowed;
        box-shadow: none;
        min-width: 120px;
    }

    /* 表格样式保持原样 */
    .table-section {
        display: flex;
        justify-content: center;
        margin: 1vh 0;
        overflow-x: auto;
        width: 100%; /* 确保表格容器占满宽度 */
    }

    table.styled-table {
        max-width: 1600px;
        width: 95vw;
        max-width: 1800px; /* 从1600px增加到1800px */
        width: 98vw; /* 从95vw增加到98vw */
        margin: 0 auto;
        border-collapse: separate;
        border-spacing: 0;
@@ -911,14 +1022,12 @@
            border-bottom: 2px solid #bfbfbf;
            padding: 16px 10px;
            font-weight: bold;
            font-size: 1.2vw;
            text-align: center;
        }

        table.styled-table tbody td {
            border-bottom: 1px solid #e8e8e8;
            padding: 14px 10px;
            font-size: 1.1vw;
            vertical-align: middle;
            text-align: center;
        }
@@ -966,26 +1075,6 @@
        padding: 2px 6px;
        border-radius: 3px;
        font-weight: bold;
        font-size: 0.9vw;
    }

    /* 带单位的输入框样式 */
    .input-with-unit {
        display: flex;
        align-items: center;
        flex: 1;
    }

        .input-with-unit .input {
            flex: 1;
            margin-right: 8px;
        }

    .unit-text {
        color: #666;
        font-size: 14px;
        white-space: nowrap;
        width: 20px;
    }

    /* 响应式调整 */
@@ -996,17 +1085,82 @@

        .form-label {
            width: 90px;
            font-size: 13px;
        }

        .input {
            font-size: 13px;
            padding: 6px 10px;
            padding: 10px 14px;
        }

        .btn-blue {
            padding: 6px 12px;
            font-size: 13px;
            padding: 10px 18px;
        }
    }

    .input-life-warn {
        width: 48px !important; /* 稍微放宽，避免字体溢出 */
        min-width: 0 !important;
        margin-right: 4px;
        padding-left: 2px;
        padding-right: 2px;
        font-size: 22px !important;
        text-align: center;
        box-sizing: border-box;
    }

    .input,
    .input.small-font,
    .input-use-limit,
    .input-tool-model,
    .input-tool-name,
    .input-life-warn {
        font-size: 22px !important;
    }

    .input-tool-model {
        width: 320px !important; /* 原为200px，现加长 */
        min-width: 0 !important;
        margin-right: 16px;
    }

    .input-tool-name {
        width: 120px !important;
        min-width: 0 !important;
        margin-right: 16px;
    }

    .highlight-label {
        color: #1890ff !important;
    }

    .tool-dir-cell {
        flex: 0 0 auto !important;
        justify-content: flex-start !important;
        display: flex !important;
        align-items: center;
        margin-left: 16px; /* 与规格型号输入框拉开距离 */
    }

    .form-cell-flex {
        display: flex;
        align-items: center;
        flex: 0 0 60%;
        min-width: 320px;
    }

        .form-cell-flex .form-label {
            margin-right: 4px;
            width: auto;
        }

        .form-cell-flex .input-use-limit {
            margin-right: 12px;
        }

    .input-use-limit {
        width: 450px !important;
        min-width: 0 !important;
        margin-right: 16px;
        flex: none !important; /* 关键：彻底禁止flex拉伸 */
    }

</style>