diff --git a/src/api/haianWarehouse/noOrderIssueNotify.js b/src/api/haianWarehouse/noOrderIssueNotify.js
index eb97490..9fff2d3 100644
--- a/src/api/haianWarehouse/noOrderIssueNotify.js
+++ b/src/api/haianWarehouse/noOrderIssueNotify.js
@@ -32,6 +32,8 @@ export const noOrderList = (data) => createAPI('/factory/partAttribute/noOrderLi
 export const queryPartAttributeData = (data) => createAPI('/factory/partAttribute/queryPartAttributeData', 'post', data)
 export const getAreaOptionsForChange = (data) => createAPI('/wcsIntegration/getAreaOptionsForChange', 'post', data)
 export const getAllNotifyStatus = (data) => createAPI('/sys/enum/list', 'get', data)
+// 无单页保留的只读查询：复用老模块查询接口，不写海安业务表 - rqrq
+export { searchOtherPart } from '@/api/orderIssure/soIssueNotify.js'
 
 // 海安无单指定策略接口：维护单行物料的批次/标签指定分配层 - rqrq
 export const getNoOrderMaterialAllocList = (data) => createAPI('/autoWareHourceHaian/haiAnIssureNotify/getNoOrderMaterialAllocList', 'post', data)
diff --git a/src/views/modules/haianWarehouse/noOrderIssue/newNoOrderIssueNotify54.vue b/src/views/modules/haianWarehouse/noOrderIssue/newNoOrderIssueNotify54.vue
index aab4e28..ad11b00 100644
--- a/src/views/modules/haianWarehouse/noOrderIssue/newNoOrderIssueNotify54.vue
+++ b/src/views/modules/haianWarehouse/noOrderIssue/newNoOrderIssueNotify54.vue
@@ -1,5 +1,465 @@
+<template>
+  <div>
+    <el-form label-position="top" style="margin-top: -0px">
+      <el-row :gutter="20">
+        <el-col :span="20">
+
+          <el-button v-if="notifyNo===''" @click="addNotify()" type="primary" class="yzzButtonAn">新建申请单</el-button>
+<!--          只允许一条明细记录 不然后续推送给wcs 立库可能会有问题-->
+          <el-button v-if="notifyNo!=''" type="primary" :disabled="dataList.length>0" @click="chooseSOSModal()" class="yzzButtonAn">新增物料</el-button>
+          <el-button v-if="notifyNo!=''" type="primary" @click="xiadaNotify()" class="yzzButtonAn">下达申请单</el-button>
+          <el-button v-if="notifyNo!=''" type="primary" @click="deleteNotify()" class="yzzButtonAn">删除申请单</el-button>
+
+        </el-col>
+      </el-row>
+      <el-row :gutter="10" v-if="notifyNo!=''">
+        <el-col :span="3">
+          <el-form-item :label="'工厂编码'">
+            <el-input v-model="notifyData.site" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item :label="'申请单号'">
+            <el-input v-model="notifyData.notifyNo" disabled style="width: 100%;"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item :label="'申请账号'">
+            <el-input v-model="notifyData.username" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item :label="'申请时间'">
+            <el-input v-model="notifyData.notifyDate" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item :label="'状态'">
+            <el-select v-model="notifyData.status" style="width: 100%" disabled>
+              <el-option label="全部" value=""></el-option>
+              <el-option v-for="item in notifyStatusList" :key="item.listValue" :label="item.listDesc"
+                :value="item.listValue"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName" type="border-card"
+      v-if="notifyNo!=''" @tab-click="tabClick">
+      <el-tab-pane label="已申请工单" name="sos">
+        <el-table :height="height" :data="dataList" border style="width: 100%;" @row-click="changeData">
+          <el-table-column v-for="(item,index) in columnList" :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="100" label="操作">
+            <template slot-scope="scope">
+              <a type="text" size="small" @click="enterSOSDetail(scope.row)">物料</a>
+              <a type="text" size="small" @click="deleteNotifySOS(scope.row)">删除</a>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="材料明细" name="sub">
+        <el-table :data="materialDetailList" :height="height" border :row-class-name="materialDetailTableRowClassName"
+          v-loading="dataListLoading" style="width: 100%; ">
+
+          <!--          <el-table-column-->
+          <!--            header-align="center"-->
+          <!--            align="center"-->
+          <!--            width="80"-->
+          <!--            label="操作">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <a type="text" size="small" v-if="currentRow.status==='ISSUE'" @click="deleteNotifyMaterial(scope.row)">删除</a>-->
+
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column v-for="(item,index) in materialDetailColumnList" :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-tab-pane>
+    </el-tabs>
+    <el-dialog title="新增工单物料" :close-on-click-modal="false" v-drag :visible.sync="seqNoModalFlag" width="980px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="订单类型">
+              <el-radio-group v-model="orderType" :disabled="seqNoList.length>0" size="small">
+                <el-radio label="slittingorder">分切订单</el-radio>
+                <el-radio label="shipment">销售发货</el-radio>
+                <el-radio label="shoporder">成品订单</el-radio>
+                <el-radio label="baofei">报废单</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="2">
+            <el-form-item label=" " v-if="orderType!=='baofei'">
+              <el-button type="primary" @click="openOrderManageDialog()" class="">从订单添加</el-button>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="'已添加订单(不保存)'" style="width: 100%" v-if="orderType!=='baofei'">
+              <el-input v-model="remark" style="width: 100%" readonly></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="物料号" v-if="orderType!=='baofei'">
+              <el-input v-model="partNo" @keyup.enter.native="addRowFromQuery" :disabled="orderType=='baofei'"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label=" ">
+              <el-button type="primary" @click="addRowFromQuery()" :loading="addLineLoading" v-if="orderType!=='baofei'"
+                class="">添加物料行</el-button>
+              <el-button type="primary" @click="openSelectMaterialModal()" v-if="orderType!=='baofei'"
+                class="">选择物料</el-button>
+              <el-button type="primary" @click="importModel()" :disabled="seqNoList.length>0" v-if="orderType!=='baofei'"
+                class="">导入</el-button>
+              <el-button type="primary" @click="importModel2()" :disabled="seqNoList.length>0" v-if="orderType==='baofei'"
+                         class="">报废导入</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table :height="400" :data="seqNoList" border style="width: 100%;" class="choose-sos-table" :row-class-name="seqNoTableRowClassName">
+        <!-- rqrq - 使用displayColumnList2计算属性，报废类型时动态显示批次号列 -->
+        <el-table-column v-for="(item,index) in displayColumnList2" :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">
+            <div v-if="item.columnProp === 'applyQty'">
+              <el-input class="applyQtyClass" v-model="scope.row.applyQty" style="height: 11px; width: 98%;"></el-input>
+            </div>
+            <!-- rqrq - 可用库存特殊显示：加粗，小于需求数量时红色 -->
+            <span v-else-if="item.columnProp === 'availableQty'" :style="{fontWeight: 'bold', color: (Number(scope.row.remark || 0) > Number(scope.row.availableQty || 0)) ? '#F56C6C' : ''}">
+              {{ scope.row.availableQty }}
+            </span>
+            <!-- rqrq - 导入数量特殊显示：大于可用库存时红色 -->
+            <span v-else-if="item.columnProp === 'remark'" :style="{fontWeight: 'bold', color: (Number(scope.row.remark || 0) > Number(scope.row.availableQty || 0)) ? '#F56C6C' : ''}">
+              {{ scope.row.remark }}
+            </span>
+            <span v-else-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="120" label="操作">
+          <template slot-scope="scope">
+            <el-button type="danger" size="mini" plain style="height:14px; line-height:14px; padding:0 8px;" @click="deleteSeqNoRow(scope.$index)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="saveNewSoIssueNotify" :loading="saveNewLoading">保存</el-button>
+        <el-button type="primary" @click="seqNoModalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 订单管理弹窗 - rqrq -->
+    <el-dialog :title="'订单添加(' + orderTypeText + ')'" :close-on-click-modal="false" v-drag :visible.sync="orderManageDialogVisible" width="1100px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="5">
+            <el-form-item :label="'Order No'">
+              <el-input v-model="orderManageData.orderNo" @keyup.enter.native="addOrderToTempList()" placeholder="请输入订单号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item :label="'Release No'">
+              <el-input v-model="orderManageData.releaseNo" @keyup.enter.native="addOrderToTempList()" placeholder="请输入Release No"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item :label="'Sequence No'">
+              <el-input v-model="orderManageData.sequenceNo" @keyup.enter.native="addOrderToTempList()" placeholder="请输入Sequence No"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item :label="' '">
+              <el-button type="primary" @click="addOrderToTempList()" :loading="addOrderTempLoading" class="">添加</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <!-- 订单明细列表 - rqrq -->
+      <el-table :height="400" :data="tempOrderList" border style="width: 100%;" v-loading="tempOrderListLoading">
+        <el-table-column prop="orderNo" header-align="center" align="center" min-width="120" label="订单号"></el-table-column>
+        <el-table-column prop="releaseNo" header-align="center" align="center" min-width="100" label="Release No"></el-table-column>
+        <el-table-column prop="sequenceNo" header-align="center" align="center" min-width="100" label="Sequence No"></el-table-column>
+        <el-table-column prop="componentPartNo" header-align="center" align="center" min-width="150" label="物料编码"></el-table-column>
+        <el-table-column prop="componentPartDesc" header-align="center" align="center" min-width="150" label="物料描述" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="applyQty" header-align="center" align="right" min-width="100" label="数量"></el-table-column>
+        <el-table-column prop="uom" header-align="center" align="center" min-width="80" label="单位"></el-table-column>
+        <el-table-column prop="isInWh" header-align="center" align="center" min-width="100" label="是否在立库"></el-table-column>
+        <!-- rqrq - 新增可用库存列 -->
+        <el-table-column prop="availableQty" header-align="center" align="right" min-width="100" label="可用库存">
+          <template slot-scope="scope">
+            <span :style="{fontWeight: 'bold', color: (scope.row.availableQty < scope.row.applyQty) ? '#F56C6C' : ''}">
+              {{ scope.row.availableQty }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column fixed="right" header-align="center" align="center" width="80" label="操作">
+          <template slot-scope="scope">
+            <el-button type="danger" size="mini" plain style="height:14px; line-height:14px; padding:0 8px;" @click="deleteTempOrderRow(scope.$index)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="summaryOrderToMainList()" :loading="summaryLoading">汇总到主列表</el-button>
+        <el-button @click="closeOrderManageDialog()">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 选择物料弹框 -->
+    <el-dialog title="新增物料" :close-on-click-modal="false" v-drag :visible.sync="selectMaterialModalFlag" width="1080px">
+      <el-form :inline="true" label-position="top">
+        <el-form-item label="物料编号">
+          <el-input v-model="componentPartNo" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label=" ">
+          <el-button type="primary" @click="loadAvailableMaterialList()"  class="">查询</el-button>
+        </el-form-item>
+      </el-form>
+      <el-container style="margin-top: 0px;">
+        <!-- 左侧：可选物料 -->
+        <el-main style="width: 470px;padding: 1px">
+          <span style="font-size: 12px">可选物料：</span>
+          <el-table height="350px" :data="availableMaterialList" border ref="itemTable1" @row-click="itemClickRow1"
+            @selection-change="handleAvailableSelectionChange" highlight-current-row style="width: 100%"
+            v-loading="selectMaterialLoading">
+            <el-table-column type="selection" header-align="center" align="center" :selectable="selectFlag" width="50">
+            </el-table-column>
+            <el-table-column prop="partNo" header-align="center" align="center" min-width="170" label="物料号">
+            </el-table-column>
+            <el-table-column prop="height" header-align="center" align="center" min-width="80" label="高度">
+            </el-table-column>
+            <el-table-column prop="isInWh" header-align="center" align="center" min-width="80" label="是否在立库">
+            </el-table-column>
+            <!-- rqrq - 新增可用库存列 -->
+            <el-table-column prop="availableQty" header-align="center" align="right" min-width="80" label="可用库存">
+              <template slot-scope="scope">
+                <span style="font-weight: bold;">{{ scope.row.availableQty }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-pagination @size-change="handleAvailableSizeChange" @current-change="handleAvailableCurrentChange"
+            :current-page="availableMaterialPage" :page-sizes="[50, 100]" :page-size="availableMaterialLimit"
+            small layout="total, prev, pager, next" :total="availableMaterialTotal"
+            style="margin-top: 10px; text-align: right;">
+          </el-pagination>
+        </el-main>
+        <!-- 中间：操作按钮 -->
+        <el-main style="width: 100px;padding: 1px">
+          <div style="margin-top: 180px;margin-left: 18px">
+            <el-button type="primary" @click="addToSelected">添加>></el-button>
+          </div>
+          <div style="margin-top: 15px;margin-left: 18px">
+            <el-button type="primary" @click="removeFromSelected">删除&lt;&lt; </el-button>
+          </div>
+        </el-main>
+        <!-- 右侧：已选物料 -->
+        <el-main style="width: 470px;padding: 1px">
+          <span style="font-size: 12px">已有物料：</span>
+          <el-table height="400px" :data="selectedMaterialList" border ref="itemTable2" @row-click="itemClickRow2"
+            @selection-change="handleSelectedSelectionChange" highlight-current-row style="width: 100%">
+            <el-table-column type="selection" header-align="center" align="center" :selectable="selectFlag" width="50">
+            </el-table-column>
+            <el-table-column prop="partNo" header-align="center" align="center" min-width="170" label="物料号">
+            </el-table-column>
+            <el-table-column prop="height" header-align="center" align="center" min-width="80" label="高度">
+            </el-table-column>
+            <el-table-column prop="isInWh" header-align="center" align="center" min-width="80" label="是否在立库">
+            </el-table-column>
+            <!-- rqrq - 新增可用库存列 -->
+            <el-table-column prop="availableQty" header-align="center" align="right" min-width="80" label="可用库存">
+              <template slot-scope="scope">
+                <span style="font-weight: bold;">{{ scope.row.availableQty }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-main>
+      </el-container>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="confirmSelectMaterial()">保存</el-button>
+        <el-button @click="selectMaterialModalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+    <el-dialog title="申请明细" :close-on-click-modal="false" v-drag :visible.sync="materialModalFlag" width="900px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'生产订单号'">
+              <el-input v-model="sobomData.orderNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label=" ">
+              <el-button type="primary" @click="openSelectMaterialModalForDetail()"
+              class="">添加</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="yzzTable">
+        <el-table :height="400" :data="sobomList" border v-loading="bomLoadFlag" style="width: 100%;">
+          <el-table-column v-for="(item,index) in columnList3" :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">
+              <div v-if="item.columnProp === 'qtyToIssue'">
+                <el-input v-model="scope.row.qtyToIssue" type="number" style="height: 11px; width: 98%;" :step="0"
+                  :min="0"></el-input>
+              </div>
+              <div v-else-if="item.columnProp === 'remark'">
+                <el-input v-model="scope.row.remark" style="padding: 0;width: 100%"></el-input>
+              </div>
+              <!-- rqrq - 可用库存特殊显示：加粗，小于申请数量时红色 -->
+              <div v-else-if="item.columnProp === 'availableQty'">
+                <span :style="{fontWeight: 'bold', color: (scope.row.availableQty < scope.row.qtyToIssue) ? '#F56C6C' : ''}">
+                  {{ scope.row.availableQty }}
+                </span>
+              </div>
+              <div v-else>
+                <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>
+
+              </div>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column prop="" header-align="center" align="center" min-width="50" label="操作">
+            <template slot-scope="scope">
+              <el-button type="primary" @click="qtyAllForBom(scope.row)" style="width: 100%">全数领料</el-button>
+            </template>
+          </el-table-column> -->
+
+        </el-table>
+      </div>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="saveNoOrderMaterialDetail()">保存</el-button>
+        <el-button type="primary" @click="materialModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <el-dialog title="保存物料" :close-on-click-modal="false" v-drag :visible.sync="saveOtherPartModalFlag" width="600px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'物料编码'">
+              <el-input v-model="otherPartData.componentPartNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item :label="'物料描述'">
+              <el-input v-model="otherPartData.partDesc" disabled></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'计量单位'">
+              <el-input v-model="otherPartData.umid" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'需求数量'">
+              <el-input-number v-model="otherPartData.qtyToIssue" style="padding: 0;width: 100%" :step="0" :min="0"
+                :controls="false"></el-input-number>
+
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item :label="'备注'">
+              <el-input v-model="otherPartData.remark"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="saveOtherPart()">保存</el-button>
+        <el-button type="primary" @click="saveOtherPartModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+    <el-dialog title="下达申请单" :close-on-click-modal="false" v-drag :visible.sync="showXiadaNotifyDialog" width="400px">
+      <el-form :inline="true" label-position="top" label-width="500px" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="要求发料时间">
+              <el-date-picker v-model="xiadaNotifyData.planIssueDate" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期时间" style="width: 100%">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" class="issueNotify">
+              <el-input type="textarea" v-model="xiadaNotifyData.remark" :rows="3" placeholder="请输入内容"
+                style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:30px;text-align:center;">
+        <el-button type="primary" @click="confirmXiadaNotify()">下达</el-button>
+        <el-button type="primary" @click="showXiadaNotifyDialog=false">取消</el-button>
+      </el-footer>
+    </el-dialog>
+    <el-dialog title="选择申请类型" :close-on-click-modal="false" v-drag :visible.sync="showAddNotifyTypeDialog"
+      width="400px">
+      <el-form :inline="true" label-position="top" label-width="500px" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="申请类型">
+              <el-radio-group v-model="selectedNotifyType">
+                <el-radio label="production">生产领料单</el-radio>
+                <el-radio label="outsourced">委外领料单</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" class="issueNotify">
+              <el-input type="textarea" v-model="selectedNotifyRemark" :rows="3" placeholder="请输入内容"
+                style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:30px;text-align:center;">
+        <el-button type="primary" @click="confirmAddNotify()">确认</el-button>
+        <el-button type="primary" @click="showAddNotifyTypeDialog=false">取消</el-button>
+      </el-footer>
+    </el-dialog>
+    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
+    <noorderUploadExcel ref="noorderUploadExcel" @refreshTable="searchTable" v-drag></noorderUploadExcel>
+    <baofeiUploadExcel ref="baofeiUploadExcel" @refreshTable="searchTable" v-drag></baofeiUploadExcel>
+  </div>
+</template>
+
 <script>
-import BaseNewNoOrderIssueNotify from '@/views/modules/noOrderIssue/newNoOrderIssueNotify.vue'
 import {
   getUserNoOrderNotifyNo,
   createNoOrderNotify,
@@ -12,13 +472,2501 @@ import {
   xiadaNotify,
   deleteNotify,
   deleteNotifySOS,
+  noOrderList,
+  getAllNotifyStatus,
+  queryPartAttributeData,
+  searchOtherPart,
 } from '@/api/haianWarehouse/noOrderIssueNotify.js'
+import noorderUploadExcel from '@/views/modules/noOrderIssue/noorder_upload_excel.vue'
+import baofeiUploadExcel from '@/views/modules/noOrderIssue/baofei_upload_excel.vue'
+import Chooselist from '@/views/modules/common/Chooselist_eam'
+import { getTableUserListLanguage } from '@/api/table.js'
+
+export default {
+  name: 'newNoOrderIssueNotify54',
+  components: {
+    Chooselist,
+    noorderUploadExcel,
+    baofeiUploadExcel,
+  },
+  watch: {
+    // notifyOrderData: {
+    //   deep: true,
+    //   handler: function (newV, oldV) {
+    //     this.notifyOrderData.locationNo = this.notifyOrderData.locationNo.toUpperCase()
+    //   }
+    // },
+  },
+  data() {
+    return {
+      activeName: 'sos',
+      noControlPartModelFlag: false,
+      buList: [],
+      partList: [],
+      partList2: [],
+      notifyStatusList: [],
+      notifyNo: '',
+      notifyData: {
+        site: '',
+        bu: '',
+        notifyNo: '',
+        notifyDate: '',
+        enteredDate: '',
+        userName: '',
+        userDisplay: '',
+        remark: '',
+        planIssueDate: '',
+      },
+      dataList2: [],
+      dataList3: [],
+      materialDetailList: [],
+      currentRow: '',
+      dataListLoading: false,
+      // 是否收藏
+      favorite: false,
+      changeBuFlag: false,
+      partModelFlag: false,
+      newBu: '',
+      // 导出 start
+      exportData: [],
+      exportName: '设备分组' + this.dayjs().format('YYYYMMDDHHmmss'),
+      exportHeader: ['设备分组'],
+      exportFooter: [],
+      exportList: [],
+      // 导出 end
+      searchData: {
+        site: this.$store.state.user.site,
+        userName: this.$store.state.user.name,
+        groupID: '',
+        groupDesc: '',
+        buDesc: '',
+        active: 'Y',
+        page: 1,
+        limit: 10,
+      },
+      sobomData: {
+        orderNo: '',
+        seqno: '',
+        partNo: '',
+      },
+      //申请单序号
+      itemNo: '',
+      notifyOrderData: {
+        partNo: '',
+        orderNo: '',
+        itemNo: '',
+        releaseNo: '',
+        sequenceNo: '',
+        partDesc: '',
+        qtyrequired: '',
+        issureQty: '',
+        needDate: '',
+      },
+      seqNoData: {
+        site: this.$store.state.user.site,
+        seqno: '',
+        releaseNo: '',
+        sequenceNo: '',
+        sResourceID: '',
+        sWorkcenterno: '',
+        operatorId: '',
+        sShiftno: '',
+        startDate: '',
+        endDate: '',
+      },
+      seqNoList: [],
+      height: 200,
+      pageIndex: 1,
+      pageSize: 20,
+      totalPage: 0,
+      dataList: [],
+      sobomList: [],
+      dataListSelections: [],
+      seqNoModalFlag: false,
+      materialModalFlag: false,
+      modalDisableFlag: false,
+      saveSeqNoModalFlag: false,
+      bomLoadFlag: false,
+      xiadaList: [],
+      columnList4: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table4ComponentPartNo',
+          tableId: '555001Table4',
+          tableName: '非BOM材料明细',
+          columnProp: 'componentPartNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '材料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table4PartDesc',
+          tableId: '555001Table4',
+          tableName: '非BOM材料明细',
+          columnProp: 'partDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '材料名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 130,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table4QtyToIssue',
+          tableId: '555001Table4',
+          tableName: '非BOM材料明细',
+          columnProp: 'qtyToIssue',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '申请数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table4Remark',
+          tableId: '555001Table4',
+          tableName: '非BOM材料明细',
+          columnProp: 'remark',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '备注',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 200,
+        },
+      ],
+      modalData: {
+        flag: '',
+        bu: '',
+        site: this.$store.state.user.site,
+        groupID: '',
+        groupDesc: '',
+        active: '',
+        createBy: this.$store.state.user.name,
+        updateBy: this.$store.state.user.name,
+      },
+      // 展示列集
+      columnList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table1ItemNo',
+          tableId: '555001Table1',
+          tableName: '领料申请工单子表',
+          columnProp: 'itemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '序号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 50,
+        },
+        /* {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table1SeqNo',
+          tableId: '555001Table1',
+          tableName: '领料申请派工单子表',
+          columnProp: 'seqNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '派工单号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 150,
+        }, */
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table1SOOrderNo',
+          tableId: '555001Table1',
+          tableName: '领料申请工单子表',
+          columnProp: 'soorderNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '生产订单号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table1ReleaseNo',
+          tableId: '555001Table1',
+          tableName: '领料申请工单子表',
+          columnProp: 'releaseNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: 'ReleaseNo',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table1SequenceNo',
+          tableId: '555001Table1',
+          tableName: '领料申请工单子表',
+          columnProp: 'sequenceNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: 'SequenceNo',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table1NeedDate',
+          tableId: '555001Table1',
+          tableName: '领料申请派工单子表',
+          columnProp: 'needDate',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '要求发料时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 80,
+        },
+      ],
+      columnList2: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2ComponentPartNo',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'partNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '物料号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2ApplyQty',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'applyQty',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '本次申请数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 80,
+        },
+        // {
+        //   userId: this.$store.state.user.name,
+        //   functionId: 555001,
+        //   serialNumber: '555001Table2FinishDate',
+        //   tableId: '555001Table2',
+        //   tableName: '查询工单及物料',
+        //   columnProp: 'height',
+        //   headerAlign: 'center',
+        //   align: 'center',
+        //   columnLabel: '高度',
+        //   columnHidden: false,
+        //   columnImage: false,
+        //   columnSortable: false,
+        //   sortLv: 0,
+        //   status: true,
+        //   fixed: false,
+        //   columnWidth: 110,
+        // },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2FinishDate',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'isInWh',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '是否在立库',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 110,
+        },
+        {
+          // rqrq - 新增可用库存列
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2AvailableQty',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'availableQty',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '可用库存',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 80,
+        },
+      ],
+      columnList3: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table3ComponentPartNo',
+          tableId: '555001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'componentPartNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '物料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: true,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 80,
+        },
+        {
+          // rqrq - 新增批次号列
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table3BatchNo',
+          tableId: '555001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'batchNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '批次号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table3QtyRequired',
+          tableId: '555001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'isInWh',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '是否在立库',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 50,
+        },
+        {
+          // rqrq - 新增可用库存列
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table3AvailableQty',
+          tableId: '555001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'availableQty',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '可用库存',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table3QtyToIssue',
+          tableId: '555001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'qtyToIssue',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '本次申请数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 60,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table3Remark',
+          tableId: '555001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'remark',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '备注',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 150,
+        },
+      ],
+      materialDetailColumnList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: '701002Table3ItemNo',
+          tableId: '701002Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'itemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '申请单序号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: '701002Table3ComponentPartNo',
+          tableId: '701002Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'componentPartNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '材料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: '701002Table3NeedDate',
+          tableId: '701002Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'needDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '需求时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 110,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: '701002Table3QtyToIssue',
+          tableId: '701002Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'qtyToIssue',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '申请数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: '701002Table3QtyToIssueOriginal',
+          tableId: '701002Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'qtyToIssueOriginal',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '已发数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: '701002Table3IssueType',
+          tableId: '701002Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'issueType',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '类型',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: '701002Table3Remark',
+          tableId: '701002Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'remark',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '备注',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 160,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: '701002Table3SOOrderNo',
+          tableId: '701002Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'soorderNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '生产订单',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: '701002Table3BOMItemNo',
+          tableId: '701002Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'bomitemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: 'BOM序号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+      ],
+      rules: {
+        groupIdType: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        groupDescType: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        activeType: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        bu: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur', 'change'],
+          },
+        ],
+      },
+      userBuList: [],
+      authSearch: false,
+      authSave: false,
+      authUpdate: false,
+      authDelete: false,
+      menuId: this.$route.meta.menuId,
+      partSearch: {
+        site: '',
+        sourceBu: '',
+        partNo: '',
+        partDesc: '',
+        spec: '',
+      },
+      xiadaModelFlag: false,
+      saveOtherPartModalFlag: false,
+      otherPartData: {
+        site: '',
+        notifyNo: '',
+        itemNo: '',
+        bOMItemNo: '',
+        componentPartNo: '',
+        qtyToIssue: '',
+        issueType: '',
+        partDesc: '',
+        umid: '',
+        remark: '',
+      },
+      showAddNotifyTypeDialog: false,
+      selectedNotifyType: 'production',
+      selectedNotifyRemark: '',
+      showXiadaNotifyDialog: false,
+      xiadaNotifyData: {
+        planIssueDate: '',
+        remark: '',
+      },
+      chooseLoading: false,
+      seqNoModalLoading: false,
+      saveNewLoading: false,
+      // 选择物料弹框相关
+      selectMaterialModalFlag: false,
+      availableMaterialList: [], // 左侧可选物料列表
+      selectedMaterialList: [], // 右侧已选物料列表
+      availableMaterialSelections: [], // 左侧选中的行
+      selectedMaterialSelections: [], // 右侧选中的行
+      selectMaterialLoading: false,
+      modelCode: '', // 模板编号
+      modelName: '', // 模板名称
+      // 左侧表格分页相关
+      availableMaterialPage: 1, // 当前页码
+      availableMaterialLimit: 100, // 每页条数
+      availableMaterialTotal: 0, // 总条数
+      componentPartNo: '', // 物料编码搜索
+      orderType: 'slittingorder',
+      // 申请明细弹框相关
+      isMaterialDetailModal: false, // 标识是否从申请明细弹框打开选择物料弹框
+      clickrow:{},
+      partNo:'',
+      addLineLoading:false,
+      addOrderLoading:false, // 订单添加按钮loading状态 - rqrq（已废弃）
+      remark:'', // 已添加订单号列表(分号分隔) - rqrq
+      addedOrderNoList: [], // 已添加订单号数组 - rqrq
+
+      // ==================== 订单管理弹窗相关 - rqrq ====================
+      orderManageDialogVisible: false, // 订单管理弹窗显示状态 - rqrq
+      orderManageData: { // 订单管理输入数据 - rqrq
+        orderNo: '',
+        releaseNo: '*',
+        sequenceNo: '*'
+      },
+      tempOrderList: [], // 临时订单明细列表（不汇总） - rqrq
+      tempOrderListLoading: false, // 临时订单列表加载状态 - rqrq
+      addOrderTempLoading: false, // 添加订单到临时列表按钮loading - rqrq
+      summaryLoading: false, // 汇总按钮loading状态 - rqrq
+    }
+  },
+
+  mounted() {
+    this.$nextTick(() => {
+      this.height = window.innerHeight - 220
+    })
+  },
+
+  created () {
+      // 按钮控制
+    // this.getButtonAuthData()
+    //this.getTableUserColumn(this.$route.meta.menuId+'Table2',2)
+    this.getUserNotifyNo()
+    },
+
+  computed: {
+    // 获取订单类型的中文名称 - rqrq
+    orderTypeText() {
+      const typeMap = {
+        'slittingorder': '分切订单',
+        'shipment': '销售发货',
+        'shoporder': '成品订单'
+      }
+      return typeMap[this.orderType] || '未知类型'
+    },
+    // 新增工单物料弹窗表格列配置（根据订单类型动态显示批次号列） - rqrq
+    displayColumnList2() {
+      // 基础列配置
+      let baseColumns = [...this.columnList2]
+
+      // 如果订单类型是报废，在物料号后面插入批次号列 - rqrq
+      if (this.orderType === 'baofei') {
+        const batchColumn = {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2BatchNo',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'batchNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '批次号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 120,
+        }
+        const remarkColumn = {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2Remark',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'remark',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '导入数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 120,
+        }
+        // 在第一个列（物料号）后面插入批次号列 - rqrq
+        baseColumns.splice(1, 0, batchColumn)
+        baseColumns.splice(2, 0, remarkColumn)
+
+      }
+
+      return baseColumns
+    }
+  },
+
+  methods: {
+      tabClick(tab, event) {
+      // 刷新当前标签页的表格数据
+      this.refreshCurrentTabTable()
+    },
+    refreshCurrentTabTable() {
+      if (this.notifyNo === '' || !this.notifyNo) {
+        return
+      }
+      if (this.activeName === 'sub') {
+        // 使用当前选中的行数据，如果没有则使用申请单基本信息
+        let queryData = {
+          site: this.notifyData.site || this.$store.state.user.site,
+          notifyNo: this.notifyNo,
+          orderType: 'shoporder',
+        }
+        // 如果当前行有数据，合并进去
+        if (
+          this.currentRow &&
+          this.currentRow !== '' &&
+          this.currentRow.notifyNo
+        ) {
+          queryData = {
+            ...this.currentRow,
+            orderType: 'shoporder',
+          }
+        }
+        this.dataListLoading = true
+        searchNotifyMaterialListNew(queryData)
+          .then(({ data }) => {
+            this.dataListLoading = false
+            if (data && data.code === 0) {
+              this.materialDetailList = data.rows
+            } else {
+              this.materialDetailList = []
+            }
+          })
+          .catch(() => {
+            this.dataListLoading = false
+            this.materialDetailList = []
+          })
+      }
+    },
+    materialDetailTableRowClassName({ row, rowIndex }) {
+      if (
+        row.qtyToIssueOriginal < row.qtyToIssue &&
+        new Date(row.needDate) <
+          new Date(this.dayjs().format('YYYY-MM-DD HH:mm'))
+      ) {
+        return 'error-row'
+      }
+      return ''
+    },
+    changeData(row) {
+      this.currentRow = JSON.parse(JSON.stringify(row))
+      this.refreshCurrentTabTable()
+    },
+    getBaseList(val, type) {
+      this.tagNo = val
+      let conSql = ''
+      this.$nextTick(() => {
+        let strVal = ''
+
+        if (val === 515) {
+          strVal = this.seqNoData.sResourceid
+          conSql =
+            " and site = '" +
+            this.notifyData.site +
+            "'" +
+            " and bu_no = '" +
+            this.notifyData.bu +
+            "'"
+          this.$refs.baseList.init(val, strVal, conSql)
+        }
+        if (val === 216) {
+          strVal = this.seqNoData.sWorkcenterno
+          conSql =
+            " and site = '" +
+            this.notifyData.site +
+            "'" +
+            " and bu_no = '" +
+            this.notifyData.bu +
+            "'"
+          this.$refs.baseList.init(val, strVal, conSql)
+        }
+        if (val === 215) {
+          strVal = this.notifyOrderData.locationNo
+          this.$refs.baseList.init(val, strVal)
+        }
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.qtyToIssue > row.qtyAvailable) {
+        return 'error-row'
+      }
+
+      return ''
+    },
+    // 报废导入表格行样式：导入数量大于可用库存时行变红 - rqrq
+    seqNoTableRowClassName({ row, rowIndex }) {
+      // 只有报废类型且remark存在时才判断 - rqrq
+      if (this.orderType === 'baofei' && row.remark !== undefined) {
+        const remarkQty = Number(row.remark || 0)
+        const availableQty = Number(row.availableQty || 0)
+        // 导入数量大于可用库存时变红 - rqrq
+        if (remarkQty > availableQty) {
+          return 'baofei-error-row'
+        }
+      }
+      return ''
+    },
+    // 列表方法的回调
+    getBaseData(val) {
+      if (this.tagNo === 515) {
+        this.seqNoData.sResourceid = val.resource_id
+      }
+      if (this.tagNo === 215) {
+        this.notifyOrderData.locationNo = val.location_id
+      }
+      if (this.tagNo === 216) {
+        this.seqNoData.sWorkcenterno = val.work_center_no
+      }
+    },
+    getUserNotifyNo() {
+      let inData = {
+        site: this.$store.state.user.site,
+        username: this.$store.state.user.name,
+      }
+      this.getAllNotifyStatus()
+      getUserNoOrderNotifyNo(inData).then(({ data }) => {
+        if (data.code === 0) {
+          if (data.row != null) {
+            this.notifyNo = data.row.notifyNo
+            this.notifyData = data.row
+            this.getNotifyNoOrderDetail()
+            /* this.searchOtherPart('非BOM物料')
+            this.searchOtherPart('不管控物料') */
+          } else {
+            this.notifyNo = ''
+            this.notifyData = {
+              site: '',
+              bu: '',
+              notifyNo: '',
+              notifyDate: '',
+              enteredDate: '',
+              userName: '',
+              userDisplay: '',
+              remark: '',
+              planIssueDate: '',
+            }
+            this.dataList = []
+          }
+        } else {
+          this.notifyNo = ''
+          this.notifyData = {
+            site: '',
+            bu: '',
+            notifyNo: '',
+            notifyDate: '',
+            enteredDate: '',
+            userName: '',
+            userDisplay: '',
+            remark: '',
+            planIssueDate: '',
+          }
+          this.dataList = []
+        }
+      })
+    },
+    getNotifyNoOrderDetail() {
+      let inData = {
+        site: this.$store.state.user.site,
+        notifyNo: this.notifyNo,
+      }
+      getNotifyNoOrderDetail(inData).then(({ data }) => {
+        if (data.code === 0) {
+          this.dataList = data.rows
+        }
+      })
+    },
+    addNotify() {
+      //this.showAddNotifyTypeDialog = true
+      let inData = {
+        site: this.$store.state.user.site,
+        userName: this.$store.state.user.name,
+        orderType: 'otherOrder', // rqrq - 固定为shoporder类型
+      }
+      createNoOrderNotify(inData).then(({ data }) => {
+        if (data.code === 0) {
+          this.showAddNotifyTypeDialog = false
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500,
+            onClose: () => {},
+          })
+          this.getUserNotifyNo()
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+    confirmAddNotify() {
+      let outWorkOrderFlag = 'N'
+      if (this.selectedNotifyType === 'outsourced') {
+        outWorkOrderFlag = 'Y'
+      } else {
+        outWorkOrderFlag = 'N'
+      }
+      let inData = {
+        site: this.$store.state.user.site,
+        userName: this.$store.state.user.name,
+        outWorkOrderFlag: outWorkOrderFlag,
+        remark: this.selectedNotifyRemark,
+        orderType: 'otherOrder', // rqrq - 固定为shoporder类型
+      }
+      this.getAllNotifyStatus()
+      createNoOrderNotify(inData).then(({ data }) => {
+        if (data.code === 0) {
+          this.showAddNotifyTypeDialog = false
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500,
+            onClose: () => {},
+          })
+          this.getUserNotifyNo()
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+    chooseSOS(row) {
+      if (this.dataList.length > 0) {
+        //这边是有个判断的，判断派工单号不能重复
+        let stop = false
+        for (let i = 0; i < this.dataList.length; i++) {
+          if (
+            this.dataList[i].orderNo == row.orderNo &&
+            this.dataList[i].releaseNo == row.releaseNo &&
+            this.dataList[i].sequenceNo == row.sequenceNo
+          ) {
+            stop = true
+          }
+        }
+        if (stop) {
+          this.$alert('已经选择过此工单，请返回点击明细直接操作！!', '提示', {
+            confirmButtonText: '确定',
+          })
+          return false
+        }
+      }
+      let inData = {
+        site: this.$store.state.user.site,
+        orderNo: row.orderNo,
+        releaseNo: row.releaseNo,
+        sequenceNo: row.sequenceNo,
+      }
+      this.chooseLoading = true
+      getShopOrderFromIFSWithOrderNo(inData)
+        .then(({ data }) => {
+          if (data.code === 0) {
+            console.log('data', data)
+            this.notifyOrderData.partNo = data.rows[0].partNo
+            this.notifyOrderData.orderNo = data.rows[0].orderNo
+            this.notifyOrderData.site = this.$store.state.user.site
+            this.notifyOrderData.partDesc = data.rows[0].partDesc
+            this.notifyOrderData.qtyRequired = data.rows[0].lotSize
+            this.notifyOrderData.releaseNo = data.rows[0].releaseNo
+            this.notifyOrderData.issureQty = ''
+            this.notifyOrderData.needDate =
+              this.dayjs().format('YYYY-MM-DD HH:mm')
+            this.notifyOrderData.sequenceNo = data.rows[0].sequenceNo
+            this.saveSeqNoModalFlag = true
+          } else {
+            this.$meassage.error(data.msg)
+            return
+          }
+        })
+        .finally(() => {
+          this.chooseLoading = false
+        })
+    },
+    saveSOS() {
+      if (
+        this.notifyOrderData.needDate == null ||
+        this.notifyOrderData.needDate == ''
+      ) {
+        this.$message.warning('请选择时间！')
+        return false
+      }
+
+      // if (
+      //   this.notifyOrderData.issureQty == null ||
+      //   this.notifyOrderData.issureQty == '' ||
+      //   this.notifyOrderData.issureQty < 0
+      // ) {
+      //   this.$message.warning('请填写领取数量！')
+      //   return false
+      // }
+      let row = this.notifyOrderData
+      console.log('row', row, this.dataList)
+      if (this.dataList.length > 0) {
+        let stop = false
+        for (let i = 0; i < this.dataList.length; i++) {
+          if (
+            this.dataList[i].soorderNo == row.orderNo &&
+            this.dataList[i].releaseNo == row.releaseNo &&
+            this.dataList[i].sequenceNo == row.sequenceNo
+          ) {
+            stop = true
+          }
+        }
+        if (stop) {
+          this.$alert('已经选择过此工单，请返回点击明细直接操作！!', '提示', {
+            confirmButtonText: '确定',
+          })
+          return false
+        }
+      }
+      this.$confirm('确定选择工单' + row.orderNo + '?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        let inData = {
+          site: this.$store.state.user.site,
+          notifyNo: this.notifyNo,
+          fgPartNo: row.partNo,
+          soorderNo: row.orderNo,
+          opsItemNo: row.itemNo,
+          sequenceNo: row.sequenceNo,
+          releaseNo: row.releaseNo,
+          needDate: row.needDate,
+          issureQty: row.issureQty,
+        }
+
+        saveSOIssueNotifyOrderList(inData).then(({ data }) => {
+          if (data.code === 0) {
+            this.saveSeqNoModalFlag = false
+            row.itemNo = data.itemNo
+            this.getNotifyNoOrderDetail()
+            this.enterSOS(row)
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+      })
+    },
+    qtyAllForSeqNo() {
+      this.notifyOrderData.issureQty = this.notifyOrderData.qtyRequired
+    },
+    qtyAllForBom(row) {
+      row.qtyToIssue = row.qtyRequired
+    },
+    enterSOSDetail(row) {
+      let rows = {
+        site: this.$store.state.user.site,
+        notifyNo: this.notifyNo,
+        orderNo: row.soorderNo,
+        seqNo: row.seqNo,
+        partNo: row.fgPartNo,
+        itemNo: row.itemNo,
+        releaseNo: row.releaseNo,
+        sequenceNo: row.sequenceNo,
+      }
+      this.clickrow = row
+      //this.searchNotifyMaterialList(rows)
+      this.enterSOS(rows)
+    },
+
+    enterSOS(row) {
+      console.log('row', row)
+
+      this.seqNoModalFlag = false
+      this.materialModalFlag = true
+      this.sobomList = []
+      this.sobomData = {
+        orderNo: row.orderNo,
+        seqNo: row.seqNo,
+        partNo: row.partNo,
+      }
+      this.bomLoadFlag = true
+      let inData = {
+        site: this.$store.state.user.site,
+        notifyNo: this.notifyNo,
+        partNo: row.partNo,
+        itemNo: row.itemNo,
+      }
+      getNoOrderMaterialList(inData).then(({ data }) => {
+        this.bomLoadFlag = false
+        if (data.code === 0) {
+          this.sobomList = data.rows
+          for (let i = 0; i < this.sobomList.length; i++) {
+            this.sobomList[i].itemNo = inData.itemNo
+            /* if(!this.sobomList[i].qtyToIssue){
+              this.$set(this.sobomList[i], 'qtyToIssue', this.sobomList[i].qtyRequired)
+            } */
+          }
+        }
+      })
+    },
+    // 从申请明细弹框打开选择物料弹框
+    openSelectMaterialModalForDetail() {
+      this.isMaterialDetailModal = true
+      // 设置模板编号和名称（使用生产订单号）
+      this.modelCode = this.sobomData.orderNo || ''
+      this.modelName = this.sobomData.partNo || ''
+
+      // 将sobomList中的数据转换为选择物料弹框需要的格式，显示在右侧"已有物料"列表中
+      this.selectedMaterialList = this.sobomList.map(item => {
+        const convertedItem = JSON.parse(JSON.stringify(item))
+        // 将qtyToIssue转换为applyQty
+        convertedItem.applyQty = convertedItem.qtyToIssue || 0
+        // 确保partNo存在（可能使用componentPartNo）
+        if (!convertedItem.partNo && convertedItem.componentPartNo) {
+          convertedItem.partNo = convertedItem.componentPartNo
+        }
+        return convertedItem
+      })
+
+      // 重置分页
+      this.availableMaterialPage = 1
+      this.availableMaterialLimit = 100
+      this.$set(
+        this,
+        'componentPartNo',
+        ''
+      ) // 清空物料编码搜索条件
+
+      // 加载可选物料列表
+      this.loadAvailableMaterialList()
+
+      // 打开弹框
+      this.selectMaterialModalFlag = true
+    },
+
+    chooseSOSModal() {
+      this.seqNoData = {
+        site: this.$store.state.user.site,
+        orderNo: '',
+        releaseNo: '*',
+        sequenceNo: '*',
+        seqno: '',
+        sResourceid: '',
+        sWorkcenterno: '',
+        operatorId: '',
+        sShiftno: '',
+        startDate: this.dayjs().format('YYYY-MM-DD'),
+        endDate: this.dayjs().format('YYYY-MM-DD'),
+      }
+      this.seqNoList = []
+      // 清空已添加订单记录 - rqrq
+      this.addedOrderNoList = []
+      this.remark = ''
+      // 清空临时订单列表 - rqrq
+      this.tempOrderList = []
+      this.seqNoModalFlag = true
+    },
+    searchSOSRouting() {
+      // 初始化seqNoList如果不存在
+      if (!this.seqNoList) {
+        this.seqNoList = []
+      }
+      // 判断this.seqNoList中是否已存在相同的orderNo、releaseNo、sequenceNo组合
+      const exists = this.seqNoList.some(
+        (row) =>
+          row.orderNo === this.seqNoData.orderNo &&
+          row.releaseNo === this.seqNoData.releaseNo &&
+          row.sequenceNo === this.seqNoData.sequenceNo
+      )
+      if (exists) {
+        this.$message.warning('该工单数据已存在，请先删除再添加！')
+        return false
+      }
+
+      const dataListExists = this.dataList.some(
+        (row) =>
+          row.soorderNo === this.seqNoData.orderNo &&
+          row.releaseNo === this.seqNoData.releaseNo &&
+          row.sequenceNo === this.seqNoData.sequenceNo
+      )
+      if (dataListExists) {
+        this.$message.warning('该工单的数据已添加过，请先删除再添加！')
+        return false
+      }
+
+      // 直接创建一行数据并添加到表格中，不调用接口
+      const newRow = {
+        orderNo: this.seqNoData.orderNo,
+        releaseNo: this.seqNoData.releaseNo,
+        sequenceNo: this.seqNoData.sequenceNo,
+        lineItemNo: '',
+        materialLineStatus: '',
+        componentPartNo: '',
+        componentPartDesc: '',
+        applyQty: 0,
+        qtyIssued: 0,
+        qtyRequired: 0,
+        qtyReserved: 0,
+        uom: '',
+        partNo: '',
+        partDesc: '',
+        startDate: '',
+        finishDate: '',
+        needDate: '',
+      }
+      this.seqNoList.push(newRow)
+      this.$message.success('添加成功')
+
+      // 清空输入框
+      this.seqNoData.orderNo = ''
+      this.seqNoData.releaseNo = ''
+      this.seqNoData.sequenceNo = ''
+    },
+
+    // ==================== 订单管理弹窗相关方法 - rqrq ====================
+
+    // 打开订单管理弹窗 - rqrq
+    openOrderManageDialog() {
+      this.orderManageDialogVisible = true
+      // 不清空临时列表，保留上次输入的数据 - rqrq
+      // this.tempOrderList = []
+    },
+
+    // 关闭订单管理弹窗 - rqrq
+    closeOrderManageDialog() {
+      this.orderManageDialogVisible = false
+      // 清空输入框 - rqrq
+      this.orderManageData = {
+        orderNo: '',
+        releaseNo: '*',
+        sequenceNo: '*'
+      }
+    },
+
+    // 添加订单到临时列表（不汇总） - rqrq
+    addOrderToTempList() {
+      // 1. 参数校验 - rqrq
+      if (!this.orderManageData.orderNo || this.orderManageData.orderNo.trim() === '') {
+        this.$message.warning('请输入Order No！')
+        return
+      }
+
+      // 2. 根据订单类型选择API - rqrq
+      let apiMethod = null
+      if (this.orderType === 'shipment') {
+        apiMethod = getShipmentAndLineForIssure
+      } else {
+        apiMethod = getShopOrderAndMaterialByShoporder
+      }
+
+      // 3. 准备请求参数 - rqrq
+      const requestParams = {
+        site: this.$store.state.user.site,
+        orderNo: this.orderManageData.orderNo.trim(),
+        releaseNo: this.orderManageData.releaseNo || '*',
+        sequenceNo: this.orderManageData.sequenceNo || '*',
+      }
+
+      // 4. 调用API获取订单物料 - rqrq
+      this.addOrderTempLoading = true
+      apiMethod(requestParams)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            let materialList = data.rows || []
+
+            if (!materialList || materialList.length === 0) {
+              this.$message.warning('该订单没有物料明细！')
+              return
+            }
+
+            // 5. 字段映射处理 - rqrq
+            materialList.forEach(item => {
+              if (this.orderType === 'shipment') {
+                if (item.inventoryPartNo) {
+                  item.componentPartNo = item.inventoryPartNo
+                }
+                if (item.shipmentId) {
+                  item.orderNo = item.shipmentId
+                }
+                if (item.inventoryQty !== undefined && !item.applyQty) {
+                  item.applyQty = item.inventoryQty
+                }
+                if (item.inventoryUom && !item.uom) {
+                  item.uom = item.inventoryUom
+                }
+              } else {
+                if (item.qtyRequired !== undefined && !item.applyQty) {
+                  item.applyQty = item.qtyRequired
+                }
+              }
+
+              // 6. 添加订单信息到每一行 - rqrq
+              item.orderNo = this.orderManageData.orderNo
+              item.releaseNo = this.orderManageData.releaseNo || ''
+              item.sequenceNo = this.orderManageData.sequenceNo || ''
+              item.partNo = item.componentPartNo
+              item.lineItemNo = ''
+              item.materialLineStatus = ''
+              item.startDate = ''
+              item.finishDate = ''
+              item.needDate = ''
+            })
+
+            // 7. 直接追加到临时列表（不汇总） - rqrq
+            this.tempOrderList.push(...materialList)
+
+            // 8. 更新已添加订单号 - rqrq
+            if (!this.addedOrderNoList.includes(this.orderManageData.orderNo)) {
+              this.addedOrderNoList.push(this.orderManageData.orderNo)
+              this.remark = this.addedOrderNoList.join(';')
+            }
+
+            this.$message.success(`订单 ${this.orderManageData.orderNo} 添加成功，共 ${materialList.length} 条物料！`)
+
+            // 9. 清空输入框 - rqrq
+            this.orderManageData.orderNo = ''
+
+
+          } else {
+            this.$message.error(data.msg || '获取订单物料失败！')
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.msg || '获取订单物料失败，请稍后重试')
+        })
+        .finally(() => {
+          this.addOrderTempLoading = false
+        })
+    },
+
+    // 删除临时订单列表中的某一行 - rqrq
+    deleteTempOrderRow(index) {
+      this.tempOrderList.splice(index, 1)
+      this.$message.success('删除成功！')
+    },
+
+    // 汇总到主列表 - rqrq
+    summaryOrderToMainList() {
+      if (!this.tempOrderList || this.tempOrderList.length === 0) {
+        this.$message.warning('临时列表为空，无法汇总！')
+        return
+      }
+
+      this.summaryLoading = true
+
+      try {
+        // 1. 创建物料映射表，用于汇总 - rqrq
+        const materialMap = new Map()
+
+        // 2. 先将临时列表的数据按物料号汇总 - rqrq
+        this.tempOrderList.forEach(item => {
+          const partNo = item.componentPartNo
+          if (!partNo) return
+
+          if (materialMap.has(partNo)) {
+            // 已存在，累加数量 - rqrq
+            const existing = materialMap.get(partNo)
+            existing.applyQty = (parseFloat(existing.applyQty) || 0) + (parseFloat(item.applyQty) || 0)
+            // 合并订单号到remark - rqrq
+            if (item.orderNo && !existing.remark.includes(item.orderNo)) {
+              existing.remark = existing.remark ? existing.remark + ';' + item.orderNo : item.orderNo
+            }
+          } else {
+            // 新增 - rqrq
+            materialMap.set(partNo, {
+              partNo: partNo,
+              componentPartNo: partNo,
+              height: item.height || '',
+              isInWh: item.isInWh || '',
+              availableQty: item.availableQty || 0, // rqrq - 新增可用库存字段
+              applyQty: parseFloat(item.applyQty) || 0,
+              componentPartDesc: item.componentPartDesc || item.partDesc || '',
+              uom: item.uom || '',
+              orderNo: item.orderNo || '',
+              releaseNo: item.releaseNo || '',
+              sequenceNo: item.sequenceNo || '',
+              lineItemNo: '',
+              materialLineStatus: '',
+              startDate: '',
+              finishDate: '',
+              needDate: '',
+              remark: item.orderNo || '', // 初始remark为订单号 - rqrq
+            })
+          }
+        })
+
+        // 3. 与主列表seqNoList中现有物料汇总 - rqrq
+        this.seqNoList.forEach(existingItem => {
+          const partNo = existingItem.componentPartNo
+          if (!partNo) return
+
+          if (materialMap.has(partNo)) {
+            // 累加数量 - rqrq
+            const mapItem = materialMap.get(partNo)
+            mapItem.applyQty = (parseFloat(mapItem.applyQty) || 0) + (parseFloat(existingItem.applyQty) || 0)
+            // 合并remark - rqrq
+            if (existingItem.remark) {
+              mapItem.remark = existingItem.remark + ';' + mapItem.remark
+            }
+          } else {
+            // 主列表中的物料在临时列表没有，直接保留 - rqrq
+            materialMap.set(partNo, existingItem)
+          }
+        })
+
+        // 4. 更新主列表seqNoList为汇总后的结果 - rqrq
+        this.seqNoList = Array.from(materialMap.values())
+
+        this.$message.success(`汇总成功！共 ${this.seqNoList.length} 行物料！`)
+
+        // 5. 清空临时列表 - rqrq
+        this.tempOrderList = []
+
+        // 6. 关闭弹窗 - rqrq
+        this.orderManageDialogVisible = false
+
+      } catch (error) {
+        this.$message.error('汇总失败：' + error.message)
+      } finally {
+        this.summaryLoading = false
+      }
+    },
+
+    // 根据订单号添加物料到列表 - rqrq（已废弃，保留用于兼容）
+    addOrderToList() {
+      // 1. 参数校验 - rqrq
+      if (!this.seqNoData.orderNo || this.seqNoData.orderNo.trim() === '') {
+        this.$message.warning('请输入Order No！')
+        return
+      }
+
+      // 2. 检查订单号是否已添加 - rqrq
+      if (this.addedOrderNoList.includes(this.seqNoData.orderNo)) {
+        this.$message.warning('该订单已添加过，请勿重复添加！')
+        return
+      }
+
+      // 3. 根据订单类型选择API - rqrq
+      let apiMethod = null
+      if (this.orderType === 'shipment') {
+        // 销售发货类型使用getShipmentAndLineForIssure - rqrq
+        apiMethod = getShipmentAndLineForIssure
+      } else {
+        // 分切订单和成品订单使用getShopOrderAndMaterialByShoporder - rqrq
+        apiMethod = getShopOrderAndMaterialByShoporder
+      }
+
+      // 4. 准备请求参数 - rqrq
+      const requestParams = {
+        site: this.$store.state.user.site,
+        orderNo: this.seqNoData.orderNo.trim(),
+        releaseNo: this.seqNoData.releaseNo || '*',
+        sequenceNo: this.seqNoData.sequenceNo || '*',
+      }
+
+      // 5. 调用API获取订单物料 - rqrq
+      this.addOrderLoading = true
+      apiMethod(requestParams)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            // 获取返回的物料列表 - rqrq
+            let materialList = data.rows || []
+
+            if (!materialList || materialList.length === 0) {
+              this.$message.warning('该订单没有物料明细！')
+              return
+            }
+
+            // 5. 字段映射处理 - 不同API返回字段名不一致 - rqrq
+            console.log('原始返回数据:', materialList) // 调试用 - rqrq
+            materialList.forEach(item => {
+              if (this.orderType === 'shipment') {
+                // 销售发货API字段映射 - rqrq
+                // inventoryPartNo -> partNo - rqrq
+                if (item.inventoryPartNo ) {
+                  item.componentPartNo = item.inventoryPartNo
+                }
+                if(item.shipmentId){
+                  item.orderNo = item.shipmentId
+                }
+                // inventoryQty -> applyQty - rqrq
+                if (item.inventoryQty !== undefined && !item.applyQty) {
+                  item.applyQty = item.inventoryQty
+                }
+                // inventoryUom -> uom - rqrq
+                if (item.inventoryUom && !item.uom) {
+                  item.uom = item.inventoryUom
+                }
+                // partDesc保持不变 - rqrq
+              } else {
+                // 分切/成品订单API字段映射 - rqrq
+                // qtyRequired -> applyQty - rqrq
+                if (item.qtyRequired !== undefined && !item.applyQty) {
+                  item.applyQty = item.qtyRequired
+                }
+              }
+            })
+            console.log('字段映射后数据:', materialList) // 调试用 - rqrq
+
+            // 6. 按物料号汇总后端返回的物料 - rqrq
+            const backendMaterialMap = new Map()
+            materialList.forEach(item => {
+              const partNo = item.componentPartNo
+              if (!partNo) return
+
+              if (backendMaterialMap.has(partNo)) {
+                // 已存在，累加数量 - rqrq
+                const existing = backendMaterialMap.get(partNo)
+                existing.applyQty = (parseFloat(existing.applyQty) || 0) + (parseFloat(item.applyQty) || 0)
+              } else {
+                // 新增 - rqrq
+                backendMaterialMap.set(partNo, {
+                  partNo: partNo,
+                  componentPartNo: partNo,
+                  height: item.height || '',
+                  isInWh: item.isInWh || '',
+                  applyQty: parseFloat(item.applyQty) || 0,
+                  componentPartDesc: item.componentPartDesc || item.partDesc || '',
+                  uom: item.uom || '',
+                  orderNo: this.seqNoData.orderNo,
+                  releaseNo: this.seqNoData.releaseNo || '',
+                  sequenceNo: this.seqNoData.sequenceNo || '',
+                  lineItemNo: '',
+                  materialLineStatus: '',
+                  startDate: '',
+                  finishDate: '',
+                  needDate: '',
+                  remark: this.seqNoData.orderNo, // 添加订单号到备注 - rqrq
+                })
+              }
+            })
+
+            // 7. 与seqNoList中现有物料汇总 - rqrq
+            this.seqNoList.forEach(existingItem => {
+              const partNo =  existingItem.componentPartNo
+              if (!partNo) return
+
+              if (backendMaterialMap.has(partNo)) {
+                // 累加数量 - rqrq
+                const backendItem = backendMaterialMap.get(partNo)
+                backendItem.applyQty = (parseFloat(backendItem.applyQty) || 0) + (parseFloat(existingItem.applyQty) || 0)
+                // 合并备注（如果现有项有备注，追加订单号） - rqrq
+                if (existingItem.remark) {
+                  backendItem.remark = existingItem.remark + ';' + this.seqNoData.orderNo
+                }
+              } else {
+                // seqNoList中的物料在后端没有，直接保留 - rqrq
+                backendMaterialMap.set(partNo, existingItem)
+              }
+            })
+
+            // 8. 更新seqNoList为汇总后的结果 - rqrq
+            this.seqNoList = Array.from(backendMaterialMap.values())
+            console.log('更新后的seqNoList:', this.seqNoList) // 调试用 - rqrq
+
+            // 9. 记录已添加的订单号 - rqrq
+            this.addedOrderNoList.push(this.seqNoData.orderNo)
+            // 更新已添加订单显示（分号分隔） - rqrq
+            this.remark = this.addedOrderNoList.join(';')
+
+            this.$message.success(`订单 ${this.seqNoData.orderNo} 添加成功，共 ${materialList.length} 条物料，汇总后 ${this.seqNoList.length} 行！`)
+
+            // 10. 清空输入框 - rqrq
+            this.seqNoData.orderNo = ''
+
+          } else {
+            this.$message.error(data.msg || '获取订单物料失败！')
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.msg || '获取订单物料失败，请稍后重试')
+        })
+        .finally(() => {
+          this.addOrderLoading = false
+        })
+    },
+    // 添加行：从接口查询数据并添加到列表
+    addRowFromQuery() {
+      if(!this.partNo){
+        this.$message.warning('请输入物料号！')
+        return
+      }
+
+      // 初始化seqNoList如果不存在
+      if (!this.seqNoList) {
+        this.seqNoList = []
+      }
+
+      // 准备查询参数
+      const queryParams = {
+        site: this.$store.state.user.site,
+        componentPartNo: this.partNo || '', // 使用物料号输入框的值
+        orderType: this.orderType, // 使用订单类型
+      }
+      this.addLineLoading = true
+      queryPartAttributeData(queryParams)
+        .then(({ data }) => {
+          if (data.code === 0 && data.rows ) {
+            // 过滤掉已存在的物料（根据partNo判断）
+            const existingPartNos = this.seqNoList.map((item) => item.partNo)
+            const newRows = existingPartNos.includes(data.rows.partNo)
+
+            if (newRows) {
+              this.$message.warning('查询到的物料已存在于列表中！')
+              return
+            }
+              // 确保数据结构完整
+              const newRow = {
+                partNo: data.rows.partNo || '',
+                height: data.rows.height || '',
+                isInWh: data.rows.isInWh || '',
+                availableQty: data.rows.availableQty || 0, // rqrq - 新增可用库存字段
+                componentPartNo: data.rows.partNo || '',
+                orderNo: '',
+                releaseNo: '',
+                sequenceNo: '',
+                lineItemNo: '',
+                materialLineStatus: '',
+                componentPartDesc: '',
+                uom: '',
+                startDate: '',
+                finishDate: '',
+                needDate: '',
+              }
+              this.seqNoList.push(newRow)
+              console.log('添加的新行:', newRow) // 调试用;
+
+              this.$set(this, 'partNo', '') // 清空物料号输入框
+          } else {
+            this.$message.warning(data.msg || '查询无数据')
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.msg || '查询失败，请稍后重试')
+        }).finally(() => {
+          this.addLineLoading = false
+        })
+    },
+    deleteSeqNoByOrderNo() {
+      if (this.seqNoData.orderNo == null || this.seqNoData.orderNo == '') {
+        this.$message.warning('请输入OrderNo！')
+        return false
+      }
+      if (this.seqNoList.length === 0) {
+        this.$message.warning('没有可删除的数据！')
+        return false
+      }
+      // 统计要删除的行数
+      const deleteCount = this.seqNoList.filter(
+        (row) => row.orderNo === this.seqNoData.orderNo
+      ).length
+      if (deleteCount === 0) {
+        this.$message.warning('未找到匹配的OrderNo数据！')
+        return false
+      }
+      this.$confirm(
+        `确定要删除OrderNo为 ${this.seqNoData.orderNo} 的 ${deleteCount} 条数据吗？`,
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }
+      )
+        .then(() => {
+          // 删除所有匹配的orderNo行
+          this.seqNoList = this.seqNoList.filter(
+            (row) => row.orderNo !== this.seqNoData.orderNo
+          )
+          this.$message.success(`成功删除 ${deleteCount} 条数据`)
+        })
+        .catch(() => {
+          // 用户取消删除
+        })
+    },
+    deleteSeqNoRow(index) {
+      if (index < 0 || index >= this.seqNoList.length) {
+        this.$message.warning('删除失败，索引无效！')
+        return false
+      }
+      const row = this.seqNoList[index]
+      this.$confirm(`确定要删除这条数据吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.seqNoList.splice(index, 1)
+          this.$message.success('删除成功')
+        })
+        .catch(() => {
+          // 用户取消删除
+        })
+    },
+    // 打开选择物料弹框
+    openSelectMaterialModal() {
+      this.isMaterialDetailModal = false // 标识从新增工单物料弹框打开
 
-export default {
-  name: 'newNoOrderIssueNotify54',
-  extends: BaseNewNoOrderIssueNotify,
-  methods: {
-    /**
+      // 设置模板编号和名称
+      this.modelCode = this.seqNoData.orderNo
+      this.modelName = this.seqNoData.releaseNo
+
+      // 初始化已选列表为当前seqNoList中的数据
+      this.selectedMaterialList = JSON.parse(JSON.stringify(this.seqNoList))
+
+      // 重置分页
+      this.availableMaterialPage = 1
+
+      // 加载可选物料列表
+      this.loadAvailableMaterialList()
+
+      // 打开弹框
+      this.selectMaterialModalFlag = true
+    },
+    // 加载可选物料列表
+    loadAvailableMaterialList() {
+      this.selectMaterialLoading = true
+      const params = {
+        page: this.availableMaterialPage,
+        limit: this.availableMaterialLimit,
+        componentPartNo: this.componentPartNo,
+      }
+      noOrderList(params)
+        .then(({ data }) => {
+          this.selectMaterialLoading = false
+          if (data && data.code === 0) {
+            if (data.page) {
+              // 过滤掉已选中的物料
+              const selectedPartNos = this.selectedMaterialList.map(
+                (item) => item.partNo || item.componentPartNo
+              )
+
+              // 如果是从申请明细弹框打开的，还需要过滤掉sobomList中已存在的物料
+              if (this.isMaterialDetailModal && this.sobomList && this.sobomList.length > 0) {
+                const sobomPartNos = this.sobomList.map(
+                  (item) => item.partNo || item.componentPartNo
+                )
+                selectedPartNos.push(...sobomPartNos)
+              }
+
+              this.availableMaterialList = data.page.list.filter(
+                (item) => !selectedPartNos.includes(item.partNo)
+              )
+            } else {
+              this.availableMaterialList = []
+            }
+            this.availableMaterialPage = data.page.currPage
+            this.availableMaterialLimit = data.page.pageSize
+            this.availableMaterialTotal = data.page.totalCount
+          } else {
+            this.availableMaterialList = []
+            if (data && data.msg) {
+              this.$message.warning(data.msg)
+            }
+          }
+        })
+        .catch((e) => {
+          this.selectMaterialLoading = false
+          this.availableMaterialList = []
+          this.availableMaterialTotal = 0
+          this.$message.error(e.msg || '加载数据失败')
+        })
+    },
+    // 左侧表格分页 - 每页条数改变
+    handleAvailableSizeChange(val) {
+      this.availableMaterialLimit = val
+      this.availableMaterialPage = 1
+      this.loadAvailableMaterialList()
+    },
+    // 左侧表格分页 - 当前页改变
+    handleAvailableCurrentChange(val) {
+      this.availableMaterialPage = val
+      this.loadAvailableMaterialList()
+    },
+    // 处理左侧表格选择变化
+    handleAvailableSelectionChange(selection) {
+      this.availableMaterialSelections = selection
+    },
+    // 处理右侧表格选择变化
+    handleSelectedSelectionChange(selection) {
+      this.selectedMaterialSelections = selection
+    },
+    // 左侧表格行点击
+    itemClickRow1(row) {
+      // 可以在这里实现行点击逻辑
+    },
+    // 右侧表格行点击
+    itemClickRow2(row) {
+      // 可以在这里实现行点击逻辑
+    },
+    // 判断行是否可选
+    selectFlag(row, index) {
+      return true // 所有行都可选
+    },
+    // 添加到已选列表
+    addToSelected() {
+      if (this.availableMaterialSelections.length === 0) {
+        this.$message.warning('请先选择要添加的物料！')
+        return false
+      }
+
+      // 将选中的项添加到已选列表
+      this.availableMaterialSelections.forEach((item) => {
+        // 检查是否已存在（使用propertiesItemNo或componentPartNo作为唯一标识）
+        const itemNo = item.partNo
+        const exists = this.selectedMaterialList.some(
+          (row) => row.PartNo === itemNo
+        )
+        if (!exists) {
+          const newItem = JSON.parse(JSON.stringify(item))
+          this.selectedMaterialList.push(newItem)
+        }
+      })
+
+      const addCount = this.availableMaterialSelections.length
+
+      // 清空选择
+      this.availableMaterialSelections = []
+
+      // 重新加载左侧数据（因为分页，需要重新获取以过滤掉已选中的）
+      this.loadAvailableMaterialList()
+
+      this.$message.success(`成功添加 ${addCount} 条数据`)
+    },
+    // 从已选列表移除
+    removeFromSelected() {
+      if (this.selectedMaterialSelections.length === 0) {
+        this.$message.warning('请先选择要删除的物料！')
+        return false
+      }
+
+      // 从已选列表中移除
+      const selectedItemNos = this.selectedMaterialSelections.map(
+        (item) => item.partNo
+      )
+      const removeCount = this.selectedMaterialSelections.length
+      this.selectedMaterialList = this.selectedMaterialList.filter(
+        (item) =>
+          !selectedItemNos.includes(
+            item.partNo
+          )
+      )
+
+      // 清空选择
+      this.selectedMaterialSelections = []
+
+      // 重新加载左侧数据（因为分页，需要重新获取，移除的项可能会出现在当前页）
+      this.loadAvailableMaterialList()
+
+      this.$message.success(`成功移除 ${removeCount} 条数据`)
+    },
+    // 确认选择物料
+    confirmSelectMaterial() {
+      if (this.isMaterialDetailModal) {
+
+        // 从申请明细弹框打开的情况，将右侧"已有物料"列表的完整数据更新到sobomList
+        const selectedItems = JSON.parse(JSON.stringify(this.selectedMaterialList))
+        // 将选中的物料转换为sobomList需要的格式
+        selectedItems.forEach(item => {
+          // 将applyQty转换为qtyToIssue
+          item.qtyToIssue = item.applyQty || 0
+          // 设置itemNo（使用sobomData中的itemNo，如果没有则使用空字符串）
+          item.itemNo = this.clickrow.itemNo
+          item.notifyNo = this.clickrow.notifyNo
+          item.soorderNo = this.clickrow.soorderNo
+          item.orderType = this.clickrow.orderType
+          item.site = this.$store.state.user.site
+          // 确保componentPartNo存在
+          if (!item.componentPartNo) {
+            item.componentPartNo = item.partNo
+          }
+        })
+        // 将右侧"已有物料"列表的完整数据替换sobomList（包括原有和新增的）
+        this.sobomList = selectedItems
+        console.log("this.sobomList", this.sobomList);
+
+        this.isMaterialDetailModal = false
+      } else {
+        // 从新增工单物料弹框打开的情况，将数据添加到seqNoList
+        this.seqNoList = JSON.parse(JSON.stringify(this.selectedMaterialList))
+      }
+
+      // 关闭弹框
+      this.selectMaterialModalFlag = false
+
+      // 清空数据
+      this.availableMaterialList = []
+      this.selectedMaterialList = []
+      this.availableMaterialSelections = []
+      this.selectedMaterialSelections = []
+
+      this.$message.success('操作成功')
+    },
+    saveNoOrderMaterialDetail() {
+      for (let i = 0; i < this.sobomList.length; i++) {
+        if (
+          this.sobomList[i].qtyToIssue === '' ||
+          this.sobomList[i].qtyToIssue == null
+        ) {
+          this.$message.warning('第'+(i+1)+'行数量为空，请填写申请数量！')
+          return false
+        }
+        this.sobomList[i].notifyNo = this.notifyNo
+        this.sobomList[i].site = this.$store.state.user.site
+      }
+
+      let materialList = this.sobomList.filter((item) => item.qtyToIssue > 0)
+      if (materialList.length == 0) {
+        this.$alert('没有需要保存的内容!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+      console.log('this.sobomList', materialList)
+      saveNoOrderMaterialDetail(materialList).then(({ data }) => {
+        if (data.code === 0) {
+          this.materialModalFlag = false
+          this.$message.success('操作成功')
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+    saveNewSoIssueNotify() {
+      for (let i = 0; i < this.seqNoList.length; i++) {
+        if (
+          this.seqNoList[i].applyQty === '' ||
+          this.seqNoList[i].applyQty == null
+        ) {
+          this.$message.warning('第'+(i+1)+'行数量为空，请填写申请数量！')
+          return false
+        }
+        this.seqNoList[i].notifyNo = this.notifyNo
+        this.seqNoList[i].site = this.$store.state.user.site
+        this.seqNoList[i].componentPartNo = this.seqNoList[i].partNo
+      }
+
+      let materialList = this.seqNoList.filter((item) => item.applyQty > 0)
+      if (materialList.length == 0) {
+        this.$alert('没有需要保存的内容!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+      console.log('this.sobomList', materialList)
+      var savaNotify = {
+        site: this.$store.state.user.site,
+        notifyNo: this.notifyNo,
+        userName: this.$store.state.user.name,
+        orderType:this.orderType,
+        materialList: materialList,
+      }
+      this.saveNewLoading = true
+      saveNoOrderNotify(savaNotify)
+        .then(({ data }) => {
+          if (data.code === 0) {
+            this.seqNoModalFlag = false
+            // 清空已添加订单记录 - rqrq
+            this.addedOrderNoList = []
+            this.remark = ''
+            this.getUserNotifyNo()
+            this.$message.success('操作成功')
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+        .finally(() => {
+          this.saveNewLoading = false
+        })
+    },
+
+    //导出excel
+    async createExportData() {
+      this.searchData.limit = -1
+      this.searchData.page = 1
+      await eamGroupSearch(this.searchData).then(({ data }) => {
+        this.exportList = data.page.list
+      })
+      return this.exportList
+    },
+
+    startDownload() {},
+
+    finishDownload() {},
+
+    fields() {
+      let json = '{'
+      this.columnList.forEach((item, index) => {
+        if (index == this.columnList.length - 1) {
+          json +=
+            '"' + item.columnLabel + '"' + ':' + '"' + item.columnProp + '"'
+        } else {
+          json +=
+            '"' +
+            item.columnLabel +
+            '"' +
+            ':' +
+            '"' +
+            item.columnProp +
+            '"' +
+            ','
+        }
+      })
+      json += '}'
+      let s = eval('(' + json + ')')
+      return s
+    },
+    xiadaNotifyModel() {
+      if (
+        this.dataList.length == 0 &&
+        this.dataList2.length == 0 &&
+        this.dataList3.length == 0
+      ) {
+        this.$alert('没有明细记录无法下达！!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+      this.xiadaModelFlag = true
+    },
+    xiadaNotify() {
+      // 检查是否有明细记录
+      if (this.dataList.length == 0) {
+        this.$alert('没有明细记录无法下达！!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+      // 初始化弹框数据
+      this.xiadaNotifyData = {
+        planIssueDate:
+          this.notifyData.planIssueDate ||
+          this.dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        remark: this.notifyData.remark || '',
+      }
+      // 打开弹框
+      this.showXiadaNotifyDialog = true
+    },
+    confirmXiadaNotify() {
+      if (this.dataList.length == 0) {
+        this.$alert('没有明细记录无法下达！!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+      // 验证要求发料时间
+      if (
+        !this.xiadaNotifyData.planIssueDate ||
+        this.xiadaNotifyData.planIssueDate === ''
+      ) {
+        this.$message.warning('请选择要求发料时间！')
+        return false
+      }
+      // 准备下达数据
+      const notifyData = {
+        ...this.notifyData,
+        planIssueDate: this.xiadaNotifyData.planIssueDate,
+        remark: this.xiadaNotifyData.remark,
+      }
+      // 执行下达操作
+      xiadaNotify(notifyData).then(({ data }) => {
+        if (data.code === 0) {
+          this.showXiadaNotifyDialog = false
+          this.xiadaModelFlag = false
+          this.getUserNotifyNo()
+          this.$message.success('操作成功')
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+    saveOtherPart() {
+      // if (
+      //   this.otherPartData.qtyToIssue == null ||
+      //   this.otherPartData.qtyToIssue == '' ||
+      //   this.otherPartData.qtyToIssue <= 0
+      // ) {
+      //   this.$message.warning('请填写领取数量！')
+      //   return false
+      // }
+      this.$confirm('确定保存' + '?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        saveOtherPart(this.otherPartData).then(({ data }) => {
+          if (data.code === 0) {
+            this.saveOtherPartModalFlag = false
+            if (this.otherPartData.issueType === '非BOM物料') {
+              this.partModelFlag = false
+              this.activeName = 'noBom'
+              this.searchOtherPart('非BOM物料')
+            }
+            if (this.otherPartData.issueType === '不管控物料') {
+              this.noControlPartModelFlag = false
+              this.activeName = 'noControl'
+              this.searchOtherPart('不管控物料')
+            }
+            this.$message.success('操作成功')
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+      })
+    },
+    deleteNotify() {
+      if (this.dataList.length > 0) {
+        this.$alert('请先删除已经申请的明细记录！!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+      deleteNotify(this.notifyData).then(({ data }) => {
+        if (data.code === 0) {
+          this.getUserNotifyNo()
+          this.$message.success(data.msg)
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+    searchOtherPart(type) {
+      let inData = {
+        site: this.notifyData.site,
+        notifyNo: this.notifyData.notifyNo,
+        issueType: type,
+      }
+      searchOtherPart(inData).then(({ data }) => {
+        if (data && data.code === 0) {
+          if (type === '非BOM物料') {
+            this.dataList2 = data.rows
+          }
+          if (type === '不管控物料') {
+            this.dataList3 = data.rows
+          }
+        }
+      })
+    },
+    // 删除
+    deleteNotifySOS(row) {
+      this.$confirm(`是否删除这个工单的申请信息?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          deleteNotifySOS(row).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.getNotifyNoOrderDetail()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {},
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定',
+              })
+            }
+          })
+        })
+        .catch(() => {})
+    },
+
+    //获取按钮的权限数据
+    getButtonAuthData() {
+      let searchFlag = this.isAuth(this.menuId + ':search')
+      let saveFlag = this.isAuth(this.menuId + ':save')
+      let updateFlag = this.isAuth(this.menuId + ':update')
+      let deleteFlag = this.isAuth(this.menuId + ':delete')
+      //处理页面的权限数据
+      this.authSearch = !searchFlag
+      this.authSave = !saveFlag
+      this.authUpdate = !updateFlag
+      this.authDelete = !deleteFlag
+    },
+
+    searchTable(rows) {
+      if( rows.length > 0){
+        for (let i = 0; i < rows.length; i++) {
+          // 判断是否为报废导入数据（有batchNo字段）- rqrq
+          if (rows[i].batchNo !== undefined || rows[i].remark !== undefined) {
+            // 报废导入数据结构 - rqrq
+            const newRow = {
+              partNo: rows[i].partNo || '',           // 第一列：物料号
+              batchNo: rows[i].batchNo || '',         // 第二列：批次号
+              remark: rows[i].remark || 0,            // 第三列：导入数量（如果为空则为0）
+              applyQty: rows[i].applyQty || 0,        // 第四列：申请数量（使用可用库存）
+              isInWh: rows[i].isInWh || 'N',          // 是否在立库
+              availableQty: rows[i].availableQty || 0, // 可用库存
+              // 以下字段保持兼容性 - rqrq
+              height: '',
+              orderNo: '',
+              releaseNo: '',
+              sequenceNo: '',
+              lineItemNo: '',
+              materialLineStatus: '',
+              componentPartDesc: '',
+              uom: '',
+              startDate: '',
+              finishDate: '',
+              needDate: '',
+            }
+            this.seqNoList.push(newRow)
+          } else {
+            // 其他导入数据结构（原逻辑）- rqrq
+            const newRow = {
+              partNo: rows[i].componentPartNo || '',
+              height: rows[i].height || '',
+              isInWh: rows[i].isInWh || '',
+              applyQty: rows[i].qtyRequired || 0,
+              availableQty: rows[i].availableQty || 0,
+              orderNo: '',
+              releaseNo: '',
+              sequenceNo: '',
+              lineItemNo: '',
+              materialLineStatus: '',
+              componentPartDesc: '',
+              uom: '',
+              startDate: '',
+              finishDate: '',
+              needDate: '',
+            }
+            this.seqNoList.push(newRow)
+          }
+        }
+      }
+    },
+    getAllNotifyStatus() {
+      let inData = {
+        site: this.$store.state.user.site,
+        listName: 'ISSUENOTIFYHEADER_STATUS',
+        locale: this.$i18n.locale,
+      }
+      getAllNotifyStatus(inData).then(({ data }) => {
+        this.notifyStatusList = data
+        console.log('notifyStatusList', this.notifyStatusList)
+      })
+    },
+    async getTableUserColumn(tableId, columnId) {
+      let queryTableUser = {
+        userId: this.$store.state.user.name,
+        functionId: this.$route.meta.menuId,
+        tableId: tableId,
+        status: true,
+        languageCode: this.$i18n.locale,
+      }
+      await getTableUserListLanguage(queryTableUser).then(({ data }) => {
+        if (data.rows.length > 0) {
+          //this.columnList1 = []
+          switch (columnId) {
+            case 1:
+              this.columnList1 = data.rows
+              break
+            case 2:
+              this.columnList2 = data.rows
+              break
+            case 3:
+              this.columnList3 = data.rows
+              break
+            case 4:
+              this.columnList4 = data.rows
+              break
+          }
+        }
+      })
+    },
+    importModel() {
+      let data = {
+        site: this.$store.state.user.site,
+        notifyNo: this.notifyData.notifyNo,
+      }
+      this.$nextTick(() => {
+        this.$refs.noorderUploadExcel.init(data)
+      })
+    },
+
+
+    importModel2() {
+      let data = {
+        site: this.$store.state.user.site,
+        notifyNo: this.notifyData.notifyNo,
+      }
+      this.$nextTick(() => {
+        this.$refs.baofeiUploadExcel.init(data)
+      })
+    },
+    // 获取 tableDefault 列
+    async getColumnList(tableId, columnId) {
+      let queryTable = {
+        functionId: this.$route.meta.menuId,
+        tableId: tableId,
+        languageCode: this.$i18n.locale,
+      }
+      await getTableDefaultListLanguage(queryTable).then(({ data }) => {
+        if (data.rows && data.rows.length > 0) {
+          switch (columnId) {
+            case 1:
+              this.columnList1 = data.rows
+              break
+            case 2:
+              this.columnList2 = data.rows
+              break
+            case 3:
+              this.columnList3 = data.rows
+              break
+            case 4:
+              this.columnList4 = data.rows
+              break
+          }
+        } else {
+          // this.showDefault = true.
+        }
+      })
+    },
+      /**
      * 海安页签刷新改走海安明细接口，固定orderType=noorder防止误查shoporder链路 - rqrq
      */
     refreshCurrentTabTable () {
@@ -53,8 +3001,7 @@ export default {
         })
       }
     },
-
-    /**
+      /**
      * 海安页面初始化：查询当前用户未下达无单申请单（header.order_type=noorder）- rqrq
      */
     getUserNotifyNo () {
@@ -86,8 +3033,7 @@ export default {
         }
       })
     },
-
-    /**
+      /**
      * 海安无单订单层查询：返回haian_SOIssueNotifyOrderList明细并保留subsite字段 - rqrq
      */
     getNotifyNoOrderDetail () {
@@ -103,8 +3049,7 @@ export default {
         }
       })
     },
-
-    /**
+      /**
      * 海安新建无单主单：请求统一传site+username，后端强制写order_type=noorder - rqrq
      */
     addNotify () {
@@ -125,8 +3070,7 @@ export default {
         }
       })
     },
-
-    /**
+      /**
      * 海安新建无单主单（带申请类型）：保持老交互，但后端仍按noorder主类型落库 - rqrq
      */
     confirmAddNotify () {
@@ -154,8 +3098,7 @@ export default {
         }
       })
     },
-
-    /**
+      /**
      * 兼容老“选择工单”入口：保存父行改走海安接口并补齐subsite，避免写入旧表 - rqrq
      */
     saveSOS () {
@@ -214,8 +3157,7 @@ export default {
         })
       })
     },
-
-    /**
+      /**
      * 海安无单明细查询：物料弹窗改走海安getNoOrderMaterialList，避免读取旧表数据 - rqrq
      */
     enterSOS (row) {
@@ -248,8 +3190,7 @@ export default {
         this.bomLoadFlag = false
       })
     },
-
-    /**
+      /**
      * 海安无单明细保存：统一透传notifyNo/site/subsite并调用海安先删后存链路 - rqrq
      */
     saveNoOrderMaterialDetail () {
@@ -280,8 +3221,7 @@ export default {
         }
       })
     },
-
-    /**
+      /**
      * 海安无单保存：父子写库统一改走saveNoOrderNotify，并为子行补齐subsite - rqrq
      */
     saveNewSoIssueNotify () {
@@ -326,8 +3266,7 @@ export default {
         this.saveNewLoading = false
       })
     },
-
-    /**
+      /**
      * 海安无单下达：调用海安头表状态流转接口，避免误触发旧模块逻辑 - rqrq
      */
     confirmXiadaNotify () {
@@ -360,8 +3299,7 @@ export default {
         }
       })
     },
-
-    /**
+      /**
      * 海安无单删单：走海安deleteNotify接口，清理haian父子数据 - rqrq
      */
     deleteNotify () {
@@ -382,8 +3320,7 @@ export default {
         }
       })
     },
-
-    /**
+      /**
      * 海安无单删除父行：删除按钮调用海安deleteNotifySOS避免误删旧表数据 - rqrq
      */
     deleteNotifySOS (row) {
@@ -409,7 +3346,69 @@ export default {
           }
         })
       }).catch(() => {})
+    }
     },
-  },
 }
 </script>
+
+<style scoped>
+.board666 .el-table .error-row {
+  background: #f86868;
+}
+
+/deep/ .el-table .error-row {
+  background: #f86868 !important;
+}
+
+/* rqrq - 报废导入：导入数量大于可用库存时行变红 */
+/deep/ .el-table .baofei-error-row {
+  background: #fef0f0 !important;
+}
+/deep/ .el-table .baofei-error-row td {
+  color: #F56C6C !important;
+}
+
+/* 在 <style scoped> 下，使用深度选择器作用到 ElementUI 内部结构 */
+.issueNotify {
+  width: 100%;
+  height: auto;
+}
+.issueNotify /deep/ .el-form-item__content {
+  display: inline !important;
+}
+
+.site-content > .el-tabs > .el-tabs__content > .site-tabs__tools {
+  top: 35px;
+  height: 40px;
+  font-size: 16px;
+  line-height: 40px;
+}
+
+.text-right /deep/ .el-input__inner {
+  text-align: right !important;
+}
+
+.text-right /deep/ .el-input-number__input {
+  text-align: right !important;
+}
+
+.yzzTable /deep/.el-table .cell {
+  line-height: 20px;
+  font-size: 12px;
+  height: 20px;
+}
+.applyQtyClass /deep/.el-input__inner {
+  height: 14px !important;
+}
+/* 选择工单弹窗：紧凑表格与按钮样式 */
+.choose-sos-btn {
+  height: 14px;
+  box-sizing: border-box;
+  padding: 0 6px;
+  line-height: 12px;
+  font-size: 12px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>
diff --git a/src/views/modules/haianWarehouse/poOrder/newPoIssueNotify54.vue b/src/views/modules/haianWarehouse/poOrder/newPoIssueNotify54.vue
index c21368e..dae8c98 100644
--- a/src/views/modules/haianWarehouse/poOrder/newPoIssueNotify54.vue
+++ b/src/views/modules/haianWarehouse/poOrder/newPoIssueNotify54.vue
@@ -1,5 +1,322 @@
+<template>
+  <div>
+    <el-form label-position="top" style="margin-top: -0px">
+      <el-row :gutter="20">
+        <el-col :span="20">
+
+          <el-button v-if="notifyNo===''" @click="addNotify()" type="primary" class="yzzButtonAn">新建申请单</el-button>
+          <el-button v-if="notifyNo!=''" type="primary" @click="chooseSOSModal()" class="yzzButtonAn">选择委外单</el-button>
+          <el-button v-if="notifyNo!=''" type="primary" @click="xiadaNotify()" class="yzzButtonAn">下达申请单</el-button>
+          <el-button v-if="notifyNo!=''" type="primary" @click="deleteNotify()" class="yzzButtonAn">删除申请单</el-button>
+
+          <!-- <el-button v-if="notifyNo!=''" @click="importModel()" type="primary"
+            style="margin-left: 2px;margin-top: 0px">{{'导入'}}</el-button> -->
+        </el-col>
+      </el-row>
+      <el-row :gutter="10" v-if="notifyNo!=''">
+        <el-col :span="3">
+          <el-form-item :label="'工厂编码'">
+            <el-input v-model="notifyData.site" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item :label="'申请单号'">
+            <el-input v-model="notifyData.notifyNo" disabled style="width: 100%;"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item :label="'申请账号'">
+            <el-input v-model="notifyData.username" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item :label="'申请时间'">
+            <el-input v-model="notifyData.notifyDate" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item :label="'状态'">
+            <el-select v-model="notifyData.status" style="width: 100%" disabled>
+              <el-option label="全部" value=""></el-option>
+              <el-option v-for="item in notifyStatusList" :key="item.listValue" :label="item.listDesc"
+                :value="item.listValue"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName" type="border-card"
+      v-if="notifyNo!=''" @tab-click="tabClick">
+      <el-tab-pane label="已申请工单" name="sos">
+        <el-table :height="height" :data="dataList" border style="width: 100%;" @row-click="changeData">
+          <el-table-column v-for="(item,index) in columnList" :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="100" label="操作">
+            <template slot-scope="scope">
+              <a type="text" size="small" @click="enterSOSDetail(scope.row)">物料</a>
+              <a type="text" size="small" @click="deleteNotifySOS(scope.row)">删除</a>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="材料明细" name="sub">
+        <el-table :data="materialDetailList" :height="height" border :row-class-name="materialDetailTableRowClassName"
+          v-loading="dataListLoading" style="width: 100%; ">
+          <el-table-column v-for="(item,index) in materialDetailColumnList" :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-tab-pane>
+    </el-tabs>
+    <el-dialog title="选择工单物料" :close-on-click-modal="false" v-drag :visible.sync="seqNoModalFlag" width="1200px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="4">
+            <el-form-item :label="'PurchaseOrder No'">
+              <el-input v-model="seqNoData.orderNo" @keyup.enter.native="searchSOSRouting()"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label=" ">
+              <el-button type="primary" @click="searchSOSRouting()" class="" :loading="seqNoModalLoading">添加</el-button>
+              <el-button type="danger" @click="deleteSeqNoByOrderNo()" class="">删除</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table :height="400" :data="seqNoList" border style="width: 100%;" class="choose-sos-table">
+        <el-table-column v-for="(item,index) in columnList2" :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">
+            <div v-if="item.columnProp === 'applyQty'">
+              <el-input class="applyQtyClass" v-model="scope.row.applyQty" style="height: 11px; width: 98%;"></el-input>
+            </div>
+            <span v-else-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: 10px;text-align:center">
+        <el-button type="primary" @click="saveNewSoIssueNotify" :loading="saveNewLoading">保存</el-button>
+        <el-button type="primary" @click="seqNoModalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+    <el-dialog title="保存工单" :close-on-click-modal="false" v-drag :visible.sync="saveSeqNoModalFlag" width="750px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'OrderNo'">
+              <el-input v-model="notifyOrderData.orderNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'ReleaseNo'">
+              <el-input v-model="notifyOrderData.releaseNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'SequenceNo'">
+              <el-input v-model="notifyOrderData.sequenceNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'工单数量'">
+              <el-input v-model="notifyOrderData.qtyRequired" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'物料'">
+              <el-input v-model="notifyOrderData.partNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item :label="'物料名称'">
+              <el-input v-model="notifyOrderData.partDesc" disabled style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'要求发料时间'">
+              <el-date-picker style="width: 100%" v-model="notifyOrderData.needDate" type="datetime"
+                value-format="yyyy-MM-dd HH:mm" placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="saveSOS()">保存</el-button>
+        <el-button type="primary" @click="saveSeqNoModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+    <el-dialog title="申请明细" :close-on-click-modal="false" v-drag :visible.sync="materialModalFlag" width="900px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'生产订单号'">
+              <el-input v-model="sobomData.orderNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'产品编码'">
+              <el-input v-model="sobomData.partNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="yzzTable">
+        <el-table :height="400" :data="sobomList" border v-loading="bomLoadFlag" style="width: 100%;">
+          <el-table-column v-for="(item,index) in columnList3" :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">
+              <div v-if="item.columnProp === 'qtyToIssue'">
+                <el-input v-model="scope.row.qtyToIssue" type="number" style="height: 11px; width: 98%;" :step="0"
+                  :min="0"></el-input>
+              </div>
+              <div v-else-if="item.columnProp === 'remark'">
+                <el-input v-model="scope.row.remark" style="padding: 0;width: 100%"></el-input>
+              </div>
+              <div v-else>
+                <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>
+
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="" header-align="center" align="center" min-width="50" label="操作">
+            <template slot-scope="scope">
+              <el-button type="primary" @click="qtyAllForBom(scope.row)" style="width: 100%">全数领料</el-button>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </div>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="saveMaterialDetail()">保存</el-button>
+        <el-button type="primary" @click="materialModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <el-dialog title="保存物料" :close-on-click-modal="false" v-drag :visible.sync="saveOtherPartModalFlag" width="600px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'物料编码'">
+              <el-input v-model="otherPartData.componentPartNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item :label="'物料描述'">
+              <el-input v-model="otherPartData.partDesc" disabled></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'计量单位'">
+              <el-input v-model="otherPartData.umid" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'需求数量'">
+              <el-input-number v-model="otherPartData.qtyToIssue" style="padding: 0;width: 100%" :step="0" :min="0"
+                :controls="false"></el-input-number>
+
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item :label="'备注'">
+              <el-input v-model="otherPartData.remark"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="saveOtherPart()">保存</el-button>
+        <el-button type="primary" @click="saveOtherPartModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+    <el-dialog title="下达申请单" :close-on-click-modal="false" v-drag :visible.sync="showXiadaNotifyDialog" width="400px">
+      <el-form :inline="true" label-position="top" label-width="500px" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="要求发料时间">
+              <el-date-picker v-model="xiadaNotifyData.planIssueDate" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期时间" style="width: 100%">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" class="issueNotify">
+              <el-input type="textarea" v-model="xiadaNotifyData.remark" :rows="3" placeholder="请输入内容"
+                style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:30px;text-align:center;">
+        <el-button type="primary" @click="confirmXiadaNotify()">下达</el-button>
+        <el-button type="primary" @click="showXiadaNotifyDialog=false">取消</el-button>
+      </el-footer>
+    </el-dialog>
+    <el-dialog title="选择申请类型" :close-on-click-modal="false" v-drag :visible.sync="showAddNotifyTypeDialog"
+      width="400px">
+      <el-form :inline="true" label-position="top" label-width="500px" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="申请类型">
+              <el-radio-group v-model="selectedNotifyType">
+                <el-radio label="production">生产领料单</el-radio>
+                <el-radio label="outsourced">委外领料单</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" class="issueNotify">
+              <el-input type="textarea" v-model="selectedNotifyRemark" :rows="3" placeholder="请输入内容"
+                style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:30px;text-align:center;">
+        <el-button type="primary" @click="confirmAddNotify()">确认</el-button>
+        <el-button type="primary" @click="showAddNotifyTypeDialog=false">取消</el-button>
+      </el-footer>
+    </el-dialog>
+    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
+  </div>
+</template>
+
 <script>
-import BaseNewPoIssueNotify from '@/views/modules/poOrder/newPoIssueNotify.vue'
 import {
   haiAnGetUserNotifyNo,
   haiAnCreateNotify,
@@ -15,12 +332,1876 @@ import {
   haiAnSearchNotifyMaterialListNew,
   getAllNotifyStatus
 } from '@/api/haianWarehouse/poOrderIssueNotify.js'
+import Chooselist from '@/views/modules/common/Chooselist_eam'
+import { getTableUserListLanguage } from '@/api/table.js'
 
 export default {
   name: 'newPoIssueNotify54',
-  extends: BaseNewPoIssueNotify,
+  components: {
+    Chooselist,
+  },
+  watch: {},
+  data() {
+    return {
+      activeName: 'sos',
+      noControlPartModelFlag: false,
+      buList: [],
+      partList: [],
+      partList2: [],
+      notifyStatusList: [],
+      notifyNo: '',
+      notifyData: {
+        site: '',
+        bu: '',
+        notifyNo: '',
+        notifyDate: '',
+        enteredDate: '',
+        userName: '',
+        userDisplay: '',
+        remark: '',
+        planIssueDate: '',
+      },
+      dataList2: [],
+      dataList3: [],
+      materialDetailList: [],
+      currentRow: '',
+      dataListLoading: false,
+      // 是否收藏
+      favorite: false,
+      changeBuFlag: false,
+      partModelFlag: false,
+      newBu: '',
+      // 导出 start
+      exportData: [],
+      exportName: '设备分组' + this.dayjs().format('YYYYMMDDHHmmss'),
+      exportHeader: ['设备分组'],
+      exportFooter: [],
+      exportList: [],
+      // 导出 end
+      searchData: {
+        site: this.$store.state.user.site,
+        userName: this.$store.state.user.name,
+        groupID: '',
+        groupDesc: '',
+        buDesc: '',
+        active: 'Y',
+        page: 1,
+        limit: 10,
+      },
+      sobomData: {
+        orderNo: '',
+        seqno: '',
+        partNo: '',
+      },
+      //申请单序号
+      itemNo: '',
+      notifyOrderData: {
+        partNo: '',
+        orderNo: '',
+        itemNo: '',
+        releaseNo: '',
+        sequenceNo: '',
+        partDesc: '',
+        qtyrequired: '',
+        issureQty: '',
+        needDate: '',
+      },
+      seqNoData: {
+        site: this.$store.state.user.site,
+        seqno: '',
+        sResourceID: '',
+        sWorkcenterno: '',
+        operatorId: '',
+        sShiftno: '',
+        startDate: '',
+        endDate: '',
+      },
+      seqNoList: [],
+      height: 200,
+      pageIndex: 1,
+      pageSize: 20,
+      totalPage: 0,
+      dataList: [],
+      sobomList: [],
+      dataListSelections: [],
+      seqNoModalFlag: false,
+      materialModalFlag: false,
+      modalDisableFlag: false,
+      saveSeqNoModalFlag: false,
+      bomLoadFlag: false,
+      xiadaList: [],
+      columnList4: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table4ComponentPartNo',
+          tableId: '555001Table4',
+          tableName: '非BOM材料明细',
+          columnProp: 'componentPartNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '材料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table4PartDesc',
+          tableId: '555001Table4',
+          tableName: '非BOM材料明细',
+          columnProp: 'partDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '材料名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 130,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table4QtyToIssue',
+          tableId: '555001Table4',
+          tableName: '非BOM材料明细',
+          columnProp: 'qtyToIssue',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '申请数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table4Remark',
+          tableId: '555001Table4',
+          tableName: '非BOM材料明细',
+          columnProp: 'remark',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '备注',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 200,
+        },
+      ],
+      modalData: {
+        flag: '',
+        bu: '',
+        site: this.$store.state.user.site,
+        groupID: '',
+        groupDesc: '',
+        active: '',
+        createBy: this.$store.state.user.name,
+        updateBy: this.$store.state.user.name,
+      },
+      // 展示列集
+      columnList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table1ItemNo',
+          tableId: '555001Table1',
+          tableName: '领料申请工单子表',
+          columnProp: 'itemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '序号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 50,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table1SOOrderNo',
+          tableId: '555001Table1',
+          tableName: '领料申请工单子表',
+          columnProp: 'soorderNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '委外单号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 120,
+        },
+        /* {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table1ReleaseNo',
+          tableId: '555001Table1',
+          tableName: '领料申请工单子表',
+          columnProp: 'releaseNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: 'ReleaseNo',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table1SequenceNo',
+          tableId: '555001Table1',
+          tableName: '领料申请工单子表',
+          columnProp: 'sequenceNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: 'SequenceNo',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 80,
+        }, */
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table1FgPartNo',
+          tableId: '555001Table1',
+          tableName: '领料申请工单子表',
+          columnProp: 'fgPartNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '产成品编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table1NeedDate',
+          tableId: '555001Table1',
+          tableName: '领料申请派工单子表',
+          columnProp: 'needDate',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '要求发料时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 80,
+        },
+      ],
+      columnList2: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2OrderNo',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'orderNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: 'OrderNo',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 100,
+        },
+        /* {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2ReleaseNo',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'releaseNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: 'ReleaseNo',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2SequenceNo',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'sequenceNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: 'SequenceNo',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 80,
+        }, */
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2LineItemNo',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'lineItemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '行号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 70,
+        },
+        /* {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2MaterialLineStatus',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'materialLineStatus',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '物料行状态',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 100,
+        }, */
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2ComponentPartNo',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'componentPartNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '物料号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2IsInWh',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'isInWh',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '是否在立库',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2ComponentPartDesc',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'componentPartDescription',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '物料描述',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 180,
+          showOverflowTooltip: true,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2ApplyQty',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'applyQty',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '本次申请数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 100,
+        },
+
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2QtyIssued',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'qtyIssued',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '已发数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2QtyRequired',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'qtyRequired',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '需求数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2QtyReserved',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'reservedQty',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '预留数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2Uom',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'uom',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '单位',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2PartNo',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'partNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '产品编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2PartDesc',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'description',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '产品名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 180,
+          showOverflowTooltip: true,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2StartDate',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'supplierName',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '委外商',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 110,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2FinishDate',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'receiptDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '接收日期',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 110,
+        },
+        /* {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table2NeedDate',
+          tableId: '555001Table2',
+          tableName: '查询工单及物料',
+          columnProp: 'needDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '需求日期',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 110,
+        }, */
+      ],
+      columnList3: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table3ComponentPartNo',
+          tableId: '555001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'componentPartNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '物料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: true,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table3IsInWh',
+          tableId: '555001Table3',
+          tableName: '查询工单及物料',
+          columnProp: 'isInWh',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '是否在立库',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table3PartDesc',
+          tableId: '555001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'componentPartDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '物料描述',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table3QtyRequired',
+          tableId: '555001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'qtyRequired',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '需求数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 50,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table3QtyToIssue',
+          tableId: '555001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'qtyToIssue',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '本次申请数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 60,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 555001,
+          serialNumber: '555001Table3Remark',
+          tableId: '555001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'remark',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '备注',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: false,
+          columnWidth: 150,
+        },
+      ],
+      materialDetailColumnList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: '701002Table3ItemNo',
+          tableId: '701002Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'itemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '申请单序号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: '701002Table3ComponentPartNo',
+          tableId: '701002Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'componentPartNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '材料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: '701002Table3NeedDate',
+          tableId: '701002Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'needDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '需求时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 110,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: '701002Table3QtyToIssue',
+          tableId: '701002Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'qtyToIssue',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '申请数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: '701002Table3QtyToIssueOriginal',
+          tableId: '701002Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'qtyToIssueOriginal',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '已发数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: '701002Table3IssueType',
+          tableId: '701002Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'issueType',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '类型',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: '701002Table3Remark',
+          tableId: '701002Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'remark',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '备注',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 160,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: '701002Table3SOOrderNo',
+          tableId: '701002Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'soorderNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '生产订单',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: '701002Table3BOMItemNo',
+          tableId: '701002Table3',
+          tableName: '申请单材料明细表',
+          columnProp: 'bomitemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: 'BOM序号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+      ],
+      rules: {
+        groupIdType: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        groupDescType: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        activeType: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        bu: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur', 'change'],
+          },
+        ],
+      },
+      userBuList: [],
+      authSearch: false,
+      authSave: false,
+      authUpdate: false,
+      authDelete: false,
+      menuId: this.$route.meta.menuId,
+      partSearch: {
+        site: '',
+        sourceBu: '',
+        partNo: '',
+        partDesc: '',
+        spec: '',
+      },
+      xiadaModelFlag: false,
+      saveOtherPartModalFlag: false,
+      otherPartData: {
+        site: '',
+        notifyNo: '',
+        itemNo: '',
+        bOMItemNo: '',
+        componentPartNo: '',
+        qtyToIssue: '',
+        issueType: '',
+        partDesc: '',
+        umid: '',
+        remark: '',
+      },
+      showAddNotifyTypeDialog: false,
+      selectedNotifyType: 'production',
+      selectedNotifyRemark: '',
+      showXiadaNotifyDialog: false,
+      xiadaNotifyData: {
+        planIssueDate: '',
+        remark: '',
+      },
+      chooseLoading: false,
+      seqNoModalLoading: false,
+      saveNewLoading: false,
+    }
+  },
+
+  mounted() {
+    this.$nextTick(() => {
+      this.height = window.innerHeight - 220
+    })
+  },
+
+  created () {
+      // 按钮控制
+    // this.getButtonAuthData()
+    //this.getTableUserColumn(this.$route.meta.menuId+'Table2',2)
+    this.getUserNotifyNo()
+    },
+
   methods: {
-    /**
+      tabClick(tab, event) {
+      // 刷新当前标签页的表格数据
+      this.refreshCurrentTabTable()
+    },
+    refreshCurrentTabTable() {
+      if (this.notifyNo === '' || !this.notifyNo) {
+        return
+      }
+      if (this.activeName === 'sub') {
+        // 使用当前选中的行数据，如果没有则使用申请单基本信息
+        let queryData = {
+          site: this.notifyData.site || this.$store.state.user.site,
+          notifyNo: this.notifyNo,
+          orderType: 'shoporder',
+        }
+        // 如果当前行有数据，合并进去
+        if (
+          this.currentRow &&
+          this.currentRow !== '' &&
+          this.currentRow.notifyNo
+        ) {
+          queryData = {
+            ...this.currentRow,
+            orderType: 'shoporder',
+          }
+        }
+        this.dataListLoading = true
+        searchNotifyMaterialListNew(queryData)
+          .then(({ data }) => {
+            this.dataListLoading = false
+            if (data && data.code === 0) {
+              this.materialDetailList = data.rows
+            } else {
+              this.materialDetailList = []
+            }
+          })
+          .catch(() => {
+            this.dataListLoading = false
+            this.materialDetailList = []
+          })
+      }
+    },
+    materialDetailTableRowClassName({ row, rowIndex }) {
+      if (
+        row.qtyToIssueOriginal < row.qtyToIssue &&
+        new Date(row.needDate) <
+          new Date(this.dayjs().format('YYYY-MM-DD HH:mm'))
+      ) {
+        return 'error-row'
+      }
+      return ''
+    },
+    changeData(row) {
+      this.currentRow = JSON.parse(JSON.stringify(row))
+      this.refreshCurrentTabTable()
+    },
+    getBaseList(val, type) {
+      this.tagNo = val
+      let conSql = ''
+      this.$nextTick(() => {
+        let strVal = ''
+
+        if (val === 515) {
+          strVal = this.seqNoData.sResourceid
+          conSql =
+            " and site = '" +
+            this.notifyData.site +
+            "'" +
+            " and bu_no = '" +
+            this.notifyData.bu +
+            "'"
+          this.$refs.baseList.init(val, strVal, conSql)
+        }
+        if (val === 216) {
+          strVal = this.seqNoData.sWorkcenterno
+          conSql =
+            " and site = '" +
+            this.notifyData.site +
+            "'" +
+            " and bu_no = '" +
+            this.notifyData.bu +
+            "'"
+          this.$refs.baseList.init(val, strVal, conSql)
+        }
+        if (val === 215) {
+          strVal = this.notifyOrderData.locationNo
+          this.$refs.baseList.init(val, strVal)
+        }
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.qtyToIssue > row.qtyAvailable) {
+        return 'error-row'
+      }
+
+      return ''
+    },
+    // 列表方法的回调
+    getBaseData(val) {
+      if (this.tagNo === 515) {
+        this.seqNoData.sResourceid = val.resource_id
+      }
+      if (this.tagNo === 215) {
+        this.notifyOrderData.locationNo = val.location_id
+      }
+      if (this.tagNo === 216) {
+        this.seqNoData.sWorkcenterno = val.work_center_no
+      }
+    },
+    getUserNotifyNo() {
+      let inData = {
+        site: this.$store.state.user.site,
+        username: this.$store.state.user.name,
+        orderType: 'poorder', // rqrq - 查询poorder类型的申请单
+      }
+      this.getAllNotifyStatus()
+      getUserNotifyNo(inData).then(({ data }) => {
+        if (data.code === 0) {
+          if (data.row != null) {
+            this.notifyNo = data.row.notifyNo
+            this.notifyData = data.row
+            this.getNotifyPoDetail()
+          } else {
+            this.notifyNo = ''
+            this.notifyData = {
+              site: '',
+              bu: '',
+              notifyNo: '',
+              notifyDate: '',
+              enteredDate: '',
+              userName: '',
+              userDisplay: '',
+              remark: '',
+              planIssueDate: '',
+            }
+            this.dataList = []
+          }
+        } else {
+          this.notifyNo = ''
+          this.notifyData = {
+            site: '',
+            bu: '',
+            notifyNo: '',
+            notifyDate: '',
+            enteredDate: '',
+            userName: '',
+            userDisplay: '',
+            remark: '',
+            planIssueDate: '',
+          }
+          this.dataList = []
+        }
+      })
+    },
+    getNotifyPoDetail() {
+      let inData = {
+        site: this.$store.state.user.site,
+        notifyNo: this.notifyNo,
+        orderType: 'poorder',
+      }
+      getNotifyPoDetail(inData).then(({ data }) => {
+        if (data.code === 0) {
+          this.dataList = data.rows
+        }
+      })
+    },
+    addNotify() {
+      //this.showAddNotifyTypeDialog = true
+      let inData = {
+        site: this.$store.state.user.site,
+        userName: this.$store.state.user.name,
+        orderType: 'poorder', // rqrq - 固定为shoporder类型
+      }
+      createNotify(inData).then(({ data }) => {
+        if (data.code === 0) {
+          this.showAddNotifyTypeDialog = false
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500,
+            onClose: () => {},
+          })
+          this.getUserNotifyNo()
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+    confirmAddNotify() {
+      let outWorkOrderFlag = 'N'
+      if (this.selectedNotifyType === 'outsourced') {
+        outWorkOrderFlag = 'Y'
+      } else {
+        outWorkOrderFlag = 'N'
+      }
+      let inData = {
+        site: this.$store.state.user.site,
+        userName: this.$store.state.user.name,
+        outWorkOrderFlag: outWorkOrderFlag,
+        remark: this.selectedNotifyRemark,
+        orderType: 'shoporder', // rqrq - 固定为shoporder类型
+      }
+      this.getAllNotifyStatus()
+      createNotify(inData).then(({ data }) => {
+        if (data.code === 0) {
+          this.showAddNotifyTypeDialog = false
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500,
+            onClose: () => {},
+          })
+          this.getUserNotifyNo()
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+    chooseSOS(row) {
+      if (this.dataList.length > 0) {
+        //这边是有个判断的，判断派工单号不能重复
+        let stop = false
+        for (let i = 0; i < this.dataList.length; i++) {
+          if (
+            this.dataList[i].orderNo == row.orderNo &&
+            this.dataList[i].releaseNo == row.releaseNo &&
+            this.dataList[i].sequenceNo == row.sequenceNo
+          ) {
+            stop = true
+          }
+        }
+        if (stop) {
+          this.$alert('已经选择过此工单，请返回点击明细直接操作！!', '提示', {
+            confirmButtonText: '确定',
+          })
+          return false
+        }
+      }
+      let inData = {
+        site: this.$store.state.user.site,
+        orderNo: row.orderNo,
+        releaseNo: row.releaseNo,
+        sequenceNo: row.sequenceNo,
+      }
+      this.chooseLoading = true
+      getShopOrderFromIFSWithOrderNo(inData)
+        .then(({ data }) => {
+          if (data.code === 0) {
+            console.log('data', data)
+            this.notifyOrderData.partNo = data.rows[0].partNo
+            this.notifyOrderData.orderNo = data.rows[0].orderNo
+            this.notifyOrderData.site = this.$store.state.user.site
+            this.notifyOrderData.partDesc = data.rows[0].partDesc
+            this.notifyOrderData.qtyRequired = data.rows[0].lotSize
+            this.notifyOrderData.releaseNo = data.rows[0].releaseNo
+            this.notifyOrderData.issureQty = ''
+            this.notifyOrderData.needDate =
+              this.dayjs().format('YYYY-MM-DD HH:mm')
+            this.notifyOrderData.sequenceNo = data.rows[0].sequenceNo
+            this.saveSeqNoModalFlag = true
+          } else {
+            this.$meassage.error(data.msg)
+            return
+          }
+        })
+        .finally(() => {
+          this.chooseLoading = false
+        })
+    },
+    saveSOS() {
+      if (
+        this.notifyOrderData.needDate == null ||
+        this.notifyOrderData.needDate == ''
+      ) {
+        this.$message.warning('请选择时间！')
+        return false
+      }
+
+      // if (
+      //   this.notifyOrderData.issureQty == null ||
+      //   this.notifyOrderData.issureQty == '' ||
+      //   this.notifyOrderData.issureQty < 0
+      // ) {
+      //   this.$message.warning('请填写领取数量！')
+      //   return false
+      // }
+      let row = this.notifyOrderData
+      console.log('row', row, this.dataList)
+      if (this.dataList.length > 0) {
+        let stop = false
+        for (let i = 0; i < this.dataList.length; i++) {
+          if (
+            this.dataList[i].soorderNo == row.orderNo &&
+            this.dataList[i].releaseNo == row.releaseNo &&
+            this.dataList[i].sequenceNo == row.sequenceNo
+          ) {
+            stop = true
+          }
+        }
+        if (stop) {
+          this.$alert('已经选择过此工单，请返回点击明细直接操作！!', '提示', {
+            confirmButtonText: '确定',
+          })
+          return false
+        }
+      }
+      this.$confirm('确定选择工单' + row.orderNo + '?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        let inData = {
+          site: this.$store.state.user.site,
+          notifyNo: this.notifyNo,
+          fgPartNo: row.partNo,
+          soorderNo: row.orderNo,
+          opsItemNo: row.itemNo,
+          sequenceNo: row.sequenceNo,
+          releaseNo: row.releaseNo,
+          needDate: row.needDate,
+          issureQty: row.issureQty,
+        }
+
+        saveSOIssueNotifyOrderList(inData).then(({ data }) => {
+          if (data.code === 0) {
+            this.saveSeqNoModalFlag = false
+            row.itemNo = data.itemNo
+            this.getNotifyPoDetail()
+            this.enterSOS(row)
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+      })
+    },
+    qtyAllForSeqNo() {
+      this.notifyOrderData.issureQty = this.notifyOrderData.qtyRequired
+    },
+    qtyAllForBom(row) {
+      row.qtyToIssue = row.qtyRequired
+    },
+    enterSOSDetail(row) {
+      let rows = {
+        site: this.$store.state.user.site,
+        notifyNo: this.notifyNo,
+        orderNo: row.soorderNo,
+        seqNo: row.seqNo,
+        partNo: row.fgPartNo,
+        itemNo: row.itemNo,
+        releaseNo: row.releaseNo,
+        sequenceNo: row.sequenceNo,
+      }
+
+      //this.searchNotifyMaterialList(rows)
+      this.enterSOS(rows)
+    },
+
+    enterSOS(row) {
+      console.log('row', row)
+
+      this.seqNoModalFlag = false
+      this.materialModalFlag = true
+      this.sobomList = []
+      this.sobomData = {
+        orderNo: row.orderNo,
+        seqNo: row.seqNo,
+        partNo: row.partNo,
+      }
+      this.bomLoadFlag = true
+      let inData = {
+        site: this.$store.state.user.site,
+        notifyNo: this.notifyNo,
+        orderNo: row.orderNo,
+        releaseNo: row.releaseNo,
+        sequenceNo: row.sequenceNo,
+        partNo: row.partNo,
+        itemNo: row.itemNo,
+      }
+      getSOSBOMForIssureNew(inData).then(({ data }) => {
+        this.bomLoadFlag = false
+        if (data.code === 0) {
+          this.sobomList = data.rows
+          for (let i = 0; i < this.sobomList.length; i++) {
+            this.sobomList[i].itemNo = inData.itemNo
+            /* if(!this.sobomList[i].qtyToIssue){
+              this.$set(this.sobomList[i], 'qtyToIssue', this.sobomList[i].qtyRequired)
+            } */
+          }
+        }
+      })
+    },
+
+    chooseSOSModal() {
+      this.seqNoData = {
+        site: this.$store.state.user.site,
+        orderNo: '',
+        releaseNo: '*',
+        sequenceNo: '*',
+        seqno: '',
+        sResourceid: '',
+        sWorkcenterno: '',
+        operatorId: '',
+        sShiftno: '',
+        startDate: this.dayjs().format('YYYY-MM-DD'),
+        endDate: this.dayjs().format('YYYY-MM-DD'),
+      }
+      this.seqNoList = []
+      this.seqNoModalFlag = true
+    },
+    searchSOSRouting() {
+      if (this.seqNoData.orderNo == null || this.seqNoData.orderNo == '') {
+        this.$message.warning('请输入OrderNo！')
+        return false
+      }
+      // 初始化seqNoList如果不存在
+      if (!this.seqNoList) {
+        this.seqNoList = []
+      }
+      // 调用接口前判断this.seqNoList是否存在orderNo
+      const orderNoExists = this.seqNoList.some(
+        (row) => row.orderNo === this.seqNoData.orderNo
+      )
+      if (orderNoExists) {
+        this.$message.warning('该OrderNo的数据已存在，请先删除再添加！')
+        return false
+      }
+
+      const dataListExists = this.dataList.some(
+        (row) => row.soorderNo === this.seqNoData.orderNo
+      )
+      if (dataListExists) {
+        this.$message.warning('该OrderNo的数据已添加过，请先删除再添加！')
+        return false
+      }
+      if (this.seqNoModalLoading) {
+        console.log("正在加载中，防重复提交");
+        
+        return;
+      }
+      this.seqNoModalLoading = true
+      let params = {
+        site: this.$store.state.user.site,
+        outsourcingNo: this.seqNoData.orderNo,
+      }
+      getShopOrderAndMaterialByShoporder(params)
+        .then(({ data }) => {
+          if (data.code === 0) {
+            if (!data.rows || data.rows.length === 0) {
+              this.$message.warning('未查询到数据！')
+              return
+            }
+            // 将返回的数据添加到this.seqNoList中，而不是替换
+            data.rows.forEach((newRow) => {
+              // 初始化每行的需求数量（需求数量 - 已发数量 - 预留数量）
+              const qtyRequired = parseFloat(newRow.qtyRequired) || 0
+              const qtyIssued = parseFloat(newRow.qtyIssued) || 0
+              const reservedQty = parseFloat(newRow.reservedQty) || 0
+              const applyQty = qtyRequired - qtyIssued - reservedQty
+              this.$set(newRow, 'applyQty', applyQty > 0 ? applyQty : 0)
+              // 添加到列表中
+              this.seqNoList.push(newRow)
+            })
+            this.$message.success(`成功添加 ${data.rows.length} 条数据`)
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+        .catch((e) => {
+          this.$message.error(e.msg || '查询失败')
+          return
+        })
+        .finally(() => {
+          this.seqNoModalLoading = false
+        })
+    },
+    deleteSeqNoByOrderNo() {
+      if (this.seqNoData.orderNo == null || this.seqNoData.orderNo == '') {
+        this.$message.warning('请输入OrderNo！')
+        return false
+      }
+      if (this.seqNoList.length === 0) {
+        this.$message.warning('没有可删除的数据！')
+        return false
+      }
+      // 统计要删除的行数
+      const deleteCount = this.seqNoList.filter(
+        (row) => row.orderNo === this.seqNoData.orderNo
+      ).length
+      if (deleteCount === 0) {
+        this.$message.warning('未找到匹配的OrderNo数据！')
+        return false
+      }
+      this.$confirm(
+        `确定要删除OrderNo为 ${this.seqNoData.orderNo} 的 ${deleteCount} 条数据吗？`,
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }
+      )
+        .then(() => {
+          // 删除所有匹配的orderNo行
+          this.seqNoList = this.seqNoList.filter(
+            (row) => row.orderNo !== this.seqNoData.orderNo
+          )
+          this.$message.success(`成功删除 ${deleteCount} 条数据`)
+        })
+        .catch(() => {
+          // 用户取消删除
+        })
+    },
+    saveMaterialDetail() {
+      for (let i = 0; i < this.sobomList.length; i++) {
+        if (
+          this.sobomList[i].applyQty === '' ||
+          this.sobomList[i].applyQty == null
+        ) {
+          this.sobomList[i].applyQty = 0
+        }
+        this.sobomList[i].notifyNo = this.notifyNo
+        this.sobomList[i].site = this.$store.state.user.site
+      }
+
+      let materialList = this.sobomList.filter((item) => item.qtyToIssue > 0)
+      if (materialList.length == 0) {
+        this.$alert('没有需要保存的内容!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+      console.log('this.sobomList', materialList)
+      saveMaterialDetail(materialList).then(({ data }) => {
+        if (data.code === 0) {
+          this.materialModalFlag = false
+          this.$message.success('操作成功')
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+    saveNewSoIssueNotify() {
+      for (let i = 0; i < this.seqNoList.length; i++) {
+        if (
+          this.seqNoList[i].applyQty === '' ||
+          this.seqNoList[i].applyQty == null
+        ) {
+          this.seqNoList[i].applyQty = 0
+        }
+        this.seqNoList[i].notifyNo = this.notifyNo
+        this.seqNoList[i].site = this.$store.state.user.site
+      }
+
+      let materialList = this.seqNoList.filter((item) => item.applyQty > 0)
+      if (materialList.length == 0) {
+        this.$alert('没有需要保存的内容!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+      console.log('this.sobomList', materialList)
+      var savaNotify = {
+        site: this.$store.state.user.site,
+        notifyNo: this.notifyNo,
+        userName: this.$store.state.user.name,
+        materialList: materialList,
+      }
+      this.saveNewLoading = true
+      saveNewSoIssueNotify(savaNotify)
+        .then(({ data }) => {
+          if (data.code === 0) {
+            this.seqNoModalFlag = false
+            this.getUserNotifyNo()
+            this.$message.success('操作成功')
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+        .finally(() => {
+          this.saveNewLoading = false
+        })
+    },
+
+    //导出excel
+    async createExportData() {
+      this.searchData.limit = -1
+      this.searchData.page = 1
+      await eamGroupSearch(this.searchData).then(({ data }) => {
+        this.exportList = data.page.list
+      })
+      return this.exportList
+    },
+
+    startDownload() {},
+
+    finishDownload() {},
+
+    fields() {
+      let json = '{'
+      this.columnList.forEach((item, index) => {
+        if (index == this.columnList.length - 1) {
+          json +=
+            '"' + item.columnLabel + '"' + ':' + '"' + item.columnProp + '"'
+        } else {
+          json +=
+            '"' +
+            item.columnLabel +
+            '"' +
+            ':' +
+            '"' +
+            item.columnProp +
+            '"' +
+            ','
+        }
+      })
+      json += '}'
+      let s = eval('(' + json + ')')
+      return s
+    },
+    xiadaNotifyModel() {
+      if (
+        this.dataList.length == 0 &&
+        this.dataList2.length == 0 &&
+        this.dataList3.length == 0
+      ) {
+        this.$alert('没有明细记录无法下达！!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+      this.xiadaModelFlag = true
+    },
+    xiadaNotify() {
+      // 检查是否有明细记录
+      if (this.dataList.length == 0) {
+        this.$alert('没有明细记录无法下达！!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+      // 初始化弹框数据
+      this.xiadaNotifyData = {
+        planIssueDate:
+          this.notifyData.planIssueDate ||
+          this.dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        remark: this.notifyData.remark || '',
+      }
+      // 打开弹框
+      this.showXiadaNotifyDialog = true
+    },
+    confirmXiadaNotify() {
+      if (this.dataList.length == 0) {
+        this.$alert('没有明细记录无法下达！!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+      // 验证要求发料时间
+      if (
+        !this.xiadaNotifyData.planIssueDate ||
+        this.xiadaNotifyData.planIssueDate === ''
+      ) {
+        this.$message.warning('请选择要求发料时间！')
+        return false
+      }
+      // 准备下达数据
+      const notifyData = {
+        ...this.notifyData,
+        planIssueDate: this.xiadaNotifyData.planIssueDate,
+        remark: this.xiadaNotifyData.remark,
+      }
+      // 执行下达操作
+      xiadaNotify(notifyData).then(({ data }) => {
+        if (data.code === 0) {
+          this.showXiadaNotifyDialog = false
+          this.xiadaModelFlag = false
+          this.getUserNotifyNo()
+          this.$message.success('操作成功')
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+    saveOtherPart() {
+      // if (
+      //   this.otherPartData.qtyToIssue == null ||
+      //   this.otherPartData.qtyToIssue == '' ||
+      //   this.otherPartData.qtyToIssue <= 0
+      // ) {
+      //   this.$message.warning('请填写领取数量！')
+      //   return false
+      // }
+      this.$confirm('确定保存' + '?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        saveOtherPart(this.otherPartData).then(({ data }) => {
+          if (data.code === 0) {
+            this.saveOtherPartModalFlag = false
+            if (this.otherPartData.issueType === '非BOM物料') {
+              this.partModelFlag = false
+              this.activeName = 'noBom'
+              this.searchOtherPart('非BOM物料')
+            }
+            if (this.otherPartData.issueType === '不管控物料') {
+              this.noControlPartModelFlag = false
+              this.activeName = 'noControl'
+              this.searchOtherPart('不管控物料')
+            }
+            this.$message.success('操作成功')
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+      })
+    },
+    deleteNotify() {
+      if (this.dataList.length > 0) {
+        this.$alert('请先删除已经申请的明细记录！!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+      deleteNotify(this.notifyData).then(({ data }) => {
+        if (data.code === 0) {
+          this.getUserNotifyNo()
+          this.$message.success(data.msg)
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+    searchOtherPart(type) {
+      let inData = {
+        site: this.notifyData.site,
+        notifyNo: this.notifyData.notifyNo,
+        issueType: type,
+      }
+      searchOtherPart(inData).then(({ data }) => {
+        if (data && data.code === 0) {
+          if (type === '非BOM物料') {
+            this.dataList2 = data.rows
+          }
+          if (type === '不管控物料') {
+            this.dataList3 = data.rows
+          }
+        }
+      })
+    },
+    importModel() {
+      if (this.dataList.length > 0) {
+        this.$alert('有已申请工单明细无法导入！!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return
+      }
+      let data = {
+        site: this.notifyData.site,
+        notifyNo: this.notifyData.notifyNo,
+      }
+      this.$nextTick(() => {
+        this.$refs.walUploadExcel.init(data)
+      })
+    },
+    // 删除
+    deleteNotifySOS(row) {
+      this.$confirm(`是否删除这个工单的申请信息?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          deleteNotifySOS(row).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.getNotifyPoDetail()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {},
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定',
+              })
+            }
+          })
+        })
+        .catch(() => {})
+    },
+
+    //获取按钮的权限数据
+    getButtonAuthData() {
+      let searchFlag = this.isAuth(this.menuId + ':search')
+      let saveFlag = this.isAuth(this.menuId + ':save')
+      let updateFlag = this.isAuth(this.menuId + ':update')
+      let deleteFlag = this.isAuth(this.menuId + ':delete')
+      //处理页面的权限数据
+      this.authSearch = !searchFlag
+      this.authSave = !saveFlag
+      this.authUpdate = !updateFlag
+      this.authDelete = !deleteFlag
+    },
+
+    searchTable() {},
+    getAllNotifyStatus() {
+      let inData = {
+        site: this.$store.state.user.site,
+        listName: 'ISSUENOTIFYHEADER_STATUS',
+        locale: this.$i18n.locale,
+      }
+      getAllNotifyStatus(inData).then(({ data }) => {
+        this.notifyStatusList = data
+        console.log('notifyStatusList', this.notifyStatusList)
+      })
+    },
+    async getTableUserColumn(tableId, columnId) {
+      let queryTableUser = {
+        userId: this.$store.state.user.name,
+        functionId: this.$route.meta.menuId,
+        tableId: tableId,
+        status: true,
+        languageCode: this.$i18n.locale,
+      }
+      await getTableUserListLanguage(queryTableUser).then(({ data }) => {
+        if (data.rows.length > 0) {
+          //this.columnList1 = []
+          switch (columnId) {
+            case 1:
+              this.columnList1 = data.rows
+              break
+            case 2:
+              this.columnList2 = data.rows
+              break
+            case 3:
+              this.columnList3 = data.rows
+              break
+            case 4:
+              this.columnList4 = data.rows
+              break
+          }
+        }
+      })
+    },
+
+    // 获取 tableDefault 列
+    async getColumnList(tableId, columnId) {
+      let queryTable = {
+        functionId: this.$route.meta.menuId,
+        tableId: tableId,
+        languageCode: this.$i18n.locale,
+      }
+      await getTableDefaultListLanguage(queryTable).then(({ data }) => {
+        if (data.rows && data.rows.length > 0) {
+          switch (columnId) {
+            case 1:
+              this.columnList1 = data.rows
+              break
+            case 2:
+              this.columnList2 = data.rows
+              break
+            case 3:
+              this.columnList3 = data.rows
+              break
+            case 4:
+              this.columnList4 = data.rows
+              break
+          }
+        } else {
+          // this.showDefault = true.
+        }
+      })
+    },
+      /**
      * 海安委外页签刷新：材料明细固定按poorder查询，避免落回shoporder链路 - rqrq
      */
     refreshCurrentTabTable () {
@@ -54,8 +2235,7 @@ export default {
         })
       }
     },
-
-    /**
+      /**
      * 海安委外初始化：只查询当前用户poorder未下达主单 - rqrq
      */
     getUserNotifyNo () {
@@ -94,8 +2274,7 @@ export default {
         this.materialDetailList = []
       })
     },
-
-    /**
+      /**
      * 海安委外父行查询：固定orderType=poorder读取haian_SOIssueNotifyOrderList - rqrq
      */
     getNotifyPoDetail () {
@@ -112,8 +2291,7 @@ export default {
         }
       })
     },
-
-    /**
+      /**
      * 海安委外新建主单：主记录site使用当前登录大site，orderType固定poorder - rqrq
      */
     addNotify () {
@@ -134,8 +2312,7 @@ export default {
         }
       })
     },
-
-    /**
+      /**
      * 海安委外新建主单（带备注）：沿用老交互并固定orderType=poorder - rqrq
      */
     confirmAddNotify () {
@@ -160,8 +2337,7 @@ export default {
         }
       })
     },
-
-    /**
+      /**
      * 委外单查询：IFS仍使用大site，回传contract/site映射为subSite供后续落库 - rqrq
      */
     searchSOSRouting () {
@@ -218,8 +2394,7 @@ export default {
         this.seqNoModalLoading = false
       })
     },
-
-    /**
+      /**
      * 海安委外批量保存：主单site=大site，明细subsite取IFS回传工厂编码 - rqrq
      */
     saveNewSoIssueNotify () {
@@ -260,8 +2435,7 @@ export default {
         this.saveNewLoading = false
       })
     },
-
-    /**
+      /**
      * 委外明细入口：直接走海安poorder物料查询并回填itemNo/subsite - rqrq
      */
     enterSOSDetail (row) {
@@ -278,8 +2452,7 @@ export default {
       }
       this.enterSOS(rows)
     },
-
-    /**
+      /**
      * 委外物料弹窗：查询参数使用大site，IFS回传站点映射subsite后回显 - rqrq
      */
     enterSOS (row) {
@@ -315,8 +2488,7 @@ export default {
         this.bomLoadFlag = false
       })
     },
-
-    /**
+      /**
      * 海安委外明细保存：统一补齐notifyNo/site/subsite并写入haian_明细表 - rqrq
      */
     saveMaterialDetail () {
@@ -346,8 +2518,7 @@ export default {
         }
       })
     },
-
-    /**
+      /**
      * 兼容老“单行保存父行”入口：补齐poorder+subsite后走海安父行保存接口 - rqrq
      */
     saveSOS () {
@@ -406,8 +2577,7 @@ export default {
         })
       })
     },
-
-    /**
+      /**
      * 海安委外下达：调用海安下达接口，WCS推送由后续链路接管 - rqrq
      */
     confirmXiadaNotify () {
@@ -441,8 +2611,7 @@ export default {
         }
       })
     },
-
-    /**
+      /**
      * 海安委外删除主单：仅允许未下达且无明细时删除，落海安主表删除链路 - rqrq
      */
     deleteNotify () {
@@ -468,8 +2637,7 @@ export default {
         }
       })
     },
-
-    /**
+      /**
      * 海安委外删除父行：按notifyNo+itemNo+orderType删除对应父子明细 - rqrq
      */
     deleteNotifySOS (row) {
@@ -496,8 +2664,7 @@ export default {
         })
       }).catch(() => {})
     },
-
-    /**
+      /**
      * 海安委外状态字典：沿用公共枚举接口，避免前端硬编码状态值 - rqrq
      */
     getAllNotifyStatus () {
@@ -510,6 +2677,60 @@ export default {
         this.notifyStatusList = data
       })
     }
-  }
+    },
 }
 </script>
+
+<style scoped>
+.board666 .el-table .error-row {
+  background: #f86868;
+}
+
+/deep/ .el-table .error-row {
+  background: #f86868 !important;
+}
+
+/* 在 <style scoped> 下，使用深度选择器作用到 ElementUI 内部结构 */
+.issueNotify {
+  width: 100%;
+  height: auto;
+}
+.issueNotify /deep/ .el-form-item__content {
+  display: inline !important;
+}
+
+.site-content > .el-tabs > .el-tabs__content > .site-tabs__tools {
+  top: 35px;
+  height: 40px;
+  font-size: 16px;
+  line-height: 40px;
+}
+
+.text-right /deep/ .el-input__inner {
+  text-align: right !important;
+}
+
+.text-right /deep/ .el-input-number__input {
+  text-align: right !important;
+}
+
+.yzzTable /deep/.el-table .cell {
+  line-height: 20px;
+  font-size: 12px;
+  height: 20px;
+}
+.applyQtyClass /deep/.el-input__inner {
+  height: 14px !important;
+}
+/* 选择工单弹窗：紧凑表格与按钮样式 */
+.choose-sos-btn {
+  height: 14px;
+  box-sizing: border-box;
+  padding: 0 6px;
+  line-height: 12px;
+  font-size: 12px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>
diff --git a/src/views/modules/haianWarehouse/poOrder/searchPoIssureNotify54.vue b/src/views/modules/haianWarehouse/poOrder/searchPoIssureNotify54.vue
index 4282f81..ad0af92 100644
--- a/src/views/modules/haianWarehouse/poOrder/searchPoIssureNotify54.vue
+++ b/src/views/modules/haianWarehouse/poOrder/searchPoIssureNotify54.vue
@@ -1,5 +1,542 @@
+<template>
+  <div class="mod-config yzz">
+    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
+      <el-form :inline="true" label-position="top" style="margin-top: 0px">
+        <el-form-item :label="'申请单号'">
+          <el-input v-model="searchData.notifyNo" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'申请账号'">
+          <el-input v-model="searchData.userName" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'工单号'">
+          <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="状态" >
+          <el-select v-model="searchData.status" placeholder="请选择" style="width: 120px">
+            <el-option label="全部" value=""></el-option>
+            <el-option label="ISSUE" value="ISSUE"></el-option>
+            <el-option label="CANCEL" value="CANCEL"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="'申请单日期'">
+          <el-date-picker
+            style="width: 120px"
+            v-model="searchData.startDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item style="margin-top: 23px;">
+          <label style="margin-left: 0px;font-size: 19px">&#10142</label>
+        </el-form-item>
+        <el-form-item :label="' '">
+          <el-date-picker
+            style="width: 120px"
+            v-model="searchData.endDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="推送WCS" >
+          <el-select v-model="searchData.pushWcsFlag" placeholder="请选择" style="width: 120px">
+            <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-option label="出库完成" value="出库完成"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="' '">
+          <el-button type="primary" @click="searchTable()">查询</el-button>
+          <!-- <el-button type="primary" @click="createNotifyModal()">新增</el-button> -->
+          <download-excel
+            :fields="fields()"
+            :data="exportData"
+            type="xls"
+            :name="exportName"
+            :header="exportHeader"
+            :footer="exportFooter"
+            :fetch="createExportData"
+            :before-generate="startDownload"
+            :before-finish="finishDownload"
+            worksheet="导出信息"
+            class="el-button el-button--primary el-button--medium">
+            {{ '导出' }}
+          </download-excel>
+        </el-form-item>
+      </el-form>
+    </el-form>
+    <el-table
+      :data="dataList"
+      @row-click="changeData"
+      :height="height"
+      border
+      highlight-current-row
+      ref="mainTable"
+      v-loading="dataListLoading"
+      style="width: 100%; ">
+      <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
+        header-align="center"
+        align="center"
+        width="180"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" v-if="scope.row.status==='ISSUE'" @click="closeNotifyModel(scope.row)">关闭</a>
+          <a type="text" size="small" v-if="scope.row.status==='CLOSED'" @click="openNotify(scope.row)">开启</a>
+          <a type="text" size="small" v-if="scope.row.pushWcsFlag!=='出库完成'&&scope.row.pushWcsFlag!=='推送完成'&&scope.row.status==='ISSUE'" @click="previewInventory(scope.row)" style="margin-left: 10px;">推送WCS</a>
+          <!-- rqrq - 取消下达按钮，只在状态为ISSUE且未推送WCS时显示 -->
+          <a type="text" size="small" v-if="scope.row.status==='ISSUE'&&scope.row.pushWcsFlag==='未推送'" @click="cancelIssueNotifyHandle(scope.row)" style="margin-left: 10px;">取消下达</a>
+<!--          <a type="text" size="small" v-if="scope.row.pushWcsFlag!=='Y'" @click="pushToWcs(scope.row)" style="margin-left: 10px;">推送WCS</a>-->
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 1000]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+
+    <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName"  type="border-card"  @tab-click="tabClick">
+      <el-tab-pane label="申请单明细" name="detail">
+        <el-table
+          :data="dataList2"
+          :height="height"
+          border
+          v-loading="dataListLoading"
+          style="width: 100%; ">
+<!--          <el-table-column-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            width="80"-->
+<!--            label="操作">-->
+<!--            <template slot-scope="scope">-->
+<!--              <a type="text" size="small" v-if="currentRow.status==='ISSUE'" @click="deleteNotifySOSPlus(scope.row)">删除</a>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column
+            v-for="(item,index) in columnList2" :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">
+              <!-- rqrq - 是否推送WCS特殊显示：Y显示绿色"是"，否则显示灰色"否" -->
+              <span v-if="item.columnProp === 'pushWmsFlag'" :style="{color: scope.row.pushWmsFlag === 'Y' ? '#67C23A' : '#909399'}">
+                {{ scope.row.pushWmsFlag === 'Y' ? '是' : '否' }}
+              </span>
+              <!-- rqrq - 立库取出特殊显示：Y显示绿色"是"，否则显示灰色"否" -->
+              <span v-else-if="item.columnProp === 'transportFlag'" :style="{color: scope.row.transportFlag === 'Y' ? '#67C23A' : '#909399'}">
+                {{ scope.row.transportFlag === 'Y' ? '是' : '否' }}
+              </span>
+              <!-- 普通列显示 -->
+              <span v-else-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="120"
+            label="操作">
+            <template slot-scope="scope">
+              <a type="text" size="small" v-if="scope.row.pushWmsFlag !== 'Y' && currentRow && currentRow.pushWcsFlag === '未推送'" @click="enterSOSDetail(scope.row)" style="margin-right: 10px;">修改</a>
+              <a type="text" size="small" v-if="scope.row.pushWmsFlag !== 'Y' && currentRow && currentRow.pushWcsFlag === '未推送'" @click="deleteNotifySOSPlus(scope.row)">删除</a>
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </el-tab-pane>
+      <el-tab-pane label="材料明细" name="sub">
+        <el-table
+          :data="dataList3"
+          :height="height"
+          border
+          :row-class-name="tableRowClassName"
+          v-loading="dataListLoading"
+          @row-dblclick="handleMaterialRowDblClick"
+          style="width: 100%; ">
+
+<!--          <el-table-column-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            width="80"-->
+<!--            label="操作">-->
+<!--            <template slot-scope="scope">-->
+<!--              <a type="text" size="small" v-if="currentRow.status==='ISSUE'" @click="deleteNotifyMaterial(scope.row)">删除</a>-->
+
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column
+            v-for="(item,index) in columnList3" :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-tab-pane>
+      <el-tab-pane label="材料汇总" name="sum">
+        <el-table
+          :data="dataList4"
+          :height="height"
+          border
+          v-loading="dataListLoading"
+          style="width: 100%; ">
+          <!--          <el-table-column-->
+          <!--            header-align="center"-->
+          <!--            align="center"-->
+          <!--            width="80"-->
+          <!--            fixed="left"-->
+          <!--            label="操作">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column
+            v-for="(item,index) in columnList4" :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-tab-pane>
+      <el-tab-pane label="预留标签清单" name="labelDetail">
+        <el-table
+          :data="dataList7"
+          :height="height"
+          border
+          v-loading="dataListLoading"
+          style="width: 100%; ">
+          <el-table-column
+            v-for="(item,index) in columnList6" :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-tab-pane>
+    </el-tabs>
+
+    <el-dialog title="关闭原因" :close-on-click-modal="false" v-drag :visible.sync="closeModalFlag" width="450px">
+      <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item >
+              <el-input
+                type="textarea"
+                v-model="closeData.closeRemark "
+                :rows="3"
+                resize='none'
+                maxlength="200"
+                show-word-limit
+                style="height: 60px" >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 60px;text-align:center">
+        <el-button type="primary" @click="closeNotify()">保存</el-button>
+        <el-button type="primary" @click="closeModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 物料明细对话框 -->
+    <el-dialog title="申请明细" :close-on-click-modal="false" v-drag :visible.sync="materialModalFlag" width="900px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'生产订单号'">
+              <el-input v-model="sobomData.orderNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'产品编码'">
+              <el-input v-model="sobomData.partNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="yzzTable">
+        <el-table :height="400" :data="sobomList" border v-loading="bomLoadFlag" style="width: 100%;">
+          <el-table-column
+            prop="componentPartNo"
+            label="物料编码"
+            sortable
+            headerAlign="center"
+            width="120"
+            align="left">
+          </el-table-column>
+          <el-table-column
+            prop="componentPartDesc"
+            label="物料描述"
+            headerAlign="center"
+            width="200"
+            align="left"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="qtyRequired"
+            label="需求数量"
+            headerAlign="center"
+            width="100"
+            align="right">
+          </el-table-column>
+          <!-- rqrq - 新增可用库存列 -->
+          <el-table-column
+            prop="availableQty"
+            label="可用库存"
+            headerAlign="center"
+            width="100"
+            align="right">
+            <template slot-scope="scope">
+              <span :style="{fontWeight: 'bold', color: (scope.row.availableQty < scope.row.qtyRequired) ? '#F56C6C' : ''}">
+                {{ scope.row.availableQty }}
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="qtyToIssue"
+            label="本次申请数量"
+            headerAlign="center"
+            width="120"
+            align="right">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.qtyToIssue" type="number" style="height: 11px; width: 98%;" :step="0"
+                :min="0"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="remark"
+            label="备注"
+            headerAlign="center"
+            width="200"
+            align="left">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.remark" style="padding: 0;width: 100%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="" header-align="center" align="center" min-width="80" label="操作">
+            <template slot-scope="scope">
+              <el-button type="primary" @click="qtyAllForBom(scope.row)" style="width: 100%">全数领料</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="saveMaterialDetail()">保存</el-button>
+        <el-button type="primary" @click="materialModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 编辑材料明细对话框 -->
+    <el-dialog title="编辑材料明细" :close-on-click-modal="false" v-drag :visible.sync="editMaterialModalFlag" width="600px">
+      <el-form :inline="true" label-position="top" label-width="120px" style="margin-top: 20px;">
+        <el-row>
+          <el-col span="8">
+            <el-form-item label="申请单序号">
+              <el-input v-model="editMaterialData.itemNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col span="8">
+            <el-form-item label="材料编码">
+              <el-input v-model="editMaterialData.componentPartNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col span="8">
+        <el-form-item label="生产订单">
+          <el-input v-model="editMaterialData.soorderNo" disabled></el-input>
+        </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col span="8">
+            <el-form-item label="需求时间">
+          <el-input v-model="editMaterialData.needDate" disabled></el-input>
+          </el-form-item>
+          </el-col>
+          <el-col span="8">
+          <el-form-item label="申请数量" required>
+            <el-input 
+              v-model="editMaterialData.qtyToIssue" 
+              :min="0" 
+              style="width: 98%;"
+              @input="value => editMaterialData.qtyToIssue = value
+                .replace(/[^\d.]/g, '')        
+                .replace(/\.{2,}/g, '.')         
+                .replace(/^\./, '0.')            
+                .replace(/(\.\d{4}).*/, '$1')    
+                .replace(/^0+(?=\d)/, '0')      
+                .replace(/^0+(?=\.)/, '0')"      
+            ></el-input>
+        </el-form-item>
+          </el-col>
+          <el-col span="8">
+            <el-form-item label="类型">
+          <el-input v-model="editMaterialData.issueType" disabled></el-input>
+        </el-form-item>
+          </el-col>
+          
+        </el-row>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveEditMaterialDetail()">保存</el-button>
+        <el-button type="primary" @click="editMaterialModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 库存预览模态框 -->
+    <el-dialog
+      title="库存匹配预览"
+      :visible.sync="previewDialogVisible"
+      width="80%"
+      :close-on-click-modal="false">
+      <el-table
+        :data="previewData"
+        border
+        v-loading="previewLoading"
+        style="width: 100%;"
+        height="300"
+        :row-class-name="getRowClassName">
+        <el-table-column
+          prop="rowNo"
+          label="行号"
+          width="80"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="productionOrderNo"
+          label="生产订单号"
+          width="100"
+          sortable
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="bomLineNo"
+          label="BOM行号"
+          width="100"
+          sortable
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="partNo"
+          label="物料编码"
+          width="100"
+          sortable
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="requiredQty"
+          label="需求数量"
+          width="80"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="isWarehouseSatisfied"
+          label="立库是否满足"
+          width="100"
+          align="center">
+          <template slot-scope="scope">
+            <span :style="{color: scope.row.isWarehouseSatisfied === 'Y' ? '#67C23A' : '#F56C6C'}">
+              {{ scope.row.isWarehouseSatisfied === 'Y' ? '是' : '否' }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="isOtherWarehouseSatisfied"
+          label="分切仓库是否满足"
+          width="120"
+          align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.isOtherWarehouseSatisfied" :style="{color: scope.row.isOtherWarehouseSatisfied === 'Y' ? '#67C23A' : '#F56C6C'}">
+              {{ scope.row.isOtherWarehouseSatisfied === 'Y' ? '是' : '否' }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="matchedBarcodes"
+          label="匹配条码"
+          min-width="300"
+          align="left"
+          class-name="wrap-text-column">
+          <template slot-scope="scope">
+            <div style="white-space: normal; word-break: break-all; line-height: 1.5;">
+              {{ scope.row.matchedBarcodes }}
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" class="yzzButtonAn" @click="pushToWCS" :disabled="previewLoading">
+          {{ previewLoading ? '推送中...' : '推送至WCS' }}
+        </el-button>
+        <el-button @click="previewDialogVisible = false" :disabled="previewLoading">关闭</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+
 <script>
-import BaseSearchIssureNotify54 from '@/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue'
 import {
   haiAnGetPoOrderMaterialForIssure,
   haiAnSearchNotifyHeaderNew,
@@ -8,10 +545,1916 @@ import {
 } from '@/api/haianWarehouse/poOrderIssueNotify.js'
 
 export default {
-  name: 'searchPoIssureNotify54',
-  extends: BaseSearchIssureNotify54,
-  methods: {
-    /**
+    name: 'searchPoIssureNotify54',
+
+    data() {
+      return {
+        height:200,
+        activeName: 'detail',
+        dataList: [],
+        dataList2: [],
+        dataList3: [],
+        dataList4: [],
+        dataList5: [],
+        dataList6: [],
+        dataList7: [], // 预留标签清单数据 - rqrq
+        userBuList:[],
+        createNotifyFlag: false,
+        saveOrderDetailFlag: false,
+        closeData:{
+          site:'',
+          notifyNo:'',
+          closeRemark:'',
+          username:this.$store.state.user.name,
+        },
+        closeModalFlag:false,
+        searchData: {
+          page: 1,
+          limit: 100,
+          site:'',
+          userName: '',
+          notifyNo: '',
+          status: '',
+          pushWcsFlag: '', // rqrq - 推送WCS筛选条件
+          loginUserName: this.$store.state.user.name,
+          startDate: this.dayjs().format("YYYY-MM-DD"),
+          endDate: this.dayjs().format("YYYY-MM-DD"),
+          issueStartDate:this.dayjs().format("YYYY-MM-DD"),
+          issueEndDate: this.dayjs().format("YYYY-MM-DD")+" 23:59:59",
+          sql: "",
+          orderNo: "",
+          orderType: 'shoporder', // rqrq - 默认查询shoporder类型
+        },
+        notifyData:{
+          site: '',
+          bu: '',
+          notifyNo: '',
+          notifyDate: '',
+          enteredDate: '',
+          userName: this.$store.state.user.name,
+          userDisplay: '',
+          remark: '',
+          planIssueDate: '',
+          outWorkOrderFlag: false,
+        },
+        pageIndex: 1,
+        pageSize: 100,
+        totalPage: 0,
+        //工单分页
+        co_pageIndex: 1,
+        co_pageSize: 100,
+        co_totalPage: 0,
+        dataListLoading: false,
+        currentRow:'',
+        columnList1:[
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1NotifyNo',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "notifyNo",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "申请单单号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1NotifyDate',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "notifyDate",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "申请日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1UserName',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "username",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "申请账号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1EnteredDate',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "enteredDate",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "录入时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1Status',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "status",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1ConfirmStatus',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "confirmStatus",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "确认状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1WcsPushFlag',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "pushWcsFlag",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "推送WCS",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1Remark',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "remark",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "备注",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200
+          },
+        ],
+        columnList2:[
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2ItemNo',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "itemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 40
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2NeedDate',
+            tableId: "701002Table2",
+            tableName: "领料申请派工单子表",
+            columnProp: 'needDate',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '要求发料时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2PushWcsTime',
+            tableId: "701002Table2",
+            tableName: "领料申请派工单子表",
+            columnProp: 'pushWcsTime',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '推送WCS时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2SOOrderNo',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "soorderNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "生产订单",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2FGPartNo',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "fgPartNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工单物料",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2ReleaseNo',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "releaseNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "发布号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2SequenceNo',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "sequenceNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2PushWmsFlag',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "pushWmsFlag",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "是否推送WCS",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2TransportFlag',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "transportFlag",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "立库取出",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2AreaDesc',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "areaDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "配送区域",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          }
+
+        ],
+        columnList3:[
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3ItemNo',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "itemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "申请单序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3ComponentPartNo',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "componentPartNo",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "材料编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3IsInWh',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "isInWh",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "是否进立库",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3NeedDate',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "needDate",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "需求时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 110
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3QtyToIssue',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "qtyToIssue",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "申请数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },/* {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3QtyToIssueOriginal',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "qtyToIssueOriginal",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "已发数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          }, */{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3IssueType',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "issueType",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3Remark',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "remark",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "备注",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 160
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3SOOrderNo',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "soorderNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "生产订单",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3BOMItemNo',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "bomitemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "BOM序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+
+          },
+        ],
+        columnList4:[
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table4IssueType',
+            tableId: "701002Table4",
+            tableName: "申请单材料明细表",
+            columnProp: "issueType",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table4ComponentPartNo',
+            tableId: "701002Table4",
+            tableName: "申请单材料明细表",
+            columnProp: "componentPartNo",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "材料编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table4IsInWh',
+            tableId: "701002Table4",
+            tableName: "申请单材料明细表",
+            columnProp: "isInWh",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "是否进立库",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table4PartDesc',
+            tableId: "701002Table4",
+            tableName: "申请单材料明细表",
+            columnProp: "partDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "材料名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table4QtyToIssue',
+            tableId: "701002Table4",
+            tableName: "申请单材料明细表",
+            columnProp: "qtyToIssue",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "合计申请数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table4QtyToIssueOriginal',
+            tableId: "701002Table4",
+            tableName: "申请单材料明细表",
+            columnProp: "qtyToIssueOriginal",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "合计已发数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
+        ],
+        columnList6:[ // 预留标签清单列配置 - rqrq
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6ItemNo',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "itemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "订单序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6BOMItemNo',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "bomItemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "订单物料行号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6SerialNo',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "serialNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "标签号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6TaskRef',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "taskRef",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "立库任务号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6TaskItem',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "taskItem",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "立库任务行号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6OutWcsFlag',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "outWcsFlag",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "立库取出",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6OutWcsTime',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "outWcsTime",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "取出时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 140
+          }
+        ],
+
+        // 导出 start
+        exportData: [],
+        exportName: '发料申请单'+this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader: ["发料申请单"],
+        exportFooter: [],
+        // 导出 end
+        orderDetailData:{
+          orderNo:'',
+          seqNo:'',
+          locationNo:'',
+          qtyrequired:'',
+          issureQty:0,
+          partDesc:'',
+          partNo:'',
+          resourceId:'',
+          resourceDesc:'',
+          needDate:'',
+          itemDesc:'',
+          workCenterNo:'',
+          itemNo:0,
+          materialType:'BOM物料',
+        },
+        chooseSOSModalFlag: false,
+        chooseSOSData: {
+          orderno: '',
+          seqno: '',
+          sResourceid: '',
+          startDate: '',
+          endDate: '',
+        },
+        chooseOrderModalFlag: false,
+        chooseOrderData: {
+          page: 1,
+          limit: 100,
+          orderNo: '',
+          status: '',
+          date3: '',
+          date4: '',
+          statusList: '',
+        },
+        chooseOrderList: [],
+        chooseOperationModalFlag: false,
+        chooseOperationData: {
+          orderNo: '',
+          site: '',
+          itemDesc: ''
+        },
+        chooseOperationList: [],
+        chooseResourceModalFlag: false,
+        chooseResourceData: {
+          site: '',
+          workCenterNo: '',
+          resourceID: '',
+          resourceDesc: '',
+        },
+        chooseResourceList: [],
+        chooseSOSList: [],
+        choosePartModalFlag: false,
+        choosePartData: {
+          site: '',
+          sourceBu: '',
+          partNo: '',
+          partDesc: '',
+          spec: '',
+        },
+        choosePartList: [],
+        // 预览相关数据
+        previewDialogVisible: false,
+        previewLoading: false,
+        previewData: [],
+        // 物料明细对话框相关数据
+        materialModalFlag: false,
+        sobomList: [],
+        sobomData: {
+          orderNo: '',
+          seqNo: '',
+          partNo: '',
+        },
+        bomLoadFlag: false,
+        // 编辑材料明细对话框相关数据
+        editMaterialModalFlag: false,
+        editMaterialData: {
+          itemNo: '',
+          componentPartNo: '',
+          isInWh: '',
+          needDate: '',
+          qtyToIssue: 0,
+          issueType: '',
+          remark: '',
+          soorderNo: '',
+          bomitemNo: '',
+          site: '',
+          notifyNo: '',
+        },
+      }
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = (window.innerHeight- 315) / 2
+      })
+    },
+
+
+    created () {
+      this.searchTable()
+      // 补充海安标签扩展列，确保预留标签页签能展示海安增强字段 - rqrq
+    this.haiAnEnsureLabelColumns()
+    },
+    methods: {
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.searchTable()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.searchTable()
+      },
+      tabClick (tab, event) {
+        // 刷新列表数据
+        this.refreshCurrentTabTable()
+      },
+      changeData(row){
+        this.currentRow = JSON.parse(JSON.stringify(row));
+        this.refreshCurrentTabTable ();
+      },
+      refreshCurrentTabTable(){
+        if(this.currentRow===''||this.currentRow===null){
+          this.currentRow={site:'',notifyNo:'',orderType:'shoporder'}
+        }
+        // rqrq - 添加orderType参数
+        let queryData = {
+          ...this.currentRow,
+          orderType: 'shoporder'
+        }
+        if(this.activeName==='detail'){
+          searchNotifyOrderListNew(queryData).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList2 = data.rows
+
+            } else {
+              this.dataList2 = [];
+            }
+          });
+        }else if(this.activeName==='sub'){
+          searchNotifyMaterialListNew(queryData).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList3 = data.rows
+
+            } else {
+              this.dataList3 = [];
+            }
+          });
+        }else if(this.activeName==='change'){
+          searchNotifyLogNew(queryData).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList5 = data.rows
+
+            } else {
+              this.dataList5 = [];
+            }
+          });
+        }else if(this.activeName==='close'){
+          searchNotifyLogCloseNew(queryData).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList6 = data.rows
+
+            } else {
+              this.dataList6 = [];
+            }
+          });
+        }else if(this.activeName==='labelDetail'){ // rqrq - 预留标签清单页签
+          searchMaterialListDetail(queryData).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList7 = data.rows
+
+            } else {
+              this.dataList7 = [];
+            }
+          });
+        }else {
+          searchSumNotifyMaterialListNew(queryData).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList4 = data.rows
+
+            } else {
+              this.dataList4 = [];
+            }
+          });
+        }
+      },
+      searchTable(){
+        this.searchData.limit = this.pageSize
+        this.searchData.page = this.pageIndex
+        searchNotifyHeaderNew(this.searchData).then(({data}) => {
+          //区分请求成功和失败的状况
+          if (data && data.code == 0) {
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
+          } else {
+            this.dataList = [];
+          }
+        });
+      },
+      closeNotifyModel(row){
+        this.closeData.site=row.site
+        this.closeData.notifyNo=row.notifyNo
+        this.closeData.closeRemark=''
+        this.closeModalFlag=true
+      },
+      closeNotify(){
+        if(this.closeData.closeRemark==null||this.closeData.closeRemark===''){
+          this.$alert("必须输入关闭原因", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+
+            let inData={
+              site:this.closeData.site,
+              notifyNo:this.closeData.notifyNo,
+              closeRemark:this.closeData.closeRemark,
+              username:this.$store.state.user.name,
+              status:'CLOSED',
+            }
+          updateNotifyStatusNew(inData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.closeModalFlag=false
+              this.searchTable()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+
+      },
+      openNotify(row){
+        this.$confirm('确认打开?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let inData={
+            site:row.site,
+            notifyNo:row.notifyNo,
+            status:'ISSUE',
+          }
+          updateNotifyStatusNew(inData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.searchTable()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+      // 预览库存匹配情况
+      previewInventory(row) {
+        this.currentRow = row  // 保存当前行数据
+        this.previewDialogVisible = true
+        this.previewLoading = true
+        this.previewData = []
+
+        let inData = {
+          site: row.site,
+          notifyNo: row.notifyNo
+        }
+
+        checkIssueNotifyInventory(inData).then(({data}) => {
+          this.previewLoading = false
+          if (data && data.code === 0) {
+            this.previewData = data.rows || []
+            console.log('库存预览数据:', this.previewData)
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        }).catch(() => {
+          this.previewLoading = false
+          this.$message.error('获取库存预览失败')
+        })
+      },
+
+      // 根据订单满足状态设置行样式
+      getRowClassName({row}) {
+        if (row.orderSatisfactionStatus === 1) {
+          return 'success-row'  // 绿色：完全立库满足
+        } else if (row.orderSatisfactionStatus === 2) {
+          return 'warning-row'  // 黄色：立库+分切区满足
+        } else if (row.orderSatisfactionStatus === 3) {
+          return 'danger-row'   // 红色：存在不满足
+        }
+        return ''
+      },
+
+      // 从预览对话框推送至WCS
+      pushToWCS() {
+        // 筛选绿色和黄色的数据（orderSatisfactionStatus = 1 或 2）
+        // const validData = this.previewData.filter(item =>
+        //   item.orderSatisfactionStatus === 1 || item.orderSatisfactionStatus === 2
+        // )
+        //全部推送 后端判断
+        const validData = this.previewData
+
+        if (validData.length === 0) {
+          this.$message.warning('没有可推送的数据（只推送绿色和黄色状态的数据）')
+          return
+        }
+
+        this.$confirm(`确认推送 ${validData.length} 条数据至WCS？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          // 显示加载状态 - rqrq
+          this.previewLoading = true
+
+          const inData = {
+            site: this.currentRow.site,
+            notifyNo: this.currentRow.notifyNo,
+            inventoryList: validData
+          }
+
+          pushInventoryToWcs(inData).then(({data}) => {
+            this.previewLoading = false
+            if (data && data.code === 0) {
+              this.$message({
+                message: '推送WCS成功',
+                type: 'success',
+                duration: 1500
+              })
+              this.previewDialogVisible = false
+              this.searchTable()
+            } else {
+              this.$alert(data.msg || '推送失败', '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          }).catch((error) => {
+            this.previewLoading = false
+            this.$message.error(error.message || '推送WCS失败，请重试')
+          })
+        }).catch(() => {
+          // 用户取消操作 - rqrq
+          console.log('用户取消推送')
+        })
+      },
+
+      pushToWcs(row){
+        this.$confirm('确认推送到WCS?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let inData={
+            site: row.site,
+            notifyNo: row.notifyNo
+          }
+          pushNotifyToWcs(inData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.searchTable()
+              this.$message({
+                message: '推送WCS成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+
+      /**
+       * @Description 取消下达处理方法 - rqrq
+       * @param row 当前行数据
+       */
+      cancelIssueNotifyHandle(row) {
+        // 先判断发起人是否有未下达的shoporder申请单 - rqrq
+        let checkData = {
+          site: row.site,
+          username: row.username
+        }
+
+        checkUserHasUnissueShopOrder(checkData).then(({ data }) => {
+          if (data && data.code === 0) {
+            // 如果有未下达的申请单 - rqrq
+            if (data.row != null) {
+              this.$alert('该用户有未下达的申请单,请先处理', '提示', {
+                confirmButtonText: '确定'
+              })
+              return
+            }
+
+            // 没有未下达的申请单，执行取消下达 - rqrq
+            this.$confirm(`确定取消下达申请单【${row.notifyNo}】吗?`, '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              let cancelData = {
+                site: row.site,
+                notifyNo: row.notifyNo
+              }
+
+              cancelIssueNotify(cancelData).then(({ data }) => {
+                if (data && data.code === 0) {
+                  this.$message.success('取消下达成功')
+                  // 重新加载数据 - rqrq
+                  this.searchTable()
+                } else {
+                  this.$alert(data.msg, '错误', {
+                    confirmButtonText: '确定'
+                  })
+                }
+              }).catch(() => {
+                this.$message.error('取消下达失败')
+              })
+            }).catch(() => {
+              // 用户取消操作 - rqrq
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        }).catch(() => {
+          this.$message.error('检查用户申请单失败')
+        })
+      },
+
+      deleteNotifyMaterial(row){
+        this.$confirm('确认删除?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteNotifyMaterial(row).then(({data}) => {
+            if (data && data.code === 0) {
+              this.refreshCurrentTabTable()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+      deleteNotifySOSPlus(row){
+        this.$confirm('确认删除?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteNotifySOSPlus(row).then(({data}) => {
+            if (data && data.code === 0) {
+              this.refreshCurrentTabTable()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+      // 进入工单物料明细
+      enterSOSDetail(row) {
+        let rows = {
+          site: this.currentRow.site || this.$store.state.user.site,
+          notifyNo: this.currentRow.notifyNo,
+          orderNo: row.soorderNo || row.orderNo,
+          seqNo: row.seqNo || '',
+          partNo: row.fgPartNo || row.partNo,
+          itemNo: row.itemNo,
+          releaseNo: row.releaseNo,
+          sequenceNo: row.sequenceNo,
+        }
+        this.enterSOS(rows)
+      },
+      // 打开物料明细对话框
+      enterSOS(row) {
+        this.materialModalFlag = true
+        this.sobomList = []
+        this.sobomData = {
+          orderNo: row.orderNo,
+          seqNo: row.seqNo,
+          partNo: row.partNo,
+        }
+        this.bomLoadFlag = true
+        let inData = {
+          site: this.currentRow.site || this.$store.state.user.site,
+          notifyNo: this.currentRow.notifyNo,
+          orderNo: row.orderNo,
+          releaseNo: row.releaseNo,
+          sequenceNo: row.sequenceNo,
+          partNo: row.partNo,
+          itemNo: row.itemNo,
+        }
+        getSOSBOMForIssureNew(inData).then(({ data }) => {
+          this.bomLoadFlag = false
+          if (data.code === 0) {
+            this.sobomList = data.rows
+            for (let i = 0; i < this.sobomList.length; i++) {
+              this.sobomList[i].itemNo = inData.itemNo
+            }
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        }).catch(() => {
+          this.bomLoadFlag = false
+          this.$message.error('获取物料明细失败')
+        })
+      },
+      // 全数领料
+      qtyAllForBom(row) {
+        row.qtyToIssue = row.qtyRequired
+      },
+      // 保存物料明细
+      saveMaterialDetail() {
+        for (let i = 0; i < this.sobomList.length; i++) {
+          if (
+            this.sobomList[i].qtyToIssue === '' ||
+            this.sobomList[i].qtyToIssue == null
+          ) {
+            this.sobomList[i].qtyToIssue = 0
+          }
+          this.sobomList[i].notifyNo = this.currentRow.notifyNo
+          this.sobomList[i].site = this.currentRow.site || this.$store.state.user.site
+        }
+
+        let materialList = this.sobomList.filter((item) => item.qtyToIssue > 0)
+        if (materialList.length == 0) {
+          this.$alert('没有需要保存的内容!', '提示', {
+            confirmButtonText: '确定',
+          })
+          return false
+        }
+        saveMaterialDetail(materialList).then(({ data }) => {
+          if (data.code === 0) {
+            this.materialModalFlag = false
+            this.refreshCurrentTabTable()
+            this.$message.success('操作成功')
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+      },
+      // 处理材料明细行双击事件
+      handleMaterialRowDblClick(row) {
+
+        if(!'未推送'.includes(this.currentRow.pushWcsFlag)){
+          this.$message.warning('只有未推送状态的申请单才能编辑材料明细')
+          return;
+        }
+        // 保存完整的行数据，以便后续保存时包含所有必要字段
+        this.editMaterialData = JSON.parse(JSON.stringify(row))
+        // 确保包含必要的字段
+        this.editMaterialData.site = this.currentRow.site || this.$store.state.user.site
+        this.editMaterialData.notifyNo = this.currentRow.notifyNo || ''
+        // 确保申请数量有默认值
+        if (this.editMaterialData.qtyToIssue === null || this.editMaterialData.qtyToIssue === undefined) {
+          this.editMaterialData.qtyToIssue = 0
+        }
+        this.editMaterialModalFlag = true
+      },
+      // 保存编辑的材料明细
+      saveEditMaterialDetail() {
+        if (this.editMaterialData.qtyToIssue === null || this.editMaterialData.qtyToIssue === '') {
+          this.$alert('申请数量不能为空!', '提示', {
+            confirmButtonText: '确定',
+          })
+          return false
+        }
+        if (this.editMaterialData.qtyToIssue < 0) {
+          this.$alert('申请数量不能小于0!', '提示', {
+            confirmButtonText: '确定',
+          })
+          return false
+        }
+        
+        // 使用完整的行数据，只更新申请数量
+        let materialData = {
+          ...this.editMaterialData,
+        }
+        
+        // 确保申请数量不为空
+        if (materialData.qtyToIssue === '' || materialData.qtyToIssue == null) {
+          materialData.qtyToIssue = 0
+        }
+        
+        
+        updateMaterialDetail(materialData).then(({ data }) => {
+          if (data.code === 0) {
+            this.editMaterialModalFlag = false
+            this.refreshCurrentTabTable()
+            this.$message.success('保存成功')
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        }).catch(() => {
+          this.$message.error('保存失败')
+        })
+      },
+
+
+
+
+      //导出excel - rqrq
+      async createExportData() {
+        const queryParams = {
+          ...this.searchData,
+          limit: 999999,  // 设置一个很大的数字来获取全部数据 - rqrq
+          page: 1
+        }
+        const {data} = await searchNotifyHeaderNew(queryParams)
+        if (data && data.code === 0) {
+          return data.page.list || []
+        }
+        return []
+      },
+      startDownload() {
+        //  this.exportData = this.dataList
+
+      },
+      finishDownload() {
+      },
+      fields() {
+        let json = "{"
+        this.columnList1.forEach((item, index) => {
+          if (index == this.columnList1.length - 1) {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+          } else {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+          }
+        })
+        json += "}"
+        let s = eval("(" + json + ")")
+
+        return s
+      },
+
+      tableRowClassName ({row, rowIndex}) {
+
+        if (row.qtyToIssueOriginal<row.qtyToIssue&&new Date(row.needDate)<new Date(this.dayjs().format("YYYY-MM-DD HH:mm"))) {
+          return 'error-row'
+        }
+
+        return ''
+      },
+      /**
+     * 统一构建海安查询入参，强制使用登录用户site避免跨站点串单 - rqrq
+     */
+    haiAnBuildQueryData (row) {
+      const baseRow = row || {}
+      return {
+        ...baseRow,
+        site: this.$store.state.user.site,
+        orderType: 'shoporder'
+      }
+    },
+      /**
+     * 海安标签页签增加subsite/allocSeq/palletId/taskSeq列，便于追踪标签流向 - rqrq
+     */
+    haiAnEnsureLabelColumns () {
+      if (!Array.isArray(this.columnList6)) {
+        return
+      }
+      const appendColumn = (columnProp, columnLabel, columnWidth = 100, align = 'left') => {
+        if (this.columnList6.some(col => col.columnProp === columnProp)) {
+          return
+        }
+        this.columnList6.push({
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: `701002Table6${columnProp}`,
+          tableId: '701002Table6',
+          tableName: '海安预留标签清单表',
+          columnProp,
+          headerAlign: 'center',
+          align,
+          columnLabel,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth
+        })
+      }
+      appendColumn('taskSeq', '立库任务序号', 110, 'right')
+      appendColumn('subSite', '子站点', 110, 'left')
+      appendColumn('allocSeq', '分配序号', 100, 'right')
+      appendColumn('palletId', '栈板号', 120, 'left')
+    },
+      /**
+     * 海安页签刷新逻辑，四个页签均改为海安接口并保留原交互语义 - rqrq
+     */
+    refreshCurrentTabTable () {
+      if (this.currentRow === '' || this.currentRow === null) {
+        this.currentRow = { site: this.$store.state.user.site, notifyNo: '', orderType: 'shoporder' }
+      }
+      const queryData = this.haiAnBuildQueryData(this.currentRow)
+      if (this.activeName === 'detail') {
+        haiAnSearchNotifyOrderListNew(queryData).then(({ data }) => {
+          this.dataList2 = data && data.code === 0 ? (data.rows || []) : []
+        })
+      } else if (this.activeName === 'sub') {
+        haiAnSearchNotifyMaterialListNew(queryData).then(({ data }) => {
+          this.dataList3 = data && data.code === 0 ? (data.rows || []) : []
+        })
+      } else if (this.activeName === 'change') {
+        haiAnSearchNotifyLogNew(queryData).then(({ data }) => {
+          this.dataList5 = data && data.code === 0 ? (data.rows || []) : []
+        })
+      } else if (this.activeName === 'close') {
+        haiAnSearchNotifyLogCloseNew(queryData).then(({ data }) => {
+          this.dataList6 = data && data.code === 0 ? (data.rows || []) : []
+        })
+      } else if (this.activeName === 'labelDetail') {
+        haiAnSearchMaterialListDetail(queryData).then(({ data }) => {
+          this.dataList7 = data && data.code === 0 ? (data.rows || []) : []
+        })
+      } else {
+        haiAnSearchSumNotifyMaterialListNew(queryData).then(({ data }) => {
+          this.dataList4 = data && data.code === 0 ? (data.rows || []) : []
+        })
+      }
+    },
+      /**
+     * 海安主表查询改为海安接口，固定传登录站点并保留分页语义 - rqrq
+     */
+    searchTable () {
+      this.searchData.limit = this.pageSize
+      this.searchData.page = this.pageIndex
+      this.searchData.site = this.$store.state.user.site
+      this.searchData.orderType = 'shoporder'
+      haiAnSearchNotifyHeaderNew(this.searchData).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.dataList = data.page.list
+          this.pageIndex = data.page.currPage
+          this.pageSize = data.page.pageSize
+          this.totalPage = data.page.totalCount
+          return
+        }
+        this.dataList = []
+      })
+    },
+      /**
+     * 海安关闭申请单，保持旧页面的必填关闭原因校验与提示语义 - rqrq
+     */
+    closeNotify () {
+      if (this.closeData.closeRemark == null || this.closeData.closeRemark === '') {
+        this.$alert('必须输入关闭原因', '错误', {
+          confirmButtonText: '确定'
+        })
+        return false
+      }
+      const inData = {
+        site: this.$store.state.user.site,
+        notifyNo: this.closeData.notifyNo,
+        closeRemark: this.closeData.closeRemark,
+        username: this.$store.state.user.name,
+        status: 'CLOSED'
+      }
+      haiAnUpdateNotifyStatusNew(inData).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.closeModalFlag = false
+          this.searchTable()
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500
+          })
+          return
+        }
+        this.$alert(data.msg, '错误', {
+          confirmButtonText: '确定'
+        })
+      })
+    },
+      /**
+     * 海安开启申请单，状态回写改走海安接口并保持原确认交互 - rqrq
+     */
+    openNotify (row) {
+      this.$confirm('确认打开?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const inData = {
+          site: this.$store.state.user.site,
+          notifyNo: row.notifyNo,
+          status: 'ISSUE'
+        }
+        haiAnUpdateNotifyStatusNew(inData).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.searchTable()
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500
+            })
+            return
+          }
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        })
+      })
+    },
+      /**
+     * 海安库存预览当前为占位实现，保留入口并给出待开发提示 - rqrq
+     */
+    previewInventory (row) {
+      this.currentRow = row
+      this.previewDialogVisible = true
+      this.previewLoading = true
+      this.previewData = []
+      const inData = {
+        site: this.$store.state.user.site,
+        notifyNo: row.notifyNo
+      }
+      haiAnCheckIssueNotifyInventory(inData).then(({ data }) => {
+        this.previewLoading = false
+        if (data && data.code === 0) {
+          this.previewData = data.rows || []
+          if (data.placeholder) {
+            this.$message.warning(data.msg || '海安库存预览待开发')
+          }
+          return
+        }
+        this.$alert(data.msg, '错误', {
+          confirmButtonText: '确定'
+        })
+      }).catch(() => {
+        this.previewLoading = false
+        this.$message.error('获取库存预览失败')
+      })
+    },
+      /**
+     * 海安推送WCS当前为占位实现，仅提示待开发并不触发真实推送 - rqrq
+     */
+    pushToWCS () {
+      const validData = this.previewData || []
+      this.$confirm(`确认推送 ${validData.length} 条数据至WCS？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.previewLoading = true
+        const inData = {
+          site: this.$store.state.user.site,
+          notifyNo: this.currentRow.notifyNo,
+          inventoryList: validData
+        }
+        haiAnPushInventoryToWcs(inData).then(({ data }) => {
+          this.previewLoading = false
+          if (data && data.code === 0) {
+            this.$message.warning(data.msg || '海安推送WCS待开发')
+            this.previewDialogVisible = false
+            return
+          }
+          this.$alert(data.msg || '推送失败', '错误', {
+            confirmButtonText: '确定'
+          })
+        }).catch((error) => {
+          this.previewLoading = false
+          this.$message.error(error.message || '推送WCS失败，请重试')
+        })
+      })
+    },
+      /**
+     * 兼容旧入口的海安推送占位方法，避免历史按钮调用空指针 - rqrq
+     */
+    pushToWcs (row) {
+      this.previewInventory(row)
+    },
+      /**
+     * 海安取消下达流程：先检查未下达冲突，再执行取消并刷新列表 - rqrq
+     */
+    cancelIssueNotifyHandle (row) {
+      const checkData = {
+        site: this.$store.state.user.site,
+        username: row.username
+      }
+      haiAnCheckUserHasUnissueShopOrder(checkData).then(({ data }) => {
+        if (data && data.code === 0) {
+          if (data.row != null) {
+            this.$alert('该用户有未下达的申请单,请先处理', '提示', {
+              confirmButtonText: '确定'
+            })
+            return
+          }
+          this.$confirm(`确定取消下达申请单【${row.notifyNo}】吗?`, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            const cancelData = {
+              site: this.$store.state.user.site,
+              notifyNo: row.notifyNo
+            }
+            haiAnCancelIssueNotify(cancelData).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message.success('取消下达成功')
+                this.searchTable()
+                return
+              }
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }).catch(() => {
+              this.$message.error('取消下达失败')
+            })
+          })
+          return
+        }
+        this.$alert(data.msg, '错误', {
+          confirmButtonText: '确定'
+        })
+      }).catch(() => {
+        this.$message.error('检查用户申请单失败')
+      })
+    },
+      /**
+     * 海安删除工单行增强接口，保留未推送状态限制并同步刷新当前页签 - rqrq
+     */
+    deleteNotifySOSPlus (row) {
+      this.$confirm('确认删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const inData = {
+          ...row,
+          site: this.$store.state.user.site,
+          notifyNo: this.currentRow.notifyNo
+        }
+        haiAnDeleteNotifySOSPlus(inData).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.refreshCurrentTabTable()
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500
+            })
+            return
+          }
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        })
+      })
+    },
+      /**
+     * 海安查看页物料弹窗查询，按海安接口回显已保存数量并透传subsite - rqrq
+     */
+    enterSOS (row) {
+      this.materialModalFlag = true
+      this.sobomList = []
+      this.sobomData = {
+        orderNo: row.orderNo,
+        seqNo: row.seqNo,
+        partNo: row.partNo,
+        subSite: row.subSite
+      }
+      this.bomLoadFlag = true
+      const inData = {
+        site: this.$store.state.user.site,
+        notifyNo: this.currentRow.notifyNo,
+        orderNo: row.orderNo,
+        releaseNo: row.releaseNo,
+        sequenceNo: row.sequenceNo,
+        partNo: row.partNo,
+        itemNo: row.itemNo
+      }
+      haiAnGetSOSBOMForIssureNew(inData).then(({ data }) => {
+        this.bomLoadFlag = false
+        if (data && data.code === 0) {
+          this.sobomList = data.rows || []
+          for (let i = 0; i < this.sobomList.length; i++) {
+            this.sobomList[i].itemNo = inData.itemNo
+            this.sobomList[i].subSite = row.subSite
+          }
+          return
+        }
+        this.$alert(data.msg, '错误', {
+          confirmButtonText: '确定'
+        })
+      }).catch(() => {
+        this.bomLoadFlag = false
+        this.$message.error('获取物料明细失败')
+      })
+    },
+      /**
+     * 海安保存材料明细走海安先删后存链路，并透传subsite防止跨子站点串单 - rqrq
+     */
+    saveMaterialDetail () {
+      for (let i = 0; i < this.sobomList.length; i++) {
+        if (this.sobomList[i].qtyToIssue === '' || this.sobomList[i].qtyToIssue == null) {
+          this.sobomList[i].qtyToIssue = 0
+        }
+        this.sobomList[i].notifyNo = this.currentRow.notifyNo
+        this.sobomList[i].site = this.$store.state.user.site
+        this.sobomList[i].subSite = this.sobomList[i].subSite || this.sobomData.subSite || this.currentRow.subSite
+      }
+      const materialList = this.sobomList.filter((item) => item.qtyToIssue > 0)
+      if (materialList.length === 0) {
+        this.$alert('没有需要保存的内容!', '提示', {
+          confirmButtonText: '确定'
+        })
+        return false
+      }
+      haiAnSaveMaterialDetail(materialList).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.materialModalFlag = false
+          this.refreshCurrentTabTable()
+          this.$message.success('操作成功')
+          return
+        }
+        this.$alert(data.msg, '错误', {
+          confirmButtonText: '确定'
+        })
+      })
+    },
+      /**
+     * 海安编辑材料数量，沿用未推送限制并改为海安更新接口 - rqrq
+     */
+    saveEditMaterialDetail () {
+      if (this.editMaterialData.qtyToIssue === null || this.editMaterialData.qtyToIssue === '') {
+        this.$alert('申请数量不能为空!', '提示', {
+          confirmButtonText: '确定'
+        })
+        return false
+      }
+      if (this.editMaterialData.qtyToIssue < 0) {
+        this.$alert('申请数量不能小于0!', '提示', {
+          confirmButtonText: '确定'
+        })
+        return false
+      }
+      const materialData = {
+        ...this.editMaterialData,
+        site: this.$store.state.user.site,
+        notifyNo: this.currentRow.notifyNo
+      }
+      if (materialData.qtyToIssue === '' || materialData.qtyToIssue == null) {
+        materialData.qtyToIssue = 0
+      }
+      haiAnUpdateMaterialDetail(materialData).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.editMaterialModalFlag = false
+          this.refreshCurrentTabTable()
+          this.$message.success('保存成功')
+          return
+        }
+        this.$alert(data.msg, '错误', {
+          confirmButtonText: '确定'
+        })
+      }).catch(() => {
+        this.$message.error('保存失败')
+      })
+    },
+      /**
+     * 海安导出数据改为海安主查询接口，确保导出内容来自海安表链路 - rqrq
+     */
+    async createExportData () {
+      const queryParams = {
+        ...this.searchData,
+        site: this.$store.state.user.site,
+        orderType: 'shoporder',
+        limit: 999999,
+        page: 1
+      }
+      const { data } = await haiAnSearchNotifyHeaderNew(queryParams)
+      if (data && data.code === 0) {
+        return data.page.list || []
+      }
+      return []
+    },
+      /**
      * 委外发料查看页参数：固定orderType=poorder，保证主子表查询口径一致 - rqrq
      */
     haiAnBuildQueryData (row) {
@@ -22,8 +2465,7 @@ export default {
         orderType: 'poorder'
       }
     },
-
-    /**
+      /**
      * 委外发料主列表查询：仅查询poorder类型海安申请单 - rqrq
      */
     searchTable () {
@@ -42,8 +2484,7 @@ export default {
         this.dataList = []
       })
     },
-
-    /**
+      /**
      * 委外发料物料弹窗：调用海安poorder专用IFS聚合接口并透传subsite - rqrq
      */
     enterSOS (row) {
@@ -82,8 +2523,7 @@ export default {
         this.$message.error('获取委外发料明细失败')
       })
     },
-
-    /**
+      /**
      * 委外发料取消下达：按poorder口径检查未下达单据后再执行取消 - rqrq
      */
     cancelIssueNotifyHandle (row) {
@@ -131,45 +2571,123 @@ export default {
         this.$message.error('检查用户申请单失败')
       })
     },
-
+      /**
+     * 委外发料导出：固定按poorder维度导出海安主单数据 - rqrq
+     */
+    async createExportData () {
+      const queryParams = {
+        ...this.searchData,
+        site: this.$store.state.user.site,
+        orderType: 'poorder',
+        limit: 999999,
+        page: 1
+      }
+      const { data } = await haiAnSearchNotifyHeaderNew(queryParams)
+      if (data && data.code === 0) {
+        return data.page.list || []
+      }
+      return []
+    },
     /**
      * 委外发料WCS预览：按海安复刻约束保持关闭，避免触发真实推送链路 - rqrq
      */
     previewInventory () {
       this.$message.warning('海安委外发料WCS推送功能暂不启用')
     },
-
     /**
      * 委外发料WCS推送：按复刻要求注掉推送，仅保留提示 - rqrq
      */
     pushToWCS () {
       this.$message.warning('海安委外发料WCS推送功能暂不启用')
     },
-
     /**
      * 兼容旧按钮入口：统一提示关闭，不触发后端推送接口 - rqrq
      */
     pushToWcs () {
       this.$message.warning('海安委外发料WCS推送功能暂不启用')
+    }
     },
 
-    /**
-     * 委外发料导出：固定按poorder维度导出海安主单数据 - rqrq
-     */
-    async createExportData () {
-      const queryParams = {
-        ...this.searchData,
-        site: this.$store.state.user.site,
-        orderType: 'poorder',
-        limit: 999999,
-        page: 1
-      }
-      const { data } = await haiAnSearchNotifyHeaderNew(queryParams)
-      if (data && data.code === 0) {
-        return data.page.list || []
-      }
-      return []
-    }
   }
-}
 </script>
+
+<style scoped>
+/deep/ .el-form-item--medium .el-form-item__content {
+  height: auto;
+}
+.disabled {
+  cursor: not-allowed !important;
+  color: #C0C4CC !important;
+  pointer-events: none;
+}
+
+.text-right >>> .el-input__inner {
+  text-align: right !important;
+}
+
+.text-right >>> .el-input-number__input {
+  text-align: right !important;
+}
+
+.yzzTable /deep/.el-table .cell {
+  line-height: 20px;
+  font-size: 12px;
+  height: 20px;
+}
+
+.single-line-multi-select >>> .el-select__tags {
+  display: flex;
+  flex-wrap: nowrap;
+  overflow: hidden;
+  white-space: nowrap;
+  max-width: 100%;
+}
+
+.single-line-multi-select >>> .el-tag {
+  flex-shrink: 0;
+  max-width: 100px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.single-line-multi-select >>> .el-select__input {
+  flex-shrink: 0;
+  min-width: 30px;
+}
+
+/* 库存预览表格行颜色 */
+/deep/ .el-table .success-row {
+  background: #f0f9ff !important;
+  border-left: 3px solid #67C23A;
+}
+
+/* rqrq - 匹配条码列自动换行显示 */
+/deep/ .wrap-text-column .cell {
+  white-space: normal !important;
+  word-break: break-all !important;
+  line-height: 1.5 !important;
+}
+
+/deep/ .el-table .warning-row {
+  background: #fdf6ec !important;
+  border-left: 3px solid #E6A23C;
+}
+
+/deep/ .el-table .danger-row {
+  background: #fef0f0 !important;
+  border-left: 3px solid #F56C6C;
+}
+
+/deep/ .el-table .success-row:hover > td {
+  background-color: #ecf5ff !important;
+}
+
+/deep/ .el-table .warning-row:hover > td {
+  background-color: #faecd8 !important;
+}
+
+/deep/ .el-table .danger-row:hover > td {
+  background-color: #fde2e2 !important;
+}
+</style>
diff --git a/src/views/modules/haianWarehouse/shipment/shipmentIssue54.vue b/src/views/modules/haianWarehouse/shipment/shipmentIssue54.vue
index 924da64..9582902 100644
--- a/src/views/modules/haianWarehouse/shipment/shipmentIssue54.vue
+++ b/src/views/modules/haianWarehouse/shipment/shipmentIssue54.vue
@@ -1,5 +1,514 @@
+<template>
+  <div>
+    <el-form label-position="top" style="margin-top: -0px">
+      <el-row :gutter="20">
+        <el-col :span="20">
+          <el-button v-if="notifyNo===''" @click="addNotify()" type="primary" class="yzzButtonAn">新建申请单</el-button>
+          <el-button v-if="notifyNo!=''" type="primary" @click="chooseSOSModal()"
+            class="yzzButtonAn">选择SHIPMENT</el-button>
+          <el-button v-if="notifyNo!=''" type="primary" @click="xiadaNotifyModel()"
+            class="yzzButtonAn">下达申请单</el-button>
+          <el-button v-if="notifyNo!=''" type="primary" @click="deleteNotify()" class="yzzButtonAn">删除申请单</el-button>
+        </el-col>
+      </el-row>
+      <el-row :gutter="10" v-if="notifyNo!=''">
+        <el-col :span="3">
+          <el-form-item :label="'工厂编码'">
+            <el-input v-model="notifyData.site" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item :label="'申请单号'">
+            <el-input v-model="notifyData.notifyNo" disabled style="width: 100%;"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item :label="'申请账号'">
+            <el-input v-model="notifyData.username" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item :label="'申请日期'">
+            <el-input v-model="notifyData.notifyDate" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="3">
+          <el-form-item :label="'状态'">
+            <el-select v-model="notifyData.status" style="width: 100%" disabled>
+              <el-option label="全部" value=""></el-option>
+              <el-option v-for="item in notifyStatusList" :key="item.listValue" :label="item.listDesc"
+                :value="item.listValue"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!-- <el-row :gutter="10" v-if="notifyNo!=''">
+        <el-col :span="12">
+          <el-form-item :label="'备注'">
+            <el-input v-model="notifyData.remark" style="width: 100%;"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row> -->
+
+    </el-form>
+
+    <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName" type="border-card"
+      v-if="notifyNo!=''">
+      <el-tab-pane label="已申请工单" name="sos">
+        <el-table :height="height" :data="dataList" border style="width: 100%;">
+          <el-table-column v-for="(item,index) in columnList" :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="100" label="操作">
+            <template slot-scope="scope">
+              <a type="text" size="small" @click="enterSOSDetail(scope.row)">物料</a>
+              <a type="text" size="small" @click="deleteNotifySOS(scope.row)">删除</a>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <!-- <el-tab-pane label="非BOM物料" name="noBom">
+        <el-table :data="dataList2" :height="height" border style="width: 100%; ">
+          <el-table-column v-for="(item,index) in columnList4" :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 header-align="center" align="center" width="80" label="操作">
+            <template slot-scope="scope">
+              <a type="text" size="small" @click="deleteNotifyMaterial(scope.row)">删除</a>
+
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="不管控物料" name="noControl">
+        <el-table :data="dataList3" :height="height" border style="width: 100%; ">
+          <el-table-column v-for="(item,index) in columnList4" :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 header-align="center" align="center" width="80" label="操作">
+            <template slot-scope="scope">
+              <a type="text" size="small" @click="deleteNotifyMaterial(scope.row)">删除</a>
+
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane> -->
+    </el-tabs>
+    <el-dialog title="选择SHIPMENT" :close-on-click-modal="false" v-drag :visible.sync="seqNoModalFlag" width="1200px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="4">
+            <el-form-item :label="'shipmentId'">
+              <el-input v-model="seqNoData.orderNo" @keyup.enter.native="searchSOSRouting()"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="' '">
+              <el-button type="primary" @click="searchSOSRouting()" class="" :loading="seqNoModalLoading">添加</el-button>
+              <el-button type="danger" @click="deleteFromSeqNoList()" class="">删除</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table :height="400" :data="seqNoList" border style="width: 100%;" class="choose-sos-table">
+        <el-table-column v-for="(item,index) in columnList2" :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">
+            <div v-if="item.columnProp === 'qtyToApply'">
+              <el-input class="qtyToApplyClass" v-model="scope.row.qtyToApply" style="height: 11px; width: 98%;"
+                :step="0" :min="0"></el-input>
+            </div>
+            <!-- rqrq - 可用库存特殊显示：加粗，小于库存数量时红色 -->
+            <span v-else-if="item.columnProp === 'availableQty'" :style="{fontWeight: 'bold', color: (scope.row.availableQty < scope.row.inventoryQty) ? '#F56C6C' : ''}">
+              {{ scope.row.availableQty }}
+            </span>
+            <span v-else-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="left" header-align="center" align="center" width="80" label="操作">
+          <template slot-scope="scope">
+            <el-button type="primary" size="mini" plain class="choose-sos-btn" :loading="chooseLoading"
+              @click="chooseSOS(scope.row)">选择</el-button>
+          </template>
+        </el-table-column> -->
+      </el-table>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="saveNewSoIssueNotify" :loading="saveNewLoading">保存</el-button>
+        <el-button type="primary" @click="seqNoModalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+    <el-dialog title="保存SHIPMENT" :close-on-click-modal="false" v-drag :visible.sync="saveSeqNoModalFlag" width="750px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'SHIPMENTID'">
+              <el-input v-model="notifyOrderData.orderNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'SHIPMENT类型'">
+              <el-input v-model="notifyOrderData.shipmentType" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'SHIPMENT状态'">
+              <el-input v-model="notifyOrderData.status" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="'客户'">
+              <el-input v-model="notifyOrderData.addressName" disabled style="width: 204%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'计划交付时间'">
+              <el-input v-model="notifyOrderData.deliveryDate" disabled></el-input>
+              <!-- <el-date-picker style="width: 100%" v-model="notifyOrderData.deliveryDate" type="datetime"
+                value-format="yyyy-MM-dd" placeholder="选择日期">
+              </el-date-picker> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'计划运输时间'">
+              <el-input v-model="notifyOrderData.needDate" disabled></el-input>
+              <!-- <el-date-picker style="width: 100%" v-model="notifyOrderData.needDate" type="datetime"
+                value-format="yyyy-MM-dd" placeholder="选择日期">
+              </el-date-picker> -->
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item :label="'此次退料数量'">
+              <el-input v-model="notifyOrderData.unissureQty"  @input=" value=>notifyOrderData.unissureQty = value.match(/0$|^[1-9]\d*/) ? value.match(/0$|^[1-9]\d*/)[0] : ''"></el-input>
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col :span="6">
+            <el-form-item :label="' '">
+              <el-button type="primary" @click="qtyAllForSeqNo()">全数退料</el-button>
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="saveSOS()">保存</el-button>
+        <el-button type="primary" @click="saveSeqNoModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+    <el-dialog title="变更BU" :close-on-click-modal="false" v-drag :visible.sync="changeBuFlag" width="350px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item :label="'工厂编码'">
+              <el-input v-model="notifyData.site" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="'申请单号'">
+              <el-input v-model="notifyData.notifyNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="'BU'">
+              <el-select v-model="newBu" placeholder="请选择" style="width: 100%">
+                <el-option v-for="i in buList" :key="i.buNo" :label="i.buNo+' - '+i.buDesc" :value="i.buNo">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="saveNewBu()">保存</el-button>
+        <el-button type="primary" @click="changeBuFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+    <el-dialog title="申请明细" :close-on-click-modal="false" v-drag :visible.sync="materialModalFlag" width="900px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'生产订单号'">
+              <el-input v-model="sobomData.orderNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="6">
+            <el-form-item :label="'产品编码'">
+              <el-input v-model="sobomData.partNo" disabled></el-input>
+            </el-form-item>
+          </el-col> -->
+        </el-row>
+      </el-form>
+      <div class="yzzTable">
+        <el-table :height="400" :data="sobomList" border v-loading="bomLoadFlag" style="width: 100%;">
+          <el-table-column v-for="(item,index) in columnList3" :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">
+              <div v-if="item.columnProp === 'qtyToIssue'">
+                <el-input v-model="scope.row.qtyToIssue" style="height: 11px; width: 98%;" :step="0"
+                  :min="0"></el-input>
+              </div>
+              <div v-else-if="item.columnProp === 'remark'">
+                <el-input v-model="scope.row.remark" style="padding: 0;width: 100%"></el-input>
+              </div>
+              <div v-else>
+                <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>
+
+              </div>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column prop="" header-align="center" align="center" min-width="50" label="操作">
+            <template slot-scope="scope">
+              <el-button type="primary" @click="qtyAllForBom(scope.row)" style="width: 100%">全数领料</el-button>
+            </template>
+          </el-table-column> -->
+
+        </el-table>
+      </div>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="saveMaterialDetail()">保存</el-button>
+        <!--        <el-button type="primary" @click="materialModalFlag=false">关闭</el-button>-->
+      </el-footer>
+    </el-dialog>
+
+    <el-dialog width="600px" title="选择非BOM物料" :close-on-click-modal="false" :visible.sync="partModelFlag">
+      <el-form :inline="true" label-position="top" label-width="100px">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item style="margin-left: 0px" label="物料编码">
+              <el-input v-model="partSearch.partNo"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item style="margin-left: 0px" label="物料名称">
+              <el-input v-model="partSearch.partDesc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item style="margin-left: 0px" label="规格型号">
+              <el-input v-model="partSearch.spec"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label=" ">
+              <el-button type="primary" @click="searchPartModel()">{{'查询'}}</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table height="450" :data="partList" border @row-dblclick="chooseNoBomPartNo" style="width: 100%;">
+        <el-table-column prop="partNo" header-align="center" align="left" min-width="80" style="font-size: 20px"
+          label="物料编码">
+        </el-table-column>
+        <el-table-column prop="partDesc" header-align="center" align="left" min-width="120" style="font-size: 20px"
+          label="物料描述">
+        </el-table-column>
+        <el-table-column prop="spec" header-align="center" align="left" min-width="120" style="font-size: 20px"
+          label="规格型号">
+        </el-table-column>
+        <el-table-column prop="sku" header-align="center" align="left" min-width="80" label="SKU">
+        </el-table-column>
+        <el-table-column prop="umid" header-align="center" align="left" min-width="60" label="计量单位">
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+    <el-dialog width="600px" title="选择不管控物料" :close-on-click-modal="false" :visible.sync="noControlPartModelFlag">
+      <el-form :inline="true" label-position="top" label-width="100px">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item style="margin-left: 0px" label="物料编码">
+              <el-input v-model="partSearch.partNo"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item style="margin-left: 0px" label="物料名称">
+              <el-input v-model="partSearch.partDesc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item style="margin-left: 0px" label="规格型号">
+              <el-input v-model="partSearch.spec"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label=" ">
+              <el-button type="primary" @click="searchNoControlPartModel()">{{'查询'}}</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table height="450" :data="partList2" border @row-dblclick="chooseNoControlPartNo" style="width: 100%;">
+
+        <el-table-column prop="partNo" header-align="center" align="left" min-width="80" style="font-size: 20px"
+          label="物料编码">
+        </el-table-column>
+        <el-table-column prop="partDesc" header-align="center" align="left" min-width="120" style="font-size: 20px"
+          label="物料描述">
+        </el-table-column>
+        <el-table-column prop="spec" header-align="center" align="left" min-width="120" style="font-size: 20px"
+          label="规格型号">
+        </el-table-column>
+        <el-table-column prop="sku" header-align="center" align="left" min-width="80" label="SKU">
+        </el-table-column>
+        <el-table-column prop="umid" header-align="center" align="left" min-width="60" label="计量单位">
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+    <el-dialog width="500px" title="物料库存 VS 需求数量" :close-on-click-modal="false" :visible.sync="xiadaModelFlag">
+      <div class="board666">
+        <el-table height="300" :data="xiadaList" border :row-class-name="tableRowClassName" style="width: 100%;">
+          <el-table-column prop="componentPartNo" header-align="center" align="left" min-width="80"
+            style="font-size: 20px" label="物料编码">
+          </el-table-column>
+          <el-table-column prop="partDesc" header-align="center" align="left" min-width="120" style="font-size: 20px"
+            label="物料描述">
+          </el-table-column>
+          <el-table-column prop="qtyToIssue" header-align="center" align="right" min-width="80" style="font-size: 20px"
+            label="发料数量">
+          </el-table-column>
+          <el-table-column prop="qtyOnHand" header-align="center" align="right" min-width="80" label="库存数量">
+          </el-table-column>
+          <el-table-column prop="qtyAvailable" header-align="center" align="right" min-width="80" label="可用数量">
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="xiadaNotify()">确定下达</el-button>
+        <el-button type="primary" @click="xiadaModelFlag=false">取消</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <el-dialog title="保存物料" :close-on-click-modal="false" v-drag :visible.sync="saveOtherPartModalFlag" width="600px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'物料编码'">
+              <el-input v-model="otherPartData.componentPartNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item :label="'物料描述'">
+              <el-input v-model="otherPartData.partDesc" disabled></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'计量单位'">
+              <el-input v-model="otherPartData.umid" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'需求数量'">
+              <el-input-number v-model="otherPartData.qtyToIssue" style="padding: 0;width: 100%" :step="0" :min="0"
+                :controls="false"></el-input-number>
+
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item :label="'备注'">
+              <el-input v-model="otherPartData.remark"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="saveOtherPart()">保存</el-button>
+        <el-button type="primary" @click="saveOtherPartModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+    <el-dialog title="选择申请类型" :close-on-click-modal="false" v-drag :visible.sync="showAddNotifyTypeDialog"
+      width="400px">
+      <el-form :inline="true" label-position="top" label-width="500px" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="申请类型">
+              <el-radio-group v-model="selectedNotifyType">
+                <el-radio label="production">生产领料单</el-radio>
+                <el-radio label="outsourced">委外领料单</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" class="issueNotify">
+              <el-input type="textarea" v-model="selectedNotifyRemark" :rows="3" placeholder="请输入内容"
+                style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:30px;text-align:center;">
+        <el-button type="primary" @click="confirmAddNotify()">确认</el-button>
+        <el-button type="primary" @click="showAddNotifyTypeDialog=false">取消</el-button>
+      </el-footer>
+    </el-dialog>
+    <el-dialog title="下达申请单" :close-on-click-modal="false" v-drag :visible.sync="showXiadaNotifyDialog"
+      width="400px">
+      <el-form :inline="true" label-position="top" label-width="500px" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="要求发料时间">
+              <el-date-picker
+                v-model="xiadaNotifyData.planIssueDate"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd HH:mm:ss"
+                placeholder="选择日期时间"
+                style="width: 100%">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" class="issueNotify">
+              <el-input type="textarea" v-model="xiadaNotifyData.remark" :rows="3" placeholder="请输入内容"
+                style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:30px;text-align:center;">
+        <el-button type="primary" @click="confirmXiadaNotify()">下达</el-button>
+        <el-button type="primary" @click="showXiadaNotifyDialog=false">取消</el-button>
+      </el-footer>
+    </el-dialog>
+    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
+  </div>
+</template>
+
 <script>
-import BaseShipmentIssue from '@/views/modules/shipment/shipmentIssue.vue'
 import {
   haiAnGetUserNotifyNo,
   haiAnCreateNotify,
@@ -15,12 +524,1782 @@ import {
   haiAnSearchNotifyMaterialListNew,
   getAllNotifyStatus
 } from '@/api/haianWarehouse/shipmentIssue.js'
+import Chooselist from '@/views/modules/common/Chooselist_eam'
+import { get } from 'lodash'
 
 export default {
   name: 'shipmentIssue54',
-  extends: BaseShipmentIssue,
+  components: {
+    Chooselist,
+  },
+  watch: {},
+  data() {
+    return {
+      activeName: 'sos',
+      noControlPartModelFlag: false,
+      buList: [],
+      partList: [],
+      partList2: [],
+      notifyStatusList: [],
+      notifyNo: '',
+      notifyData: {
+        site: '',
+        bu: '',
+        notifyNo: '',
+        notifyDate: '',
+        enteredDate: '',
+        userName: '',
+        userDisplay: '',
+        remark: '',
+        planIssueDate: '',
+      },
+      dataList2: [],
+      dataList3: [],
+      // 是否收藏
+      favorite: false,
+      changeBuFlag: false,
+      partModelFlag: false,
+      newBu: '',
+      // 导出 start
+      exportData: [],
+      exportName: '设备分组' + this.dayjs().format('YYYYMMDDHHmmss'),
+      exportHeader: ['设备分组'],
+      exportFooter: [],
+      exportList: [],
+      // 导出 end
+      searchData: {
+        site: this.$store.state.user.site,
+        userName: this.$store.state.user.name,
+        groupID: '',
+        groupDesc: '',
+        buDesc: '',
+        active: 'Y',
+        page: 1,
+        limit: 10,
+      },
+      sobomData: {
+        orderno: '',
+        seqno: '',
+        partNo: '',
+      },
+      //申请单序号
+      itemNo: '',
+      notifyOrderData: {
+        partNo: '',
+        orderNo: '',
+        itemNo: '',
+        seqNo: '',
+        partDesc: '',
+        qtyrequired: '',
+        sResourceID: '',
+        unissureQty: '',
+        locationNo: '',
+        needDate: '',
+      },
+      seqNoData: {
+        site: this.$store.state.user.site,
+        seqno: '',
+        sResourceID: '',
+        sWorkcenterno: '',
+        operatorId: '',
+        sShiftno: '',
+        startDate: '',
+        endDate: '',
+      },
+      seqNoList: [],
+      height: 200,
+      pageIndex: 1,
+      pageSize: 20,
+      totalPage: 0,
+      dataList: [],
+      sobomList: [],
+      dataListSelections: [],
+      seqNoModalFlag: false,
+      materialModalFlag: false,
+      modalDisableFlag: false,
+      saveSeqNoModalFlag: false,
+      bomLoadFlag: false,
+      xiadaList: [],
+      columnList4: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table4ComponentPartNo',
+          tableId: '701001Table4',
+          tableName: '非BOM材料明细',
+          columnProp: 'componentPartNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '材料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table4PartDesc',
+          tableId: '701001Table4',
+          tableName: '非BOM材料明细',
+          columnProp: 'partDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '材料名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 130,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table4QtyToIssue',
+          tableId: '701001Table4',
+          tableName: '非BOM材料明细',
+          columnProp: 'qtyToIssue',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '申请数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table4Remark',
+          tableId: '701001Table4',
+          tableName: '非BOM材料明细',
+          columnProp: 'remark',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '备注',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 200,
+        },
+      ],
+      modalData: {
+        flag: '',
+        bu: '',
+        site: this.$store.state.user.site,
+        groupID: '',
+        groupDesc: '',
+        active: '',
+        createBy: this.$store.state.user.name,
+        updateBy: this.$store.state.user.name,
+      },
+      // 展示列集
+      columnList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table1ItemNo',
+          tableId: '701001Table1',
+          tableName: '领料申请工单子表',
+          columnProp: 'itemNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '序号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 50,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table1SOOrderNo',
+          tableId: '701001Table1',
+          tableName: '领料申请工单子表',
+          columnProp: 'soorderNo',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: 'SHIPMENTID',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        /* {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table1OpsItemNo',
+          tableId: '701001Table1',
+          tableName: '领料申请工单子表',
+          columnProp: 'opsItemNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '工序',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table1ItemDesc',
+          tableId: '701001Table1',
+          tableName: '领料申请工单子表',
+          columnProp: 'itemDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '工序名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table1LocationNo',
+          tableId: '701001Table1',
+          tableName: '领料申请工单子表',
+          columnProp: 'locationNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '机台编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        }, */
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table1NeedDate',
+          tableId: '701001Table1',
+          tableName: '领料申请派工单子表',
+          columnProp: 'needDate',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '运输日期',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        /* {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table1IssureQty',
+          tableId: '701001Table1',
+          tableName: '领料申请派工单子表',
+          columnProp: 'unissureQty',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '退料数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        }, */
+      ],
+      columnList2: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2ShipmentId',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'shipmentId',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: 'SHIPMENTID',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2InventoryUom',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'inventoryUom',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '单位',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 60,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2InventoryPartNo',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'inventoryPartNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '库存物料号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          // rqrq - 新增可用库存列
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2AvailableQty',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'availableQty',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '可用库存',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2ShipmentLineNo',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'shipmentLineNo',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '行号',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 60,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2InventoryQty',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'inventoryQty',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '库存数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2QtyAssigned',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'qtyAssigned',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '已分配数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2QtyToApply',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'qtyToApply',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '本次申请数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2State',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'state',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '状态',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2NextStepFlow',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'nextStepFlow',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '下一步流程',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2ReceiverType',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'receiverType',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '接收方类型',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2ReceiverAddressName',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'receiverAddressName',
+          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: 701001,
+          serialNumber: '701001Table2ShipmentType',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'shipmentType',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '运输类型',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2PlannedShipDate',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'plannedShipDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '计划运输时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2PlannedDeliveryDate',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'plannedDeliveryDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '计划交付时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },
+      ],
+      columnList3: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table3ComponentPartNo',
+          tableId: '701001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'componentPartNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '物料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: true,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table3PartDesc',
+          tableId: '701001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'componentPartDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '物料描述',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        /* {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table3QtyRequired',
+          tableId: '701001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'qtyRequired',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '需求数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 50,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table3QtyOnHand',
+          tableId: '701001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'qtyOnHand',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '现场库存',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 50,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table3StockQty',
+          tableId: '701001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'stockQty',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: 'ERP库存',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 50,
+        }, */
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table3QtyToIssue',
+          tableId: '701001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'qtyOnHand',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '可发数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 60,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table3QtyToIssue',
+          tableId: '701001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'qtyToIssue',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '本次发料数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 60,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table3Remark',
+          tableId: '701001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'remark',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '备注',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150,
+        },
+      ],
+      rules: {
+        groupIdType: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        groupDescType: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        activeType: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        bu: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur', 'change'],
+          },
+        ],
+      },
+      userBuList: [],
+      authSearch: false,
+      authSave: false,
+      authUpdate: false,
+      authDelete: false,
+      menuId: this.$route.meta.menuId,
+      partSearch: {
+        site: '',
+        sourceBu: '',
+        partNo: '',
+        partDesc: '',
+        spec: '',
+      },
+      xiadaModelFlag: false,
+      saveOtherPartModalFlag: false,
+      otherPartData: {
+        site: '',
+        notifyNo: '',
+        itemNo: '',
+        bOMItemNo: '',
+        componentPartNo: '',
+        qtyToIssue: '',
+        issueType: '',
+        partDesc: '',
+        umid: '',
+        remark: '',
+      },
+      showAddNotifyTypeDialog: false,
+      selectedNotifyType: 'production',
+      selectedNotifyRemark: '',
+      chooseLoading: false,
+      seqNoModalLoading: false,
+      saveNewLoading: false,
+      showXiadaNotifyDialog: false,
+      xiadaNotifyData: {
+        planIssueDate: '',
+        remark: '',
+      },
+    }
+  },
+
+  mounted() {
+    this.$nextTick(() => {
+        this.height = window.innerHeight - 230
+      })
+  },
+
+  created () {
+      // 按钮控制
+    this.getButtonAuthData()
+    // 获取用户的 site 和 bu
+    //this.getSiteAndBuByUserName()
+    // 校验用户是否收藏
+    /* this.favoriteIsOk()*/
+
+    this.getUserNotifyNo()
+    // 动态列
+    /* this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
+      this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
+      this.getTableUserColumn(this.$route.meta.menuId+'table3',3)
+      this.getTableUserColumn(this.$route.meta.menuId+'table4',4) */
+    // if (!this.authSearch) {
+    //   // 获取数据列表
+    //   this.getDataList()
+    // }
+    },
+
   methods: {
-    /**
+      deleteNotifyMaterial(row) {
+      this.$confirm('确认删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        deleteNotifyMaterialWithOutLog(row).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.searchOtherPart('非BOM物料')
+            this.searchOtherPart('不管控物料')
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {},
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+      })
+    },
+    getBaseList(val, type) {
+      this.tagNo = val
+      let conSql = ''
+      this.$nextTick(() => {
+        let strVal = ''
+
+        if (val === 515) {
+          strVal = this.seqNoData.sResourceid
+          conSql =
+            " and site = '" +
+            this.notifyData.site +
+            "'" +
+            " and bu_no = '" +
+            this.notifyData.bu +
+            "'"
+          this.$refs.baseList.init(val, strVal, conSql)
+        }
+        if (val === 216) {
+          strVal = this.seqNoData.sWorkcenterno
+          conSql =
+            " and site = '" +
+            this.notifyData.site +
+            "'" +
+            " and bu_no = '" +
+            this.notifyData.bu +
+            "'"
+          this.$refs.baseList.init(val, strVal, conSql)
+        }
+        if (val === 215) {
+          strVal = this.notifyOrderData.locationNo
+          this.$refs.baseList.init(val, strVal)
+        }
+      })
+    },
+    chooseNoBomPartNo(row) {
+      this.otherPartData = {
+        site: this.notifyData.site,
+        notifyNo: this.notifyData.notifyNo,
+        itemNo: 998,
+        bOMItemNo: '',
+        componentPartNo: row.partNo,
+        qtyToIssue: '',
+        issueType: '非BOM物料',
+        partDesc: row.partDesc,
+        umid: row.umid,
+        remark: '',
+      }
+      this.saveOtherPartModalFlag = true
+    },
+    chooseNoControlPartNo(row) {
+      this.otherPartData = {
+        site: this.notifyData.site,
+        notifyNo: this.notifyData.notifyNo,
+        itemNo: 999,
+        bOMItemNo: '',
+        componentPartNo: row.partNo,
+        qtyToIssue: '',
+        issueType: '不管控物料',
+        partDesc: row.partDesc,
+        umid: row.umid,
+        remark: '',
+      }
+      this.saveOtherPartModalFlag = true
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.qtyToIssue > row.qtyAvailable) {
+        return 'error-row'
+      }
+
+      return ''
+    },
+    // 列表方法的回调
+    getBaseData(val) {
+      if (this.tagNo === 515) {
+        this.seqNoData.sResourceid = val.resource_id
+      }
+      if (this.tagNo === 215) {
+        this.notifyOrderData.locationNo = val.location_id
+      }
+      if (this.tagNo === 216) {
+        this.seqNoData.sWorkcenterno = val.work_center_no
+      }
+    },
+    getUserNotifyNo() {
+      let inData = {
+        site: this.$store.state.user.site,
+        username: this.$store.state.user.name,
+      }
+      this.getAllNotifyStatus()
+      getUserNotifyNo(inData).then(({ data }) => {
+        if (data.code === 0) {
+          if (data.row != null) {
+            this.notifyNo = data.row.notifyNo
+            this.notifyData = data.row
+            this.getNotifyNoDetail()
+          } else {
+            this.notifyNo = ''
+            this.notifyData = {
+              site: '',
+              bu: '',
+              notifyNo: '',
+              notifyDate: '',
+              enteredDate: '',
+              userName: '',
+              userDisplay: '',
+              remark: '',
+              planIssueDate: '',
+            }
+            this.dataList = []
+          }
+        } else {
+          this.notifyNo = ''
+          this.notifyData = {
+            site: '',
+            bu: '',
+            notifyNo: '',
+            notifyDate: '',
+            enteredDate: '',
+            userName: '',
+            userDisplay: '',
+            remark: '',
+            planIssueDate: '',
+          }
+          this.dataList = []
+        }
+      })
+    },
+    getNotifyNoDetail() {
+      let inData = {
+        site: this.$store.state.user.site,
+        notifyNo: this.notifyNo,
+      }
+      getNotifyNoDetail(inData).then(({ data }) => {
+        if (data.code === 0) {
+          this.dataList = data.rows
+        }
+      })
+    },
+    addNotify() {
+      let inData = {
+        site: this.$store.state.user.site,
+        userName: this.$store.state.user.name,
+      }
+      createNotify(inData).then(({ data }) => {
+        if (data.code === 0) {
+          this.showAddNotifyTypeDialog = false
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500,
+            onClose: () => {},
+          })
+          this.getUserNotifyNo()
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+    confirmAddNotify() {
+      let outWorkOrderFlag = 'N'
+      if (this.selectedNotifyType === 'outsourced') {
+        outWorkOrderFlag = 'Y'
+      } else {
+        outWorkOrderFlag = 'N'
+      }
+      let inData = {
+        site: this.$store.state.user.site,
+        userName: this.$store.state.user.name,
+        outWorkOrderFlag: outWorkOrderFlag,
+        remark: this.selectedNotifyRemark,
+      }
+      this.getAllNotifyStatus()
+      createNotify(inData).then(({ data }) => {
+        if (data.code === 0) {
+          this.showAddNotifyTypeDialog = false
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500,
+            onClose: () => {},
+          })
+          this.getUserNotifyNo()
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+    chooseSOS(row) {
+      if (this.dataList.length > 0) {
+        //这边是有个判断的，判断shipmentId不能重复
+        let stop = false
+        for (let i = 0; i < this.dataList.length; i++) {
+          if (this.dataList[i].soorderNo == row.SHIPMENT_ID) {
+            stop = true
+          }
+        }
+        if (stop) {
+          this.$alert('已经选择过此工单，请返回点击明细直接操作！!', '提示', {
+            confirmButtonText: '确定',
+          })
+          return false
+        }
+      }
+      let inData = {
+        site: this.$store.state.user.site,
+        orderNo: row.SHIPMENT_ID,
+      }
+      this.chooseLoading = true
+      getIFSShopOrderByOrderNo(inData)
+        .then(({ data }) => {
+          if (data.code === 0) {
+            console.log('data', data)
+            this.notifyOrderData.orderNo = data.shopOrderVo[0].SHIPMENT_ID
+            this.notifyOrderData.shipmentType =
+              data.shopOrderVo[0].SHIPMENT_TYPE
+            this.notifyOrderData.status = data.shopOrderVo[0].STATE
+            this.notifyOrderData.addressName =
+              data.shopOrderVo[0].RECEIVER_ADDRESS_NAME
+            this.notifyOrderData.needDate =
+              data.shopOrderVo[0].PLANNED_SHIP_DATE
+            this.notifyOrderData.deliveryDate =
+              data.shopOrderVo[0].PLANNED_DELIVERY_DATE
+            this.saveSeqNoModalFlag = true
+          } else {
+            this.$meassage.error(data.msg)
+            return
+          }
+        })
+        .finally(() => {
+          this.chooseLoading = false
+        })
+    },
+    saveNewSoIssueNotify() {
+      for (let i = 0; i < this.seqNoList.length; i++) {
+        if (
+          this.seqNoList[i].qtyToApply === '' ||
+          this.seqNoList[i].qtyToApply == null
+        ) {
+          this.seqNoList[i].qtyToApply = 0
+        }
+        this.seqNoList[i].notifyNo = this.notifyNo
+        this.seqNoList[i].site = this.$store.state.user.site
+      }
+
+      let materialList = this.seqNoList.filter((item) => item.qtyToApply > 0)
+      if (materialList.length == 0) {
+        this.$alert('没有需要保存的内容!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+      console.log('this.sobomList', materialList)
+      var savaNotify = {
+        site: this.$store.state.user.site,
+        notifyNo: this.notifyNo,
+        userName: this.$store.state.user.name,
+        materialList: materialList,
+      }
+      this.saveNewLoading = true
+      saveNewShipmentAndLine(savaNotify).then(({ data }) => {
+        if (data.code === 0) {
+          this.seqNoModalFlag = false
+          this.getUserNotifyNo()
+          this.$message.success('操作成功')
+        } else {
+          this.$message.error(data.msg)
+        }
+      }).finally(() => {
+        this.saveNewLoading = false
+      })
+    },
+    saveSOS() {
+      if (
+        this.notifyOrderData.needDate == null ||
+        this.notifyOrderData.needDate == ''
+      ) {
+        this.$message.warning('请选择时间！')
+        return false
+      }
+      let row = this.notifyOrderData
+      console.log('row', row)
+      if (this.dataList.length > 0) {
+        let stop = false
+        for (let i = 0; i < this.dataList.length; i++) {
+          if (this.dataList[i].soorderNo == row.orderNo) {
+            stop = true
+          }
+        }
+        if (stop) {
+          this.$alert(
+            '已经选择过此SHIPMENT，请返回点击明细直接操作！!',
+            '提示',
+            {
+              confirmButtonText: '确定',
+            }
+          )
+          return false
+        }
+      }
+      this.$confirm('确定选择SHIPMENT' + row.orderNo + '?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        let inData = {
+          site: this.$store.state.user.site,
+          notifyNo: this.notifyNo,
+          fgpartNo: row.partNo,
+          soorderNo: row.orderNo,
+          opsItemNo: row.itemNo,
+          seqNo: row.seqNo,
+          locationNo: row.locationNo,
+          needDate: row.needDate + ' 00:00',
+          unissureQty: row.unissureQty,
+        }
+
+        saveShipmentOrderList(inData).then(({ data }) => {
+          if (data.code === 0) {
+            this.saveSeqNoModalFlag = false
+            ;(() => {
+              // 同步代码块：赋值操作在此完成
+              row.itemNo = data.itemNo
+            })()
+            this.getNotifyNoDetail()
+            this.enterSOS(row)
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+      })
+    },
+    qtyAllForSeqNo() {
+      this.notifyOrderData.unissureQty = this.notifyOrderData.qtyRequired
+    },
+    qtyAllForBom(row) {
+      row.qtyToIssue = row.qtyRequired
+    },
+    enterSOSDetail(row) {
+      let rows = {
+        site: this.$store.state.user.site,
+        notifyNo: this.notifyNo,
+        soorderNo: row.soorderNo,
+        seqNo: row.seqNo,
+        partNo: row.fgpartNo,
+        itemNo: row.itemNo,
+      }
+      this.sobomData.orderNo = rows.soorderNo
+
+      this.searchUnissueNotifyMaterialList(rows)
+      //this.enterSOS(rows)
+    },
+    searchUnissueNotifyMaterialList(row) {
+      this.bomLoadFlag = true
+      this.materialModalFlag = true
+      searchUnissueNotifyMaterialList(row)
+        .then(({ data }) => {
+          if (data.code === 0) {
+            this.sobomList = data.rows
+          }
+        })
+        .finally(() => {
+          this.bomLoadFlag = false
+        })
+    },
+
+    enterSOS(row) {
+      console.log('row', row)
+
+      this.seqNoModalFlag = false
+      this.materialModalFlag = true
+      this.sobomList = []
+      this.sobomData = {
+        orderNo: row.orderNo,
+        seqNo: row.seqNo,
+        partNo: row.partNo,
+      }
+      this.bomLoadFlag = true
+      let inData = {
+        site: this.$store.state.user.site,
+        notifyNo: this.notifyNo,
+        soorderNo: row.orderNo,
+        seqNo: row.seqNo,
+        partNo: row.partNo,
+        itemNo: row.itemNo,
+      }
+      getSOSBOMForIssure(inData).then(({ data }) => {
+        this.bomLoadFlag = false
+        if (data.code === 0) {
+          this.sobomList = data.rows
+          for (let i = 0; i < this.sobomList.length; i++) {
+            this.sobomList[i].itemNo = inData.itemNo
+            if (!this.sobomList[i].qtyToIssue) {
+              this.$set(
+                this.sobomList[i],
+                'qtyToIssue',
+                this.sobomList[i].qtyOnHand
+              )
+            }
+          }
+        }
+      })
+    },
+    ToSOS() {
+      this.seqNoModalFlag = true
+      this.materialModalFlag = false
+    },
+    chooseSOSModal() {
+      this.seqNoData = {
+        site: this.$store.state.user.site,
+        orderno: '',
+        seqno: '',
+        sResourceid: '',
+        sWorkcenterno: '',
+        operatorId: '',
+      }
+      //this.searchSOSRouting()查询工单列表
+      this.seqNoList = []
+      this.seqNoModalFlag = true
+    },
+    searchSOSRouting() {
+     if (this.seqNoData.orderNo == null || this.seqNoData.orderNo == '') {
+        this.$message.warning('请输入shipmentid！')
+        return false
+      }
+      if (!this.seqNoList) {
+        this.seqNoList = []
+      }
+      // 调用接口前判断this.seqNoList是否存在orderNo
+      const orderNoExists = this.seqNoList.some(row => row.shipmentId === this.seqNoData.orderNo)
+      if (orderNoExists) {
+        this.$message.warning('该shipmentId的数据已存在，请先删除再添加！')
+        return false
+      }
+      
+      const dataListExists = this.dataList.some(row => row.soorderNo === this.seqNoData.orderNo)
+      if (dataListExists) {
+        this.$message.warning('该shipmentId的数据已添加过，请先删除再添加！')
+        return false
+      }
+      this.seqNoModalLoading = true
+      getShipmentAndLineForIssure(this.seqNoData).then(({ data }) => {
+        if (data.code === 0) {
+          // 将返回的数据添加到this.seqNoList中，而不是替换
+          data.rows.forEach((newRow) => {
+            // 初始化每行的需求数量（需求数量 - 已发数量 - 预留数量）
+            const inventoryQty = parseFloat(newRow.inventoryQty) || 0
+            const qtyAssigned = parseFloat(newRow.qtyAssigned) || 0
+            const qtyToApply = inventoryQty - qtyAssigned
+            this.$set(
+              newRow,
+              'qtyToApply',
+              qtyToApply > 0 ? qtyToApply : 0
+            )
+            // 添加到列表中
+            this.seqNoList.push(newRow)
+          })
+          this.$message.success(`成功添加 ${data.rows.length} 条数据`)
+        }else {
+            this.$message.error(data.msg)
+          }
+      }).catch((e) => {
+          this.$message.error(e.msg || '查询失败')
+          return
+        }).finally(() => {
+          this.seqNoModalLoading = false
+        })
+    },
+    deleteFromSeqNoList() {
+      if (!this.seqNoData.orderNo || this.seqNoData.orderNo.trim() === '') {
+        this.$message.warning('请输入shipmentId')
+        return
+      }
+      const orderNo = this.seqNoData.orderNo.trim()
+      const originalLength = this.seqNoList.length
+      // 过滤掉 shipmentId 和 orderNo 相同的数据
+      this.seqNoList = this.seqNoList.filter((item) => {
+        return item.shipmentId !== orderNo
+      })
+      const deletedCount = originalLength - this.seqNoList.length
+      if (deletedCount > 0) {
+        this.$message.success(`成功删除 ${deletedCount} 条数据`)
+      } else {
+        this.$message.warning('未找到匹配的数据')
+      }
+    },
+    saveMaterialDetail() {
+      for (let i = 0; i < this.sobomList.length; i++) {
+        this.sobomList[i].notifyNo = this.notifyNo
+        this.sobomList[i].site = this.$store.state.user.site
+        this.sobomList[i].bomItemNo =
+          this.sobomList[i].lineItemNo || this.sobomList[i].bomItemNo
+      }
+
+      let materialList = this.sobomList.filter((item) => item.qtyToIssue > 0)
+      if (materialList.length == 0) {
+        this.$alert('没有需要保存的内容!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+      console.log('this.sobomList', materialList)
+      saveShipmentMaterialDetail(materialList).then(({ data }) => {
+        if (data.code === 0) {
+          this.materialModalFlag = false
+          this.$message.success('操作成功')
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+    //获取用户的bu
+    getSiteAndBuByUserName() {
+      let tempData = {
+        username: this.$store.state.user.name,
+      }
+      getSiteAndBuByUserName(tempData).then(({ data }) => {
+        if (data.code === 0 && data.row != null) {
+          this.userBuList = data.rows
+        }
+      })
+    },
+    // 校验用户是否收藏
+    favoriteIsOk() {
+      let userFavorite = {
+        userId: this.$store.state.user.id,
+        languageCode: this.$i18n.locale,
+      }
+      userFavoriteList(userFavorite).then(({ data }) => {
+        for (let i = 0; i < data.list.length; i++) {
+          if (this.$route.meta.menuId === data.list[i].menuId) {
+            this.favorite = true
+          }
+        }
+      })
+    },
+
+    // 收藏 OR 取消收藏
+    favoriteFunction() {
+      let userFavorite = {
+        userId: this.$store.state.user.id,
+        functionId: this.$route.meta.menuId,
+      }
+      if (this.favorite) {
+        removeUserFavorite(userFavorite).then(({ data }) => {
+          this.$message.success(data.msg)
+          this.favorite = false
+        })
+      } else {
+        // 收藏
+        saveUserFavorite(userFavorite).then(({ data }) => {
+          this.$message.success(data.msg)
+          this.favorite = true
+        })
+      }
+    },
+
+    //导出excel
+    async createExportData() {
+      this.searchData.limit = -1
+      this.searchData.page = 1
+      await eamGroupSearch(this.searchData).then(({ data }) => {
+        this.exportList = data.page.list
+      })
+      return this.exportList
+    },
+
+    startDownload() {},
+
+    finishDownload() {},
+
+    fields() {
+      let json = '{'
+      this.columnList.forEach((item, index) => {
+        if (index == this.columnList.length - 1) {
+          json +=
+            '"' + item.columnLabel + '"' + ':' + '"' + item.columnProp + '"'
+        } else {
+          json +=
+            '"' +
+            item.columnLabel +
+            '"' +
+            ':' +
+            '"' +
+            item.columnProp +
+            '"' +
+            ','
+        }
+      })
+      json += '}'
+      let s = eval('(' + json + ')')
+      return s
+    },
+    noBomModel() {
+      this.partSearch = {
+        site: this.notifyData.site,
+        sourceBu: this.notifyData.bu,
+        partNo: '',
+        partDesc: '',
+        spec: '',
+      }
+      this.partModelFlag = true
+      this.searchPartModel()
+    },
+    noControlModel() {
+      this.partSearch = {
+        site: this.notifyData.site,
+        sourceBu: this.notifyData.bu,
+        partNo: '',
+        partDesc: '',
+        spec: '',
+      }
+      this.noControlPartModelFlag = true
+      this.searchNoControlPartModel()
+    },
+    searchPartModel() {
+      getPartList(this.partSearch).then(({ data }) => {
+        if (data.code === 0) {
+          this.partList = data.rows
+        }
+      })
+    },
+    searchNoControlPartModel() {
+      getNoControlPartList(this.partSearch).then(({ data }) => {
+        if (data.code === 0) {
+          this.partList2 = data.rows
+        }
+      })
+    },
+    xiadaNotifyModel() {
+      // 检查是否有明细记录
+      if (
+        this.dataList.length == 0 
+      ) {
+        this.$alert('没有明细记录无法下达！!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+      // 初始化弹框数据
+      this.xiadaNotifyData = {
+        planIssueDate: this.notifyData.planIssueDate || this.dayjs().format('YYYY-MM-DD HH:mm:ss'),
+        remark: this.notifyData.remark || '',
+      }
+      // 打开弹框
+      this.showXiadaNotifyDialog = true
+    },
+    confirmXiadaNotify() {
+      if (
+        this.dataList.length == 0 
+      ) {
+        this.$alert('没有明细记录无法下达！!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+      // 验证要求发料时间
+      if (!this.xiadaNotifyData.planIssueDate || this.xiadaNotifyData.planIssueDate === '') {
+        this.$message.warning('请选择要求发料时间！')
+        return false
+      }
+      // 准备下达数据
+      const notifyData = {
+        ...this.notifyData,
+        planIssueDate: this.xiadaNotifyData.planIssueDate,
+        remark: this.xiadaNotifyData.remark,
+      }
+      // 执行下达操作
+      updateNotifyStatus(notifyData).then(({ data }) => {
+        if (data.code === 0) {
+          this.showXiadaNotifyDialog = false
+          this.xiadaModelFlag = false
+          this.getUserNotifyNo()
+          this.$message.success('操作成功')
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+    xiadaNotify() {
+      xiadaNotify(this.notifyData).then(({ data }) => {
+        if (data.code === 0) {
+          this.xiadaModelFlag = false
+          this.getUserNotifyNo()
+          this.$message.success('操作成功')
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+    saveOtherPart() {
+      if (
+        this.otherPartData.qtyToIssue == null ||
+        this.otherPartData.qtyToIssue == '' ||
+        this.otherPartData.qtyToIssue <= 0
+      ) {
+        this.$message.warning('请填写领取数量！')
+        return false
+      }
+      this.$confirm('确定保存' + '?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        saveOtherPart(this.otherPartData).then(({ data }) => {
+          if (data.code === 0) {
+            this.saveOtherPartModalFlag = false
+            if (this.otherPartData.issueType === '非BOM物料') {
+              this.partModelFlag = false
+              this.activeName = 'noBom'
+              this.searchOtherPart('非BOM物料')
+            }
+            if (this.otherPartData.issueType === '不管控物料') {
+              this.noControlPartModelFlag = false
+              this.activeName = 'noControl'
+              this.searchOtherPart('不管控物料')
+            }
+            this.$message.success('操作成功')
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+      })
+    },
+    deleteNotify() {
+      if (this.dataList.length > 0) {
+        this.$alert('请先删除已经申请的明细记录！!', '提示', {
+          confirmButtonText: '确定',
+        })
+        return false
+      }
+      deleteUnissueNotifyHeader(this.notifyData).then(({ data }) => {
+        if (data.code === 0) {
+          this.getUserNotifyNo()
+          this.$message.success(data.msg)
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+    updateBuModel() {
+      if (this.dataList.length > 0) {
+        this.$alert('已经选择了工单，无法切换BU，请删除已选工单！', '错误', {
+          confirmButtonText: '确定',
+        })
+      }
+      let inData = {
+        site: this.notifyData.site,
+        username: this.$store.state.user.name,
+      }
+      getBuByUserNameSite(inData).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.buList = data.rows
+        }
+      })
+      this.newBu = this.notifyData.bu
+      this.changeBuFlag = true
+    },
+    saveNewBu() {
+      let inData = {
+        bu: this.newBu,
+        site: this.notifyData.site,
+        notifyNo: this.notifyData.notifyNo,
+      }
+      updateNotifyBu(inData).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.notifyData.bu = this.newBu
+          this.changeBuFlag = false
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500,
+            onClose: () => {},
+          })
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+    searchOtherPart(type) {
+      let inData = {
+        site: this.notifyData.site,
+        notifyNo: this.notifyData.notifyNo,
+        issueType: type,
+      }
+      searchOtherPart(inData).then(({ data }) => {
+        if (data && data.code === 0) {
+          if (type === '非BOM物料') {
+            this.dataList2 = data.rows
+          }
+          if (type === '不管控物料') {
+            this.dataList3 = data.rows
+          }
+        }
+      })
+    },
+    // 删除
+    deleteNotifySOS(row) {
+      this.$confirm(`是否删除这个工单的申请信息?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          deleteNotifyUnissue(row).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.getNotifyNoDetail()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {},
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定',
+              })
+            }
+          })
+        })
+        .catch(() => {})
+    },
+
+    // 动态列开始 获取 用户保存的 格式列
+    async getTableUserColumn(tableId, columnId) {
+      let queryTableUser = {
+        userId: this.$store.state.user.name,
+        functionId: this.$route.meta.menuId,
+        tableId: tableId,
+        status: true,
+        languageCode: this.$i18n.locale,
+      }
+      await getTableUserListLanguage(queryTableUser).then(({ data }) => {
+        if (data.rows.length > 0) {
+          //this.columnList1 = []
+          switch (columnId) {
+            case 1:
+              this.columnList = data.rows
+              break
+            case 2:
+              this.columnList2 = data.rows
+              break
+            case 3:
+              this.columnList3 = data.rows
+              break
+            case 4:
+              this.columnList4 = data.rows
+              break
+          }
+        } else {
+          this.getColumnList(tableId, columnId)
+        }
+      })
+    },
+
+    // 获取 tableDefault 列
+    async getColumnList(tableId, columnId) {
+      let queryTable = {
+        functionId: this.$route.meta.menuId,
+        tableId: tableId,
+        languageCode: this.$i18n.locale,
+      }
+      await getTableDefaultListLanguage(queryTable).then(({ data }) => {
+        if (!data.rows.length == 0) {
+          switch (columnId) {
+            case 1:
+              this.columnList = data.rows
+              break
+            case 2:
+              this.columnList2 = data.rows
+              break
+            case 3:
+              this.columnList3 = data.rows
+              break
+            case 4:
+              this.columnList4 = data.rows
+              break
+          }
+        } else {
+          // this.showDefault = true.
+        }
+      })
+    },
+    //获取按钮的权限数据
+    getButtonAuthData() {
+      let searchFlag = this.isAuth(this.menuId + ':search')
+      let saveFlag = this.isAuth(this.menuId + ':save')
+      let updateFlag = this.isAuth(this.menuId + ':update')
+      let deleteFlag = this.isAuth(this.menuId + ':delete')
+      //处理页面的权限数据
+      this.authSearch = !searchFlag
+      this.authSave = !saveFlag
+      this.authUpdate = !updateFlag
+      this.authDelete = !deleteFlag
+    },
+    searchTable() {},
+    getAllNotifyStatus() {
+      let inData = {
+        site: this.$store.state.user.site,
+        listName: 'ISSUENOTIFYHEADER_STATUS',
+        locale: this.$i18n.locale,
+      }
+      getAllNotifyStatus(inData).then(({ data }) => {
+        this.notifyStatusList = data
+        console.log('notifyStatusList', this.notifyStatusList)
+      })
+    },
+      /**
      * 海安销售发料初始化：只读取当前用户shipment未下达申请单 - rqrq
      */
     getUserNotifyNo () {
@@ -59,8 +2338,7 @@ export default {
         this.sobomList = []
       })
     },
-
-    /**
+      /**
      * 海安销售发料父行查询：固定orderType=shipment，避免误读shoporder数据 - rqrq
      */
     getNotifyNoDetail () {
@@ -77,8 +2355,7 @@ export default {
         }
       })
     },
-
-    /**
+      /**
      * 海安新建销售发料主单：主记录site使用当前登录大site - rqrq
      */
     addNotify () {
@@ -99,8 +2376,7 @@ export default {
         }
       })
     },
-
-    /**
+      /**
      * 海安新建销售发料主单（带备注）：沿用原交互并固定orderType=shipment - rqrq
      */
     confirmAddNotify () {
@@ -125,8 +2401,7 @@ export default {
         }
       })
     },
-
-    /**
+      /**
      * 销售发货单查询：IFS入参仍用大site，回传contract/site映射为subsite保存 - rqrq
      */
     searchSOSRouting () {
@@ -173,8 +2448,7 @@ export default {
         this.seqNoModalLoading = false
       })
     },
-
-    /**
+      /**
      * 海安销售发料批量保存：主单site=大site，明细subsite取IFS工厂编码 - rqrq
      */
     saveNewSoIssueNotify () {
@@ -217,8 +2491,7 @@ export default {
         this.saveNewLoading = false
       })
     },
-
-    /**
+      /**
      * 销售发料物料入口：按父行itemNo+shipmentId查询海安明细并回显subsite - rqrq
      */
     enterSOSDetail (row) {
@@ -233,8 +2506,7 @@ export default {
       this.sobomData.orderNo = rows.soorderNo
       this.searchUnissueNotifyMaterialList(rows)
     },
-
-    /**
+      /**
      * 销售发料明细查询：仍按大site调接口，回传工厂编码映射subsite保存到行数据 - rqrq
      */
     searchUnissueNotifyMaterialList (row) {
@@ -261,8 +2533,7 @@ export default {
         this.bomLoadFlag = false
       })
     },
-
-    /**
+      /**
      * 新增后立即进入明细：统一复用海安shipment物料查询，避免回调老接口 - rqrq
      */
     enterSOS (row) {
@@ -280,15 +2551,11 @@ export default {
         subSite: row.subSite
       })
     },
-
-    /**
+      /**
      * 海安销售发料明细保存：统一补齐notifyNo/site/subsite后写入haian_子表 - rqrq
      */
     saveMaterialDetail () {
       for (let i = 0; i < this.sobomList.length; i++) {
-        if (this.sobomList[i].qtyToIssue === '' || this.sobomList[i].qtyToIssue == null) {
-          this.sobomList[i].qtyToIssue = 0
-        }
         this.sobomList[i].notifyNo = this.notifyNo
         this.sobomList[i].site = this.$store.state.user.site
         this.sobomList[i].bomItemNo = this.sobomList[i].lineItemNo || this.sobomList[i].bomItemNo
@@ -312,8 +2579,7 @@ export default {
         }
       })
     },
-
-    /**
+      /**
      * 兼容单行父行保存入口：按shipment固定orderType+subsite写海安父行 - rqrq
      */
     saveSOS () {
@@ -363,8 +2629,7 @@ export default {
         })
       })
     },
-
-    /**
+      /**
      * 海安销售发料下达：调用海安下达接口，WCS推送保持占位不在本页触发 - rqrq
      */
     confirmXiadaNotify () {
@@ -398,8 +2663,7 @@ export default {
         }
       })
     },
-
-    /**
+      /**
      * 海安销售发料删除主单：仅允许未下达无明细时删除 - rqrq
      */
     deleteNotify () {
@@ -425,8 +2689,7 @@ export default {
         }
       })
     },
-
-    /**
+      /**
      * 海安销售发料删除父行：按notifyNo+itemNo+orderType删除对应父子记录 - rqrq
      */
     deleteNotifySOS (row) {
@@ -453,8 +2716,7 @@ export default {
         })
       }).catch(() => {})
     },
-
-    /**
+      /**
      * 销售发料材料页签刷新：按shipment维度从海安明细表回显最新保存结果 - rqrq
      */
     refreshCurrentTabTable () {
@@ -488,8 +2750,7 @@ export default {
         })
       }
     },
-
-    /**
+      /**
      * 销售发料状态枚举查询：沿用公共字典接口 - rqrq
      */
     getAllNotifyStatus () {
@@ -502,6 +2763,58 @@ export default {
         this.notifyStatusList = data
       })
     }
-  }
+    },
 }
 </script>
+
+<style scoped>
+.board666 .el-table .error-row {
+  background: #f86868;
+}
+
+/* 在 <style scoped> 下，使用深度选择器作用到 ElementUI 内部结构 */
+.issueNotify {
+  width: 100%;
+  height: auto;
+}
+.issueNotify /deep/ .el-form-item__content {
+  display: inline !important;
+}
+
+.site-content > .el-tabs > .el-tabs__content > .site-tabs__tools {
+  top: 35px;
+  height: 40px;
+  font-size: 16px;
+  line-height: 40px;
+}
+
+.text-right /deep/ .el-input__inner {
+  text-align: right !important;
+}
+
+.text-right /deep/ .el-input-number__input {
+  text-align: right !important;
+}
+
+.yzzTable /deep/.el-table .cell {
+  line-height: 20px;
+  font-size: 12px;
+  height: 20px;
+}
+.qtyToApplyClass /deep/.el-input__inner {
+  height: 14px !important;
+}
+</style>
+<style scoped>
+/* 选择工单弹窗：紧凑表格与按钮样式 */
+.choose-sos-btn {
+  height: 14px;
+  box-sizing: border-box;
+  padding: 0 6px;
+  line-height: 12px;
+  font-size: 12px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>
diff --git a/src/views/modules/haianWarehouse/shipment/shipmentNotification54.vue b/src/views/modules/haianWarehouse/shipment/shipmentNotification54.vue
index c1828cc..97bed82 100644
--- a/src/views/modules/haianWarehouse/shipment/shipmentNotification54.vue
+++ b/src/views/modules/haianWarehouse/shipment/shipmentNotification54.vue
@@ -1,5 +1,542 @@
+<template>
+  <div class="mod-config yzz">
+    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
+      <el-form :inline="true" label-position="top" style="margin-top: 0px">
+        <el-form-item :label="'申请单号'">
+          <el-input v-model="searchData.notifyNo" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'申请账号'">
+          <el-input v-model="searchData.userName" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'工单号'">
+          <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="状态" >
+          <el-select v-model="searchData.status" placeholder="请选择" style="width: 120px">
+            <el-option label="全部" value=""></el-option>
+            <el-option label="ISSUE" value="ISSUE"></el-option>
+            <el-option label="CANCEL" value="CANCEL"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="'申请单日期'">
+          <el-date-picker
+            style="width: 120px"
+            v-model="searchData.startDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item style="margin-top: 23px;">
+          <label style="margin-left: 0px;font-size: 19px">&#10142</label>
+        </el-form-item>
+        <el-form-item :label="' '">
+          <el-date-picker
+            style="width: 120px"
+            v-model="searchData.endDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="推送WCS" >
+          <el-select v-model="searchData.pushWcsFlag" placeholder="请选择" style="width: 120px">
+            <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-option label="出库完成" value="出库完成"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="' '">
+          <el-button type="primary" @click="searchTable()">查询</el-button>
+          <!-- <el-button type="primary" @click="createNotifyModal()">新增</el-button> -->
+          <download-excel
+            :fields="fields()"
+            :data="exportData"
+            type="xls"
+            :name="exportName"
+            :header="exportHeader"
+            :footer="exportFooter"
+            :fetch="createExportData"
+            :before-generate="startDownload"
+            :before-finish="finishDownload"
+            worksheet="导出信息"
+            class="el-button el-button--primary el-button--medium">
+            {{ '导出' }}
+          </download-excel>
+        </el-form-item>
+      </el-form>
+    </el-form>
+    <el-table
+      :data="dataList"
+      @row-click="changeData"
+      :height="height"
+      border
+      highlight-current-row
+      ref="mainTable"
+      v-loading="dataListLoading"
+      style="width: 100%; ">
+      <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
+        header-align="center"
+        align="center"
+        width="180"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" v-if="scope.row.status==='ISSUE'" @click="closeNotifyModel(scope.row)">关闭</a>
+          <a type="text" size="small" v-if="scope.row.status==='CLOSED'" @click="openNotify(scope.row)">开启</a>
+          <a type="text" size="small" v-if="scope.row.pushWcsFlag!=='出库完成'&&scope.row.pushWcsFlag!=='推送完成'&&scope.row.status==='ISSUE'" @click="previewInventory(scope.row)" style="margin-left: 10px;">推送WCS</a>
+          <!-- rqrq - 取消下达按钮，只在状态为ISSUE且未推送WCS时显示 -->
+          <a type="text" size="small" v-if="scope.row.status==='ISSUE'&&scope.row.pushWcsFlag==='未推送'" @click="cancelIssueNotifyHandle(scope.row)" style="margin-left: 10px;">取消下达</a>
+<!--          <a type="text" size="small" v-if="scope.row.pushWcsFlag!=='Y'" @click="pushToWcs(scope.row)" style="margin-left: 10px;">推送WCS</a>-->
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 1000]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+
+    <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName"  type="border-card"  @tab-click="tabClick">
+      <el-tab-pane label="申请单明细" name="detail">
+        <el-table
+          :data="dataList2"
+          :height="height"
+          border
+          v-loading="dataListLoading"
+          style="width: 100%; ">
+<!--          <el-table-column-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            width="80"-->
+<!--            label="操作">-->
+<!--            <template slot-scope="scope">-->
+<!--              <a type="text" size="small" v-if="currentRow.status==='ISSUE'" @click="deleteNotifySOSPlus(scope.row)">删除</a>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column
+            v-for="(item,index) in columnList2" :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">
+              <!-- rqrq - 是否推送WCS特殊显示：Y显示绿色"是"，否则显示灰色"否" -->
+              <span v-if="item.columnProp === 'pushWmsFlag'" :style="{color: scope.row.pushWmsFlag === 'Y' ? '#67C23A' : '#909399'}">
+                {{ scope.row.pushWmsFlag === 'Y' ? '是' : '否' }}
+              </span>
+              <!-- rqrq - 立库取出特殊显示：Y显示绿色"是"，否则显示灰色"否" -->
+              <span v-else-if="item.columnProp === 'transportFlag'" :style="{color: scope.row.transportFlag === 'Y' ? '#67C23A' : '#909399'}">
+                {{ scope.row.transportFlag === 'Y' ? '是' : '否' }}
+              </span>
+              <!-- 普通列显示 -->
+              <span v-else-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="120"
+            label="操作">
+            <template slot-scope="scope">
+              <a type="text" size="small" v-if="scope.row.pushWmsFlag !== 'Y' && currentRow && currentRow.pushWcsFlag === '未推送'" @click="enterSOSDetail(scope.row)" style="margin-right: 10px;">修改</a>
+              <a type="text" size="small" v-if="scope.row.pushWmsFlag !== 'Y' && currentRow && currentRow.pushWcsFlag === '未推送'" @click="deleteNotifySOSPlus(scope.row)">删除</a>
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </el-tab-pane>
+      <el-tab-pane label="材料明细" name="sub">
+        <el-table
+          :data="dataList3"
+          :height="height"
+          border
+          :row-class-name="tableRowClassName"
+          v-loading="dataListLoading"
+          @row-dblclick="handleMaterialRowDblClick"
+          style="width: 100%; ">
+
+<!--          <el-table-column-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            width="80"-->
+<!--            label="操作">-->
+<!--            <template slot-scope="scope">-->
+<!--              <a type="text" size="small" v-if="currentRow.status==='ISSUE'" @click="deleteNotifyMaterial(scope.row)">删除</a>-->
+
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column
+            v-for="(item,index) in columnList3" :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-tab-pane>
+      <el-tab-pane label="材料汇总" name="sum">
+        <el-table
+          :data="dataList4"
+          :height="height"
+          border
+          v-loading="dataListLoading"
+          style="width: 100%; ">
+          <!--          <el-table-column-->
+          <!--            header-align="center"-->
+          <!--            align="center"-->
+          <!--            width="80"-->
+          <!--            fixed="left"-->
+          <!--            label="操作">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column
+            v-for="(item,index) in columnList4" :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-tab-pane>
+      <el-tab-pane label="预留标签清单" name="labelDetail">
+        <el-table
+          :data="dataList7"
+          :height="height"
+          border
+          v-loading="dataListLoading"
+          style="width: 100%; ">
+          <el-table-column
+            v-for="(item,index) in columnList6" :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-tab-pane>
+    </el-tabs>
+
+    <el-dialog title="关闭原因" :close-on-click-modal="false" v-drag :visible.sync="closeModalFlag" width="450px">
+      <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item >
+              <el-input
+                type="textarea"
+                v-model="closeData.closeRemark "
+                :rows="3"
+                resize='none'
+                maxlength="200"
+                show-word-limit
+                style="height: 60px" >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 60px;text-align:center">
+        <el-button type="primary" @click="closeNotify()">保存</el-button>
+        <el-button type="primary" @click="closeModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 物料明细对话框 -->
+    <el-dialog title="申请明细" :close-on-click-modal="false" v-drag :visible.sync="materialModalFlag" width="900px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'生产订单号'">
+              <el-input v-model="sobomData.orderNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'产品编码'">
+              <el-input v-model="sobomData.partNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="yzzTable">
+        <el-table :height="400" :data="sobomList" border v-loading="bomLoadFlag" style="width: 100%;">
+          <el-table-column
+            prop="componentPartNo"
+            label="物料编码"
+            sortable
+            headerAlign="center"
+            width="120"
+            align="left">
+          </el-table-column>
+          <el-table-column
+            prop="componentPartDesc"
+            label="物料描述"
+            headerAlign="center"
+            width="200"
+            align="left"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="qtyRequired"
+            label="需求数量"
+            headerAlign="center"
+            width="100"
+            align="right">
+          </el-table-column>
+          <!-- rqrq - 新增可用库存列 -->
+          <el-table-column
+            prop="availableQty"
+            label="可用库存"
+            headerAlign="center"
+            width="100"
+            align="right">
+            <template slot-scope="scope">
+              <span :style="{fontWeight: 'bold', color: (scope.row.availableQty < scope.row.qtyRequired) ? '#F56C6C' : ''}">
+                {{ scope.row.availableQty }}
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="qtyToIssue"
+            label="本次申请数量"
+            headerAlign="center"
+            width="120"
+            align="right">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.qtyToIssue" type="number" style="height: 11px; width: 98%;" :step="0"
+                :min="0"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="remark"
+            label="备注"
+            headerAlign="center"
+            width="200"
+            align="left">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.remark" style="padding: 0;width: 100%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="" header-align="center" align="center" min-width="80" label="操作">
+            <template slot-scope="scope">
+              <el-button type="primary" @click="qtyAllForBom(scope.row)" style="width: 100%">全数领料</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="saveMaterialDetail()">保存</el-button>
+        <el-button type="primary" @click="materialModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 编辑材料明细对话框 -->
+    <el-dialog title="编辑材料明细" :close-on-click-modal="false" v-drag :visible.sync="editMaterialModalFlag" width="600px">
+      <el-form :inline="true" label-position="top" label-width="120px" style="margin-top: 20px;">
+        <el-row>
+          <el-col span="8">
+            <el-form-item label="申请单序号">
+              <el-input v-model="editMaterialData.itemNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col span="8">
+            <el-form-item label="材料编码">
+              <el-input v-model="editMaterialData.componentPartNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col span="8">
+        <el-form-item label="生产订单">
+          <el-input v-model="editMaterialData.soorderNo" disabled></el-input>
+        </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col span="8">
+            <el-form-item label="需求时间">
+          <el-input v-model="editMaterialData.needDate" disabled></el-input>
+          </el-form-item>
+          </el-col>
+          <el-col span="8">
+          <el-form-item label="申请数量" required>
+            <el-input 
+              v-model="editMaterialData.qtyToIssue" 
+              :min="0" 
+              style="width: 98%;"
+              @input="value => editMaterialData.qtyToIssue = value
+                .replace(/[^\d.]/g, '')        
+                .replace(/\.{2,}/g, '.')         
+                .replace(/^\./, '0.')            
+                .replace(/(\.\d{4}).*/, '$1')    
+                .replace(/^0+(?=\d)/, '0')      
+                .replace(/^0+(?=\.)/, '0')"      
+            ></el-input>
+        </el-form-item>
+          </el-col>
+          <el-col span="8">
+            <el-form-item label="类型">
+          <el-input v-model="editMaterialData.issueType" disabled></el-input>
+        </el-form-item>
+          </el-col>
+          
+        </el-row>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveEditMaterialDetail()">保存</el-button>
+        <el-button type="primary" @click="editMaterialModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 库存预览模态框 -->
+    <el-dialog
+      title="库存匹配预览"
+      :visible.sync="previewDialogVisible"
+      width="80%"
+      :close-on-click-modal="false">
+      <el-table
+        :data="previewData"
+        border
+        v-loading="previewLoading"
+        style="width: 100%;"
+        height="300"
+        :row-class-name="getRowClassName">
+        <el-table-column
+          prop="rowNo"
+          label="行号"
+          width="80"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="productionOrderNo"
+          label="生产订单号"
+          width="100"
+          sortable
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="bomLineNo"
+          label="BOM行号"
+          width="100"
+          sortable
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="partNo"
+          label="物料编码"
+          width="100"
+          sortable
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="requiredQty"
+          label="需求数量"
+          width="80"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="isWarehouseSatisfied"
+          label="立库是否满足"
+          width="100"
+          align="center">
+          <template slot-scope="scope">
+            <span :style="{color: scope.row.isWarehouseSatisfied === 'Y' ? '#67C23A' : '#F56C6C'}">
+              {{ scope.row.isWarehouseSatisfied === 'Y' ? '是' : '否' }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="isOtherWarehouseSatisfied"
+          label="分切仓库是否满足"
+          width="120"
+          align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.isOtherWarehouseSatisfied" :style="{color: scope.row.isOtherWarehouseSatisfied === 'Y' ? '#67C23A' : '#F56C6C'}">
+              {{ scope.row.isOtherWarehouseSatisfied === 'Y' ? '是' : '否' }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="matchedBarcodes"
+          label="匹配条码"
+          min-width="300"
+          align="left"
+          class-name="wrap-text-column">
+          <template slot-scope="scope">
+            <div style="white-space: normal; word-break: break-all; line-height: 1.5;">
+              {{ scope.row.matchedBarcodes }}
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" class="yzzButtonAn" @click="pushToWCS" :disabled="previewLoading">
+          {{ previewLoading ? '推送中...' : '推送至WCS' }}
+        </el-button>
+        <el-button @click="previewDialogVisible = false" :disabled="previewLoading">关闭</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+
 <script>
-import BaseSearchIssureNotify54 from '@/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue'
 import {
   haiAnGetShipmentMaterialForIssure,
   haiAnSearchNotifyHeaderNew,
@@ -8,10 +545,1916 @@ import {
 } from '@/api/haianWarehouse/shipmentIssue.js'
 
 export default {
-  name: 'shipmentNotification54',
-  extends: BaseSearchIssureNotify54,
-  methods: {
-    /**
+    name: 'shipmentNotification54',
+
+    data() {
+      return {
+        height:200,
+        activeName: 'detail',
+        dataList: [],
+        dataList2: [],
+        dataList3: [],
+        dataList4: [],
+        dataList5: [],
+        dataList6: [],
+        dataList7: [], // 预留标签清单数据 - rqrq
+        userBuList:[],
+        createNotifyFlag: false,
+        saveOrderDetailFlag: false,
+        closeData:{
+          site:'',
+          notifyNo:'',
+          closeRemark:'',
+          username:this.$store.state.user.name,
+        },
+        closeModalFlag:false,
+        searchData: {
+          page: 1,
+          limit: 100,
+          site:'',
+          userName: '',
+          notifyNo: '',
+          status: '',
+          pushWcsFlag: '', // rqrq - 推送WCS筛选条件
+          loginUserName: this.$store.state.user.name,
+          startDate: this.dayjs().format("YYYY-MM-DD"),
+          endDate: this.dayjs().format("YYYY-MM-DD"),
+          issueStartDate:this.dayjs().format("YYYY-MM-DD"),
+          issueEndDate: this.dayjs().format("YYYY-MM-DD")+" 23:59:59",
+          sql: "",
+          orderNo: "",
+          orderType: 'shoporder', // rqrq - 默认查询shoporder类型
+        },
+        notifyData:{
+          site: '',
+          bu: '',
+          notifyNo: '',
+          notifyDate: '',
+          enteredDate: '',
+          userName: this.$store.state.user.name,
+          userDisplay: '',
+          remark: '',
+          planIssueDate: '',
+          outWorkOrderFlag: false,
+        },
+        pageIndex: 1,
+        pageSize: 100,
+        totalPage: 0,
+        //工单分页
+        co_pageIndex: 1,
+        co_pageSize: 100,
+        co_totalPage: 0,
+        dataListLoading: false,
+        currentRow:'',
+        columnList1:[
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1NotifyNo',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "notifyNo",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "申请单单号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1NotifyDate',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "notifyDate",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "申请日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1UserName',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "username",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "申请账号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1EnteredDate',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "enteredDate",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "录入时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1Status',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "status",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1ConfirmStatus',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "confirmStatus",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "确认状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1WcsPushFlag',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "pushWcsFlag",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "推送WCS",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1Remark',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "remark",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "备注",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200
+          },
+        ],
+        columnList2:[
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2ItemNo',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "itemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 40
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2NeedDate',
+            tableId: "701002Table2",
+            tableName: "领料申请派工单子表",
+            columnProp: 'needDate',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '要求发料时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2PushWcsTime',
+            tableId: "701002Table2",
+            tableName: "领料申请派工单子表",
+            columnProp: 'pushWcsTime',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '推送WCS时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2SOOrderNo',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "soorderNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "生产订单",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2FGPartNo',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "fgPartNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工单物料",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2ReleaseNo',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "releaseNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "发布号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2SequenceNo',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "sequenceNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2PushWmsFlag',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "pushWmsFlag",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "是否推送WCS",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2TransportFlag',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "transportFlag",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "立库取出",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2AreaDesc',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "areaDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "配送区域",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          }
+
+        ],
+        columnList3:[
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3ItemNo',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "itemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "申请单序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3ComponentPartNo',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "componentPartNo",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "材料编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3IsInWh',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "isInWh",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "是否进立库",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3NeedDate',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "needDate",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "需求时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 110
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3QtyToIssue',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "qtyToIssue",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "申请数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },/* {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3QtyToIssueOriginal',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "qtyToIssueOriginal",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "已发数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          }, */{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3IssueType',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "issueType",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3Remark',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "remark",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "备注",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 160
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3SOOrderNo',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "soorderNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "生产订单",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3BOMItemNo',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "bomitemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "BOM序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+
+          },
+        ],
+        columnList4:[
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table4IssueType',
+            tableId: "701002Table4",
+            tableName: "申请单材料明细表",
+            columnProp: "issueType",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table4ComponentPartNo',
+            tableId: "701002Table4",
+            tableName: "申请单材料明细表",
+            columnProp: "componentPartNo",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "材料编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table4IsInWh',
+            tableId: "701002Table4",
+            tableName: "申请单材料明细表",
+            columnProp: "isInWh",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "是否进立库",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table4PartDesc',
+            tableId: "701002Table4",
+            tableName: "申请单材料明细表",
+            columnProp: "partDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "材料名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table4QtyToIssue',
+            tableId: "701002Table4",
+            tableName: "申请单材料明细表",
+            columnProp: "qtyToIssue",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "合计申请数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table4QtyToIssueOriginal',
+            tableId: "701002Table4",
+            tableName: "申请单材料明细表",
+            columnProp: "qtyToIssueOriginal",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "合计已发数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
+        ],
+        columnList6:[ // 预留标签清单列配置 - rqrq
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6ItemNo',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "itemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "订单序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6BOMItemNo',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "bomItemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "订单物料行号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6SerialNo',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "serialNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "标签号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6TaskRef',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "taskRef",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "立库任务号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6TaskItem',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "taskItem",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "立库任务行号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6OutWcsFlag',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "outWcsFlag",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "立库取出",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6OutWcsTime',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "outWcsTime",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "取出时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 140
+          }
+        ],
+
+        // 导出 start
+        exportData: [],
+        exportName: '发料申请单'+this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader: ["发料申请单"],
+        exportFooter: [],
+        // 导出 end
+        orderDetailData:{
+          orderNo:'',
+          seqNo:'',
+          locationNo:'',
+          qtyrequired:'',
+          issureQty:0,
+          partDesc:'',
+          partNo:'',
+          resourceId:'',
+          resourceDesc:'',
+          needDate:'',
+          itemDesc:'',
+          workCenterNo:'',
+          itemNo:0,
+          materialType:'BOM物料',
+        },
+        chooseSOSModalFlag: false,
+        chooseSOSData: {
+          orderno: '',
+          seqno: '',
+          sResourceid: '',
+          startDate: '',
+          endDate: '',
+        },
+        chooseOrderModalFlag: false,
+        chooseOrderData: {
+          page: 1,
+          limit: 100,
+          orderNo: '',
+          status: '',
+          date3: '',
+          date4: '',
+          statusList: '',
+        },
+        chooseOrderList: [],
+        chooseOperationModalFlag: false,
+        chooseOperationData: {
+          orderNo: '',
+          site: '',
+          itemDesc: ''
+        },
+        chooseOperationList: [],
+        chooseResourceModalFlag: false,
+        chooseResourceData: {
+          site: '',
+          workCenterNo: '',
+          resourceID: '',
+          resourceDesc: '',
+        },
+        chooseResourceList: [],
+        chooseSOSList: [],
+        choosePartModalFlag: false,
+        choosePartData: {
+          site: '',
+          sourceBu: '',
+          partNo: '',
+          partDesc: '',
+          spec: '',
+        },
+        choosePartList: [],
+        // 预览相关数据
+        previewDialogVisible: false,
+        previewLoading: false,
+        previewData: [],
+        // 物料明细对话框相关数据
+        materialModalFlag: false,
+        sobomList: [],
+        sobomData: {
+          orderNo: '',
+          seqNo: '',
+          partNo: '',
+        },
+        bomLoadFlag: false,
+        // 编辑材料明细对话框相关数据
+        editMaterialModalFlag: false,
+        editMaterialData: {
+          itemNo: '',
+          componentPartNo: '',
+          isInWh: '',
+          needDate: '',
+          qtyToIssue: 0,
+          issueType: '',
+          remark: '',
+          soorderNo: '',
+          bomitemNo: '',
+          site: '',
+          notifyNo: '',
+        },
+      }
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = (window.innerHeight- 315) / 2
+      })
+    },
+
+
+    created () {
+      this.searchTable()
+      // 补充海安标签扩展列，确保预留标签页签能展示海安增强字段 - rqrq
+    this.haiAnEnsureLabelColumns()
+    },
+    methods: {
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.searchTable()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.searchTable()
+      },
+      tabClick (tab, event) {
+        // 刷新列表数据
+        this.refreshCurrentTabTable()
+      },
+      changeData(row){
+        this.currentRow = JSON.parse(JSON.stringify(row));
+        this.refreshCurrentTabTable ();
+      },
+      refreshCurrentTabTable(){
+        if(this.currentRow===''||this.currentRow===null){
+          this.currentRow={site:'',notifyNo:'',orderType:'shoporder'}
+        }
+        // rqrq - 添加orderType参数
+        let queryData = {
+          ...this.currentRow,
+          orderType: 'shoporder'
+        }
+        if(this.activeName==='detail'){
+          searchNotifyOrderListNew(queryData).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList2 = data.rows
+
+            } else {
+              this.dataList2 = [];
+            }
+          });
+        }else if(this.activeName==='sub'){
+          searchNotifyMaterialListNew(queryData).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList3 = data.rows
+
+            } else {
+              this.dataList3 = [];
+            }
+          });
+        }else if(this.activeName==='change'){
+          searchNotifyLogNew(queryData).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList5 = data.rows
+
+            } else {
+              this.dataList5 = [];
+            }
+          });
+        }else if(this.activeName==='close'){
+          searchNotifyLogCloseNew(queryData).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList6 = data.rows
+
+            } else {
+              this.dataList6 = [];
+            }
+          });
+        }else if(this.activeName==='labelDetail'){ // rqrq - 预留标签清单页签
+          searchMaterialListDetail(queryData).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList7 = data.rows
+
+            } else {
+              this.dataList7 = [];
+            }
+          });
+        }else {
+          searchSumNotifyMaterialListNew(queryData).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList4 = data.rows
+
+            } else {
+              this.dataList4 = [];
+            }
+          });
+        }
+      },
+      searchTable(){
+        this.searchData.limit = this.pageSize
+        this.searchData.page = this.pageIndex
+        searchNotifyHeaderNew(this.searchData).then(({data}) => {
+          //区分请求成功和失败的状况
+          if (data && data.code == 0) {
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
+          } else {
+            this.dataList = [];
+          }
+        });
+      },
+      closeNotifyModel(row){
+        this.closeData.site=row.site
+        this.closeData.notifyNo=row.notifyNo
+        this.closeData.closeRemark=''
+        this.closeModalFlag=true
+      },
+      closeNotify(){
+        if(this.closeData.closeRemark==null||this.closeData.closeRemark===''){
+          this.$alert("必须输入关闭原因", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+
+            let inData={
+              site:this.closeData.site,
+              notifyNo:this.closeData.notifyNo,
+              closeRemark:this.closeData.closeRemark,
+              username:this.$store.state.user.name,
+              status:'CLOSED',
+            }
+          updateNotifyStatusNew(inData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.closeModalFlag=false
+              this.searchTable()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+
+      },
+      openNotify(row){
+        this.$confirm('确认打开?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let inData={
+            site:row.site,
+            notifyNo:row.notifyNo,
+            status:'ISSUE',
+          }
+          updateNotifyStatusNew(inData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.searchTable()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+      // 预览库存匹配情况
+      previewInventory(row) {
+        this.currentRow = row  // 保存当前行数据
+        this.previewDialogVisible = true
+        this.previewLoading = true
+        this.previewData = []
+
+        let inData = {
+          site: row.site,
+          notifyNo: row.notifyNo
+        }
+
+        checkIssueNotifyInventory(inData).then(({data}) => {
+          this.previewLoading = false
+          if (data && data.code === 0) {
+            this.previewData = data.rows || []
+            console.log('库存预览数据:', this.previewData)
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        }).catch(() => {
+          this.previewLoading = false
+          this.$message.error('获取库存预览失败')
+        })
+      },
+
+      // 根据订单满足状态设置行样式
+      getRowClassName({row}) {
+        if (row.orderSatisfactionStatus === 1) {
+          return 'success-row'  // 绿色：完全立库满足
+        } else if (row.orderSatisfactionStatus === 2) {
+          return 'warning-row'  // 黄色：立库+分切区满足
+        } else if (row.orderSatisfactionStatus === 3) {
+          return 'danger-row'   // 红色：存在不满足
+        }
+        return ''
+      },
+
+      // 从预览对话框推送至WCS
+      pushToWCS() {
+        // 筛选绿色和黄色的数据（orderSatisfactionStatus = 1 或 2）
+        // const validData = this.previewData.filter(item =>
+        //   item.orderSatisfactionStatus === 1 || item.orderSatisfactionStatus === 2
+        // )
+        //全部推送 后端判断
+        const validData = this.previewData
+
+        if (validData.length === 0) {
+          this.$message.warning('没有可推送的数据（只推送绿色和黄色状态的数据）')
+          return
+        }
+
+        this.$confirm(`确认推送 ${validData.length} 条数据至WCS？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          // 显示加载状态 - rqrq
+          this.previewLoading = true
+
+          const inData = {
+            site: this.currentRow.site,
+            notifyNo: this.currentRow.notifyNo,
+            inventoryList: validData
+          }
+
+          pushInventoryToWcs(inData).then(({data}) => {
+            this.previewLoading = false
+            if (data && data.code === 0) {
+              this.$message({
+                message: '推送WCS成功',
+                type: 'success',
+                duration: 1500
+              })
+              this.previewDialogVisible = false
+              this.searchTable()
+            } else {
+              this.$alert(data.msg || '推送失败', '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          }).catch((error) => {
+            this.previewLoading = false
+            this.$message.error(error.message || '推送WCS失败，请重试')
+          })
+        }).catch(() => {
+          // 用户取消操作 - rqrq
+          console.log('用户取消推送')
+        })
+      },
+
+      pushToWcs(row){
+        this.$confirm('确认推送到WCS?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let inData={
+            site: row.site,
+            notifyNo: row.notifyNo
+          }
+          pushNotifyToWcs(inData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.searchTable()
+              this.$message({
+                message: '推送WCS成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+
+      /**
+       * @Description 取消下达处理方法 - rqrq
+       * @param row 当前行数据
+       */
+      cancelIssueNotifyHandle(row) {
+        // 先判断发起人是否有未下达的shoporder申请单 - rqrq
+        let checkData = {
+          site: row.site,
+          username: row.username
+        }
+
+        checkUserHasUnissueShopOrder(checkData).then(({ data }) => {
+          if (data && data.code === 0) {
+            // 如果有未下达的申请单 - rqrq
+            if (data.row != null) {
+              this.$alert('该用户有未下达的申请单,请先处理', '提示', {
+                confirmButtonText: '确定'
+              })
+              return
+            }
+
+            // 没有未下达的申请单，执行取消下达 - rqrq
+            this.$confirm(`确定取消下达申请单【${row.notifyNo}】吗?`, '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              let cancelData = {
+                site: row.site,
+                notifyNo: row.notifyNo
+              }
+
+              cancelIssueNotify(cancelData).then(({ data }) => {
+                if (data && data.code === 0) {
+                  this.$message.success('取消下达成功')
+                  // 重新加载数据 - rqrq
+                  this.searchTable()
+                } else {
+                  this.$alert(data.msg, '错误', {
+                    confirmButtonText: '确定'
+                  })
+                }
+              }).catch(() => {
+                this.$message.error('取消下达失败')
+              })
+            }).catch(() => {
+              // 用户取消操作 - rqrq
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        }).catch(() => {
+          this.$message.error('检查用户申请单失败')
+        })
+      },
+
+      deleteNotifyMaterial(row){
+        this.$confirm('确认删除?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteNotifyMaterial(row).then(({data}) => {
+            if (data && data.code === 0) {
+              this.refreshCurrentTabTable()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+      deleteNotifySOSPlus(row){
+        this.$confirm('确认删除?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteNotifySOSPlus(row).then(({data}) => {
+            if (data && data.code === 0) {
+              this.refreshCurrentTabTable()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+      // 进入工单物料明细
+      enterSOSDetail(row) {
+        let rows = {
+          site: this.currentRow.site || this.$store.state.user.site,
+          notifyNo: this.currentRow.notifyNo,
+          orderNo: row.soorderNo || row.orderNo,
+          seqNo: row.seqNo || '',
+          partNo: row.fgPartNo || row.partNo,
+          itemNo: row.itemNo,
+          releaseNo: row.releaseNo,
+          sequenceNo: row.sequenceNo,
+        }
+        this.enterSOS(rows)
+      },
+      // 打开物料明细对话框
+      enterSOS(row) {
+        this.materialModalFlag = true
+        this.sobomList = []
+        this.sobomData = {
+          orderNo: row.orderNo,
+          seqNo: row.seqNo,
+          partNo: row.partNo,
+        }
+        this.bomLoadFlag = true
+        let inData = {
+          site: this.currentRow.site || this.$store.state.user.site,
+          notifyNo: this.currentRow.notifyNo,
+          orderNo: row.orderNo,
+          releaseNo: row.releaseNo,
+          sequenceNo: row.sequenceNo,
+          partNo: row.partNo,
+          itemNo: row.itemNo,
+        }
+        getSOSBOMForIssureNew(inData).then(({ data }) => {
+          this.bomLoadFlag = false
+          if (data.code === 0) {
+            this.sobomList = data.rows
+            for (let i = 0; i < this.sobomList.length; i++) {
+              this.sobomList[i].itemNo = inData.itemNo
+            }
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        }).catch(() => {
+          this.bomLoadFlag = false
+          this.$message.error('获取物料明细失败')
+        })
+      },
+      // 全数领料
+      qtyAllForBom(row) {
+        row.qtyToIssue = row.qtyRequired
+      },
+      // 保存物料明细
+      saveMaterialDetail() {
+        for (let i = 0; i < this.sobomList.length; i++) {
+          if (
+            this.sobomList[i].qtyToIssue === '' ||
+            this.sobomList[i].qtyToIssue == null
+          ) {
+            this.sobomList[i].qtyToIssue = 0
+          }
+          this.sobomList[i].notifyNo = this.currentRow.notifyNo
+          this.sobomList[i].site = this.currentRow.site || this.$store.state.user.site
+        }
+
+        let materialList = this.sobomList.filter((item) => item.qtyToIssue > 0)
+        if (materialList.length == 0) {
+          this.$alert('没有需要保存的内容!', '提示', {
+            confirmButtonText: '确定',
+          })
+          return false
+        }
+        saveMaterialDetail(materialList).then(({ data }) => {
+          if (data.code === 0) {
+            this.materialModalFlag = false
+            this.refreshCurrentTabTable()
+            this.$message.success('操作成功')
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+      },
+      // 处理材料明细行双击事件
+      handleMaterialRowDblClick(row) {
+
+        if(!'未推送'.includes(this.currentRow.pushWcsFlag)){
+          this.$message.warning('只有未推送状态的申请单才能编辑材料明细')
+          return;
+        }
+        // 保存完整的行数据，以便后续保存时包含所有必要字段
+        this.editMaterialData = JSON.parse(JSON.stringify(row))
+        // 确保包含必要的字段
+        this.editMaterialData.site = this.currentRow.site || this.$store.state.user.site
+        this.editMaterialData.notifyNo = this.currentRow.notifyNo || ''
+        // 确保申请数量有默认值
+        if (this.editMaterialData.qtyToIssue === null || this.editMaterialData.qtyToIssue === undefined) {
+          this.editMaterialData.qtyToIssue = 0
+        }
+        this.editMaterialModalFlag = true
+      },
+      // 保存编辑的材料明细
+      saveEditMaterialDetail() {
+        if (this.editMaterialData.qtyToIssue === null || this.editMaterialData.qtyToIssue === '') {
+          this.$alert('申请数量不能为空!', '提示', {
+            confirmButtonText: '确定',
+          })
+          return false
+        }
+        if (this.editMaterialData.qtyToIssue < 0) {
+          this.$alert('申请数量不能小于0!', '提示', {
+            confirmButtonText: '确定',
+          })
+          return false
+        }
+        
+        // 使用完整的行数据，只更新申请数量
+        let materialData = {
+          ...this.editMaterialData,
+        }
+        
+        // 确保申请数量不为空
+        if (materialData.qtyToIssue === '' || materialData.qtyToIssue == null) {
+          materialData.qtyToIssue = 0
+        }
+        
+        
+        updateMaterialDetail(materialData).then(({ data }) => {
+          if (data.code === 0) {
+            this.editMaterialModalFlag = false
+            this.refreshCurrentTabTable()
+            this.$message.success('保存成功')
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        }).catch(() => {
+          this.$message.error('保存失败')
+        })
+      },
+
+
+
+
+      //导出excel - rqrq
+      async createExportData() {
+        const queryParams = {
+          ...this.searchData,
+          limit: 999999,  // 设置一个很大的数字来获取全部数据 - rqrq
+          page: 1
+        }
+        const {data} = await searchNotifyHeaderNew(queryParams)
+        if (data && data.code === 0) {
+          return data.page.list || []
+        }
+        return []
+      },
+      startDownload() {
+        //  this.exportData = this.dataList
+
+      },
+      finishDownload() {
+      },
+      fields() {
+        let json = "{"
+        this.columnList1.forEach((item, index) => {
+          if (index == this.columnList1.length - 1) {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+          } else {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+          }
+        })
+        json += "}"
+        let s = eval("(" + json + ")")
+
+        return s
+      },
+
+      tableRowClassName ({row, rowIndex}) {
+
+        if (row.qtyToIssueOriginal<row.qtyToIssue&&new Date(row.needDate)<new Date(this.dayjs().format("YYYY-MM-DD HH:mm"))) {
+          return 'error-row'
+        }
+
+        return ''
+      },
+      /**
+     * 统一构建海安查询入参，强制使用登录用户site避免跨站点串单 - rqrq
+     */
+    haiAnBuildQueryData (row) {
+      const baseRow = row || {}
+      return {
+        ...baseRow,
+        site: this.$store.state.user.site,
+        orderType: 'shoporder'
+      }
+    },
+      /**
+     * 海安标签页签增加subsite/allocSeq/palletId/taskSeq列，便于追踪标签流向 - rqrq
+     */
+    haiAnEnsureLabelColumns () {
+      if (!Array.isArray(this.columnList6)) {
+        return
+      }
+      const appendColumn = (columnProp, columnLabel, columnWidth = 100, align = 'left') => {
+        if (this.columnList6.some(col => col.columnProp === columnProp)) {
+          return
+        }
+        this.columnList6.push({
+          userId: this.$store.state.user.name,
+          functionId: 701002,
+          serialNumber: `701002Table6${columnProp}`,
+          tableId: '701002Table6',
+          tableName: '海安预留标签清单表',
+          columnProp,
+          headerAlign: 'center',
+          align,
+          columnLabel,
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth
+        })
+      }
+      appendColumn('taskSeq', '立库任务序号', 110, 'right')
+      appendColumn('subSite', '子站点', 110, 'left')
+      appendColumn('allocSeq', '分配序号', 100, 'right')
+      appendColumn('palletId', '栈板号', 120, 'left')
+    },
+      /**
+     * 海安页签刷新逻辑，四个页签均改为海安接口并保留原交互语义 - rqrq
+     */
+    refreshCurrentTabTable () {
+      if (this.currentRow === '' || this.currentRow === null) {
+        this.currentRow = { site: this.$store.state.user.site, notifyNo: '', orderType: 'shoporder' }
+      }
+      const queryData = this.haiAnBuildQueryData(this.currentRow)
+      if (this.activeName === 'detail') {
+        haiAnSearchNotifyOrderListNew(queryData).then(({ data }) => {
+          this.dataList2 = data && data.code === 0 ? (data.rows || []) : []
+        })
+      } else if (this.activeName === 'sub') {
+        haiAnSearchNotifyMaterialListNew(queryData).then(({ data }) => {
+          this.dataList3 = data && data.code === 0 ? (data.rows || []) : []
+        })
+      } else if (this.activeName === 'change') {
+        haiAnSearchNotifyLogNew(queryData).then(({ data }) => {
+          this.dataList5 = data && data.code === 0 ? (data.rows || []) : []
+        })
+      } else if (this.activeName === 'close') {
+        haiAnSearchNotifyLogCloseNew(queryData).then(({ data }) => {
+          this.dataList6 = data && data.code === 0 ? (data.rows || []) : []
+        })
+      } else if (this.activeName === 'labelDetail') {
+        haiAnSearchMaterialListDetail(queryData).then(({ data }) => {
+          this.dataList7 = data && data.code === 0 ? (data.rows || []) : []
+        })
+      } else {
+        haiAnSearchSumNotifyMaterialListNew(queryData).then(({ data }) => {
+          this.dataList4 = data && data.code === 0 ? (data.rows || []) : []
+        })
+      }
+    },
+      /**
+     * 海安主表查询改为海安接口，固定传登录站点并保留分页语义 - rqrq
+     */
+    searchTable () {
+      this.searchData.limit = this.pageSize
+      this.searchData.page = this.pageIndex
+      this.searchData.site = this.$store.state.user.site
+      this.searchData.orderType = 'shoporder'
+      haiAnSearchNotifyHeaderNew(this.searchData).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.dataList = data.page.list
+          this.pageIndex = data.page.currPage
+          this.pageSize = data.page.pageSize
+          this.totalPage = data.page.totalCount
+          return
+        }
+        this.dataList = []
+      })
+    },
+      /**
+     * 海安关闭申请单，保持旧页面的必填关闭原因校验与提示语义 - rqrq
+     */
+    closeNotify () {
+      if (this.closeData.closeRemark == null || this.closeData.closeRemark === '') {
+        this.$alert('必须输入关闭原因', '错误', {
+          confirmButtonText: '确定'
+        })
+        return false
+      }
+      const inData = {
+        site: this.$store.state.user.site,
+        notifyNo: this.closeData.notifyNo,
+        closeRemark: this.closeData.closeRemark,
+        username: this.$store.state.user.name,
+        status: 'CLOSED'
+      }
+      haiAnUpdateNotifyStatusNew(inData).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.closeModalFlag = false
+          this.searchTable()
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500
+          })
+          return
+        }
+        this.$alert(data.msg, '错误', {
+          confirmButtonText: '确定'
+        })
+      })
+    },
+      /**
+     * 海安开启申请单，状态回写改走海安接口并保持原确认交互 - rqrq
+     */
+    openNotify (row) {
+      this.$confirm('确认打开?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const inData = {
+          site: this.$store.state.user.site,
+          notifyNo: row.notifyNo,
+          status: 'ISSUE'
+        }
+        haiAnUpdateNotifyStatusNew(inData).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.searchTable()
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500
+            })
+            return
+          }
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        })
+      })
+    },
+      /**
+     * 海安库存预览当前为占位实现，保留入口并给出待开发提示 - rqrq
+     */
+    previewInventory (row) {
+      this.currentRow = row
+      this.previewDialogVisible = true
+      this.previewLoading = true
+      this.previewData = []
+      const inData = {
+        site: this.$store.state.user.site,
+        notifyNo: row.notifyNo
+      }
+      haiAnCheckIssueNotifyInventory(inData).then(({ data }) => {
+        this.previewLoading = false
+        if (data && data.code === 0) {
+          this.previewData = data.rows || []
+          if (data.placeholder) {
+            this.$message.warning(data.msg || '海安库存预览待开发')
+          }
+          return
+        }
+        this.$alert(data.msg, '错误', {
+          confirmButtonText: '确定'
+        })
+      }).catch(() => {
+        this.previewLoading = false
+        this.$message.error('获取库存预览失败')
+      })
+    },
+      /**
+     * 海安推送WCS当前为占位实现，仅提示待开发并不触发真实推送 - rqrq
+     */
+    pushToWCS () {
+      const validData = this.previewData || []
+      this.$confirm(`确认推送 ${validData.length} 条数据至WCS？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.previewLoading = true
+        const inData = {
+          site: this.$store.state.user.site,
+          notifyNo: this.currentRow.notifyNo,
+          inventoryList: validData
+        }
+        haiAnPushInventoryToWcs(inData).then(({ data }) => {
+          this.previewLoading = false
+          if (data && data.code === 0) {
+            this.$message.warning(data.msg || '海安推送WCS待开发')
+            this.previewDialogVisible = false
+            return
+          }
+          this.$alert(data.msg || '推送失败', '错误', {
+            confirmButtonText: '确定'
+          })
+        }).catch((error) => {
+          this.previewLoading = false
+          this.$message.error(error.message || '推送WCS失败，请重试')
+        })
+      })
+    },
+      /**
+     * 兼容旧入口的海安推送占位方法，避免历史按钮调用空指针 - rqrq
+     */
+    pushToWcs (row) {
+      this.previewInventory(row)
+    },
+      /**
+     * 海安取消下达流程：先检查未下达冲突，再执行取消并刷新列表 - rqrq
+     */
+    cancelIssueNotifyHandle (row) {
+      const checkData = {
+        site: this.$store.state.user.site,
+        username: row.username
+      }
+      haiAnCheckUserHasUnissueShopOrder(checkData).then(({ data }) => {
+        if (data && data.code === 0) {
+          if (data.row != null) {
+            this.$alert('该用户有未下达的申请单,请先处理', '提示', {
+              confirmButtonText: '确定'
+            })
+            return
+          }
+          this.$confirm(`确定取消下达申请单【${row.notifyNo}】吗?`, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            const cancelData = {
+              site: this.$store.state.user.site,
+              notifyNo: row.notifyNo
+            }
+            haiAnCancelIssueNotify(cancelData).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message.success('取消下达成功')
+                this.searchTable()
+                return
+              }
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }).catch(() => {
+              this.$message.error('取消下达失败')
+            })
+          })
+          return
+        }
+        this.$alert(data.msg, '错误', {
+          confirmButtonText: '确定'
+        })
+      }).catch(() => {
+        this.$message.error('检查用户申请单失败')
+      })
+    },
+      /**
+     * 海安删除工单行增强接口，保留未推送状态限制并同步刷新当前页签 - rqrq
+     */
+    deleteNotifySOSPlus (row) {
+      this.$confirm('确认删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const inData = {
+          ...row,
+          site: this.$store.state.user.site,
+          notifyNo: this.currentRow.notifyNo
+        }
+        haiAnDeleteNotifySOSPlus(inData).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.refreshCurrentTabTable()
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500
+            })
+            return
+          }
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        })
+      })
+    },
+      /**
+     * 海安查看页物料弹窗查询，按海安接口回显已保存数量并透传subsite - rqrq
+     */
+    enterSOS (row) {
+      this.materialModalFlag = true
+      this.sobomList = []
+      this.sobomData = {
+        orderNo: row.orderNo,
+        seqNo: row.seqNo,
+        partNo: row.partNo,
+        subSite: row.subSite
+      }
+      this.bomLoadFlag = true
+      const inData = {
+        site: this.$store.state.user.site,
+        notifyNo: this.currentRow.notifyNo,
+        orderNo: row.orderNo,
+        releaseNo: row.releaseNo,
+        sequenceNo: row.sequenceNo,
+        partNo: row.partNo,
+        itemNo: row.itemNo
+      }
+      haiAnGetSOSBOMForIssureNew(inData).then(({ data }) => {
+        this.bomLoadFlag = false
+        if (data && data.code === 0) {
+          this.sobomList = data.rows || []
+          for (let i = 0; i < this.sobomList.length; i++) {
+            this.sobomList[i].itemNo = inData.itemNo
+            this.sobomList[i].subSite = row.subSite
+          }
+          return
+        }
+        this.$alert(data.msg, '错误', {
+          confirmButtonText: '确定'
+        })
+      }).catch(() => {
+        this.bomLoadFlag = false
+        this.$message.error('获取物料明细失败')
+      })
+    },
+      /**
+     * 海安保存材料明细走海安先删后存链路，并透传subsite防止跨子站点串单 - rqrq
+     */
+    saveMaterialDetail () {
+      for (let i = 0; i < this.sobomList.length; i++) {
+        if (this.sobomList[i].qtyToIssue === '' || this.sobomList[i].qtyToIssue == null) {
+          this.sobomList[i].qtyToIssue = 0
+        }
+        this.sobomList[i].notifyNo = this.currentRow.notifyNo
+        this.sobomList[i].site = this.$store.state.user.site
+        this.sobomList[i].subSite = this.sobomList[i].subSite || this.sobomData.subSite || this.currentRow.subSite
+      }
+      const materialList = this.sobomList.filter((item) => item.qtyToIssue > 0)
+      if (materialList.length === 0) {
+        this.$alert('没有需要保存的内容!', '提示', {
+          confirmButtonText: '确定'
+        })
+        return false
+      }
+      haiAnSaveMaterialDetail(materialList).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.materialModalFlag = false
+          this.refreshCurrentTabTable()
+          this.$message.success('操作成功')
+          return
+        }
+        this.$alert(data.msg, '错误', {
+          confirmButtonText: '确定'
+        })
+      })
+    },
+      /**
+     * 海安编辑材料数量，沿用未推送限制并改为海安更新接口 - rqrq
+     */
+    saveEditMaterialDetail () {
+      if (this.editMaterialData.qtyToIssue === null || this.editMaterialData.qtyToIssue === '') {
+        this.$alert('申请数量不能为空!', '提示', {
+          confirmButtonText: '确定'
+        })
+        return false
+      }
+      if (this.editMaterialData.qtyToIssue < 0) {
+        this.$alert('申请数量不能小于0!', '提示', {
+          confirmButtonText: '确定'
+        })
+        return false
+      }
+      const materialData = {
+        ...this.editMaterialData,
+        site: this.$store.state.user.site,
+        notifyNo: this.currentRow.notifyNo
+      }
+      if (materialData.qtyToIssue === '' || materialData.qtyToIssue == null) {
+        materialData.qtyToIssue = 0
+      }
+      haiAnUpdateMaterialDetail(materialData).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.editMaterialModalFlag = false
+          this.refreshCurrentTabTable()
+          this.$message.success('保存成功')
+          return
+        }
+        this.$alert(data.msg, '错误', {
+          confirmButtonText: '确定'
+        })
+      }).catch(() => {
+        this.$message.error('保存失败')
+      })
+    },
+      /**
+     * 海安导出数据改为海安主查询接口，确保导出内容来自海安表链路 - rqrq
+     */
+    async createExportData () {
+      const queryParams = {
+        ...this.searchData,
+        site: this.$store.state.user.site,
+        orderType: 'shoporder',
+        limit: 999999,
+        page: 1
+      }
+      const { data } = await haiAnSearchNotifyHeaderNew(queryParams)
+      if (data && data.code === 0) {
+        return data.page.list || []
+      }
+      return []
+    },
+      /**
      * 销售发料查看页查询参数：固定orderType=shipment，避免与shoporder串单 - rqrq
      */
     haiAnBuildQueryData (row) {
@@ -22,8 +2465,7 @@ export default {
         orderType: 'shipment'
       }
     },
-
-    /**
+      /**
      * 销售发料主列表查询：按shipment业务类型过滤海安主单 - rqrq
      */
     searchTable () {
@@ -42,8 +2484,7 @@ export default {
         this.dataList = []
       })
     },
-
-    /**
+      /**
      * 销售发料物料弹窗：调用海安shipment专用IFS聚合接口并回填subsite - rqrq
      */
     enterSOS (row) {
@@ -81,8 +2522,7 @@ export default {
         this.$message.error('获取销售发料明细失败')
       })
     },
-
-    /**
+      /**
      * 销售发料取消下达：检查同用户shipment未下达单据后再执行取消 - rqrq
      */
     cancelIssueNotifyHandle (row) {
@@ -130,45 +2570,123 @@ export default {
         this.$message.error('检查用户申请单失败')
       })
     },
-
+      /**
+     * 销售发料导出：固定按shipment维度导出海安主单数据 - rqrq
+     */
+    async createExportData () {
+      const queryParams = {
+        ...this.searchData,
+        site: this.$store.state.user.site,
+        orderType: 'shipment',
+        limit: 999999,
+        page: 1
+      }
+      const { data } = await haiAnSearchNotifyHeaderNew(queryParams)
+      if (data && data.code === 0) {
+        return data.page.list || []
+      }
+      return []
+    },
     /**
      * 销售发料WCS预览：按海安复刻约束保持关闭，避免触发真实推送链路 - rqrq
      */
     previewInventory () {
       this.$message.warning('海安销售发料WCS推送功能暂不启用')
     },
-
     /**
      * 销售发料WCS推送：按复刻要求注掉推送，仅保留提示 - rqrq
      */
     pushToWCS () {
       this.$message.warning('海安销售发料WCS推送功能暂不启用')
     },
-
     /**
      * 兼容旧按钮入口：统一走关闭提示，不触发任何后端推送接口 - rqrq
      */
     pushToWcs () {
       this.$message.warning('海安销售发料WCS推送功能暂不启用')
+    }
     },
 
-    /**
-     * 销售发料导出：固定按shipment维度导出海安主单数据 - rqrq
-     */
-    async createExportData () {
-      const queryParams = {
-        ...this.searchData,
-        site: this.$store.state.user.site,
-        orderType: 'shipment',
-        limit: 999999,
-        page: 1
-      }
-      const { data } = await haiAnSearchNotifyHeaderNew(queryParams)
-      if (data && data.code === 0) {
-        return data.page.list || []
-      }
-      return []
-    }
   }
-}
 </script>
+
+<style scoped>
+/deep/ .el-form-item--medium .el-form-item__content {
+  height: auto;
+}
+.disabled {
+  cursor: not-allowed !important;
+  color: #C0C4CC !important;
+  pointer-events: none;
+}
+
+.text-right >>> .el-input__inner {
+  text-align: right !important;
+}
+
+.text-right >>> .el-input-number__input {
+  text-align: right !important;
+}
+
+.yzzTable /deep/.el-table .cell {
+  line-height: 20px;
+  font-size: 12px;
+  height: 20px;
+}
+
+.single-line-multi-select >>> .el-select__tags {
+  display: flex;
+  flex-wrap: nowrap;
+  overflow: hidden;
+  white-space: nowrap;
+  max-width: 100%;
+}
+
+.single-line-multi-select >>> .el-tag {
+  flex-shrink: 0;
+  max-width: 100px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.single-line-multi-select >>> .el-select__input {
+  flex-shrink: 0;
+  min-width: 30px;
+}
+
+/* 库存预览表格行颜色 */
+/deep/ .el-table .success-row {
+  background: #f0f9ff !important;
+  border-left: 3px solid #67C23A;
+}
+
+/* rqrq - 匹配条码列自动换行显示 */
+/deep/ .wrap-text-column .cell {
+  white-space: normal !important;
+  word-break: break-all !important;
+  line-height: 1.5 !important;
+}
+
+/deep/ .el-table .warning-row {
+  background: #fdf6ec !important;
+  border-left: 3px solid #E6A23C;
+}
+
+/deep/ .el-table .danger-row {
+  background: #fef0f0 !important;
+  border-left: 3px solid #F56C6C;
+}
+
+/deep/ .el-table .success-row:hover > td {
+  background-color: #ecf5ff !important;
+}
+
+/deep/ .el-table .warning-row:hover > td {
+  background-color: #faecd8 !important;
+}
+
+/deep/ .el-table .danger-row:hover > td {
+  background-color: #fde2e2 !important;
+}
+</style>
diff --git a/src/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue b/src/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue
index 605e454..5b74172 100644
--- a/src/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue
+++ b/src/views/modules/haianWarehouse/shopOrderIssueNotify/searchIssureNotify54.vue
@@ -1,5 +1,542 @@
+<template>
+  <div class="mod-config yzz">
+    <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
+      <el-form :inline="true" label-position="top" style="margin-top: 0px">
+        <el-form-item :label="'申请单号'">
+          <el-input v-model="searchData.notifyNo" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'申请账号'">
+          <el-input v-model="searchData.userName" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item :label="'工单号'">
+          <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="状态" >
+          <el-select v-model="searchData.status" placeholder="请选择" style="width: 120px">
+            <el-option label="全部" value=""></el-option>
+            <el-option label="ISSUE" value="ISSUE"></el-option>
+            <el-option label="CANCEL" value="CANCEL"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="'申请单日期'">
+          <el-date-picker
+            style="width: 120px"
+            v-model="searchData.startDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item style="margin-top: 23px;">
+          <label style="margin-left: 0px;font-size: 19px">&#10142</label>
+        </el-form-item>
+        <el-form-item :label="' '">
+          <el-date-picker
+            style="width: 120px"
+            v-model="searchData.endDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="推送WCS" >
+          <el-select v-model="searchData.pushWcsFlag" placeholder="请选择" style="width: 120px">
+            <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-option label="出库完成" value="出库完成"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="' '">
+          <el-button type="primary" @click="searchTable()">查询</el-button>
+          <!-- <el-button type="primary" @click="createNotifyModal()">新增</el-button> -->
+          <download-excel
+            :fields="fields()"
+            :data="exportData"
+            type="xls"
+            :name="exportName"
+            :header="exportHeader"
+            :footer="exportFooter"
+            :fetch="createExportData"
+            :before-generate="startDownload"
+            :before-finish="finishDownload"
+            worksheet="导出信息"
+            class="el-button el-button--primary el-button--medium">
+            {{ '导出' }}
+          </download-excel>
+        </el-form-item>
+      </el-form>
+    </el-form>
+    <el-table
+      :data="dataList"
+      @row-click="changeData"
+      :height="height"
+      border
+      highlight-current-row
+      ref="mainTable"
+      v-loading="dataListLoading"
+      style="width: 100%; ">
+      <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
+        header-align="center"
+        align="center"
+        width="180"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" v-if="scope.row.status==='ISSUE'" @click="closeNotifyModel(scope.row)">关闭</a>
+          <a type="text" size="small" v-if="scope.row.status==='CLOSED'" @click="openNotify(scope.row)">开启</a>
+          <a type="text" size="small" v-if="scope.row.pushWcsFlag!=='出库完成'&&scope.row.pushWcsFlag!=='推送完成'&&scope.row.status==='ISSUE'" @click="previewInventory(scope.row)" style="margin-left: 10px;">推送WCS</a>
+          <!-- rqrq - 取消下达按钮，只在状态为ISSUE且未推送WCS时显示 -->
+          <a type="text" size="small" v-if="scope.row.status==='ISSUE'&&scope.row.pushWcsFlag==='未推送'" @click="cancelIssueNotifyHandle(scope.row)" style="margin-left: 10px;">取消下达</a>
+<!--          <a type="text" size="small" v-if="scope.row.pushWcsFlag!=='Y'" @click="pushToWcs(scope.row)" style="margin-left: 10px;">推送WCS</a>-->
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 1000]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+
+    <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName"  type="border-card"  @tab-click="tabClick">
+      <el-tab-pane label="申请单明细" name="detail">
+        <el-table
+          :data="dataList2"
+          :height="height"
+          border
+          v-loading="dataListLoading"
+          style="width: 100%; ">
+<!--          <el-table-column-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            width="80"-->
+<!--            label="操作">-->
+<!--            <template slot-scope="scope">-->
+<!--              <a type="text" size="small" v-if="currentRow.status==='ISSUE'" @click="deleteNotifySOSPlus(scope.row)">删除</a>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column
+            v-for="(item,index) in columnList2" :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">
+              <!-- rqrq - 是否推送WCS特殊显示：Y显示绿色"是"，否则显示灰色"否" -->
+              <span v-if="item.columnProp === 'pushWmsFlag'" :style="{color: scope.row.pushWmsFlag === 'Y' ? '#67C23A' : '#909399'}">
+                {{ scope.row.pushWmsFlag === 'Y' ? '是' : '否' }}
+              </span>
+              <!-- rqrq - 立库取出特殊显示：Y显示绿色"是"，否则显示灰色"否" -->
+              <span v-else-if="item.columnProp === 'transportFlag'" :style="{color: scope.row.transportFlag === 'Y' ? '#67C23A' : '#909399'}">
+                {{ scope.row.transportFlag === 'Y' ? '是' : '否' }}
+              </span>
+              <!-- 普通列显示 -->
+              <span v-else-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="120"
+            label="操作">
+            <template slot-scope="scope">
+              <a type="text" size="small" v-if="scope.row.pushWmsFlag !== 'Y' && currentRow && currentRow.pushWcsFlag === '未推送'" @click="enterSOSDetail(scope.row)" style="margin-right: 10px;">修改</a>
+              <a type="text" size="small" v-if="scope.row.pushWmsFlag !== 'Y' && currentRow && currentRow.pushWcsFlag === '未推送'" @click="deleteNotifySOSPlus(scope.row)">删除</a>
+            </template>
+          </el-table-column>
+        </el-table>
+
+      </el-tab-pane>
+      <el-tab-pane label="材料明细" name="sub">
+        <el-table
+          :data="dataList3"
+          :height="height"
+          border
+          :row-class-name="tableRowClassName"
+          v-loading="dataListLoading"
+          @row-dblclick="handleMaterialRowDblClick"
+          style="width: 100%; ">
+
+<!--          <el-table-column-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            width="80"-->
+<!--            label="操作">-->
+<!--            <template slot-scope="scope">-->
+<!--              <a type="text" size="small" v-if="currentRow.status==='ISSUE'" @click="deleteNotifyMaterial(scope.row)">删除</a>-->
+
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <el-table-column
+            v-for="(item,index) in columnList3" :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-tab-pane>
+      <el-tab-pane label="材料汇总" name="sum">
+        <el-table
+          :data="dataList4"
+          :height="height"
+          border
+          v-loading="dataListLoading"
+          style="width: 100%; ">
+          <!--          <el-table-column-->
+          <!--            header-align="center"-->
+          <!--            align="center"-->
+          <!--            width="80"-->
+          <!--            fixed="left"-->
+          <!--            label="操作">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <a type="text" size="small" @click="printLabel(scope.row)">打印标签</a>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <el-table-column
+            v-for="(item,index) in columnList4" :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-tab-pane>
+      <el-tab-pane label="预留标签清单" name="labelDetail">
+        <el-table
+          :data="dataList7"
+          :height="height"
+          border
+          v-loading="dataListLoading"
+          style="width: 100%; ">
+          <el-table-column
+            v-for="(item,index) in columnList6" :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-tab-pane>
+    </el-tabs>
+
+    <el-dialog title="关闭原因" :close-on-click-modal="false" v-drag :visible.sync="closeModalFlag" width="450px">
+      <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item >
+              <el-input
+                type="textarea"
+                v-model="closeData.closeRemark "
+                :rows="3"
+                resize='none'
+                maxlength="200"
+                show-word-limit
+                style="height: 60px" >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 60px;text-align:center">
+        <el-button type="primary" @click="closeNotify()">保存</el-button>
+        <el-button type="primary" @click="closeModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 物料明细对话框 -->
+    <el-dialog title="申请明细" :close-on-click-modal="false" v-drag :visible.sync="materialModalFlag" width="900px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'生产订单号'">
+              <el-input v-model="sobomData.orderNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'产品编码'">
+              <el-input v-model="sobomData.partNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="yzzTable">
+        <el-table :height="400" :data="sobomList" border v-loading="bomLoadFlag" style="width: 100%;">
+          <el-table-column
+            prop="componentPartNo"
+            label="物料编码"
+            sortable
+            headerAlign="center"
+            width="120"
+            align="left">
+          </el-table-column>
+          <el-table-column
+            prop="componentPartDesc"
+            label="物料描述"
+            headerAlign="center"
+            width="200"
+            align="left"
+            show-overflow-tooltip>
+          </el-table-column>
+          <el-table-column
+            prop="qtyRequired"
+            label="需求数量"
+            headerAlign="center"
+            width="100"
+            align="right">
+          </el-table-column>
+          <!-- rqrq - 新增可用库存列 -->
+          <el-table-column
+            prop="availableQty"
+            label="可用库存"
+            headerAlign="center"
+            width="100"
+            align="right">
+            <template slot-scope="scope">
+              <span :style="{fontWeight: 'bold', color: (scope.row.availableQty < scope.row.qtyRequired) ? '#F56C6C' : ''}">
+                {{ scope.row.availableQty }}
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="qtyToIssue"
+            label="本次申请数量"
+            headerAlign="center"
+            width="120"
+            align="right">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.qtyToIssue" type="number" style="height: 11px; width: 98%;" :step="0"
+                :min="0"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="remark"
+            label="备注"
+            headerAlign="center"
+            width="200"
+            align="left">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.remark" style="padding: 0;width: 100%"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column prop="" header-align="center" align="center" min-width="80" label="操作">
+            <template slot-scope="scope">
+              <el-button type="primary" @click="qtyAllForBom(scope.row)" style="width: 100%">全数领料</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="saveMaterialDetail()">保存</el-button>
+        <el-button type="primary" @click="materialModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 编辑材料明细对话框 -->
+    <el-dialog title="编辑材料明细" :close-on-click-modal="false" v-drag :visible.sync="editMaterialModalFlag" width="600px">
+      <el-form :inline="true" label-position="top" label-width="120px" style="margin-top: 20px;">
+        <el-row>
+          <el-col span="8">
+            <el-form-item label="申请单序号">
+              <el-input v-model="editMaterialData.itemNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col span="8">
+            <el-form-item label="材料编码">
+              <el-input v-model="editMaterialData.componentPartNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col span="8">
+        <el-form-item label="生产订单">
+          <el-input v-model="editMaterialData.soorderNo" disabled></el-input>
+        </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col span="8">
+            <el-form-item label="需求时间">
+          <el-input v-model="editMaterialData.needDate" disabled></el-input>
+          </el-form-item>
+          </el-col>
+          <el-col span="8">
+          <el-form-item label="申请数量" required>
+            <el-input 
+              v-model="editMaterialData.qtyToIssue" 
+              :min="0" 
+              style="width: 98%;"
+              @input="value => editMaterialData.qtyToIssue = value
+                .replace(/[^\d.]/g, '')        
+                .replace(/\.{2,}/g, '.')         
+                .replace(/^\./, '0.')            
+                .replace(/(\.\d{4}).*/, '$1')    
+                .replace(/^0+(?=\d)/, '0')      
+                .replace(/^0+(?=\.)/, '0')"      
+            ></el-input>
+        </el-form-item>
+          </el-col>
+          <el-col span="8">
+            <el-form-item label="类型">
+          <el-input v-model="editMaterialData.issueType" disabled></el-input>
+        </el-form-item>
+          </el-col>
+          
+        </el-row>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveEditMaterialDetail()">保存</el-button>
+        <el-button type="primary" @click="editMaterialModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 库存预览模态框 -->
+    <el-dialog
+      title="库存匹配预览"
+      :visible.sync="previewDialogVisible"
+      width="80%"
+      :close-on-click-modal="false">
+      <el-table
+        :data="previewData"
+        border
+        v-loading="previewLoading"
+        style="width: 100%;"
+        height="300"
+        :row-class-name="getRowClassName">
+        <el-table-column
+          prop="rowNo"
+          label="行号"
+          width="80"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="productionOrderNo"
+          label="生产订单号"
+          width="100"
+          sortable
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="bomLineNo"
+          label="BOM行号"
+          width="100"
+          sortable
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="partNo"
+          label="物料编码"
+          width="100"
+          sortable
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="requiredQty"
+          label="需求数量"
+          width="80"
+          align="center">
+        </el-table-column>
+        <el-table-column
+          prop="isWarehouseSatisfied"
+          label="立库是否满足"
+          width="100"
+          align="center">
+          <template slot-scope="scope">
+            <span :style="{color: scope.row.isWarehouseSatisfied === 'Y' ? '#67C23A' : '#F56C6C'}">
+              {{ scope.row.isWarehouseSatisfied === 'Y' ? '是' : '否' }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="isOtherWarehouseSatisfied"
+          label="分切仓库是否满足"
+          width="120"
+          align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.isOtherWarehouseSatisfied" :style="{color: scope.row.isOtherWarehouseSatisfied === 'Y' ? '#67C23A' : '#F56C6C'}">
+              {{ scope.row.isOtherWarehouseSatisfied === 'Y' ? '是' : '否' }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="matchedBarcodes"
+          label="匹配条码"
+          min-width="300"
+          align="left"
+          class-name="wrap-text-column">
+          <template slot-scope="scope">
+            <div style="white-space: normal; word-break: break-all; line-height: 1.5;">
+              {{ scope.row.matchedBarcodes }}
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" class="yzzButtonAn" @click="pushToWCS" :disabled="previewLoading">
+          {{ previewLoading ? '推送中...' : '推送至WCS' }}
+        </el-button>
+        <el-button @click="previewDialogVisible = false" :disabled="previewLoading">关闭</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+
 <script>
-import BaseSearchIssureNotify from '@/views/modules/orderIssure/searchIssureNotify.vue'
 import {
   haiAnSearchNotifyHeaderNew,
   haiAnSearchNotifyOrderListNew,
@@ -20,14 +557,1484 @@ import {
 } from '@/api/haianWarehouse/searchIssureNotify.js'
 
 export default {
-  name: 'searchIssureNotify54',
-  extends: BaseSearchIssureNotify,
-  created () {
-    // 补充海安标签扩展列，确保预留标签页签能展示海安增强字段 - rqrq
+    name: 'searchIssureNotify54',
+
+    data() {
+      return {
+        height:200,
+        activeName: 'detail',
+        dataList: [],
+        dataList2: [],
+        dataList3: [],
+        dataList4: [],
+        dataList5: [],
+        dataList6: [],
+        dataList7: [], // 预留标签清单数据 - rqrq
+        userBuList:[],
+        createNotifyFlag: false,
+        saveOrderDetailFlag: false,
+        closeData:{
+          site:'',
+          notifyNo:'',
+          closeRemark:'',
+          username:this.$store.state.user.name,
+        },
+        closeModalFlag:false,
+        searchData: {
+          page: 1,
+          limit: 100,
+          site:'',
+          userName: '',
+          notifyNo: '',
+          status: '',
+          pushWcsFlag: '', // rqrq - 推送WCS筛选条件
+          loginUserName: this.$store.state.user.name,
+          startDate: this.dayjs().format("YYYY-MM-DD"),
+          endDate: this.dayjs().format("YYYY-MM-DD"),
+          issueStartDate:this.dayjs().format("YYYY-MM-DD"),
+          issueEndDate: this.dayjs().format("YYYY-MM-DD")+" 23:59:59",
+          sql: "",
+          orderNo: "",
+          orderType: 'shoporder', // rqrq - 默认查询shoporder类型
+        },
+        notifyData:{
+          site: '',
+          bu: '',
+          notifyNo: '',
+          notifyDate: '',
+          enteredDate: '',
+          userName: this.$store.state.user.name,
+          userDisplay: '',
+          remark: '',
+          planIssueDate: '',
+          outWorkOrderFlag: false,
+        },
+        pageIndex: 1,
+        pageSize: 100,
+        totalPage: 0,
+        //工单分页
+        co_pageIndex: 1,
+        co_pageSize: 100,
+        co_totalPage: 0,
+        dataListLoading: false,
+        currentRow:'',
+        columnList1:[
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1NotifyNo',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "notifyNo",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "申请单单号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1NotifyDate',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "notifyDate",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "申请日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1UserName',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "username",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "申请账号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1EnteredDate',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "enteredDate",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "录入时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1Status',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "status",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1ConfirmStatus',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "confirmStatus",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "确认状态",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1WcsPushFlag',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "pushWcsFlag",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "推送WCS",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table1Remark',
+            tableId: "701002Table1",
+            tableName: "领料申请主表",
+            columnProp: "remark",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "备注",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 200
+          },
+        ],
+        columnList2:[
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2ItemNo',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "itemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 40
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2NeedDate',
+            tableId: "701002Table2",
+            tableName: "领料申请派工单子表",
+            columnProp: 'needDate',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '要求发料时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2PushWcsTime',
+            tableId: "701002Table2",
+            tableName: "领料申请派工单子表",
+            columnProp: 'pushWcsTime',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '推送WCS时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2SOOrderNo',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "soorderNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "生产订单",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2FGPartNo',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "fgPartNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "工单物料",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2ReleaseNo',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "releaseNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "发布号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2SequenceNo',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "sequenceNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2PushWmsFlag',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "pushWmsFlag",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "是否推送WCS",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2TransportFlag',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "transportFlag",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "立库取出",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          }, {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table2AreaDesc',
+            tableId: "701002Table2",
+            tableName: "申请单派工单明细表",
+            columnProp: "areaDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "配送区域",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          }
+
+        ],
+        columnList3:[
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3ItemNo',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "itemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "申请单序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3ComponentPartNo',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "componentPartNo",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "材料编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3IsInWh',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "isInWh",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "是否进立库",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3NeedDate',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "needDate",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "需求时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 110
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3QtyToIssue',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "qtyToIssue",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "申请数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },/* {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3QtyToIssueOriginal',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "qtyToIssueOriginal",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "已发数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          }, */{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3IssueType',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "issueType",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3Remark',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "remark",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "备注",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 160
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3SOOrderNo',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "soorderNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "生产订单",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table3BOMItemNo',
+            tableId: "701002Table3",
+            tableName: "申请单材料明细表",
+            columnProp: "bomitemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "BOM序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+
+          },
+        ],
+        columnList4:[
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table4IssueType',
+            tableId: "701002Table4",
+            tableName: "申请单材料明细表",
+            columnProp: "issueType",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "类型",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table4ComponentPartNo',
+            tableId: "701002Table4",
+            tableName: "申请单材料明细表",
+            columnProp: "componentPartNo",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "材料编码",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table4IsInWh',
+            tableId: "701002Table4",
+            tableName: "申请单材料明细表",
+            columnProp: "isInWh",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "是否进立库",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table4PartDesc',
+            tableId: "701002Table4",
+            tableName: "申请单材料明细表",
+            columnProp: "partDesc",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "材料名称",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 130
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table4QtyToIssue',
+            tableId: "701002Table4",
+            tableName: "申请单材料明细表",
+            columnProp: "qtyToIssue",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "合计申请数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table4QtyToIssueOriginal',
+            tableId: "701002Table4",
+            tableName: "申请单材料明细表",
+            columnProp: "qtyToIssueOriginal",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "合计已发数量",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
+        ],
+        columnList6:[ // 预留标签清单列配置 - rqrq
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6ItemNo',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "itemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "订单序号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6BOMItemNo',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "bomItemNo",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "订单物料行号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6SerialNo',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "serialNo",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "标签号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6TaskRef',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "taskRef",
+            headerAlign: "center",
+            align: "left",
+            columnLabel: "立库任务号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6TaskItem',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "taskItem",
+            headerAlign: "center",
+            align: "right",
+            columnLabel: "立库任务行号",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100
+          },{
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6OutWcsFlag',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "outWcsFlag",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "立库取出",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701002,
+            serialNumber: '701002Table6OutWcsTime',
+            tableId: "701002Table6",
+            tableName: "预留标签清单表",
+            columnProp: "outWcsTime",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "取出时间",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 140
+          }
+        ],
+
+        // 导出 start
+        exportData: [],
+        exportName: '发料申请单'+this.dayjs().format('YYYYMMDDHHmmss'),
+        exportHeader: ["发料申请单"],
+        exportFooter: [],
+        // 导出 end
+        orderDetailData:{
+          orderNo:'',
+          seqNo:'',
+          locationNo:'',
+          qtyrequired:'',
+          issureQty:0,
+          partDesc:'',
+          partNo:'',
+          resourceId:'',
+          resourceDesc:'',
+          needDate:'',
+          itemDesc:'',
+          workCenterNo:'',
+          itemNo:0,
+          materialType:'BOM物料',
+        },
+        chooseSOSModalFlag: false,
+        chooseSOSData: {
+          orderno: '',
+          seqno: '',
+          sResourceid: '',
+          startDate: '',
+          endDate: '',
+        },
+        chooseOrderModalFlag: false,
+        chooseOrderData: {
+          page: 1,
+          limit: 100,
+          orderNo: '',
+          status: '',
+          date3: '',
+          date4: '',
+          statusList: '',
+        },
+        chooseOrderList: [],
+        chooseOperationModalFlag: false,
+        chooseOperationData: {
+          orderNo: '',
+          site: '',
+          itemDesc: ''
+        },
+        chooseOperationList: [],
+        chooseResourceModalFlag: false,
+        chooseResourceData: {
+          site: '',
+          workCenterNo: '',
+          resourceID: '',
+          resourceDesc: '',
+        },
+        chooseResourceList: [],
+        chooseSOSList: [],
+        choosePartModalFlag: false,
+        choosePartData: {
+          site: '',
+          sourceBu: '',
+          partNo: '',
+          partDesc: '',
+          spec: '',
+        },
+        choosePartList: [],
+        // 预览相关数据
+        previewDialogVisible: false,
+        previewLoading: false,
+        previewData: [],
+        // 物料明细对话框相关数据
+        materialModalFlag: false,
+        sobomList: [],
+        sobomData: {
+          orderNo: '',
+          seqNo: '',
+          partNo: '',
+        },
+        bomLoadFlag: false,
+        // 编辑材料明细对话框相关数据
+        editMaterialModalFlag: false,
+        editMaterialData: {
+          itemNo: '',
+          componentPartNo: '',
+          isInWh: '',
+          needDate: '',
+          qtyToIssue: 0,
+          issueType: '',
+          remark: '',
+          soorderNo: '',
+          bomitemNo: '',
+          site: '',
+          notifyNo: '',
+        },
+      }
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = (window.innerHeight- 315) / 2
+      })
+    },
+
+
+    created () {
+      this.searchTable()
+      // 补充海安标签扩展列，确保预留标签页签能展示海安增强字段 - rqrq
     this.haiAnEnsureLabelColumns()
-  },
-  methods: {
-    /**
+    },
+    methods: {
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.searchTable()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.searchTable()
+      },
+      tabClick (tab, event) {
+        // 刷新列表数据
+        this.refreshCurrentTabTable()
+      },
+      changeData(row){
+        this.currentRow = JSON.parse(JSON.stringify(row));
+        this.refreshCurrentTabTable ();
+      },
+      refreshCurrentTabTable(){
+        if(this.currentRow===''||this.currentRow===null){
+          this.currentRow={site:'',notifyNo:'',orderType:'shoporder'}
+        }
+        // rqrq - 添加orderType参数
+        let queryData = {
+          ...this.currentRow,
+          orderType: 'shoporder'
+        }
+        if(this.activeName==='detail'){
+          searchNotifyOrderListNew(queryData).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList2 = data.rows
+
+            } else {
+              this.dataList2 = [];
+            }
+          });
+        }else if(this.activeName==='sub'){
+          searchNotifyMaterialListNew(queryData).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList3 = data.rows
+
+            } else {
+              this.dataList3 = [];
+            }
+          });
+        }else if(this.activeName==='change'){
+          searchNotifyLogNew(queryData).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList5 = data.rows
+
+            } else {
+              this.dataList5 = [];
+            }
+          });
+        }else if(this.activeName==='close'){
+          searchNotifyLogCloseNew(queryData).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList6 = data.rows
+
+            } else {
+              this.dataList6 = [];
+            }
+          });
+        }else if(this.activeName==='labelDetail'){ // rqrq - 预留标签清单页签
+          searchMaterialListDetail(queryData).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList7 = data.rows
+
+            } else {
+              this.dataList7 = [];
+            }
+          });
+        }else {
+          searchSumNotifyMaterialListNew(queryData).then(({data}) => {
+            //区分请求成功和失败的状况
+            if (data && data.code == 0) {
+              this.dataList4 = data.rows
+
+            } else {
+              this.dataList4 = [];
+            }
+          });
+        }
+      },
+      searchTable(){
+        this.searchData.limit = this.pageSize
+        this.searchData.page = this.pageIndex
+        searchNotifyHeaderNew(this.searchData).then(({data}) => {
+          //区分请求成功和失败的状况
+          if (data && data.code == 0) {
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
+          } else {
+            this.dataList = [];
+          }
+        });
+      },
+      closeNotifyModel(row){
+        this.closeData.site=row.site
+        this.closeData.notifyNo=row.notifyNo
+        this.closeData.closeRemark=''
+        this.closeModalFlag=true
+      },
+      closeNotify(){
+        if(this.closeData.closeRemark==null||this.closeData.closeRemark===''){
+          this.$alert("必须输入关闭原因", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+
+            let inData={
+              site:this.closeData.site,
+              notifyNo:this.closeData.notifyNo,
+              closeRemark:this.closeData.closeRemark,
+              username:this.$store.state.user.name,
+              status:'CLOSED',
+            }
+          updateNotifyStatusNew(inData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.closeModalFlag=false
+              this.searchTable()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+
+      },
+      openNotify(row){
+        this.$confirm('确认打开?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let inData={
+            site:row.site,
+            notifyNo:row.notifyNo,
+            status:'ISSUE',
+          }
+          updateNotifyStatusNew(inData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.searchTable()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+      // 预览库存匹配情况
+      previewInventory(row) {
+        this.currentRow = row  // 保存当前行数据
+        this.previewDialogVisible = true
+        this.previewLoading = true
+        this.previewData = []
+
+        let inData = {
+          site: row.site,
+          notifyNo: row.notifyNo
+        }
+
+        checkIssueNotifyInventory(inData).then(({data}) => {
+          this.previewLoading = false
+          if (data && data.code === 0) {
+            this.previewData = data.rows || []
+            console.log('库存预览数据:', this.previewData)
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        }).catch(() => {
+          this.previewLoading = false
+          this.$message.error('获取库存预览失败')
+        })
+      },
+
+      // 根据订单满足状态设置行样式
+      getRowClassName({row}) {
+        if (row.orderSatisfactionStatus === 1) {
+          return 'success-row'  // 绿色：完全立库满足
+        } else if (row.orderSatisfactionStatus === 2) {
+          return 'warning-row'  // 黄色：立库+分切区满足
+        } else if (row.orderSatisfactionStatus === 3) {
+          return 'danger-row'   // 红色：存在不满足
+        }
+        return ''
+      },
+
+      // 从预览对话框推送至WCS
+      pushToWCS() {
+        // 筛选绿色和黄色的数据（orderSatisfactionStatus = 1 或 2）
+        // const validData = this.previewData.filter(item =>
+        //   item.orderSatisfactionStatus === 1 || item.orderSatisfactionStatus === 2
+        // )
+        //全部推送 后端判断
+        const validData = this.previewData
+
+        if (validData.length === 0) {
+          this.$message.warning('没有可推送的数据（只推送绿色和黄色状态的数据）')
+          return
+        }
+
+        this.$confirm(`确认推送 ${validData.length} 条数据至WCS？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          // 显示加载状态 - rqrq
+          this.previewLoading = true
+
+          const inData = {
+            site: this.currentRow.site,
+            notifyNo: this.currentRow.notifyNo,
+            inventoryList: validData
+          }
+
+          pushInventoryToWcs(inData).then(({data}) => {
+            this.previewLoading = false
+            if (data && data.code === 0) {
+              this.$message({
+                message: '推送WCS成功',
+                type: 'success',
+                duration: 1500
+              })
+              this.previewDialogVisible = false
+              this.searchTable()
+            } else {
+              this.$alert(data.msg || '推送失败', '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          }).catch((error) => {
+            this.previewLoading = false
+            this.$message.error(error.message || '推送WCS失败，请重试')
+          })
+        }).catch(() => {
+          // 用户取消操作 - rqrq
+          console.log('用户取消推送')
+        })
+      },
+
+      pushToWcs(row){
+        this.$confirm('确认推送到WCS?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let inData={
+            site: row.site,
+            notifyNo: row.notifyNo
+          }
+          pushNotifyToWcs(inData).then(({data}) => {
+            if (data && data.code === 0) {
+              this.searchTable()
+              this.$message({
+                message: '推送WCS成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+
+      /**
+       * @Description 取消下达处理方法 - rqrq
+       * @param row 当前行数据
+       */
+      cancelIssueNotifyHandle(row) {
+        // 先判断发起人是否有未下达的shoporder申请单 - rqrq
+        let checkData = {
+          site: row.site,
+          username: row.username
+        }
+
+        checkUserHasUnissueShopOrder(checkData).then(({ data }) => {
+          if (data && data.code === 0) {
+            // 如果有未下达的申请单 - rqrq
+            if (data.row != null) {
+              this.$alert('该用户有未下达的申请单,请先处理', '提示', {
+                confirmButtonText: '确定'
+              })
+              return
+            }
+
+            // 没有未下达的申请单，执行取消下达 - rqrq
+            this.$confirm(`确定取消下达申请单【${row.notifyNo}】吗?`, '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              let cancelData = {
+                site: row.site,
+                notifyNo: row.notifyNo
+              }
+
+              cancelIssueNotify(cancelData).then(({ data }) => {
+                if (data && data.code === 0) {
+                  this.$message.success('取消下达成功')
+                  // 重新加载数据 - rqrq
+                  this.searchTable()
+                } else {
+                  this.$alert(data.msg, '错误', {
+                    confirmButtonText: '确定'
+                  })
+                }
+              }).catch(() => {
+                this.$message.error('取消下达失败')
+              })
+            }).catch(() => {
+              // 用户取消操作 - rqrq
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        }).catch(() => {
+          this.$message.error('检查用户申请单失败')
+        })
+      },
+
+      deleteNotifyMaterial(row){
+        this.$confirm('确认删除?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteNotifyMaterial(row).then(({data}) => {
+            if (data && data.code === 0) {
+              this.refreshCurrentTabTable()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+      deleteNotifySOSPlus(row){
+        this.$confirm('确认删除?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteNotifySOSPlus(row).then(({data}) => {
+            if (data && data.code === 0) {
+              this.refreshCurrentTabTable()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定'
+              })
+            }
+          })
+        })
+      },
+      // 进入工单物料明细
+      enterSOSDetail(row) {
+        let rows = {
+          site: this.currentRow.site || this.$store.state.user.site,
+          notifyNo: this.currentRow.notifyNo,
+          orderNo: row.soorderNo || row.orderNo,
+          seqNo: row.seqNo || '',
+          partNo: row.fgPartNo || row.partNo,
+          itemNo: row.itemNo,
+          releaseNo: row.releaseNo,
+          sequenceNo: row.sequenceNo,
+        }
+        this.enterSOS(rows)
+      },
+      // 打开物料明细对话框
+      enterSOS(row) {
+        this.materialModalFlag = true
+        this.sobomList = []
+        this.sobomData = {
+          orderNo: row.orderNo,
+          seqNo: row.seqNo,
+          partNo: row.partNo,
+        }
+        this.bomLoadFlag = true
+        let inData = {
+          site: this.currentRow.site || this.$store.state.user.site,
+          notifyNo: this.currentRow.notifyNo,
+          orderNo: row.orderNo,
+          releaseNo: row.releaseNo,
+          sequenceNo: row.sequenceNo,
+          partNo: row.partNo,
+          itemNo: row.itemNo,
+        }
+        getSOSBOMForIssureNew(inData).then(({ data }) => {
+          this.bomLoadFlag = false
+          if (data.code === 0) {
+            this.sobomList = data.rows
+            for (let i = 0; i < this.sobomList.length; i++) {
+              this.sobomList[i].itemNo = inData.itemNo
+            }
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        }).catch(() => {
+          this.bomLoadFlag = false
+          this.$message.error('获取物料明细失败')
+        })
+      },
+      // 全数领料
+      qtyAllForBom(row) {
+        row.qtyToIssue = row.qtyRequired
+      },
+      // 保存物料明细
+      saveMaterialDetail() {
+        for (let i = 0; i < this.sobomList.length; i++) {
+          if (
+            this.sobomList[i].qtyToIssue === '' ||
+            this.sobomList[i].qtyToIssue == null
+          ) {
+            this.sobomList[i].qtyToIssue = 0
+          }
+          this.sobomList[i].notifyNo = this.currentRow.notifyNo
+          this.sobomList[i].site = this.currentRow.site || this.$store.state.user.site
+        }
+
+        let materialList = this.sobomList.filter((item) => item.qtyToIssue > 0)
+        if (materialList.length == 0) {
+          this.$alert('没有需要保存的内容!', '提示', {
+            confirmButtonText: '确定',
+          })
+          return false
+        }
+        saveMaterialDetail(materialList).then(({ data }) => {
+          if (data.code === 0) {
+            this.materialModalFlag = false
+            this.refreshCurrentTabTable()
+            this.$message.success('操作成功')
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+      },
+      // 处理材料明细行双击事件
+      handleMaterialRowDblClick(row) {
+
+        if(!'未推送'.includes(this.currentRow.pushWcsFlag)){
+          this.$message.warning('只有未推送状态的申请单才能编辑材料明细')
+          return;
+        }
+        // 保存完整的行数据，以便后续保存时包含所有必要字段
+        this.editMaterialData = JSON.parse(JSON.stringify(row))
+        // 确保包含必要的字段
+        this.editMaterialData.site = this.currentRow.site || this.$store.state.user.site
+        this.editMaterialData.notifyNo = this.currentRow.notifyNo || ''
+        // 确保申请数量有默认值
+        if (this.editMaterialData.qtyToIssue === null || this.editMaterialData.qtyToIssue === undefined) {
+          this.editMaterialData.qtyToIssue = 0
+        }
+        this.editMaterialModalFlag = true
+      },
+      // 保存编辑的材料明细
+      saveEditMaterialDetail() {
+        if (this.editMaterialData.qtyToIssue === null || this.editMaterialData.qtyToIssue === '') {
+          this.$alert('申请数量不能为空!', '提示', {
+            confirmButtonText: '确定',
+          })
+          return false
+        }
+        if (this.editMaterialData.qtyToIssue < 0) {
+          this.$alert('申请数量不能小于0!', '提示', {
+            confirmButtonText: '确定',
+          })
+          return false
+        }
+        
+        // 使用完整的行数据，只更新申请数量
+        let materialData = {
+          ...this.editMaterialData,
+        }
+        
+        // 确保申请数量不为空
+        if (materialData.qtyToIssue === '' || materialData.qtyToIssue == null) {
+          materialData.qtyToIssue = 0
+        }
+        
+        
+        updateMaterialDetail(materialData).then(({ data }) => {
+          if (data.code === 0) {
+            this.editMaterialModalFlag = false
+            this.refreshCurrentTabTable()
+            this.$message.success('保存成功')
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        }).catch(() => {
+          this.$message.error('保存失败')
+        })
+      },
+
+
+
+
+      //导出excel - rqrq
+      async createExportData() {
+        const queryParams = {
+          ...this.searchData,
+          limit: 999999,  // 设置一个很大的数字来获取全部数据 - rqrq
+          page: 1
+        }
+        const {data} = await searchNotifyHeaderNew(queryParams)
+        if (data && data.code === 0) {
+          return data.page.list || []
+        }
+        return []
+      },
+      startDownload() {
+        //  this.exportData = this.dataList
+
+      },
+      finishDownload() {
+      },
+      fields() {
+        let json = "{"
+        this.columnList1.forEach((item, index) => {
+          if (index == this.columnList1.length - 1) {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
+          } else {
+            json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
+          }
+        })
+        json += "}"
+        let s = eval("(" + json + ")")
+
+        return s
+      },
+
+      tableRowClassName ({row, rowIndex}) {
+
+        if (row.qtyToIssueOriginal<row.qtyToIssue&&new Date(row.needDate)<new Date(this.dayjs().format("YYYY-MM-DD HH:mm"))) {
+          return 'error-row'
+        }
+
+        return ''
+      },
+      /**
      * 统一构建海安查询入参，强制使用登录用户site避免跨站点串单 - rqrq
      */
     haiAnBuildQueryData (row) {
@@ -38,7 +2045,7 @@ export default {
         orderType: 'shoporder'
       }
     },
-    /**
+      /**
      * 海安标签页签增加subsite/allocSeq/palletId/taskSeq列，便于追踪标签流向 - rqrq
      */
     haiAnEnsureLabelColumns () {
@@ -73,7 +2080,7 @@ export default {
       appendColumn('allocSeq', '分配序号', 100, 'right')
       appendColumn('palletId', '栈板号', 120, 'left')
     },
-    /**
+      /**
      * 海安页签刷新逻辑，四个页签均改为海安接口并保留原交互语义 - rqrq
      */
     refreshCurrentTabTable () {
@@ -107,7 +2114,7 @@ export default {
         })
       }
     },
-    /**
+      /**
      * 海安主表查询改为海安接口，固定传登录站点并保留分页语义 - rqrq
      */
     searchTable () {
@@ -126,7 +2133,7 @@ export default {
         this.dataList = []
       })
     },
-    /**
+      /**
      * 海安关闭申请单，保持旧页面的必填关闭原因校验与提示语义 - rqrq
      */
     closeNotify () {
@@ -159,7 +2166,7 @@ export default {
         })
       })
     },
-    /**
+      /**
      * 海安开启申请单，状态回写改走海安接口并保持原确认交互 - rqrq
      */
     openNotify (row) {
@@ -189,7 +2196,7 @@ export default {
         })
       })
     },
-    /**
+      /**
      * 海安库存预览当前为占位实现，保留入口并给出待开发提示 - rqrq
      */
     previewInventory (row) {
@@ -218,7 +2225,7 @@ export default {
         this.$message.error('获取库存预览失败')
       })
     },
-    /**
+      /**
      * 海安推送WCS当前为占位实现，仅提示待开发并不触发真实推送 - rqrq
      */
     pushToWCS () {
@@ -250,13 +2257,13 @@ export default {
         })
       })
     },
-    /**
+      /**
      * 兼容旧入口的海安推送占位方法，避免历史按钮调用空指针 - rqrq
      */
     pushToWcs (row) {
       this.previewInventory(row)
     },
-    /**
+      /**
      * 海安取消下达流程：先检查未下达冲突，再执行取消并刷新列表 - rqrq
      */
     cancelIssueNotifyHandle (row) {
@@ -303,7 +2310,7 @@ export default {
         this.$message.error('检查用户申请单失败')
       })
     },
-    /**
+      /**
      * 海安删除工单行增强接口，保留未推送状态限制并同步刷新当前页签 - rqrq
      */
     deleteNotifySOSPlus (row) {
@@ -333,7 +2340,7 @@ export default {
         })
       })
     },
-    /**
+      /**
      * 海安查看页物料弹窗查询，按海安接口回显已保存数量并透传subsite - rqrq
      */
     enterSOS (row) {
@@ -373,7 +2380,7 @@ export default {
         this.$message.error('获取物料明细失败')
       })
     },
-    /**
+      /**
      * 海安保存材料明细走海安先删后存链路，并透传subsite防止跨子站点串单 - rqrq
      */
     saveMaterialDetail () {
@@ -404,7 +2411,7 @@ export default {
         })
       })
     },
-    /**
+      /**
      * 海安编辑材料数量，沿用未推送限制并改为海安更新接口 - rqrq
      */
     saveEditMaterialDetail () {
@@ -442,7 +2449,7 @@ export default {
         this.$message.error('保存失败')
       })
     },
-    /**
+      /**
      * 海安导出数据改为海安主查询接口，确保导出内容来自海安表链路 - rqrq
      */
     async createExportData () {
@@ -459,6 +2466,88 @@ export default {
       }
       return []
     }
+    },
+
   }
-}
 </script>
+
+<style scoped>
+/deep/ .el-form-item--medium .el-form-item__content {
+  height: auto;
+}
+.disabled {
+  cursor: not-allowed !important;
+  color: #C0C4CC !important;
+  pointer-events: none;
+}
+
+.text-right >>> .el-input__inner {
+  text-align: right !important;
+}
+
+.text-right >>> .el-input-number__input {
+  text-align: right !important;
+}
+
+.yzzTable /deep/.el-table .cell {
+  line-height: 20px;
+  font-size: 12px;
+  height: 20px;
+}
+
+.single-line-multi-select >>> .el-select__tags {
+  display: flex;
+  flex-wrap: nowrap;
+  overflow: hidden;
+  white-space: nowrap;
+  max-width: 100%;
+}
+
+.single-line-multi-select >>> .el-tag {
+  flex-shrink: 0;
+  max-width: 100px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.single-line-multi-select >>> .el-select__input {
+  flex-shrink: 0;
+  min-width: 30px;
+}
+
+/* 库存预览表格行颜色 */
+/deep/ .el-table .success-row {
+  background: #f0f9ff !important;
+  border-left: 3px solid #67C23A;
+}
+
+/* rqrq - 匹配条码列自动换行显示 */
+/deep/ .wrap-text-column .cell {
+  white-space: normal !important;
+  word-break: break-all !important;
+  line-height: 1.5 !important;
+}
+
+/deep/ .el-table .warning-row {
+  background: #fdf6ec !important;
+  border-left: 3px solid #E6A23C;
+}
+
+/deep/ .el-table .danger-row {
+  background: #fef0f0 !important;
+  border-left: 3px solid #F56C6C;
+}
+
+/deep/ .el-table .success-row:hover > td {
+  background-color: #ecf5ff !important;
+}
+
+/deep/ .el-table .warning-row:hover > td {
+  background-color: #faecd8 !important;
+}
+
+/deep/ .el-table .danger-row:hover > td {
+  background-color: #fde2e2 !important;
+}
+</style>