BUG修改

快乐的昕的电脑

2025-10-13 729310a090413ae277f680457e4239e66a95cf5d

 components/mold.vue

@@ -1,25 +1,23 @@
<template>
   <view class="page">
      <!-- 刀具选择区 -->
      <view class="top-section">
         <view class="form-row">
      <view class="top-section-grid">
         <view class="form-cell">
            <label class="form-label">选择刀具编号：</label>
            <select v-model="selectedToolNo" class="form-select">
               <option v-for="tool in toolList" :key="tool.no" :value="tool.no">{{ tool.no }} | {{ tool.name }}</option>
            </select>
            <button class="btn-blue" @click="showToolDialog = true">刀具目录</button>
         </view>
         <view class="form-row">
         <view class="form-cell">
            <label class="form-label">设置使用上限：</label>
            <input class="input" type="number" v-model="useLimitInput" placeholder="每次换刀后手填" :disabled="!selectedToolNo" />
            <button class="btn-blue" @click="setUseLimit" :disabled="!selectedToolNo || !useLimitInput">保存上限</button>
         </view>
         <view class="form-row">
         <view class="form-cell">
            <label class="form-label">刀具名称：</label>
            <input class="input" v-model="toolName" placeholder="刀具带出" disabled />
         </view>
         <view class="form-row">
            <label class="form-label">规格型号：</label>
            <label class="form-label" style="margin-left: 16px;">规格型号：</label>
            <input class="input" v-model="toolModel" placeholder="刀具带出" disabled />
         </view>
      </view>
@@ -44,8 +42,15 @@
               </button>
            </view>
            <view class="dialog-actions">
               <button class="btn-blue" @click="confirmTool">确定</button>
               <button class="btn-disabled" @click="showToolDialog = false">取消</button>
               <div style="display: flex; align-items: center;">
                  <button class="btn-blue" @click="prevPage" :disabled="pageIndex === 1">上一页</button>
                  <span style="margin: 0 12px;">第{{ pageIndex }}页 / 共{{ totalPages }}页</span>
                  <button class="btn-blue" @click="nextPage" :disabled="pageIndex === totalPages">下一页</button>
               </div>
               <div>
                  <button class="btn-blue" @click="confirmTool">确定</button>
                  <button class="btn-disabled" @click="showToolDialog = false">取消</button>
               </div>
            </view>
         </view>
      </view>
@@ -99,29 +104,80 @@
   export default {
      data() {
         return {
            toolList: [
               // 示例数据，实际应从后端接口获取
               { no: 'T22050338', name: 'm1.5合金长刀', model: 'xxx' },
               { no: 'T22050337', name: 'm0.546合金长刀', model: 'yyy' }
            ],
            machineNo: '',//机台编码
            workOrderNo: '',//工单号
            pageIndex: 1,
            pageSize: 18,
            total: 0,
            toolList: [],
            selectedToolNo: '',
            toolName: '',
            toolModel: '',
            showToolDialog: false,
            searchKey: '',
            filteredTools: [],
                useLimitInput: '',
            toolRecords: [
               // 示例数据，实际应从后端接口获取
               { id: 1, no: 'T22050338', name: 'm1.5合金长刀', upTime: '7-13 9:00', upCount: 15, downTime: '7-13 19:00', downCount: 3115, useCount: 3100, useLimit: 8888, lifePercent: '34.88%', lifeWarn: '90%', warnStatus: '正常' }
            ]
            useLimitInput: '',
            toolRecords: []
         };
      },
      computed: {
         totalPages() {
            return Math.ceil(this.total / this.pageSize) || 1;
         }
      },
      methods: {
         searchTool() {
            this.filteredTools = this.toolList.filter(t =>
               t.no.includes(this.searchKey) || t.name.includes(this.searchKey)
            );
         async fetchTools(searchKey) {
            const res = await this.$post({
               url: '/MesCutterLedger/QueryTools',
               data: JSON.stringify({
                  searchKey,
                  pageIndex: this.pageIndex,
                  pageSize: this.pageSize
               }),
               headers: { 'Content-Type': 'application/json' }
            });

            if (res.status === 0) {
               // 兼容不同返回结构：直接数组 / { tbBillList, total } / { data: [...] }
               const payload = Array.isArray(res.data) ? res.data
                  : (res.data && res.data.tbBillList) ? res.data.tbBillList
                     : (res.data && res.data.data) ? res.data.data
                        : [];

               const getField = (obj, ...keys) => {
                  for (const k of keys) if (obj?.[k] !== undefined && obj?.[k] !== null) return obj[k];
                  return null;
               };

               this.filteredTools = (payload || []).map(t => ({
                  no: getField(t, 'cutterId', 'CUTTER_ID', 'cutteR_ID', 'daA001', 'no'),
                  name: getField(t, 'cutterName', 'CUTTER_NAME', 'cutteR_NAME', 'name'),
                  model: getField(t, 'cutterModel', 'CUTTER_MODEL', 'cutteR_MODEL', 'model')
               }));

               // 总数兼容多个字段名
               this.total = (res.data && (res.data.total ?? res.totalCount ?? res.total))
                  || payload.length || 0;
            } else {
               this.$showMessage(res.message || '查询失败');
            }
         },
         //翻页
         async prevPage() {
            if (this.pageIndex > 1) {
               this.pageIndex--;
               await this.fetchTools(this.searchKey);
            }
         },
         async nextPage() {
            if (this.pageIndex < this.totalPages) {
               this.pageIndex++;
               await this.fetchTools(this.searchKey);
            }
         },
         async searchTool() {
            this.pageIndex = 1; // 搜索时重置到第一页
            await this.fetchTools(this.searchKey);
         },
         selectTool(tool) {
            this.selectedToolNo = tool.no;
@@ -131,78 +187,180 @@
         confirmTool() {
            this.showToolDialog = false;
         },
         handleUpTool() {
            // 上刀提交逻辑，调用后端接口
            this.$showMessage('上刀提交成功（示例）');
         async handleUpTool() {
            if (!this.workOrderNo) {
               this.$showMessage('工单号不能为空');
               return;
            }
            if (!this.machineNo) {
               this.$showMessage('机台号不能为空');
               return;
            }
            if (!this.selectedToolNo) {
               this.$showMessage('刀具编号不能为空');
               return;
            }
            if (!this.useLimitInput) {
               this.$showMessage('使用上限不能为空');
               return;
            }
            const useLimit = Number(this.useLimitInput);
            if (isNaN(useLimit) || useLimit <= 0) {
               this.$showMessage('请输入有效的使用上限');
               return;
            }
            const payload = {
               workOrderNo: this.workOrderNo,   // 工单号
               machineNo: this.machineNo,       // 机台编号
               toolNo: this.selectedToolNo,     // 刀具编号
               type: '上刀',                         // 上刀
               useLimit: this.useLimitInput ? Number(this.useLimitInput) : null // 使用上限
            };
            const res = await this.$post({
               url: '/MesCutterLedger/SubmitToolAction',
               data: JSON.stringify(payload),
               headers: { 'Content-Type': 'application/json' }
            });
            if (res.status === 0) {
               this.$showMessage('上刀提交成功');
            } else {
               this.$showMessage(res.message || '上刀提交失败');
            }
         },
         handleDownTool() {
            // 下刀提交逻辑，调用后端接口
            this.$showMessage('下刀提交成功（示例）');
         async handleDownTool() {
            if (!this.workOrderNo) {
               this.$showMessage('工单号不能为空');
               return;
            }
            if (!this.machineNo) {
               this.$showMessage('机台号不能为空');
               return;
            }
            if (!this.selectedToolNo) {
               this.$showMessage('刀具编号不能为空');
               return;
            }
            if (!this.useLimitInput) {
               this.$showMessage('使用上限不能为空');
               return;
            }
            const useLimit = Number(this.useLimitInput);
            if (isNaN(useLimit) || useLimit <= 0) {
               this.$showMessage('请输入有效的使用上限');
               return;
            }
            const payload = {
               workOrderNo: this.workOrderNo,
               machineNo: this.machineNo,
               toolNo: this.selectedToolNo,
               type: '下刀', // 下刀
               useLimit: this.useLimitInput ? Number(this.useLimitInput) : null
            };
            const res = await this.$post({
               url: '/MesCutterLedger/SubmitToolAction',
               data: JSON.stringify(payload),
               headers: { 'Content-Type': 'application/json' }
            });
            if (res.status === 0) {
               this.$showMessage('下刀提交成功');
            } else {
               this.$showMessage(res.message || '下刀提交失败');
            }
         },
         cancel() {
            this.selectedToolNo = '';
            this.toolName = '';
            this.toolModel = '';
         },
         async fetchFormData() {
            if (!this.workOrderNo || !this.machineNo) {
               console.warn('工单号或机台号为空，跳过获取表单数据');
               return;
            }

            const payload = {
               workOrderNo: this.workOrderNo.trim(),
               machineNo: this.machineNo.trim()
            };

            try {
               console.log('请求参数:', payload); // 添加调试日志

               const res = await this.$post({
                  url: '/MesCutterLedger/GetFormData',
                  data: JSON.stringify(payload),
                  headers: { 'Content-Type': 'application/json' }
               });

               if (res.status === 0) {
                  console.log('获取数据成功:', res.data);
                  // ... 处理数据
               } else {
                  this.$showMessage(res.message || '获取表单数据失败');
               }
            } catch (error) {
               console.error('获取表单数据错误:', error);
               this.$showMessage('获取数据失败，请检查网络连接');
            }
         }
         //// 添加辅助方法
         //formatDateTime(dateTimeStr) {
         //    if (!dateTimeStr) return '';
         //    // 根据后端返回的时间格式进行调整
         //    const date = new Date(dateTimeStr);
         //    return `${date.getMonth() + 1}-${date.getDate()} ${date.getHours()}:${date.getMinutes().toString().padStart(2, '0')}`;
         //}
      },
      mounted() {
         // 实际应从后端加载刀具目录和使用记录
         this.filteredTools = this.toolList;
         this.fetchTools('');
         this.machineNo = uni.getStorageSync('machineNo') || '';
         this.workOrderNo = uni.getStorageSync('daa001') || '';

         // 添加调试信息
         console.log('机台号:', this.machineNo);
         console.log('工单号:', this.workOrderNo);

         if (this.machineNo && this.workOrderNo) {
            this.fetchFormData();
         } else {
            console.warn('机台号或工单号为空，无法获取表单数据');
         }
      }
   };
</script>

<style scoped>
    .form-row {
        display: flex;
        align-items: center;
        margin-bottom: 1.2vh;
    }

    .form-label {
        width: 120px;
        font-weight: bold;
    }

    .form-select {
        width: 220px;
        padding: 1vh;
        font-size: 1.1vw;
        margin-right: 10px;
    }

    .button-row {
        display: flex;
        justify-content: center;
        gap: 32px;
        margin: 2vh 0;
    }

   .page {
      padding: 2vh;
   .top-section-grid {
      display: flex;
      flex-direction: column;
      box-sizing: border-box;
   }

   .top-section {
      display: flex;
      flex-wrap: wrap;
      justify-content: center;
      align-items: flex-end;
      gap: 32px;
      margin-bottom: 2vh;
   }

   .form-group {
   .form-cell {
      display: flex;
      align-items: center;
      margin-right: 2vw;
      margin-bottom: 1.5vh;
   }

   .form-label {
      width: 90px;
      font-weight: bold;
   }

   .input {
      padding: 1vh;
      font-size: 1.5vw;
      font-size: 1.1vw;
      border: 1px solid #ccc;
      width: 16vw;
      width: 10vw;
      margin-right: 8px;
   }

   .form-select {
      width: 12vw;
      padding: 1vh;
      font-size: 1.1vw;
      margin-right: 8px;
   }

   .btn-blue {
@@ -210,19 +368,32 @@
      color: white;
      border: none;
      padding: 8px 18px;
      margin-left: 10px;
      margin-left: 8px;
      border-radius: 5px;
      cursor: pointer;
   }

   .btn-disabled {
      background-color: #ccc;
   .button-row {
      display: flex;
      justify-content: center;
      gap: 32px;
      margin: 2vh 0;
   }

   .save-btn, .cancel-btn {
      width: 28%;
      padding: 1.5vh;
      background-color: #00A2E9;
      color: white;
      font-size: 1.2vw;
      border: none;
      padding: 8px 18px;
      margin-left: 10px;
      text-align: center;
      border-radius: 5px;
      cursor: not-allowed;
   }

   .cancel-btn {
      background-color: #ccc;
      color: #333;
   }

   .dialog-overlay {
@@ -249,6 +420,8 @@
      display: flex;
      flex-wrap: wrap;
      margin: 1vh 0;
      max-height: 40vh;
      overflow-y: auto;
   }

   .tool-btn {
@@ -258,6 +431,8 @@
      border: 1px solid #ccc;
      border-radius: 4px;
      cursor: pointer;
      background: #e0e0e0;
      color: #888;
   }

   .dialog-actions {
@@ -292,22 +467,6 @@
      display: flex;
      justify-content: space-around;
      margin-top: 2vh;
   }

   .save-btn, .cancel-btn {
      width: 28%;
      padding: 1.5vh;
      background-color: #00A2E9;
      color: white;
      font-size: 1.2vw;
      border: none;
      text-align: center;
      border-radius: 5px;
   }

   .cancel-btn {
      background-color: #ccc;
      color: #333;
   }

   .tool-desc {