From 9254d6cac7552176f18880bbdf9e6fb0d6eba2db Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Wed, 10 Sep 2025 12:53:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=A3=80=E9=AA=8C=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yieldReport/com_process_inspection.vue    | 1458 +++++++++++++++++
 .../yieldReport/com_produce_report_normal.vue |  237 ++-
 2 files changed, 1639 insertions(+), 56 deletions(-)
 create mode 100644 src/views/modules/yieldReport/com_process_inspection.vue

diff --git a/src/views/modules/yieldReport/com_process_inspection.vue b/src/views/modules/yieldReport/com_process_inspection.vue
new file mode 100644
index 0000000..3c48bc3
--- /dev/null
+++ b/src/views/modules/yieldReport/com_process_inspection.vue
@@ -0,0 +1,1458 @@
+<template>
+  <div class="process-inspection">
+    <el-dialog
+      title="过程检验"
+      :close-on-click-modal="false"
+      v-drag
+      :visible.sync="visible"
+      width="1400px"
+      :append-to-body="true"
+      @close="handleClose">
+
+      <!-- 查询条件 -->
+      <el-form :inline="true" label-position="top" :model="searchData">
+        <el-form-item label=" ">
+          <el-button type="primary" @click="addModal">新增</el-button>
+          <el-button type="primary" @click="submitResult">审核</el-button>
+          <el-button type="primary" @click="deleteModal">删除</el-button>
+        </el-form-item>
+      </el-form>
+
+      <!-- 检验记录展示列表 -->
+      <el-table
+        :height="400"
+        :data="dataList"
+        border
+        ref="IPQCTable"
+        @row-click="IPQCClickRow"
+        @selection-change="selectionIPQC"
+        style="width: 100%;">
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          :selectable="selectFlag"
+          width="50">
+        </el-table-column>
+        <el-table-column
+          prop="state"
+          header-align="center"
+          align="center"
+          label="状态">
+          <template slot-scope="scope">
+            <div :style="{fontWeight:'bold', color: scope.row.state =='待检验' ? 'red' : scope.row.state =='待审核' ? '#ffa500e0' : scope.row.state =='已完成' ? '#3ac252' : ''}">
+              {{ scope.row.state }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-for="(item,index) in columnList1" :key="index"
+          :sortable="item.columnSortable"
+          :prop="item.columnProp"
+          :header-align="item.headerAlign"
+          :show-overflow-tooltip="item.showOverflowTooltip"
+          :align="item.align"
+          :fixed="item.fixed==''?false:item.fixed"
+          :min-width="item.columnWidth"
+          :label="item.columnLabel">
+          <template slot-scope="scope">
+            <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="130"
+          label="操作">
+          <template slot-scope="scope">
+            <el-link style="cursor: pointer" v-if="!authDetail && scope.row.state === '未开始'" @click="actionModal(scope.row)">开始检验</el-link>
+            <el-link style="cursor: pointer" v-if="!authDetail && scope.row.state !== '未开始'" @click="detailModal(scope.row)">检验单</el-link>
+            <el-link style="cursor: pointer" v-if="!authFile" @click="getFileContentData(scope.row)">工作文件</el-link>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 分页 -->
+      <el-pagination
+        style="margin-top: 0px"
+        @size-change="sizeChangeHandle"
+        @current-change="currentChangeHandle"
+        :current-page="pageIndex"
+        :page-sizes="[20, 50, 100, 200, 500]"
+        :page-size="pageSize"
+        :total="totalPage"
+        layout="total, sizes, prev, pager, next, jumper">
+      </el-pagination>
+
+      <!-- 新增检验记录弹窗 -->
+      <el-dialog title="新增检验记录" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="495px" :append-to-body="true">
+        <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+          <el-form-item label="BU" prop="bu" :rules="rules.bu">
+            <el-select v-model="modalData.bu" placeholder="请选择" @change="buChange" style="width: 221px">
+              <el-option
+                v-for="i in userBuList"
+                :key="i.buNo"
+                :label="i.sitename"
+                :value="i.buNo">
+                <span style="float: left;width: 100px">{{ i.sitename }}</span>
+                <span style="float: right; color: #8492a6;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; font-size: 11px;width: 60px">
+                  {{ i.buDesc }}
+                </span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="标签号">
+            <el-input v-if="this.modalData.specialTaskFlag === 'Y'" disabled v-model="modalData.rollNo" style="width: 221px"></el-input>
+            <el-input v-else v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 221px"></el-input>
+          </el-form-item>
+        </el-form>
+        <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px">
+          <el-form-item v-if="this.modalData.specialTaskFlag !== 'Y' && (this.modalData.rollNo === '' || this.modalData.rollNo == null)" prop="orderNo" :rules="rules.seqNoType">
+            <span style="cursor: pointer" slot="label" @click="getBaseList(1052)"><a herf="#">派工单号</a></span>
+            <el-input v-model="modalData.seqNo" style="width: 221px"></el-input>
+          </el-form-item>
+          <el-form-item v-if="this.modalData.specialTaskFlag !== 'Y' && this.modalData.rollNo !== '' && this.modalData.rollNo != null" prop="orderNo" :rules="rules.seqNoType">
+            <span slot="label">派工单号</span>
+            <el-input v-model="modalData.seqNo" disabled style="width: 221px"></el-input>
+          </el-form-item>
+          <el-form-item v-if="this.modalData.specialTaskFlag === 'Y'" prop="orderNo" :rules="rules.seqNoType">
+            <span slot="label">派工单号</span>
+            <el-input v-model="modalData.seqNo" disabled style="width: 221px"></el-input>
+          </el-form-item>
+          <el-form-item label="工单号" prop="orderNo" :rules="rules.orderNoType">
+            <el-input v-model="modalData.orderNo" style="width: 221px" disabled></el-input>
+          </el-form-item>
+        </el-form>
+        <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px">
+          <el-form-item label="工序" prop="operationDesc" :rules="rules.operationDescType">
+            <el-select v-model="modalData.operationDesc" placeholder="请选择" style="width: 221px">
+              <el-option
+                v-for="i in operationList"
+                :key="i.operationNo"
+                :label="i.operationDesc"
+                :value="i.operationDesc">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="this.modalData.specialTaskFlag === 'Y'">
+            <span style="cursor: pointer" slot="label" @click="getBaseList(505)"><a herf="#">机台</a></span>
+            <el-input v-model="modalData.resourceDesc" style="width: 221px"></el-input>
+          </el-form-item>
+          <el-form-item v-else label="机台" prop="resourceId" :rules="rules.resourceIdType">
+            <el-input v-model="modalData.resourceDesc" style="width: 221px"></el-input>
+          </el-form-item>
+        </el-form>
+        <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px">
+          <el-form-item v-if="this.modalData.specialTaskFlag === 'Y'" :model="modalData">
+            <span style="cursor: pointer" slot="label" @click="queryPartList"><a herf="#">物料编码</a></span>
+            <el-input v-model="modalData.partNo" style="width: 221px"></el-input>
+          </el-form-item>
+          <el-form-item v-else label="物料编码" prop="partNo" :rules="rules.partNoType">
+            <el-input v-model="modalData.partNo" readonly style="width: 221px"></el-input>
+          </el-form-item>
+          <el-form-item label="物料名称">
+            <el-input v-model="modalData.partDesc" readonly style="width: 221px"></el-input>
+          </el-form-item>
+        </el-form>
+        <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px">
+          <el-form-item label="物料类别">
+            <el-input v-model="modalData.invdefinetype" readonly style="width: 221px"></el-input>
+          </el-form-item>
+          <el-form-item label="SKU">
+            <el-input v-model="modalData.sku" readonly style="width: 221px"></el-input>
+          </el-form-item>
+        </el-form>
+        <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px">
+          <el-form-item label="检验类型" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType">
+            <el-select v-model="modalData.inspectionTypeNo" style="width: 221px">
+              <el-option label="首件检" value="首件检"></el-option>
+              <el-option label="自检" value="自检"></el-option>
+              <el-option label="巡检" value="巡检"></el-option>
+              <el-option label="末件检" value="末件检"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="送检数量" prop="rollQty" :rules="rules.rollQtyType">
+            <el-input v-model="modalData.rollQty" type="number" style="width: 103px"></el-input>
+          </el-form-item>
+          <el-form-item label="单位" prop="umId" :rules="rules.umIdType">
+            <el-select v-model="modalData.umId" placeholder="请选择" style="width: 103px">
+              <el-option
+                v-for="i in umList"
+                :key="i.umId"
+                :label="i.umName"
+                :value="i.umId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px">
+          <el-form-item prop="templateId" :rules="rules.templateId">
+            <span style="cursor: pointer" v-if="this.controlData.baseData === '控制'" slot="label" @click="queryTemplateList"><a>检验模板</a></span>
+            <span v-else slot="label">检验模板</span>
+            <el-input v-model="modalData.templateName" disabled style="width: 221px"></el-input>
+          </el-form-item>
+          <el-form-item label="送检总数">
+            <el-input v-model="modalData.sjzs" disabled style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item label=" ">
+            <input type="checkbox" id="specialTask" name="specialTask" v-model="checked" @click="changeSpecialTask"/> <label for="specialTask">无工单检验</label>
+          </el-form-item>
+        </el-form>
+        <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px">
+          <el-form-item label="老卷号">
+            <el-input v-model="modalData.batchRollNo" style="width: 456px"></el-input>
+          </el-form-item>
+        </el-form>
+        <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px">
+          <el-form-item label="特殊要求">
+            <el-input type="textarea" v-model="modalData.specialRequirements" :rows="3" resize='none' show-word-limit style="width: 456px;height: 30px"></el-input>
+          </el-form-item>
+        </el-form>
+        <el-footer style="height:40px;margin-top: 55px;text-align:center">
+          <el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
+          <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+        </el-footer>
+      </el-dialog>
+
+      <!-- 派工单号弹出框 -->
+      <el-dialog title="派工单号" @close="closeSeqDialog" :close-on-click-modal="false" v-drag :visible.sync="seqDetailFlag" width="952px" :append-to-body="true">
+        <el-form :inline="true" label-position="top" :model="seqDetailData" style="margin-left: 7px;margin-top: -5px;">
+          <el-form-item label="工单号">
+            <el-input v-model="seqDetailData.orderNo" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item label="派工单号">
+            <el-input v-model="seqDetailData.seqNo" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item label="SKU">
+            <el-input v-model="seqDetailData.sku" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item label="物料编码">
+            <el-input v-model="seqDetailData.partNo" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item label="物料名称">
+            <el-input v-model="seqDetailData.partDesc" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item label="工序">
+            <el-input v-model="seqDetailData.operationDesc" clearable style="width: 150px"></el-input>
+          </el-form-item>
+          <el-form-item label=" ">
+            <el-button type="primary" @click="searchSeqInfo" style="margin-top: 24px">查询</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table
+          :height="400"
+          :data="seqInfoList"
+          @row-dblclick="getRowData1"
+          border
+          style="width: 100%;">
+          <el-table-column
+            v-for="(item,index) in seqDetailColumnList" :key="index"
+            :sortable="item.columnSortable"
+            :prop="item.columnProp"
+            :header-align="item.headerAlign"
+            :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align"
+            :fixed="item.fixed==''?false:item.fixed"
+            :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+              <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-footer style="height:40px;margin-top: 20px;text-align:center">
+          <el-button type="primary" @click="seqDetailFlag=false">关闭</el-button>
+        </el-footer>
+      </el-dialog>
+
+      <!-- 检验模板弹出框 -->
+      <el-dialog title="检验模板清单" :close-on-click-modal="false" v-drag :visible.sync="templateModelFlag" width="520px" :append-to-body="true">
+        <div class="rq">
+          <el-form :inline="true" label-position="top" :model="templateData">
+            <el-form-item :label="'模板编码'">
+              <el-input v-model="templateData.templateId" clearable style="width: 120px"></el-input>
+            </el-form-item>
+            <el-form-item :label="'模板名称'">
+              <el-input v-model="templateData.templateName" clearable style="width: 120px"></el-input>
+            </el-form-item>
+            <el-form-item :label="' '">
+              <el-button type="primary" @click="queryTemplateList">查询</el-button>
+            </el-form-item>
+          </el-form>
+          <el-table
+            :height="300"
+            :data="templateList"
+            @row-dblclick="getRowData"
+            border
+            style="width: 100%;">
+            <el-table-column
+              v-for="(item,index) in templateDetailList" :key="index"
+              :sortable="item.columnSortable"
+              :prop="item.columnProp"
+              :header-align="item.headerAlign"
+              :show-overflow-tooltip="item.showOverflowTooltip"
+              :align="item.align"
+              :fixed="item.fixed==''?false:item.fixed"
+              :min-width="item.columnWidth"
+              :label="item.columnLabel">
+              <template slot-scope="scope">
+                <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+                <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <el-footer style="height:40px;margin-top: 20px;text-align:center">
+          <el-button type="primary" @click="templateModelFlag=false">关闭</el-button>
+        </el-footer>
+      </el-dialog>
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  qcIPQCInspectionSearch, // 查询IPQC的检验记录
+  ipqcRecordDelete, // 删除检验记录
+  saveOsInspection, // 新增检验记录
+  saveIPQCSubmitResult, // 审核
+  getSiteAndBuByUserName, // 获取用户BU列表
+  getTableDefaultListLanguage, // 获取表格列配置
+  ipqcDetailSearch, // 查询IPQC的检验明细
+  actionIPQCInspection, // 开始检验
+  getIPQCItemObjectList, // 查询项目设备
+  getOperationList, // 查询工序列表
+  queryController, // 检查动控
+  umSearch, // 查询单位列表
+  queryTemplateList, // 获取检验模板列表
+  queryPartList, // 查询物料集合
+  rollNoEnter as rollNoEnterAPI, // 标签号回车事件
+  searchSeqInfo, // 派工单号查询
+  getSiteAndBuByUserName2 // 获取BU列表
+} from "@/api/qc/qc.js"
+import { getInspectionFile } from '@/api/eam/eam_object_list.js'
+
+export default {
+  name: 'ComProcessInspection',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      // 查询参数
+      searchData: {
+        buNo: '',
+        inspectionNo: '',
+        partNo: '',
+        sku: '',
+        partDesc: '',
+        inspectionResult: '',
+        inspectionTypeNo: '',
+        cinvSourceCode: '',
+        orderNo: '',
+        seqNo: '',
+        operationDesc: '',
+        states: [],
+        startDate2: '',
+        endDate2: '',
+        startDate: '',
+        endDate: '',
+        limit: 20,
+        page: 1
+      },
+      searchLoading: false,
+      // 列表数据
+      dataList: [],
+      IPQCSelections: [],
+      // 分页
+      pageIndex: 1,
+      pageSize: 20,
+      totalPage: 0,
+      // BU列表
+      buList: [],
+      userBuList: [],
+      // 列配置
+      columnList1: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 301014,
+          serialNumber: '301014Table1BuDesc',
+          tableId: "301014Table1",
+          tableName: "IPQC检验记录表",
+          columnProp: 'buDesc',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: 'BU',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+          showOverflowTooltip: true
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 301014,
+          serialNumber: '301014Table1InspectionNo',
+          tableId: "301014Table1",
+          tableName: "IPQC检验记录表",
+          columnProp: 'inspectionNo',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '检验单号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+          showOverflowTooltip: true
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 301014,
+          serialNumber: '301014Table1BatchRollNo',
+          tableId: "301014Table1",
+          tableName: "IPQC检验记录表",
+          columnProp: 'batchRollNo',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '老卷号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150,
+          showOverflowTooltip: true
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 301014,
+          serialNumber: '301014Table1RollNo',
+          tableId: "301014Table1",
+          tableName: "IPQC检验记录表",
+          columnProp: 'rollNo',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '标签条码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150,
+          showOverflowTooltip: true
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 301014,
+          serialNumber: '301014Table1InspectionResult',
+          tableId: "301014Table1",
+          tableName: "IPQC检验记录表",
+          columnProp: 'inspectionResult',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '检验结论',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+          showOverflowTooltip: true
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 301014,
+          serialNumber: '301014Table1DisposalMeasures',
+          tableId: "301014Table1",
+          tableName: "IPQC检验记录表",
+          columnProp: 'disposalMeasures',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '处置措施',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+          showOverflowTooltip: true
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 301014,
+          serialNumber: '301014Table1InspectionTypeNo',
+          tableId: "301014Table1",
+          tableName: "IPQC检验记录表",
+          columnProp: 'inspectionTypeNo',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '检验类型',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+          showOverflowTooltip: true
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 301014,
+          serialNumber: '301014Table1TaskDate',
+          tableId: "301014Table1",
+          tableName: "IPQC检验记录表",
+          columnProp: 'taskDate',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '送检日期',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 130,
+          showOverflowTooltip: true
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 301014,
+          serialNumber: '301014Table1InspectionCycle',
+          tableId: "301014Table1",
+          tableName: "IPQC检验记录表",
+          columnProp: 'inspectionCycle',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '检验周期(h)',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+          showOverflowTooltip: true
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 301014,
+          serialNumber: '301014Table1OrderNo',
+          tableId: "301014Table1",
+          tableName: "IPQC检验记录表",
+          columnProp: 'orderNo',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '工单号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150,
+          showOverflowTooltip: true
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 301014,
+          serialNumber: '301014Table1SeqNo',
+          tableId: "301014Table1",
+          tableName: "IPQC检验记录表",
+          columnProp: 'seqNo',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '派工单号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 200,
+          showOverflowTooltip: true
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 301014,
+          serialNumber: '301014Table1OperationDesc',
+          tableId: "301014Table1",
+          tableName: "IPQC检验记录表",
+          columnProp: 'operationDesc',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '工序',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+          showOverflowTooltip: true
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 301014,
+          serialNumber: '301014Table1ResourceDesc',
+          tableId: "301014Table1",
+          tableName: "IPQC检验记录表",
+          columnProp: 'resourceDesc',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '机台',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+          showOverflowTooltip: true
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 301014,
+          serialNumber: '301014Table1PartNo',
+          tableId: "301014Table1",
+          tableName: "IPQC检验记录表",
+          columnProp: 'partNo',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '物料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+          showOverflowTooltip: true
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 301014,
+          serialNumber: '301014Table1PartDesc',
+          tableId: "301014Table1",
+          tableName: "IPQC检验记录表",
+          columnProp: 'partDesc',
+          headerAlign: "center",
+          align: "left",
+          columnLabel: '物料名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 300,
+          showOverflowTooltip: true
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 301014,
+          serialNumber: '301014Table1Sku',
+          tableId: "301014Table1",
+          tableName: "IPQC检验记录表",
+          columnProp: 'sku',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: 'SKU',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+          showOverflowTooltip: true
+        }
+      ],
+      // 新增弹窗
+      modalFlag: false,
+      modalData: {
+        flag: '1',
+        site: '',
+        bu: '',
+        rollNo: '',
+        seqNo: '',
+        orderNo: '',
+        operationDesc: '',
+        resourceDesc: '',
+        partNo: '',
+        partDesc: '',
+        invdefinetype: '',
+        sku: '',
+        inspectionTypeNo: '',
+        rollQty: '',
+        umId: '',
+        templateId: '',
+        templateName: '',
+        sjzs: '',
+        batchRollNo: '',
+        specialRequirements: '',
+        specialTaskFlag: 'N'
+      },
+      saveLoading: false,
+      checked: false,
+      // 下拉列表数据
+      operationList: [],
+      umList: [],
+      controlData: { baseData: '' },
+      // 权限控制
+      authDetail: false,
+      authFile: false,
+      // 详情弹窗相关
+      detailInformationFlag: false,
+      detailData: {
+        site: '',
+        buNo: '',
+        inspectionNo: '',
+        partNo: '',
+        partDesc: '',
+        rollQty: '',
+        samplingQty: '',
+        unqualifiedQty: '',
+        unqualifiedQuantity: '',
+        submitFlag: '',
+        disposalMeasures: '',
+        disposalRemark: '',
+        inspectionResult: '',
+        inspectorNo: '',
+        inspectorName: '',
+        inspectionRemark: '',
+        cinvSourceCode: '',
+        sku: '',
+        invdefinetype: '',
+        umId: '',
+        umName: '',
+        operator: '',
+        operatorName: '',
+        responsiblePerson: '',
+        responsiblePersonName: '',
+        state: '',
+        passQty: '',
+        notPassQty: '',
+        batchQualifiedQty: ''
+      },
+      detailList: [],
+      // 开始检验相关
+      ItemObjectModelFlag: false,
+      actionData: {
+        site: '',
+        buNo: '',
+        inspectionNo: ''
+      },
+      itemObjectList: [],
+      // 工作文件相关
+      fileFlag: false,
+      fileContentList: [],
+      fileLoading: false,
+      // 派工单号相关
+      seqDetailFlag: false,
+      seqInfoList: [],
+      seqDetailData: {
+        orderNo: '',
+        seqNo: '',
+        sku: '',
+        partNo: '',
+        partDesc: '',
+        operationDesc: '',
+        status: ''
+      },
+      seqDetailColumnList: [
+        {
+          columnProp: 'orderNo',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '工单号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 80,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: 'seqNo',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '派工单号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 80,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: 'sku',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: 'SKU',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 80,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: 'partNo',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '物料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 80,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: 'partDesc',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '物料名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 80,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: 'lotsize',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '批量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 80,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: 'qtyrequired',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '需求数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 80,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: 'sjzs',
+          headerAlign: "center",
+          align: "right",
+          columnLabel: '送检总数',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 80,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: 'operationDesc',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '工序',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 80,
+          showOverflowTooltip: true
+        }
+      ],
+      // 检验模板相关
+      templateModelFlag: false,
+      templateData: {
+        site: '',
+        bu: '',
+        templateId: '',
+        templateName: '',
+        inspectionTypeNo: '',
+        inspectionTypeName: ''
+      },
+      templateList: [],
+      templateDetailList: [
+        {
+          columnProp: 'templateId',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '模板编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 120,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: 'templateName',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '模板名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 200,
+          showOverflowTooltip: true
+        },
+        {
+          columnProp: 'inspectionTypeName',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '检验类型',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          fixed: '',
+          columnWidth: 100,
+          showOverflowTooltip: true
+        }
+      ],
+      rules: {
+        bu: [{ required: true, message: '请选择BU', trigger: 'change' }],
+        seqNoType: [{ required: true, message: '请输入派工单号', trigger: 'blur' }],
+        orderNoType: [{ required: true, message: '请输入工单号', trigger: 'blur' }],
+        operationDescType: [{ required: true, message: '请选择工序', trigger: 'change' }],
+        resourceIdType: [{ required: true, message: '请输入机台', trigger: 'blur' }],
+        partNoType: [{ required: true, message: '请输入物料编码', trigger: 'blur' }],
+        inspectionTypeNoType: [{ required: true, message: '请选择检验类型', trigger: 'change' }],
+        rollQtyType: [{ required: true, message: '请输入送检数量', trigger: 'blur' }],
+        umIdType: [{ required: true, message: '请选择单位', trigger: 'change' }],
+        templateId: [{ required: true, message: '请选择检验模板', trigger: 'change' }]
+      }
+    }
+  },
+  watch: {
+    visible(val) {
+      if (val) {
+        this.init()
+      }
+    }
+  },
+  methods: {
+    // 初始化
+    init() {
+      this.getSiteAndBuByUserName2()
+      this.getUmList()
+      this.getDataList()
+      // 查看 质量任务生成规则控制 动控是否开启
+      this.queryController()
+      this.getTableDefaultListLanguage()
+    },
+
+    // 检查动控是否开启
+    queryController () {
+      let tempData = {
+        controlNo: '10004',
+        site: this.$store.state.user.site,
+      }
+      queryController(tempData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.controlData = data.rows
+        } else {
+          this.$message.error(data.msg)
+        }
+      })
+    },
+
+    // 获取用户BU列表
+    getSiteAndBuByUserName2() {
+      let tempData = {
+        username: this.$store.state.user.name,
+      }
+      getSiteAndBuByUserName(tempData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.userBuList = data.rows
+          if (this.userBuList.length > 0) {
+            this.modalData.bu = this.userBuList[0].buNo
+          }
+        }
+      })
+      getSiteAndBuByUserName2(tempData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.buList = data.rows
+        }
+      })
+    },
+
+    // 获取表格列配置
+    getTableDefaultListLanguage() {
+      let tempData = {
+        functionId: 'C10000002',
+        tableId: 'IPQCResultEntry'
+      }
+      getTableDefaultListLanguage(tempData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.columnList1 = data.rows
+        }
+      })
+    },
+
+    // 获取数据列表
+    getDataList() {
+      this.searchLoading = true
+      this.searchData.limit = this.pageSize
+      this.searchData.page = this.pageIndex
+      qcIPQCInspectionSearch(this.searchData).then(({data}) => {
+        if (data.code === 0) {
+          this.dataList = data.page.list
+          this.pageIndex = data.page.currPage
+          this.pageSize = data.page.pageSize
+          this.totalPage = data.page.totalCount
+          this.searchLoading = false
+        } else {
+          this.$message.error(data.msg)
+        }
+      }).catch(() => {
+        this.searchLoading = false
+      })
+    },
+
+    // 行点击事件
+    IPQCClickRow(row) {
+      console.log('点击行:', row)
+    },
+
+    // 选择变化事件
+    selectionIPQC(selection) {
+      this.IPQCSelections = selection
+    },
+
+    // 选择标志
+    selectFlag(row, index) {
+      return true
+    },
+
+    // 分页大小变化
+    sizeChangeHandle(val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+
+    // 当前页变化
+    currentChangeHandle(val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+
+    // 新增弹窗
+    addModal() {
+      this.modalData = {
+        flag: '1',
+        site: '',
+        bu: this.userBuList.length > 0 ? this.userBuList[0].buNo : '',
+        rollNo: '',
+        seqNo: '',
+        orderNo: '',
+        operationDesc: '',
+        resourceDesc: '',
+        partNo: '',
+        partDesc: '',
+        invdefinetype: '',
+        sku: '',
+        inspectionTypeNo: '',
+        rollQty: '',
+        umId: '',
+        templateId: '',
+        templateName: '',
+        sjzs: '',
+        batchRollNo: '',
+        specialRequirements: '',
+        specialTaskFlag: 'N'
+      }
+      this.checked = false
+      this.modalFlag = true
+    },
+
+    // BU变化事件
+    buChange() {
+      // BU变化处理逻辑
+    },
+
+    // 标签号回车事件
+    rollNoEnter() {
+      if (this.modalData.rollNo) {
+        rollNoEnterAPI(this.modalData).then(({data}) => {
+          if (data && data.code === 0) {
+            const rollData = data.rows[0]
+            this.modalData.seqNo = rollData.seqNo
+            this.modalData.orderNo = rollData.orderNo
+            this.modalData.partNo = rollData.partNo
+            this.modalData.partDesc = rollData.partDesc
+            this.modalData.invdefinetype = rollData.invdefinetype
+            this.modalData.sku = rollData.sku
+            this.modalData.operationDesc = rollData.operationDesc
+            this.modalData.resourceDesc = rollData.resourceDesc
+            this.getOperationList()
+          } else {
+            this.$message.error(data.msg || '标签号查询失败')
+          }
+        }).catch(() => {
+          this.$message.error('标签号查询失败')
+        })
+      }
+    },
+
+    // 获取工序列表
+    getOperationList() {
+      getOperationList(this.modalData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.operationList = data.rows
+          if (data.rows.length > 0) {
+            this.modalData.operationDesc = data.rows[0].operationDesc
+            this.modalData.workCenterNo = data.rows[0].workCenterNo
+            this.modalData.resourceId = data.rows[0].resourceId
+            this.modalData.resourceDesc = data.rows[0].resourceDesc
+          }
+        }
+      })
+    },
+
+    // 获取单位列表
+    getUmList() {
+      umSearch().then(({data}) => {
+        if (data && data.code === 0) {
+          this.umList = data.rows
+        }
+      })
+    },
+
+    // 获取基础列表
+    getBaseList(type) {
+      this.$nextTick(() => {
+        if (type === 1052) {
+          this.searchSeqInfo()
+          this.seqDetailFlag = true
+        }
+        if (type === 505) {
+          // 机台选择逻辑
+          console.log('机台选择:', type)
+        }
+      })
+    },
+
+    // 查询物料列表
+    queryPartList() {
+      console.log('查询物料列表')
+    },
+
+    // 查询检验模板列表
+    queryTemplateList() {
+      this.templateData.bu = this.modalData.bu
+      // 查询所有检验模板
+      queryTemplateList(this.templateData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.templateList = data.rows
+          this.templateModelFlag = true
+        } else {
+          this.$message.error(data.msg)
+        }
+      })
+    },
+
+    // 选中检验模板
+    getRowData(row) {
+      this.modalData.templateId = row.templateId
+      this.modalData.templateName = row.templateName
+      this.templateModelFlag = false
+    },
+
+    // 派工单号查询
+    searchSeqInfo() {
+      let tempData = {
+        bu: this.modalData.bu,
+        seqNo: this.seqDetailData.seqNo,
+        orderNo: this.seqDetailData.orderNo,
+        sku: this.seqDetailData.sku,
+        partDesc: this.seqDetailData.partDesc,
+        partNo: this.seqDetailData.partNo,
+        operationDesc: this.seqDetailData.operationDesc,
+        status: this.seqDetailData.status
+      }
+      if (!this.seqDetailData.seqNo && !this.seqDetailData.orderNo && !this.seqDetailData.sku && !this.seqDetailData.partNo && !this.seqDetailData.partDesc && !this.seqDetailData.operationDesc){
+        this.seqInfoList = []
+      } else {
+        searchSeqInfo(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.seqInfoList = data.rows
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      }
+    },
+
+    // 选中派工单号
+    getRowData1(row) {
+      this.modalData.seqNo = row.seqno || row.seqNo
+      this.modalData.orderNo = row.orderno || row.orderNo
+      this.modalData.partNo = row.partNo
+      this.modalData.partDesc = row.partDesc
+      this.modalData.sku = row.sku
+      this.modalData.operationDesc = row.operationDesc
+      this.modalData.sjzs = row.sjzs
+      this.seqDetailFlag = false
+      this.getOperationList()
+    },
+
+    // 关闭派工单号弹窗
+    closeSeqDialog() {
+      this.seqDetailData = {
+        seqNo: '',
+        orderNo: '',
+        sku: '',
+        partNo: '',
+        partDesc: '',
+        operationDesc: '',
+        status: ''
+      }
+      this.seqInfoList = []
+    },
+
+    // 无工单检验变化
+    changeSpecialTask() {
+      this.modalData.specialTaskFlag = this.checked ? 'Y' : 'N'
+    },
+
+    // 保存数据
+    saveData() {
+      this.saveLoading = true
+      if (this.modalData.flag === '1') {
+        saveOsInspection(this.modalData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.getDataList()
+            this.modalFlag = false
+            this.$message.success('操作成功')
+          } else {
+            this.$message.error(data.msg)
+          }
+          this.saveLoading = false
+        }).catch(() => {
+          this.saveLoading = false
+        })
+      }
+    },
+
+    // 删除
+    deleteModal() {
+      if (this.IPQCSelections.length === 0) {
+        this.$alert('请勾选要删除的检验单！', '提示', {
+          confirmButtonText: '确定'
+        })
+        return false
+      }
+      this.$confirm(`是否删除该 ${this.IPQCSelections.length} 条检验记录?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let tempData = {
+          submitList: this.IPQCSelections
+        }
+        ipqcRecordDelete(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.getDataList()
+            this.IPQCSelections = []
+            this.$message.success('操作成功')
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      })
+    },
+
+    // 审核
+    submitResult() {
+      if (this.IPQCSelections.length === 0) {
+        this.$alert('请勾选要审核的检验单！', '提示', {
+          confirmButtonText: '确定'
+        })
+        return false
+      }
+      this.$confirm(`是否审核该 ${this.IPQCSelections.length} 条检验记录?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let tempData = {
+          submitList: this.IPQCSelections
+        }
+        saveIPQCSubmitResult(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.getDataList()
+            this.IPQCSelections = []
+            this.$message.success('操作成功')
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      })
+    },
+
+    // 开始检验
+    actionModal(row) {
+      this.actionData = {
+        site: row.site,
+        buNo: row.buNo,
+        inspectionNo: row.inspectionNo
+      }
+      getIPQCItemObjectList(this.actionData).then(({data}) => {
+        if (data && data.code === 0) {
+          if (data.rows.length === 0) {
+            this.actionModal2()
+          } else {
+            this.itemObjectList = data.rows
+            this.ItemObjectModelFlag = true
+          }
+        } else {
+          this.$message.error(data.msg)
+        }
+      })
+    },
+
+    // 开始检验确认
+    actionModal2() {
+      this.$confirm(`确认开始检验?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let tempData = {
+          site: this.actionData.site,
+          buNo: this.actionData.buNo,
+          inspectionNo: this.actionData.inspectionNo,
+          actionBy: this.$store.state.user.name,
+          state: '待检验',
+          equipmentList: this.itemObjectList
+        }
+        actionIPQCInspection(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.getDataList()
+            this.$message.success('操作成功')
+            this.ItemObjectModelFlag = false
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      })
+    },
+
+    // 明细记录信息查询
+    detailModal(row) {
+      this.detailData.site = row.site
+      this.detailData.buNo = row.buNo
+      this.detailData.inspectionNo = row.inspectionNo
+      this.detailData.partNo = row.partNo
+      this.detailData.partDesc = row.partDesc
+      this.detailData.rollQty = row.rollQty
+      this.detailData.samplingQty = row.samplingQty
+      this.detailData.unqualifiedQty = row.unqualifiedQty
+      this.detailData.unqualifiedQuantity = row.unqualifiedQuantity
+      this.detailData.submitFlag = row.submitFlag
+      this.detailData.disposalMeasures = row.disposalMeasures
+      this.detailData.disposalRemark = row.disposalRemark
+      this.detailData.inspectionResult = row.inspectionResult
+      this.detailData.inspectorNo = row.inspectorNo
+      this.detailData.inspectorName = row.inspectorName
+      this.detailData.inspectionRemark = row.inspectionRemark
+      this.detailData.cinvSourceCode = row.cinvSourceCode
+      this.detailData.sku = row.sku
+      this.detailData.invdefinetype = row.invdefinetype
+      this.detailData.umId = row.umId
+      this.detailData.umName = row.umName
+      this.detailData.operator = row.operator
+      this.detailData.operatorName = row.operatorName
+      this.detailData.responsiblePerson = row.responsiblePerson
+      this.detailData.responsiblePersonName = row.responsiblePersonName
+      this.detailData.state = row.state
+      if (row.state === '待检验') {
+        this.detailData.passQty = row.samplingQty
+      } else {
+        this.detailData.passQty = row.passQty
+        this.detailData.notPassQty = row.notPassQty
+      }
+      this.detailData.batchQualifiedQty = row.batchQualifiedQty
+      this.getInspectionFormData()
+      this.detailInformationFlag = true
+    },
+
+    // 检验单明细
+    getInspectionFormData() {
+      ipqcDetailSearch(this.detailData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.detailList = data.rows
+        } else {
+          this.detailList = []
+        }
+      })
+    },
+
+    // 刷新派设备文档的列表
+    getFileContentData(row) {
+      let currentData = {
+        orderRef1: row.site,
+        orderRef2: row.inspectionNo,
+        orderRef4: row.buNo,
+        partNo: row.partNo
+      }
+      this.fileLoading = true
+      getInspectionFile(currentData).then(({data}) => {
+        //区分请求成功和失败的状况
+        if (data && data.code === 0) {
+          this.fileContentList = data.rows
+        } else {
+          this.fileContentList = []
+        }
+        this.fileLoading = false
+      }).catch(()=>{
+        this.fileLoading = false
+      })
+      this.fileFlag = true
+    },
+
+    // 关闭弹窗
+    handleClose() {
+      this.$emit('update:visible', false)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.process-inspection {
+
+}
+
+.demo-form-inline .el-form-item {
+  margin-bottom: 10px;
+}
+</style>
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index b04ef3b..70386ef 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -5,7 +5,7 @@
     <el-dialog v-drag
                width="900px" class="customer-dialog"
                :title="titleCon" v-bind="$attrs" v-on="$listeners">
-      <el-form :inline="true" label-position="top" style="height: 507px;"
+      <el-form :inline="true" label-position="top" style="height: 650px;"
                label-width="80px">
         <!-- 第一行信息 -->
         <el-form style="margin-top: -10px;">
@@ -102,13 +102,49 @@
         </fieldset>
 
         <!-- 列表展示区域 -->
-        <fieldset class="customer-fieldset" style="margin-bottom: 10px; width: 660px; height: 310px;">
+        <fieldset class="customer-fieldset" style="margin-bottom: 10px; width: 660px; height: 450px;">
           <legend class="customer-legend">{{ labels.listDesc }}</legend>
-          <el-tabs v-model="activeTable" style="margin-top: -3px; width: 655px; height: 285px;"
+          <el-tabs v-model="activeTable" style="margin-top: -3px; width: 655px; height: 425px;"
                    type="border-card" @tab-click="tabClick" class="customer-tab">
+            <el-tab-pane :label=labels.orderInfo name="order_info">
+              <div style="height: 400px; padding: 10px;">
+                <!-- 技术注意事项 -->
+                <div style="margin-bottom: 10px;">
+                  <label style="font-weight: bold; margin-bottom: 5px; display: block;">技术注意事项</label>
+                  <el-input
+                    type="textarea"
+                    :rows="3"
+                    v-model="orderInfo.technicalNotes"
+                    style="width: 100%;">
+                  </el-input>
+                </div>
+
+                <!-- 客户特殊要求 -->
+                <div style="margin-bottom: 10px;">
+                  <label style="font-weight: bold; margin-bottom: 5px; display: block;">客户特殊要求</label>
+                  <el-input
+                    type="textarea"
+                    :rows="3"
+                    v-model="orderInfo.customerRequirements"
+                    style="width: 100%;">
+                  </el-input>
+                </div>
+
+                <!-- 订单备注信息 -->
+                <div>
+                  <label style="font-weight: bold; margin-bottom: 5px; display: block;">订单备注信息</label>
+                  <el-input
+                    type="textarea"
+                    :rows="3"
+                    v-model="orderInfo.orderNotes"
+                    style="width: 100%;">
+                  </el-input>
+                </div>
+              </div>
+            </el-tab-pane>
             <el-tab-pane :label=labels.timeList name="sfdc_time">
               <el-table
-                height="260"
+                height="400"
                 :data="sfdcTimeList"
                 border
                 v-loading="dataListLoading"
@@ -145,7 +181,7 @@
             </el-tab-pane>
             <el-tab-pane :label=labels.toolList name="sfdc_tool">
               <el-table
-                height="120"
+                height="170"
                 :data="orderToolList"
                 border
                 v-loading="dataListLoading"
@@ -168,7 +204,7 @@
                 </el-table-column>
               </el-table>
               <el-table
-                height="140"
+                height="230"
                 :data="sfdcToolList"
                 border
                 v-loading="dataListLoading"
@@ -210,7 +246,7 @@
             </el-tab-pane>
             <el-tab-pane :label=labels.materialList name="sfdc_material">
               <el-table
-                height="120"
+                height="170"
                 :data="orderBomList"
                 border
                 v-loading="dataListLoading"
@@ -233,7 +269,7 @@
                 </el-table-column>
               </el-table>
               <el-table
-                height="140"
+                height="230"
                 :data="sfdcMaterialList"
                 border
                 v-loading="dataListLoading"
@@ -282,7 +318,7 @@
             </el-tab-pane>
             <el-tab-pane :label=labels.rollopsList name="sfdc_rollOps">
               <el-table
-                height="260"
+                height="400"
                 :data="sfdcRollOpsList"
                 border
                 v-loading="dataListLoading"
@@ -308,7 +344,7 @@
             <!-- 不良记录 -->
             <el-tab-pane :label=labels.defectList name="sfdc_defect">
               <el-table
-                height="260"
+                height="400"
                 :data="sfdcDefectList"
                 border
                 show-summary
@@ -347,7 +383,7 @@
             </el-tab-pane>
             <el-tab-pane :label=labels.rollList name="sfdc_roll">
               <el-table
-                height="260"
+                height="400"
                 :data="sfdcRollList"
                 border
                 show-summary
@@ -394,62 +430,47 @@
             </el-tab-pane>
           </el-tabs>
         </fieldset>
+
+        <!-- 刷新按钮 -->
+        <div style="margin-left: 680px; margin-top: -640px; width: 200px;">
+          <el-button class="customer-bun-mid controller-bun" type="primary" @click="refreshPageData"
+                     style="margin-left: 20px; margin-bottom: 10px; width: 60px;">
+            {{ buttons.refreshButton }}
+          </el-button>
+          <el-button class="customer-bun-mid controller-bun" type="primary" @click="switchOperatorModal"
+                     style="margin-left: 28px; margin-bottom: 10px; width: 60px;">
+            {{ buttons.switchOperator }}
+          </el-button>
+        </div>
+
         <!-- 生产调机菜单 -->
         <fieldset class="customer-fieldset"
-                  style="margin-left: 680px; margin-top: -510px; width: 200px; height: 130px;">
+                  style="margin-left: 680px; width: 200px; height: 100px;">
           <legend class="customer-legend">{{ labels.produceButtons }}</legend>
           <el-form>
-            <el-form-item>
-              <el-button class="customer-bun-mid" type="primary" @click="refreshPageData"
-                         style="margin-left: 15px; margin-top: 10px; margin-bottom: 25px;">
-                {{ buttons.refreshButton }}
-              </el-button>
-            </el-form-item>
-            <el-form-item>
-              <el-button class="customer-bun-mid" type="primary" @click="switchOperatorModal"
-                         style="margin-left: 20px; margin-top: 10px;">
-                {{ buttons.switchOperator }}
-              </el-button>
-            </el-form-item>
-            <el-form-item style="margin-top: 20px;">
+            <el-form-item style="margin-top: 10px;">
               <el-button class="customer-bun-mid controller-bun" type="primary" @click="startTuningModal"
                          :disabled="buttonTags.tuningFlag"
                          style="margin-left: 15px; margin-bottom: 5px;">
                 {{ buttons.startTuning }}
               </el-button>
             </el-form-item>
-            <el-form-item style="margin-top: 20px;">
+            <el-form-item>
               <el-button class="customer-bun-mid controller-bun" type="primary" @click="startProduceModal"
                          :disabled="buttonTags.produceFlag"
-                         style="margin-left: 20px; margin-bottom: 5px;">
+                         style="margin-left: 20px; margin-bottom: 5px;margin-top: 10px">
                 {{ buttons.startProduce }}
               </el-button>
             </el-form-item>
-            <el-form-item style="margin-top: 12px;">
+            <el-form-item>
               <el-button class="customer-bun-mid" type="primary" @click="sopPreviewModal"
-                         style="margin-left: 15px; margin-bottom: 5px;">
+                         style="margin-left: 15px; margin-bottom: 5px;margin-top: 10px">
                 {{ buttons.sopView }}
               </el-button>
             </el-form-item>
           </el-form>
         </fieldset>
-        <!-- 不良 -->
-        <fieldset class="customer-fieldset" style="margin-left: 680px; width: 200px; height: 80px;">
-          <legend class="customer-legend">{{ labels.defectButtons }}</legend>
-          <el-form style="text-align: center;">
-            <el-form-item style="margin-top: 5px;">
-              <el-button class="customer-bun-mid controller-bun" @click="defectRollModal" type="primary"
-                         :disabled="buttonTags.defectFlag"
-                         style="margin-left: 0px; margin-top: 10px;">
-                {{ buttons.reportDefect }}
 
-              </el-button>
-            </el-form-item>
-<!--            <el-form-item style="margin-top: 5px;">-->
-<!--              <el-button v-if="showDefault" @click="saveMultiLanguage()" type="primary">多语言设置</el-button>-->
-<!--            </el-form-item>-->
-          </el-form>
-        </fieldset>
 
         <!-- 扫描 -->
         <fieldset class="customer-fieldset" style="margin-left: 680px; width: 200px; height: 80px;">
@@ -470,10 +491,26 @@
             </el-form-item>
           </el-form>
         </fieldset>
+        <!-- 不良 -->
+        <fieldset class="customer-fieldset" style="margin-left: 680px; width: 200px; height: 80px;">
+          <legend class="customer-legend">{{ labels.defectButtons }}</legend>
+          <el-form style="text-align: center;">
+            <el-form-item style="margin-top: 5px;">
+              <el-button class="customer-bun-mid controller-bun" @click="defectRollModal" type="primary"
+                         :disabled="buttonTags.defectFlag"
+                         style="margin-left: 0px; margin-top: 10px;">
+                {{ buttons.reportDefect }}
 
+              </el-button>
+            </el-form-item>
+            <!--            <el-form-item style="margin-top: 5px;">-->
+            <!--              <el-button v-if="showDefault" @click="saveMultiLanguage()" type="primary">多语言设置</el-button>-->
+            <!--            </el-form-item>-->
+          </el-form>
+        </fieldset>
         <!-- 停机 -->
         <fieldset class="customer-fieldset"
-                  style="margin-left: 680px; width: 200px; height: 105px;">
+                  style="margin-left: 680px; width: 200px; height: 80px;">
           <legend class="customer-legend">{{ labels.downTimeButtons }}</legend>
           <el-form style="text-align: center;">
             <el-form-item>
@@ -486,7 +523,7 @@
         </fieldset>
         <!--其他操作-->
         <fieldset class="customer-fieldset"
-                  style="margin-left: 680px; margin-bottom: 10px; width: 200px; height: 105px;">
+                  style="margin-left: 680px; margin-bottom: 10px; width: 200px; height: 80px;">
           <legend class="customer-legend">{{ buttons.otherOperation }}</legend>
           <el-form style="text-align: center;">
 
@@ -549,6 +586,42 @@
             </el-form-item>
           </el-form>
         </fieldset>
+
+        <!-- 质量检验 -->
+        <fieldset class="customer-fieldset"
+                  style="margin-left: 680px; margin-bottom: 10px; width: 200px; height: 80px;">
+          <legend class="customer-legend">{{ labels.qualityInspection }}</legend>
+          <el-form style="text-align: center;">
+            <el-form-item style="margin-top: 10px;">
+              <el-button class="customer-bun-mid" type="primary" @click="qualityInspectionModal"
+                         style="margin-left: 15px; margin-bottom: 5px;">
+                {{ buttons.qualityInspection }}
+              </el-button>
+            </el-form-item>
+
+            <el-form-item>
+              <el-button class="controller-bun" type="primary" @click="qualityInspectionModal"
+                         style="margin-left: 15px; margin-bottom: 5px;margin-top: 10px;">
+                {{ buttons.mrb }}
+              </el-button>
+            </el-form-item>
+
+          </el-form>
+        </fieldset>
+
+        <!-- TID绑定 -->
+        <fieldset class="customer-fieldset"
+                  style="margin-left: 680px; margin-bottom: 10px; width: 200px; height: 80px;">
+          <legend class="customer-legend">{{ labels.tidBanding }}</legend>
+          <el-form style="text-align: center;">
+            <el-form-item style="margin-top: 10px;">
+              <el-button class="customer-bun-mid" type="primary"
+                         style="margin-left: 15px; margin-bottom: 5px;">
+                {{ buttons.tidBand }}
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </fieldset>
       </el-form>
     </el-dialog>
 
@@ -662,6 +735,10 @@
     <ComMalformedMaterial ref="comMalformedMaterial" :visible.sync="showMalformedMaterialFlag"
                           @refreshPageData="refreshPageData"></ComMalformedMaterial>
 
+    <!-- 过程检验组件 -->
+    <ComProcessInspection :visible.sync="showProcessInspectionFlag">
+    </ComProcessInspection>
+
     <!-- SOP预览弹出框 -->
     <el-dialog title="SOP预览" :visible.sync="showSopPreviewFlag" width="50%" top="5vh" :before-close="closeSopPreview">
       <div class="sop-preview-content">
@@ -813,6 +890,7 @@ import comProduceDown from "./com_produce_down";/*停机组件*/
 import comFinishSchedule from "./com_finish_schedule";/*结束派工单组件*/
 import notOverFinishRoll from "./not_over_finish_roll";/*生产过程的停机组件*/
 import ComMalformedMaterial from "./com_malformed_material";/*生产过程的停机组件*/
+import ComProcessInspection from "./com_process_inspection";/*过程检验组件*/
 var functionId = 'C10000002';
 export default {
   data() {
@@ -823,6 +901,7 @@ export default {
       selectSfdcRollData: '',// 2022-11-17
       showMalformedMaterialFlag: false,// 2022-11-17
       malformedMaterialButtonFlag: true,// 2022-11-17
+      showProcessInspectionFlag: false,// 过程检验弹窗显示状态
       showDefault: false,
       popoverFlag: false,
       showNotOverFlag: false,
@@ -849,7 +928,13 @@ export default {
       sopPageIndex: 1,            // SOP预览分页当前页
       sopPageSize: 20,            // SOP预览分页大小
       sopTotalPage: 0,            // SOP预览总页数
-      activeTable: 'sfdc_time',
+      activeTable: 'order_info',
+      orderInfo: {
+        technicalNotes: '',
+        customerRequirements: '',
+        orderNotes: ''
+      },
+      orderInfoList: [],
       sfdcTimeList: [],
       orderToolList: [],
       sfdcToolList: [],
@@ -3094,14 +3179,19 @@ export default {
         startProduce: '开始生产',
         sopView:'SOP预览',
         reportDefect: '报告不良',
-        toolButton: '刀模板',
-        materialButton: '材料',
-        downTime: '报告其他停机',
+        toolButton: '刀模上机',
+        materialButton: '材料上机',
+        downTime: '异常停机',
         otherOperation: '其他操作',
         preReport: '产量报告',
         deleteRoll: '删除卷',
         notProduce: '未生产下机拆卷',
         scannerRoll: '扫描卷',
+        qualityInspection: '过程检验',
+        updateSample: '更换样片',
+        mrb: 'MRB异常单',
+        updateResult: '更换结果',
+        tidBand: 'TID文件',
       },
       buttonList: [
         {
@@ -3230,6 +3320,7 @@ export default {
         onlyCurrentRoll: '仅显示当前卷信息',
         rollButtons: '卷操作',
         listDesc: '列表信息',
+        orderInfo: '订单信息',
         timeList: '时间',
         toolList: '刀模板记录',
         materialList: '材料',
@@ -3237,10 +3328,12 @@ export default {
         defectList: '不良记录',
         rollList: '机器下机卷',
         produceButtons: '生产调机',
-        defectButtons: '不良',
-        scanButtons: '扫描',
-        downTimeButtons: '停机',
+        defectButtons: '过程不良',
+        scanButtons: '过程控制',
+        downTimeButtons: '过程异常',
         otherButtons: '其他操作',
+        qualityInspection: '质量检验',
+        tidBanding: 'TID绑定',
         toolListReplace: '刀模替换',
         toolListFinish: '结束使用',
         materialListReplace: '换料',
@@ -3621,6 +3714,7 @@ export default {
     comFinishSchedule,/*结束派工单的组件*/
     notOverFinishRoll,/*异常下级报工*/
     ComMalformedMaterial, // 材料一场,扫描
+    ComProcessInspection,/*过程检验组件*/
   },
   methods: {
     // 删除不良
@@ -3860,6 +3954,15 @@ export default {
       //刷新列表数据
       this.refreshCurrentTabTable();
     },
+    //获取订单信息列表
+    getOrderInfoList() {
+      // 获取订单相关的备注信息
+      this.orderInfo = {
+        technicalNotes: this.scheduleData.technicalNotes || '',
+        customerRequirements: this.scheduleData.customerRequirements || '',
+        orderNotes: this.scheduleData.orderNotes || ''
+      };
+    },
     //刷新派工单的时间的记录
     async getSfdcTimeList() {
       await getSfdcTimeByCon(this.searchData).then(({data}) => {
@@ -3923,7 +4026,9 @@ export default {
       }
 
       //区分不同的页签刷新不同的列表数据
-      if (this.activeTable == 'sfdc_time') {
+      if (this.activeTable == 'order_info') {
+        this.getOrderInfoList();
+      } else if (this.activeTable == 'sfdc_time') {
         await this.getSfdcTimeList();
       } else if (this.activeTable == 'sfdc_tool') {
         this.getOrderToolList();
@@ -3954,7 +4059,7 @@ export default {
       this.sfdcDefectList = [];
       this.sfdcRollList = [];
       //设置table页签
-      this.activeTable = 'sfdc_time';
+      this.activeTable = 'order_info';
       //刷新当前派工单的信息
       this.refreshPageData();
       // 操作权限
@@ -4517,6 +4622,26 @@ export default {
       });
     },
 
+    // 质量检验相关方法
+    qualityInspectionModal() {
+      this.showProcessInspectionFlag = true;
+    },
+
+    updateSampleModal() {
+      this.$message.info('更换样片功能');
+      // TODO: 实现更换样片功能
+    },
+
+    mrbModal() {
+      this.$message.info('MRB异常单功能');
+      // TODO: 实现MRB异常单功能
+    },
+
+    updateResultModal() {
+      this.$message.info('更换结果功能');
+      // TODO: 实现更换结果功能
+    },
+
     // 保存 默认配置 列
     async saveMultiLanguage() {
       // 保存页面 button label title 属性