| | |
| | | <label class="form-label">刀具编号:</label> |
| | | <input class="input small-font" v-model="selectedToolNo" placeholder="请通过刀具目录选择" disabled /> |
| | | </view> |
| | | <view class="form-cell"> |
| | | <label class="form-label">设置使用上限:</label> |
| | | <input class="input small-font input-use-limit" 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-life-warn" |
| | | v-model="lifeWarnInput" |
| | | placeholder="如0.9或90" |
| | | placeholder="如90" |
| | | :disabled="!selectedToolNo || loadingForm" /> |
| | | <span class="unit-text">%</span> |
| | | </view> |
| | |
| | | </view> |
| | | |
| | | <!-- 第二行:在最后添加刀具目录按钮 --> |
| | | <!-- 刀具名称 --> |
| | | <view class="form-cell"> |
| | | <label class="form-label">刀具名称:</label> |
| | | <input class="input small-font input-tool-name" v-model="toolName" placeholder="刀具带出" disabled /> |
| | | <view class="form-row"> |
| | | <!-- 刀具名称 --> |
| | | <view class="form-cell"> |
| | | <label class="form-label">刀具名称:</label> |
| | | <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 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 class="form-cell"> |
| | | <label class="form-label">规格型号:</label> |
| | | <input class="input small-font input-tool-model" v-model="toolModel" placeholder="刀具带出" disabled /> |
| | | </view> |
| | | <!-- 新增的刀具目录按钮 --> |
| | | <view class="form-cell"> |
| | | <button class="btn-blue large-btn" @click="openToolDialog" :disabled="loadingTools">刀具目录</button> |
| | | </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> |
| | |
| | | <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.useCount != null ? item.useCount : '' }}</td> |
| | | <!-- 只有第一行显示 currentCjNum,其它行显示 downCount --> |
| | | <td class="num"> |
| | | <template v-if="idx === 0"> |
| | | {{ item.currentCjNum != null ? item.currentCjNum : '' }} |
| | | </template> |
| | | <template v-else> |
| | | {{ item.downCount != null ? item.downCount : '' }} |
| | | </template> |
| | | </td> |
| | | <!--<td class="num">{{ item.useCount != null ? item.useCount : '' }}</td>--><!--使用次数--> |
| | | <td class="num"> |
| | | <template v-if="idx === 0"> |
| | | <!-- 第一行实时计算使用次数 --> |
| | | {{item.currentCjNum != null && item.upCount != null ? (Number(item.currentCjNum) - Number(item.upCount)) : (item.useCount != null ? item.useCount : '') }} |
| | | </template> |
| | | <template v-else> |
| | | {{ item.useCount != null ? item.useCount : '' }} |
| | | </template> |
| | | </td> |
| | | <td class="num">{{ item.useLimit != null ? item.useLimit : '' }}</td> |
| | | <td class="num">{{ item.lifePercent }}</td> |
| | | <td class="num">{{ item.lifeWarn }}</td> |
| | |
| | | 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 |
| | | if (this.toolRecords.length > 0) { |
| | | this.$set(this.toolRecords[0], 'currentCjNum', this.workOrderCurrentCjNum); |
| | | } |
| | | } |
| | | this.$showMessage('刷新完成'); |
| | | }, |
| | | // 自动保存:启动 |
| | | startAutoSave() { |
| | | if (!this.autoSaveEnabled) return; |
| | |
| | | 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; |
| | |
| | | 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; |
| | |
| | | this.fetchTools(''); |
| | | this.machineNo = uni.getStorageSync('machineNo') || ''; |
| | | this.workOrderNo = uni.getStorageSync('daa001') || ''; |
| | | // 去除默认预警值 (90% -> 0.9) |
| | | //this.lifeWarnInput = '90'; |
| | | |
| | | if (this.machineNo && this.workOrderNo) { |
| | | this.fetchFormData(); |
| | | this.fetchDefaultToolFromWorkOrder(); |
| | | this.fetchFormData().then(async () => { |
| | | await this.fetchDefaultToolFromWorkOrder(); |
| | | // 进入页面时赋值第一行 currentCjNum |
| | | if (this.toolRecords.length > 0) { |
| | | this.$set(this.toolRecords[0], 'currentCjNum', this.workOrderCurrentCjNum); |
| | | } |
| | | }); |
| | | } else { |
| | | console.warn('机台号或工单号为空,无法获取表单数据'); |
| | | } |
| | | |
| | | // 启动自动保存定时器 |
| | | this.startAutoSave(); |
| | | //this.startAutoSave(); |
| | | }, |
| | | beforeDestroy() { |
| | | // 清理定时器,防止内存泄漏 |
| | |
| | | </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; |
| | | background: #f8f9fa; |
| | | border-radius: 8px; |
| | | border: 1px solid #e9ecef; |
| | | font-size: 22px; /* 整体调大表单区字体 */ |
| | | } |
| | | |
| | | /* 表单行样式优化 */ |
| | | .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 { |
| | |
| | | .form-cell { |
| | | display: flex; |
| | | align-items: center; |
| | | flex: 1; |
| | | margin: 0 8px; |
| | | min-height: 44px; |
| | | 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: 22px; /* 原18px,调大 */ |
| | | color: #333; |
| | | white-space: nowrap; |
| | | margin-right: 8px; |
| | | margin-right: 4px; |
| | | flex-shrink: 0; |
| | | } |
| | | |
| | | .input { |
| | | padding: 8px 12px; |
| | | font-size: 20px; /* 原16px,调大 */ |
| | | padding: 14px 20px; |
| | | border: 1px solid #dcdfe6; |
| | | flex: 1; |
| | | 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: 19px; /* 原15px,调大 */ |
| | | /* 不设置字体大小 */ |
| | | } |
| | | |
| | | .input:disabled { |
| | |
| | | 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: 22px; /* 原16px,调大 */ |
| | | font-weight: 500; |
| | | white-space: nowrap; |
| | | height: 60px; |
| | | 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; |
| | |
| | | padding: 1.5vh; |
| | | background-color: #00A2E9; |
| | | color: white; |
| | | font-size: 1.6vw; /* 原1.2vw,调大 */ |
| | | border: none; |
| | | text-align: center; |
| | | border-radius: 6px; |
| | |
| | | cursor: pointer; |
| | | color: #333; |
| | | text-align: left; |
| | | font-size: 18px; /* 原13px,调大 */ |
| | | min-height: 50px; |
| | | transition: background 0.15s, color 0.15s; |
| | | overflow: hidden; |
| | |
| | | |
| | | .dialog-actions .btn-blue { |
| | | padding: 10px 24px; |
| | | font-size: 22px; /* 原16px,调大 */ |
| | | min-width: 100px; |
| | | min-width: 120px; |
| | | } |
| | | |
| | | .btn-disabled { |
| | |
| | | border: none; |
| | | padding: 10px 24px; |
| | | border-radius: 4px; |
| | | font-size: 22px; /* 原16px,调大 */ |
| | | font-weight: 500; |
| | | cursor: not-allowed; |
| | | box-shadow: none; |
| | | min-width: 100px; |
| | | 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; |
| | |
| | | border-bottom: 2px solid #bfbfbf; |
| | | padding: 16px 10px; |
| | | font-weight: bold; |
| | | font-size: 1.6vw; /* 原1.2vw,调大 */ |
| | | text-align: center; |
| | | } |
| | | |
| | | table.styled-table tbody td { |
| | | border-bottom: 1px solid #e8e8e8; |
| | | padding: 14px 10px; |
| | | font-size: 1.4vw; /* 原1.1vw,调大 */ |
| | | vertical-align: middle; |
| | | text-align: center; |
| | | } |
| | |
| | | padding: 2px 6px; |
| | | border-radius: 3px; |
| | | font-weight: bold; |
| | | font-size: 1.2vw; /* 原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: 18px; /* 原14px,调大 */ |
| | | white-space: nowrap; |
| | | width: 20px; |
| | | } |
| | | |
| | | /* 响应式调整 */ |
| | |
| | | |
| | | .form-label { |
| | | width: 90px; |
| | | font-size: 18px; /* 原16px,调大 */ |
| | | } |
| | | |
| | | .input { |
| | | font-size: 17px; /* 原14px,调大 */ |
| | | padding: 6px 10px; |
| | | padding: 10px 14px; |
| | | } |
| | | |
| | | .btn-blue { |
| | | padding: 6px 12px; |
| | | font-size: 18px; /* 原14px,调大 */ |
| | | padding: 10px 18px; |
| | | } |
| | | } |
| | | |
| | | /* 新增大按钮样式 */ |
| | | .btn-blue.large-btn { |
| | | padding: 8px 24px; |
| | | font-size: 22px; /* 原16px,调大 */ |
| | | height: 60px; |
| | | min-width: 100px; |
| | | } |
| | | |
| | | /* 调整表单单元格布局以适应按钮 */ |
| | | .form-row .form-cell:last-child { |
| | | justify-content: center; |
| | | flex: 0 0 auto; |
| | | min-width: 120px; |
| | | } |
| | | |
| | | /* 新增:让“设置使用上限”“寿命比预警值”输入框变窄 */ |
| | | .input-use-limit { |
| | | width: 80px !important; |
| | | min-width: 0 !important; |
| | | margin-right: 10px; |
| | | } |
| | | |
| | | .input-life-warn { |
| | | width: 80px !important; |
| | | 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-use-limit { |
| | | width: 60px !important; |
| | | min-width: 0 !important; |
| | | margin-right: 10px; |
| | | .input, |
| | | .input.small-font, |
| | | .input-use-limit, |
| | | .input-tool-model, |
| | | .input-tool-name, |
| | | .input-life-warn { |
| | | font-size: 22px !important; |
| | | } |
| | | |
| | | .input-tool-model { |
| | | width: 60px !important; |
| | | width: 320px !important; /* 原为200px,现加长 */ |
| | | min-width: 0 !important; |
| | | margin-right: 10px; |
| | | margin-right: 16px; |
| | | } |
| | | |
| | | .input-tool-name { |
| | | width: 120px !important; |
| | | min-width: 0 !important; |
| | | margin-right: 10px; |
| | | margin-right: 16px; |
| | | } |
| | | |
| | | .input-tool-model { |
| | | width: 120px !important; |
| | | .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: 10px; |
| | | margin-right: 16px; |
| | | flex: none !important; /* 关键:彻底禁止flex拉伸 */ |
| | | } |
| | | |
| | | </style> |