将判断上限值过大过小逻辑删除

fcx

2025-12-03 9c49917bb7ec38cc4317591763f80ccf89c2e729

 pages/QC/XJ/Add.vue

@@ -1,124 +1,130 @@
<template>
  <view>
    <view class="form-container">
      <form :modelValue="formData">
        <view class="form-group">
          <label class="form-label">检验单号:</label>
          <input class="form-input" disabled="true" type="text" v-model="formData.releaseNo"/>
        </view>
        <view class="form-group">
          <label class="form-label">创建人:</label>
          <input class="form-input" disabled="true" type="text" v-model="formData.createBy"/>
        </view>
        <view class="form-group">
          <label class="form-label">创建时间:</label>
          <input class="form-input" disabled="true" type="text" v-model="formData.createDate"/>
        </view>
        <view class="uni-form-item uni-column form-item edit">
          <text class="form-label">线体编号:</text>
          <picker v-if="isUpdate" class="picker form-input" name="selector" :range="DAA020List"
                  @change="onDaa020Change">
            <text>{{ DAA020List[DAA020Index] }}</text>
          </picker>
          <input v-else class="form-input" disabled="true" type="text" v-model="formData.daa020"/>
        </view>
        <view class="uni-form-item uni-column form-item edit">
          <text class="form-label">物料编码:</text>
          <picker v-if="isUpdate" class="picker form-input" name="selector" :range="ItemList"
                  @change="onItemChange">
            <text>{{ ItemList[ItemIndex] }}</text>
          </picker>
          <input v-else class="form-input" disabled="true" type="text" v-model="formData.itemNo"/>
        </view>
        <view class="uni-form-item uni-column form-item edit">
          <text class="form-label">计划编号:</text>
          <picker v-if="isUpdate" class="picker form-input" name="selector" :range="DAA001List"
                  @change="onDaa001Change">
            <text>{{ DAA001List[DAA001Index] }}</text>
          </picker>
          <input v-else class="form-input" disabled="true" type="text" v-model="formData.billNo"/>
        </view>

        <view class="form-group">
          <label class="form-label">物料名称:</label>
          <input class="form-input" disabled="true" type="text" v-model="formData.itemName"/>
        </view>
        <view class="form-group">
          <label class="form-label">规格型号:</label>
          <input class="form-input" disabled="true" type="text" v-model="formData.itemModel"/>
        </view>
        <view class="form-group">
          <label class="form-label">工单数量:</label>
          <input class="form-input" disabled="true" type="text" v-model="formData.planQty"/>
        </view>
        <view class="form-group">
          <label class="form-label">不合格描述:</label>
          <input class="form-input" disabled="true" type="text" v-model="formData.remarks"/>
        </view>
      </form>
  <view class="inspection-sheet">
    <!-- 头部信息 -->
    <view class="sheet-header">
      <h1>巡检单</h1>
      <view class="inspection-number">检验单号：{{ formData.billNo }}</view>
    </view>

    <view class="list-container">
      <uni-table ref="table" border emptyText="暂无更多数据">
        <uni-tr>
          <uni-th align="center" class="th" style="color: #FFFFFF;">检验项目</uni-th>
          <uni-th align="center" class="th" style="color: #FFFFFF">是否合格</uni-th>
          <uni-th align="center" class="th" style="color: #FFFFFF">记录(点击)</uni-th>
        </uni-tr>
        <uni-tr v-for="(item, index) in tableData" :key="index">
          <uni-td align="center">
            <input class="form-input" disabled="true" type="text" v-model="item.projName"/>
          </uni-td>
          <uni-td align="center">
            <input class="form-input" disabled="true" type="text" v-model="item.result"/>
          </uni-td>
          <uni-td>
            <view class="uni-group">
              <button v-if="item.isCheck >=item.levelNum" type="default" @click="toDetail(item)">
                {{ item.levelNum + '/' + item.isCheck }}
              </button>
              <button v-else type="warn" @click="toDetail(item)">
                {{ item.levelNum + '/' + item.isCheck }}
              </button>
            </view>
          </uni-td>
        </uni-tr>
      </uni-table>
    <!-- 基本信息区 -->
    <view class="basic-info">
      <view class="info-row">
        <span class="info-label">创建时间：</span>
        <span class="info-value">{{ formData.createTime }}</span>
        <span class="info-label">检验人：</span>
        <span class="info-value">{{ formData.statusUser }}</span>
      </view>
    </view>

    <view class="plus-button">
      <button type="warn" v-if="isUpdate && !isShowTable" @click="getItem">创建检验单并生成部分默认值</button>
    </view>
    <view class="plus-button">
      <button type="warn" v-if="!isUpdate && !isShowTable" @click="toImage">上传/查看图片</button>
    </view>
    <view class="plus-button">
      <button type="warn" v-if="!isUpdate && !formData.fcheckResu && !isShowTable" @click="removeXJ">删除单据</button>
    </view>
    <view class="plus-button">
      <button type="warn" v-if="!isUpdate && !isShowTable" @click="saveRemarks">添加不合格描述</button>
    <!-- 物料信息区 -->
    <view class="material-info">
      <view class="info-block">
        <view class="info-label">生产线别：</view>
        <view v-if="!isUpdate" class="info-value">{{ formData.daa020 }}</view>
        <superwei-combox v-else v-model="formData.daa020" :candidates="DAA020List"
                         class="picker info-value-input" placeholder="请选择或输入"
                         @select="onDaa020Change"></superwei-combox>
      </view>
      <view class="info-block">
        <view class="info-label">物料编码：</view>
        <view v-if="!isUpdate" class="info-value">{{ formData.itemNo }}</view>
        <superwei-combox v-else v-model="formData.itemNo" :candidates="boardItems" :isJSON="true"
                         class="picker info-value-input" keyName="itemName" placeholder="请选择或输入"
                         @select="onItemChange"></superwei-combox>
      </view>
      <view class="info-block">
        <view class="info-label">产品名称：</view>
        <view class="info-value">{{ formData.itemName }}</view>
      </view>
      <view class="info-block">
        <view class="info-label">规格型号：</view>
        <view class="info-value">{{ formData.itemModel }}</view>
      </view>
      <view class="info-block">
        <view class="info-label">工单编号：</view>
        <view v-if="!isUpdate" class="info-value">{{ formData.billNo }}</view>
        <picker v-else :range="DAA001List" class="picker info-value-input" name="selector"
                @change="onDaa001Change">
          <view>{{ DAA001List[DAA001Index] }}</view>
        </picker>
        <view class="info-label">项目：</view>
        <view class="info-value">{{ formData.projecT_CODE }}</view>
        <view class="info-label">工单数量：</view>
        <view class="info-value highlight">{{ formData.planQty }}</view>
      </view>
      <view v-if="formData.remarks && current" class="info-block">
        <view class="info-label">备注：</view>
        <view class="info-value">{{ formData.remarks }}</view>
      </view>
    </view>

    <view class="plus-button">
      <button type="warn" v-if="isShowTable" @click="getTable">获取检验项目</button>
    <!-- 操作按钮区 -->
    <view class="action-buttons">
      <button v-if="current" class="secondary-btn" @click="getTable">获取检验项目</button>
      <button v-if="formData.billNo" class="secondary-btn" @click="closeInspection">关闭此次检验</button>
    <!-- <button v-if="isShowTable && isUpdate" class="primary-btn" @click="saveTable">生成检验项目</button> --> 
    </view>
    <view class="plus-button">
      <button type="warn" v-if="isShowTable && isUpdate" @click="saveTable">生成检验项目</button>

    <!-- 检验项目表格 -->
    <view v-if="tableData.length > 0" class="inspection-table">
      <table>
        <thead>
        <tr>
          <th style="text-align: center;" width="15%">检验项目</th>
          <th style="text-align: center;" width="50%">检验描述</th>
          <th style="text-align: center;" width="20%">记录(点击)</th>
        </tr>
        </thead>
        <tbody>
        <tr v-for="(item, index) in tableData" :key="index">
          <td>{{ item.projName }}</td>
          <td>
            <view v-if="item.result=='合格'" class="watermark approved">合格</view>
            <view v-if="item.result=='不合格'" class="watermark rejected">不合格</view>
            <view v-if="item.result=='未完成'" class="watermark pending">待确认</view>
            <view class="description-text">{{ item.itemMod }}</view>
          </td>
          <td>
             <button v-if="item.isCheck < item.levelNum" class="record-btn record-btn-fill"
                    @click="toDetail(item)">
              填写 <!--({{ item.isCheck }}/{{ item.levelNum }})-->
            </button>
            
             <button v-else class="record-btn record-btn-view" @click="toDetail(item, index)">
              查看<!--({{ item.isCheck }}/{{ item.levelNum }})--> 
            </button>
          </td>
        </tr>
        </tbody>
      </table>
    </view>

    <!-- 操作按钮区 -->
    <view class="action-buttons">
      <button v-if="isUpdate && !isShowTable" class="secondary-btn" @click="getItem">创建检验单并生成部分默认值</button>
      <button v-if="!isUpdate && !isShowTable" class="secondary-btn" @click="uploadImages">查看所有图片</button>
      <button v-if="!isUpdate && !isShowTable" class="secondary-btn" @click="addDefectDescription">查看不良描述</button>
      <!--  <button v-if="!isUpdate && !formData.statusUser && !isShowTable" class="secondary-btn" @click="removeXJ">
        删除单据
      </button> -->
      <!-- <button v-if="!isUpdate && !isShowTable" class="secondary-btn" @click="saveRemarks">添加备注</button> -->
      <button v-if="!isUpdate && !isShowTable && current" class="primary-btn" @click="submit">检验提交</button>
    </view>

    <!-- 不合格描述弹窗 -->
    <view v-if="remarksPopup" class="overlay">
      <view class="popup">
        <h3>修改不合格描述</h3>
        <h3>修改备注</h3>
        <form>
          <view class="form-group">
            <label class="form-label">不合格描述:</label>
            <input class="form-input" type="text" v-model="remarks"/>
            <label class="form-label">备注:</label>
            <textarea v-model="remarks" class="form-input form-textarea" placeholder="请输入备注信息..."></textarea>
          </view>
          <button type="warn" @click="editRemarks">修改</button>
          <button class="updateBut" @click="editRemarks">修改</button>
          <button @click="remarksPopup = !remarksPopup">取消</button>
        </form>
      </view>
    </view>

  </view>
</template>

@@ -127,39 +133,32 @@
  data() {
    return {
      formData: {
        createTime: "",
        id: "",
        releaseNo: "",
        createBy: "",
        createDate: "",
        daa020: "",
        itemNo: "",
        billNo: "",
        catQty: "",
        detailMem: "",
        taskNo: "",
        fcheckResu: "",
        boardModel: "",
        planQty: "",
        mocode: "",
        boardStyle: ""
        itemNo: "",
        itemName: "",
        workshopCode: "",
        workshopName: "",
        line: "",
        lineName: "",
        comments: "",
        statusUser: "",
        itemId: "",
        fSubmit: 0,
      },

      DAA020List: [],
      DAA020Index: -1,

      DAA001List: [],
      DAA001Index: -1,
      schemeResult: [],

      isShowTable: false,
      DAA001Index: -1,

      ItemList: [],
      ItemIndex: -1,

      boardItems: [],

      lineList: [],

      lineNo: "",
      womdaaList: [],

      tableData: [],

@@ -167,8 +166,14 @@

      isUpdate: true,

      isShowTable: false,

      remarks: "",
      remarksPopup: false,

      comments: "",
      commentsPopup: false,
      current: true,
    };
  },
  onLoad(options) {
@@ -176,32 +181,87 @@

    let params = options;

    if (params["id"]) {
      this.isUpdate = false;
      this.formData.id = params["id"];
      this.formData.releaseNo = params["releaseNo"];
      //getQaItemXj02
      this.init();
    } else {
      //初始化检验单号
      this.$post({
        url: "/XJ/getMaxReleaseNo"
      }).then(res => {
        this.formData.releaseNo = res.data.tbBillList;
        this.formData.createBy = this.$loginInfo.account;
        this.formData.createDate = this.$getDate("yyyy-mm-dd");
      });

      //车间下拉框的初始化
      this.$post({
        url: "/XJ/getLineAll"
      }).then(res => {
        this.lineList = res.data.tbBillList;
        this.DAA020List = res.data.tbBillList.map(item => item.lineName);
      })
    // tab 状态识别
    if(params["current"] === 'A') {
        this.current = true;
    } else if(params["current"] === 'B') {
        this.current = false;
    }
  },

    if (params["id"]) {

        this.isUpdate = false;

        // ⭐⭐⭐ 新增：必须保存到 this.id，后续接口才能使用
        this.id = params["id"];         // ←←← 必须加这一句！！！

        // 原来你的逻辑保持不动
        this.formData.id = params["id"];
        this.formData.billNo = params["billNo"];

        // 初始化明细
        this.init();

    } else {

        // 初始化检验单号
        this.$post({
            url: "/XJ/getMaxReleaseNo"
        }).then(res => {
            this.formData.billNo = res.data.tbBillList;
            this.formData.createTime = this.$getDate("yyyy-mm-dd");
        });

        // 产品编码下拉框初始化
        this.$post({
            url: "/XJ/getLineAll"
        }).then(res => {
            this.lineList = res.data.tbBillList;
            this.DAA020List = res.data.tbBillList.map(item => item.lineName);
            this.formData.itemNo = "";
            this.formData.itemName = "";
            this.formData.workshopCode = "";
            this.formData.workshopName = "";
            this.formData.line = "";
            this.formData.lineName = "";
            this.formData.pbaid = null;
        })
    }
}
,
  methods: {
    // 获取合格项目数量
    getPassedCount() {
      return this.tableData.filter(item => item.result === '合格').length;
    },
    // 获取不合格项目数量
    getFailedCount() {
      return this.tableData.filter(item => item.result === '不合格').length;
    },
    // 获取待检验项目数量
    getPendingCount() {
      return this.tableData.filter(item => item.result === '未完成').length;
    },
    // 关闭此次检验并传巡检单号给后端
    closeInspection() {
      if (this.formData.billNo) {
        this.$post({
          url: "/XJ/closeInspection",
          data: {
            billNo: this.formData.billNo,
            id: this.formData.id
          }
        }).then(res => {
          this.$showMessage("检验已关闭");
          // 关闭当前页面，返回上一页面
          uni.navigateBack();
        }).catch(err => {
          this.$showMessage("关闭检验失败，请重试");
        });
      } else {
        this.$showMessage("巡检单号不存在");
      }
    },
    removeXJ() {
      if (this.formData.id) {
        this.$post({
@@ -222,38 +282,105 @@
        this.$showMessage("请先选择检验单号");
      }
    },
    getItem() {

      if (this.isSubmit) {
        this.$showMessage("此物料无启用的检验项目，请维护!");
        return;
      }

      if (!this.formData.billNo) {
        this.$showMessage("请选择计划编号");
        return;
      }

    submit() {
      this.$post({
        url: "/XJ/save",
        url: "/XJ/XJQaSubmit",
        data: {
          from: this.formData,
          userNo: this.$loginInfo.account,
          items: this.tableData
          gid: this.formData.id
        }
      }).then(res => {
        this.formData.id = res.data.tbBillList;
        this.$showMessage("生成检验项目成功");
        this.init();
        this.isUpdate = false;
      });

        //2024-11-28 kyy 校验合格提交增加提示
        console.log("完整响应数据:", res);
        console.log("Status Code的值:", res.statusCode);
        console.log("返回的数据:", res.data);
        
        // 检查多种成功条件
        if (res.statusCode === 200 || res.status === 0 || res.data === true || res.data.tbBillList === true) {

          this.$showMessage("成功提交检验");
          // 提交成功后跳转到列表页面
          setTimeout(() => {
            uni.navigateTo({
              url: '/pages/QC/XJ/List'
            });
          }, 1500); // 1.5秒后跳转，让用户看到成功提示
        } else {
          this.$showMessage(res.data.message || res.message || "提交失败");
        }
      }).catch(err => {
        console.log("提交出错:", err);
        this.$showMessage("提交失败，请重试");
      })
    },
    //生产线别选择并初始话工单号

    init() {
      if (this.formData.id) {
        this.$post({
          url: "/XJ/getPage",
          data: {
            pageIndex: 1,
            limit: 1,
            id: this.formData.id
          }
        }).then(res => {
          let tbBillListElement = res.data.tbBillList[0];
          if (tbBillListElement) {
            // 保存原有的ID值
            const originalId = this.formData.id;
            
            // 保存原有的billNo值
            const originalBillNo = this.formData.billNo;
            
            // 将服务器返回的数据合并到现有数据中，而不是直接替换
            Object.assign(this.formData, tbBillListElement);
            
            // 确保关键字段值不被覆盖
            if ((!this.formData.id || this.formData.id === null || this.formData.id === undefined || this.formData.id === "") && originalId) {
              this.formData.id = originalId;
            }
            
            if ((!this.formData.billNo || this.formData.billNo === null || this.formData.billNo === undefined || this.formData.billNo === "") && originalBillNo) {
              this.formData.billNo = originalBillNo;
            }
            
            this.$post({
              url: "/XJ/getJYItem",
              data: {
                pid: this.formData.id
              }
            }).then(res => {
              this.tableData.splice(0, this.tableData.length, ...res.data.tbBillList);

              this.tableData.sort((a, b) => {
                if (a.result === '未完成' && b.result === '合格') {
                  return -1;
                } else if (a.result === '合格' && b.result === '未完成') {
                  return 1;
                } else {
                  return 0;
                }
              });

              if (this.tableData.length === 0) {
                this.isShowTable = true;
              }
              
              console.log('init完成后tableData长度:', this.tableData.length, 'isShowTable:', this.isShowTable);
            })
          }
        })
      }
    },
    onDaa020Change(event) {
      //获取生产线别的下标地址
      this.DAA020Index = event.mp.detail.value;
      //this.formData.line = event;

      this.lineNo = this.lineList[this.DAA020Index].lineNo;
      this.lineNo = this.lineList[this.DAA020List.indexOf(event)].lineNo;

      this.formData.line = this.lineNo;

      this.$post({
        url: "/XJ/getBoardItem",
@@ -263,18 +390,15 @@
      }).then(res => {
        //填充工单号的数据源
        this.boardItems = res.data.tbBillList;

        this.ItemList = this.boardItems.map(item => item.itemName);
        //变为默认空值的状态
        this.ItemIndex = -1;
      })

    },
    onItemChange(event) {
      this.ItemIndex = event.mp.detail.value;
      this.formData.itemNo = this.boardItems[this.ItemIndex].itemNo;//主要是改这里
      this.formData.itemId = this.boardItems[this.ItemIndex].id;//主要是改这里
      this.formData.itemName = this.boardItems[this.ItemIndex].itemName;//主要是改这里
      this.formData.itemModel = this.boardItems[this.ItemIndex].itemModel;//主要是改这里

      this.formData.itemNo = event.itemNo;

      this.$post({
        url: "/XJ/getDaa001",
        data: {
@@ -287,103 +411,253 @@
        this.DAA001List = this.schemeResult.map(s => s.daa001);
        //变为默认空值的状态
        this.DAA001Index = -1;

        this.formData.billNo = "";
        this.formData.daa001 = "";
      })
    },
    //选取工单填充物料号和其他信息
    onDaa001Change(event) {
      this.DAA001Index = event.mp.detail.value;
      this.formData.billNo = this.schemeResult[this.DAA001Index].daa001;
      this.formData.planQty = this.schemeResult[this.DAA001Index].daa008;

      this.formData.daa001 = this.schemeResult[this.DAA001Index].daa001;

      //表单中的部分字段赋值
      this.$post({
        url: "/XJ/getItem",
        data: {
          daa001: this.formData.billNo
          daa001: this.formData.daa001
        }
      }).then(res => {
        let data = res.data.tbBillList[0];
        //当返回的结果集为空时置空原有的值
        if (!data) {
          this.formData.billNo = "";
          this.formData.taskNo = "";
          this.formData.itemNo = "";
          this.formData.planQty = "";
          this.tableData = [];
          this.tableData.splice(0, this.tableData.length);
          return;
        }

        this.$post({
          url: "/XJ/setJYItem",
          data: {
            itemNo: this.formData.itemNo
          }
        }).then(res => {
          if (res.data.tbBillList.length > 0) {
            this.tableData = res.data.tbBillList; // 在箭头函数中，this 指向外层作用域的 this
            this.isSubmit = false;
          } else {
            this.$showMessage("此物料没有启用的检验项目，请维护!");
            this.isSubmit = true;
            this.tableData = [];
          }
        });
      });
        //不为空时赋值
        this.formData.daa001 = data.daa001;
        this.formData.daa003 = data.daa003;
        this.formData.daa004 = data.daa004;
        this.formData.daa008 = data.daa008;
        this.formData.projecT_CODE = data.projecT_CODE;
        this.formData.itemId = data.itemId;
        this.formData.pbaid = data.pbaid;
        this.formData.remarks = data.remarks;
      })
    },
    init() {
    toDetail(item, index) {
  // 检查检验单是否存在
  if (!this.formData.id) {
    this.$showMessage("检验单数据不完整，请先获取检验项目或重新加载页面");
    return;
  }

  if (this.isUpdate) {
    uni.showToast({
      icon: "none",
      title: "请先生成检验项目",
      duration: 2000,
    });
    return;
  }

  // 如果 item.id 不存在，就传空字符串或者特殊标识
  const itemId = item.id != null ? item.id : '';
  const billNo = this.formData.billNo || '';
  const gid = this.formData.id || '';
  const itemIndex = index != null ? index : 0;

  uni.navigateTo({
    url: 'detail?id=' + encodeURIComponent(itemId) + 
         '&billNo=' + encodeURIComponent(billNo) + 
         '&gid=' + encodeURIComponent(gid) + 
         '&index=' + encodeURIComponent(itemIndex)
  });
},
    getTable() {
      // 在开始时清空现有数据，避免累加
      this.tableData.splice(0, this.tableData.length);
      
      // 确保itemNo存在
      if (!this.formData || !this.formData.itemNo) {
        this.$showMessage("请先选择物料编码");
        return;
      }

      // 显示加载提示，防止用户在保存过程中点击填写按钮
      uni.showLoading({
        title: '正在获取检验项目...'
      });

      this.$post({
        url: "/XJ/getPage",
        url: "/XJ/setJYItem",
        data: {
          id: this.formData.id,
          pageIndex: 1,
          limit: 1,
          itemNo: this.formData.itemNo
        }
      }).then(res => {
        let data = res.data.tbBillList[0];
        if (data) {
          this.formData = data;
        if (res.data && res.data.tbBillList && res.data.tbBillList.length > 0) {
          // 直接赋值，避免累加
          this.tableData.splice(0, this.tableData.length, ...res.data.tbBillList);
          
          // 设置状态以显示生成检验项目按钮
          this.isShowTable = true;
          this.isUpdate = true;  // 注意这里是true，表示可以生成检验项目
          
          console.log('getTable完成后的状态:', {
            isShowTable: this.isShowTable,
            isUpdate: this.isUpdate,
            tableDataLength: this.tableData.length
          });
          
          // 显示成功消息
          this.$showMessage("检验项目获取成功");

          this.$post({
            url: "/XJ/getJYItem",
            data: {
              pid: this.formData.id
            }
          }).then(res1 => {
            let tableData = res1.data.tbBillList
            //当已检验个数都不为空时按照检测结构排序
            tableData.sort((a, b) => {
              if (a.result === '未完成' && b.result === '合格') {
                return -1;
              } else if (a.result === '合格' && b.result === '未完成') {
                return 1;
              } else {
                return 0;
              }
            });
            this.tableData = tableData;
            if (this.tableData.length === 0) {
              this.isShowTable = true;
            }
          })
//生成检验项目的逻辑(根据规范已注释)
       this.saveTable();

      // 自动刷新逻辑(根据规范已注释)
      // 获取当前页面路径和参数
const pages = getCurrentPages();
const currentPage = pages[pages.length - 1];
const route = '/' + currentPage.route;
const options = currentPage.options; // 页面参数对象

// 拼接参数
let query = '';
for (let key in options) {
  query += `${key}=${options[key]}&`;
}
query = query.slice(0, -1);

// 刷新当前页面
uni.redirectTo({
  url: query ? `${route}?${query}` : route
});

location.reload()
        } else {
          this.$showMessage("此物料没有启用的检验项目，请维护!");
          this.tableData.splice(0, this.tableData.length);
        }
        
        // 隐藏加载提示，允许用户操作
        uni.hideLoading();
      }).catch(err => {
        console.error("获取检验项目失败:", err);
        this.$showMessage("获取检验项目失败，请检查网络连接");
        uni.hideLoading();
      });
    },
    toDetail(item) {
      if (this.isUpdate) {
        uni.showToast({
          icon: "none",
          title: "请先生成检验项目",
          duration: 2000,
        });
      } else {
        uni.navigateTo({
          url: 'detail?id=' + item.id + '&billNo=' + this.formData.billNo + '&gid=' + this.formData
              .id
        });
    saveTable() {
      if (this.tableData.length === 0) {
        return;
      }
    }, saveRemarks() {
      
      // 显示加载提示
      uni.showLoading({
        title: '正在保存...'
      });

      this.$post({
        url: "/XJ/saveItem",
        data: {
          gid: this.formData.id,
          items: this.tableData,
          statusUser: this.$loginInfo.account,
          ItemNo:this.formData.itemNo
        }
      }).then(res => {
        // 只在需要时更新tableData，避免重复累加
        if (res.data && res.data.tbBillList && res.data.tbBillList.items) {
          // 确保完全替换而不是累加
          this.tableData.splice(0, this.tableData.length, ...res.data.tbBillList.items);
        }
            
        // 重要：确保formData.id不被覆盖
        if (!this.formData.id) {
          this.$showMessage("警告：检验单ID丢失，请重新加载页面");
        }
            
        // 设置状态以显示检验提交按钮
        this.isShowTable = false;
        this.isUpdate = false;
            
        console.log('saveTable完成后的状态:', {
          isShowTable: this.isShowTable,
          isUpdate: this.isUpdate,
          tableDataLength: this.tableData.length
        });
            
        // 显示成功消息
        this.$showMessage("生成检验项目成功");
            
        // 隐藏加载提示，允许用户操作
        uni.hideLoading();
      }).catch(err => {
        console.error("保存检验项目失败:", err);
        this.$showMessage("保存检验项目失败，请重试");
        uni.hideLoading();
      })
    },
    toYzxSubmitFrom(releaseNo){
      uni.navigateTo({
        url: 'yzxFrom?id=' +this.formData.id+'&current='+(this.current ? 'true' : 'false')
      });
    },
    toSNScanCode(releaseNo){
      uni.navigateTo({
        url: 'ScanCode?id=' +this.formData.id+'&current='+(this.current ? 'true' : 'false')
      });
    },
    save() {

      // if (this.tableData.length === 0) {
      //    this.$showMessage(this.formData.itemNo + "物料没有检验项目");
      //    return;
      // }

      if (!this.formData.daa001) {
        this.$showMessage("请选择计划编号");
        return;
      }

      this.formData.statusUser = this.$loginInfo.account;

      this.$post({
        url: "/XJ/save",
        data: {
          from: this.formData,
          userNo: this.$loginInfo.account,
          items: this.tableData
        }
      }).then(res => {
        // 保存原有的ID值
        const originalId = this.formData.id;
        
        // 设置新的ID值（如果返回的是ID）
        if (res.data.tbBillList && typeof res.data.tbBillList === 'string' && res.data.tbBillList !== null && res.data.tbBillList !== undefined && res.data.tbBillList !== "") {
          this.formData.id = res.data.tbBillList;
        }
        
        // 如果没有返回新的ID，则保持原有的ID
        if (!this.formData.id && originalId) {
          this.formData.id = originalId;
        }
        
        this.$showMessage("生成检验项目成功");
        this.init();
        this.isUpdate = false;
      });
    },
    saveRemarks() {
      this.remarksPopup = !this.remarksPopup;
      this.remarks = this.formData.remarks;
    },
    saveComments() {
      this.commentsPopup = !this.commentsPopup;
      this.comments = this.formData.comments;
    },
    editRemarks() {
      if (this.remarks) {
@@ -403,116 +677,282 @@
        })
      }
    },
    toImage() {
      uni.navigateTo({
        url: 'ImageItem?id=' + this.formData.id
      });
    },
    getTable() {
      this.$post({
        url: "/XJ/setJYItem",
        data: {
          itemNo: this.formData.itemNo
        }
      }).then(res => {
        if (res.data.tbBillList.length > 0) {
          this.tableData = res.data.tbBillList; // 在箭头函数中，this 指向外层作用域的 this
          this.isShowTable = true;
          this.isUpdate = true;
        } else {
          this.$showMessage("此物料没有启用的检验项目，请维护!");
          this.isShowTable = true;
          this.isUpdate = false;
          this.tableData = [];
        }
      });
    },
    saveTable() {
      if (this.tableData.length === 0) {
        return;
    editComments() {
      if (this.comments) {
        //saveRemarksGid
        this.$post({
          url: "/XJ/saveCommentGid",
          data: {
            gid: this.formData.id,
            comments: this.comments
          }
        }).then(res => {
          if (res.data.tbBillList > 0) {
            this.formData.comments = this.comments;
            this.commentsPopup = !this.commentsPopup;
            this.$showMessage("保存成功");
          }
        })
      }
      this.$post({
        url: "/XJ/saveItem",
        data: {
          gid: this.formData.id,
          items: this.tableData,
          userNo: this.$loginInfo.account
        }
      }).then(res => {
        this.formData.id = res.data.tbBillList;
        this.isShowTable = false;
        this.isUpdate = false;
        this.init();
      })
    }
    },
    uploadImages() {
      // 查看所有图片的逻辑
      console.log('点击了查看所有图片按钮，billNo:', this.formData.billNo);
      uni.navigateTo({
        url: 'ImageItemALL?id=' + this.formData.id
      });
    },
    addDefectDescription() {
      // 查看所有不良描述的逻辑
      console.log('点击了查看不良描述按钮，billNo:', this.formData.billNo);
      uni.navigateTo({
        url: 'Blms?id=' + this.formData.id
      });
    },
  },
  onShow() {
    //每次进入页面都会执行的方法
    if (this.formData.id) {
      this.init();
    }
    this.init();
  }
};
</script>

<style>
.form-group {
/* 基础样式 */
.inspection-sheet {
  font-family: 'Microsoft YaHei', 'Segoe UI', sans-serif;
  max-width: 1000px;
  margin: 0 auto;
  padding: 20px;
  background-color: #fff;
  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
}

/* 头部样式 */
.sheet-header {
  text-align: center;
  margin-bottom: 20px;
  padding-bottom: 15px;
  border-bottom: 2px solid #e0e0e0;
}

.sheet-header h1 {
  color: #2c3e50;
  font-size: 24px;
  margin-bottom: 5px;
}

.inspection-number {
  font-size: 16px;
  font-weight: bold;
  color: #3498db;
}

/* 基本信息区样式 */
.basic-info,
.material-info {
  margin-bottom: 20px;
}

.info-row {
  display: flex;
  margin-bottom: 10px;
  flex-wrap: wrap;
}

.info-label {
  font-weight: bold;
  color: #34495e;
  min-width: 80px;
  margin-right: 5px;
}

.info-value {
  color: #2c3e50;
  margin-right: 20px;
}

.highlight {
  font-weight: bold;
  color: #e74c3c;
}

/* 物料信息区样式 */
.material-info {
  border: 1px solid #eee;
  padding: 15px;
  border-radius: 5px;
}

.info-block {
  display: flex;
  align-items: center;
  border-bottom: 1px solid #c9c9c9;
}
.form-label {
  margin-bottom: 0;
  padding: 5px;
}
.form-input {
  flex: 1;
  margin-bottom: 0;
  padding: 5px;
}
.picker {
  flex: 1;
  margin-bottom: 0;
  padding: 5px;
  font-size: 12px;
}
.uni-form-item {
  display: flex;
  border-bottom: 1px solid #c9c9c9;
}
.edit {
  background-color: white;
}
/* 默认样式 */
.list-container {
  height: 60vh;
  /* 设置列表容器的高度为剩余空间，并减去表单容器的高度 */
  overflow-y: auto;
  /* 允许列表容器垂直滚动 */
  padding: 10px;
  /* 可选：添加一些内边距，使列表内容更美观 */
}
/* 在小屏幕设备上，重置高度为适应屏幕 */
@media (max-width: 768px) {
  .list-container {
    height: calc(100vh - 376px);
    /* 适当调整高度 */
  }
}
.form-container {
  padding: 10px;
  /* 可选：添加一些内边距，使表单内容更美观 */
}
.th {
  background-color: lightskyblue;
  color: #FFFFFF;
}
.plus-button {
  line-height: 59px;
  font-size: 24px;
  cursor: pointer;
  z-index: 1000;
  margin-bottom: 10px;
  flex-wrap: wrap;
}

.info-value-input {
  flex: 1;
  padding: 8px 12px;
  border: 1px solid #e9ecef;
  border-radius: 6px;
  background: #ffffff;
  font-size: 14px;
  margin-top: 6px;
}

.picker {
  width: 100%;
  padding: 8px 12px;
  border: 1px solid #e9ecef;
  border-radius: 6px;
  background: #ffffff;
  font-size: 14px;
  margin-top: 6px;
}

/* 表格样式 */
.inspection-table {
  margin: 25px 0;
}

.inspection-table table {
  width: 100%;
  border-collapse: collapse;
}

.inspection-table th, .inspection-table td {
  padding: 12px 15px;
  border: 1px solid #ddd;
  text-align: left;
}

.inspection-table th {
  background-color: #f8f9fa;
  font-weight: bold;
  color: #34495e;
}

.inspection-table tr:nth-child(even) {
  background-color: #f9f9f9;
}

.inspection-table tr:hover {
  background-color: #f1f5f9;
}

/* 检验描述列特殊样式 */
.inspection-table td:nth-child(2) {
  position: relative;
  overflow: hidden;
  padding: 0;
}

/* 按钮样式 */
.action-buttons {
  display: flex;
  justify-content: flex-end;
  gap: 10px;
  margin-top: 20px;
}

.primary-btn,
.secondary-btn {
  padding: 10px 20px;
  border: none;
  border-radius: 4px;
  font-size: 14px;
  cursor: pointer;
  transition: all 0.3s;
}

.primary-btn {
  background-color: #3498db;
  color: white;
}

.primary-btn:hover {
  background-color: #2980b9;
}

.secondary-btn {
  background-color: #ecf0f1;
  color: #7f8c8d;
}

.secondary-btn:hover {
  background-color: #d5dbdb;
}

.record-btn {
  padding: 6px 12px;
  background-color: #f8f9fa;
  border: 1px solid #ddd;
  cursor: pointer;
  transition: all 0.2s;
}

.record-btn:hover {
  background-color: #e9ecef;
}

/* 填写状态按钮 */
.record-btn-fill {
  background-color: #f8f9fa;
  border: 1px solid #ddd;
}

.record-btn-fill:hover {
  background-color: #e9ecef;
}

/* 查看状态按钮 */
.record-btn-view {
  background-color: #f8f9fa;
  border: 1px solid #ddd;
}

.record-btn-view:hover {
  background-color: #e9ecef;
}

/* 水印样式 */
.watermark {
  position: absolute;
  font-size: 40px;
  font-weight: bold;
  opacity: 1;
  z-index: 1;
  pointer-events: none;
  transform: rotate(-15deg);
  width: 100%;
  text-align: center;
  top: 50%;
  left: 50%;
  transform: translate(-50%, -50%) rotate(-15deg);
}

.watermark.approved {
  color: #2ecc71; /* 绿色 */
}

.watermark.rejected {
  color: #e74c3c; /* 红色 */
}

.watermark.pending {
  color: #f39c12; /* 橙色 */
}

/* 描述文本容器 */
.description-text {
  position: relative;
  z-index: 2;
  padding: 25px;
  background-color: rgba(255, 255, 255, 0.7);
}

/* 弹窗样式 */
.overlay {
  position: fixed;
  top: 0;
@@ -523,15 +963,82 @@
  display: flex;
  justify-content: center;
  align-items: center;
  z-index: 1000;
}

.popup {
  background-color: #fff;
  background-color: white;
  padding: 20px;
  border: 1px solid #ccc;
  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
  width: 68vw;
  /* 设置宽度为视口宽度的80% */
  height: 25vh;
  /* 设置高度为视口高度的80% */
  border-radius: 8px;
  box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
  max-width: 500px;
  width: 90%;
}

.popup h3 {
  margin-top: 0;
  color: #333;
}

.form-group {
  margin-bottom: 15px;
}

.form-label {
  display: block;
  margin-bottom: 5px;
  font-weight: bold;
  color: #555;
}

.form-input {
  width: 100%;
  padding: 8px 12px;
  border: 1px solid #ddd;
  border-radius: 4px;
  box-sizing: border-box;
}

.form-textarea {
  height: 100px;
  resize: vertical;
}

.updateBut {
  background-color: #3498db;
  color: white;
  padding: 10px 20px;
  border: none;
  border-radius: 4px;
  cursor: pointer;
  margin-right: 10px;
}

.updateBut:hover {
  background-color: #2980b9;
}

/* 响应式设计 */
@media (max-width: 768px) {
  .inspection-sheet {
    padding: 10px;
  }
  
  .info-row {
    flex-direction: column;
  }
  
  .info-label, .info-value {
    margin-bottom: 5px;
  }
  
  .action-buttons {
    flex-direction: column;
  }
  
  .primary-btn, .secondary-btn {
    width: 100%;
    margin-bottom: 10px;
  }
}
</style>