diff --git a/src/api/orderIssure/noOrderIssueNotify.js b/src/api/orderIssure/noOrderIssueNotify.js
new file mode 100644
index 0000000..aca7647
--- /dev/null
+++ b/src/api/orderIssure/noOrderIssueNotify.js
@@ -0,0 +1,12 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+export const getUserNoOrderNotifyNo = data => createAPI(`/orderIssure/issureNotify/getUserNoOrderNotifyNo`,'post',data)
+export const createNoOrderNotify = data => createAPI(`/orderIssure/issureNotify/createNoOrderNotify`,'post',data)
+export const noOrderList = data => createAPI(`/factory/partAttribute/noOrderList`,'post',data)
+export const saveNoOrderNotify = data => createAPI(`/orderIssure/issureNotify/saveNoOrderNotify`,'post',data)
+export const getNotifyNoOrderDetail = data => createAPI(`/orderIssure/issureNotify/getNotifyNoOrderDetail`,'post',data)
+export const getNoOrderMaterialList = data => createAPI(`/orderIssure/issureNotify/getNoOrderMaterialList`,'post',data)
+export const saveNoOrderMaterialDetail = data => createAPI(`/orderIssure/issureNotify/saveNoOrderMaterialDetail`,'post',data)
+export const searchNoOrderNotifyHeader = data => createAPI(`/orderIssure/issureNotify/searchNoOrderNotifyHeader`,'post',data)
+
+export const getNotifyNoOrderDetailByType = data => createAPI(`/orderIssure/issureNotify/getNotifyNoOrderDetailByType`,'post',data)
\ No newline at end of file
diff --git a/src/views/modules/noOrderIssue/newNoOrderIssueNotify.vue b/src/views/modules/noOrderIssue/newNoOrderIssueNotify.vue
new file mode 100644
index 0000000..b1141e1
--- /dev/null
+++ b/src/views/modules/noOrderIssue/newNoOrderIssueNotify.vue
@@ -0,0 +1,2264 @@
+<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-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" size="small">
+                <el-radio label="shoporder">shoporder</el-radio>
+                <el-radio label="slittingorder">slittingorder</el-radio>
+                <el-radio label="shipment">shipment</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          </el-row>
+          <el-row :gutter="20">
+          <el-col :span="6">
+              <el-button type="primary" @click="openSelectMaterialModal()" style="margin-top: 5px"
+                class="">添加</el-button>
+          </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-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>
+    <!-- 选择物料弹框 -->
+    <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>
+          </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>
+          </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>
+              <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>
+  </div>
+</template>
+
+<script>
+import {
+  getUserNoOrderNotifyNo,
+  createNoOrderNotify,
+  noOrderList,
+  saveNoOrderNotify,
+  getNotifyNoOrderDetail,
+  getNoOrderMaterialList,
+  saveNoOrderMaterialDetail
+} from '@/api/orderIssure/noOrderIssueNotify.js'
+import {
+  deleteNotify,
+  getAllNotifyStatus,
+  getNotifyNoDetail,
+  saveSOIssueNotifyOrderList,
+  deleteNotifySOS,
+  searchNotifyMaterialListNew,
+  
+} from '@/api/orderIssure/soIssueNotify.js'
+import Chooselist from '@/views/modules/common/Chooselist_eam'
+import {
+  getShopOrderFromIFSWithOrderNo,
+  getSOSBOMForIssureNew,
+  searchOtherPart,
+  xiadaNotify,
+} from '../../../api/orderIssure/soIssueNotify'
+import { getTableUserListLanguage } from '../../../api/table'
+
+export default {
+  name: 'newSoIssueNotify',
+  components: {
+    Chooselist,
+  },
+  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: [],
+      materialDetailColumnList: [],
+      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: 200,
+        },
+        {
+          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,
+        },
+      ],
+      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: '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,
+        },
+        {
+          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: 'shoporder',
+      // 申请明细弹框相关
+      isMaterialDetailModal: false, // 标识是否从申请明细弹框打开选择物料弹框
+      clickrow:{},
+    }
+  },
+
+  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,
+      }
+      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 = []
+      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 = ''
+    },
+    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 // 标识从新增工单物料弹框打开
+      
+      // 设置模板编号和名称
+      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
+            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() {},
+    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.
+        }
+      })
+    },
+  },
+}
+</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/noOrderIssue/noOrderNotification.vue b/src/views/modules/noOrderIssue/noOrderNotification.vue
new file mode 100644
index 0000000..115a850
--- /dev/null
+++ b/src/views/modules/noOrderIssue/noOrderNotification.vue
@@ -0,0 +1,2692 @@
+<template>
+  <div class="mod-config">
+    <!-- 条件查询 -->
+    <el-form :inline="true" label-position="top" :model="searchData">
+      <el-form-item :label="'单据号'">
+        <el-input v-model="searchData.notifyNo" clearable style="width: 120px"></el-input>
+      </el-form-item>
+      <el-form-item :label="'单据状态'">
+        <el-select multiple collapse-tags v-model="searchData.orderStatusList" clearable style="width: 160px">
+          <el-option label="ISSUE" value="ISSUE"></el-option>
+          <el-option label="CLOSED" value="CLOSED"></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;">
+        <!-- <laber style="margin-left: -9px;font-size: 19px"></laber> -->
+        ~
+      </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="' '">
+        <el-button type="primary" :loading="searchLoading" @click="getDataList()">查询</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 展示列表 -->
+    <el-table :height="height" :data="dataList" border v-loading="searchLoading" ref="inboundTable"
+      :row-style="rowStyle" @row-click="inboundClickRow" @current-change="changeCurrentRow" style="width: 100%;">
+      <el-table-column type="selection" header-align="center" align="center" width="50">
+      </el-table-column>
+      <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="250" label="操作">
+        <template slot-scope="scope">
+          <!-- <template v-if="!authUpdate">
+            <el-link
+              v-if="scope.row.orderStatus === '草稿' || scope.row.orderStatus === '待检验' || scope.row.orderStatus === '编辑中'"
+              style="cursor: pointer" @click="updateModal(scope.row)">编辑</el-link>
+          </template> -->
+          <template v-if="!authClose">
+            <el-link style="cursor: pointer" @click="closeModal(scope.row)">关闭</el-link>
+          </template>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页栏 -->
+    <el-pagination style="margin-top: 0px" @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
+      :current-page="pageIndex" :page-sizes="[20, 50, 100, 200, 500]" :page-size="pageSize" :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+
+    <!-- 收货入库通知新增/修改 -->
+    <el-dialog title="收货入库通知" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="525px">
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules"
+        style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="单据类型" prop="orderType">
+          <el-select v-model="modalData.orderType" :disabled="modalDisableFlag" style="width: 100px">
+            <el-option label="生产退料" value="生产退料"></el-option>
+            <el-option label="生产入库" value="生产入库"></el-option>
+            <el-option label="其他入库" value="其他入库"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="要求入库日期" prop="requiredInboundDate">
+          <el-date-picker style="width: 120px" v-model="modalData.requiredInboundDate" type="date"
+            value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px">
+        <el-form-item>
+          <!--          <span v-if="modalDisableFlag" slot="label">供应商</span>-->
+          <span style="cursor: pointer" slot="label" @click="getBaseList(506)"><a href="#">供应商</a></span>
+          <el-input v-model="modalData.supplierId" @change="supplierBlur(506)" style="width: 100px"></el-input>
+          <el-input v-model="modalData.supplierName" disabled style="width: 380px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-left: 7px">
+        <el-form-item :label="'备注'">
+          <el-input type="textarea" v-model="modalData.remarks" :rows="3" resize='none' show-word-limit
+            style="width: 485px;height: 20px"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:35px;margin-top: 55px;text-align:center">
+        <el-button type="primary" :loading="saveLoading" @click="saveData()">保存</el-button>
+        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 页签 -->
+    <el-tabs v-model="activeTable" style="width: 100%" :style="{height: secondHeight + 'px'}" type="border-card"
+      @tab-click="tabClick" class="customer-tab">
+      <el-tab-pane label="已申请物料" name="inboundDetail">
+        <!-- <el-form label-position="top" style="margin-left: 2px;">
+          <el-button type="primary" @click="deleteInboundDetail()" icon="el-icon-delete">删除</el-button>
+        </el-form> -->
+        <el-table :data="detailList" :height="secondHeight - 68" border @selection-change="selectionInboundDetail"
+          v-loading="searchLoading" style="width: 100%;">
+          <!-- <el-table-column type="selection" header-align="center" align="center" width="50">
+          </el-table-column> -->
+          <el-table-column v-for="(item,index) in columnDetailList" :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 prop="requiredQty" header-align="center" align="right" min-width="100" label="要求入库数量">
+            <template slot-scope="scope">
+              <span v-if="editBatchVisible">
+                <el-input :controls="false" v-model="scope.row.requiredQty"
+                  @input="value => scope.row.requiredQty = value.match(/^(\d+\.?\d*|\.\d+)$/) ? value : ''"
+                  style="height: 11px; width: 98%;">
+                </el-input>
+              </span>
+              <span v-else>
+                <span>{{scope.row[scope.column.property]}}</span>
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="inWarehouseName" header-align="center" align="center" min-width="180" label="入库仓库">
+            <template slot-scope="scope">
+              <span v-if="editBatchVisible">
+                <el-button type="text" @click="chooseWareHouse(scope.row)"
+                  style="width:18%;padding: 3px 7px">选择</el-button>
+                <el-input v-model="scope.row.inWarehouseName" readonly style="width:77%"></el-input>
+              </span>
+              <span v-else>
+                <span>{{scope.row[scope.column.property]}}</span>
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="actualStockInQty" header-align="center" align="right" min-width="100" label="实际入库数量">
+          </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-tabs>
+
+    <!-- 收获入库单明细新增 -->
+    <el-dialog title="收货入库单明细" :close-on-click-modal="false" v-drag :visible.sync="detailModal" width="900px">
+      <div style="font-size: 12px">
+        <el-form :inline="true" label-position="top" :model="detailSearchData">
+          <el-form-item :label="'物料编码'">
+            <el-input v-model="detailSearchData.partNo" clearable style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'物料名称'">
+            <el-input v-model="detailSearchData.partDesc" clearable style="width: 120px"></el-input>
+          </el-form-item>
+          <template v-if="detailSearchData.orderType === '生产入库'">
+            <el-form-item :label="'生产订单'">
+              <el-input v-model="detailSearchData.relatedOrderNo" clearable style="width: 120px"></el-input>
+            </el-form-item>
+            <el-form-item :label="'订单状态'">
+              <el-select v-model="detailSearchData.status" clearable style="width: 100px">
+                <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-option label="已停工" value="已停工"></el-option>
+                <el-option label="已关闭" value="已关闭"></el-option>
+              </el-select>
+            </el-form-item>
+          </template>
+          <el-form-item label=" ">
+            <el-button type="primary" @click="searchTypeChange">查询</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <el-container v-if="detailSearchData.orderType === '其他入库'">
+        <el-header style="width: 880px;height: 200px;padding: 0 0 0 0">
+          <span style="font-size: 12px">可选物料</span>
+          <el-table height="200px" :data="partList1" border ref="partTable1" @selection-change="selectionPart1"
+            highlight-current-row style="width: 100%">
+            <el-table-column type="selection" header-align="center" align="center" width="50">
+            </el-table-column>
+            <el-table-column prop="partNo" header-align="center" align="center" min-width="80" label="物料编码">
+            </el-table-column>
+            <el-table-column prop="partDesc" header-align="center" align="left" min-width="120" label="物料名称">
+            </el-table-column>
+            <el-table-column prop="unit" header-align="center" align="left" min-width="120" label="物料单位">
+            </el-table-column>
+          </el-table>
+          <!-- 分页-->
+          <el-pagination style="margin-top: 5px" @size-change="sizeChangeHandle2" @current-change="currentChangeHandle2"
+            :current-page="pageIndex2" :page-sizes="[20, 50, 100, 200, 500]" :page-size="pageSize2" :total="totalPage2"
+            layout="total, sizes, prev, pager, next, jumper">
+          </el-pagination>
+        </el-header>
+        <el-main style="width: 880px;height: 27px;margin-top: 70px;padding: 0 0 0 0;text-align:center">
+          <div>
+            <el-button type="primary" @click="addPart">添加>></el-button>
+            <el-button type="primary" @click="deletePart">删除&lt;&lt;</el-button>
+          </div>
+        </el-main>
+        <el-footer style="width: 880px;height: 200px;padding: 0 0 0 0;">
+          <span style="font-size: 12px">已选物料</span>
+          <div class="rq">
+            <el-table height="200px" :data="partList2" border ref="partTable2" @selection-change="selectionPart2"
+              highlight-current-row style="width: 100%">
+              <el-table-column type="selection" header-align="center" align="center" width="50">
+              </el-table-column>
+              <el-table-column prop="partNo" header-align="center" align="center" min-width="80" label="物料编码">
+              </el-table-column>
+              <el-table-column prop="partDesc" header-align="center" align="left" min-width="120" label="物料名称">
+              </el-table-column>
+              <el-table-column prop="" header-align="center" align="center" min-width="100" label="要求入库数量">
+                <template slot-scope="scope">
+                  <el-input :controls="false" v-model="scope.row.requiredQty"
+                    @input="value => scope.row.requiredQty = value.match(/^(\d+\.?\d*|\.\d+)$/) ? value : ''"
+                    style="height: 11px; width: 98%;">
+                  </el-input>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-footer>
+      </el-container>
+      <el-container v-else-if="detailSearchData.orderType === '生产入库'">
+        <el-header style="width: 880px;height: 200px;padding: 0 0 0 0">
+          <span style="font-size: 12px">可选物料</span>
+          <el-table height="200px" :data="partList1" border ref="partTable1" @selection-change="selectionPart1"
+            highlight-current-row style="width: 100%">
+            <el-table-column type="selection" header-align="center" align="center" width="50">
+            </el-table-column>
+            <el-table-column prop="relatedOrderNo" header-align="center" align="left" min-width="100" label="生产订单">
+            </el-table-column>
+            <el-table-column prop="partNo" header-align="center" align="left" min-width="100" label="物料编码">
+            </el-table-column>
+            <el-table-column prop="partDesc" header-align="center" align="left" min-width="200" label="物料名称">
+            </el-table-column>
+            <el-table-column prop="unit" header-align="center" align="left" min-width="80" label="物料单位">
+            </el-table-column>
+            <el-table-column prop="orderQty" header-align="center" align="right" min-width="80" label="订单数量">
+            </el-table-column>
+            <el-table-column prop="requiredQty" header-align="center" align="right" min-width="80" label="可入库数">
+            </el-table-column>
+            <el-table-column prop="countRollNo" header-align="center" align="right" min-width="80" label="可入库卷数">
+            </el-table-column>
+          </el-table>
+          <!-- 分页-->
+          <el-pagination style="margin-top: 5px" @size-change="sizeChangeHandle2" @current-change="currentChangeHandle2"
+            :current-page="pageIndex2" :page-sizes="[20, 50, 100, 200, 500]" :page-size="pageSize2" :total="totalPage2"
+            layout="total, sizes, prev, pager, next, jumper">
+          </el-pagination>
+        </el-header>
+        <el-main style="width: 880px;height: 27px;margin-top: 70px;padding: 0 0 0 0;text-align:center">
+          <div>
+            <el-button type="primary" @click="addPart">添加>></el-button>
+            <el-button type="primary" @click="deletePart">删除&lt;&lt;</el-button>
+          </div>
+        </el-main>
+        <el-footer style="width: 880px;height: 200px;padding: 0 0 0 0;">
+          <span style="font-size: 12px">已选物料</span>
+          <div class="rq">
+            <el-table height="200px" :data="partList2" border ref="partTable2" @selection-change="selectionPart2"
+              highlight-current-row style="width: 100%">
+              <el-table-column type="selection" header-align="center" align="center" width="50">
+              </el-table-column>
+              <el-table-column prop="relatedOrderNo" header-align="center" align="center" min-width="80" label="生产订单">
+              </el-table-column>
+              <el-table-column prop="partNo" header-align="center" align="center" min-width="80" label="物料编码">
+              </el-table-column>
+              <el-table-column prop="partDesc" header-align="center" align="left" min-width="150" label="物料名称">
+              </el-table-column>
+              <el-table-column prop="" header-align="center" align="center" min-width="100" label="要求入库数量">
+                <template slot-scope="scope">
+                  <el-input :controls="false" v-model="scope.row.requiredQty"
+                    @input="value => scope.row.requiredQty = value.match(/^(\d+\.?\d*|\.\d+)$/) ? value : ''"
+                    style="height: 11px; width: 98%;">
+                  </el-input>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-footer>
+      </el-container>
+      <el-footer style="height:30px;margin-top: 35px;text-align:center">
+        <el-button type="primary" :loading="saveLoading" @click="saveInboundDetail">保存</el-button>
+        <el-button type="primary" @click="detailModal = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <el-dialog title="选择工单" :close-on-click-modal="false" v-drag :visible.sync="seqNoModalFlag" width="1000px">
+      <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="'生产订单'">
+              <el-input v-model="seqNoData.orderno"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item>
+              <span slot="label" style="" @click="getBaseList(515)"><a herf="#">机台</a></span>
+
+              <el-input v-model="seqNoData.sResourceid"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item>
+              <span slot="label" style="" @click="getBaseList(216)"><a herf="#">加工中心</a></span>
+              <el-input v-model="seqNoData.sWorkcenterno"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item :label="'派工日期'">
+              <el-date-picker style="width: 100%" v-model="seqNoData.startDate" type="date" value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item :label="'到'">
+              <el-date-picker style="width: 100%" v-model="seqNoData.endDate" type="date" value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item>
+              <el-button type="primary" @click="searchSOSRouting()" style="margin-top: 5px" class="">查询</el-button>
+
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table :height="400" :data="seqNoList" border style="width: 100%;">
+        <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">
+            <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="left" header-align="center" align="center" width="60" label="操作">
+          <template slot-scope="scope">
+            <a type="text" size="small" @click="chooseSOS(scope.row)">选择</a>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <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="'生产订单'">
+              <el-input v-model="notifyOrderData.orderNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'机台'">
+              <el-input v-model="notifyOrderData.sResourceID" 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="12">
+            <el-form-item :label="'物料名称'">
+              <el-input v-model="notifyOrderData.partDesc" 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-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-col :span="6">
+            <el-form-item label="机台">
+              <el-input v-model="notifyOrderData.locationNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'此次领料数量'">
+              <el-input-number v-model="notifyOrderData.issureQty" style="padding: 0px;width: 100%" :controls="false"
+                :step="0" :min="0" class="text-right"></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="' '">
+              <el-button type="primary" @click="qtyAllForSeqNo()" style="margin-top: 4%;">全数领料</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="入库明细" :close-on-click-modal="false" v-drag :visible.sync="detailModal2" width="900px">
+      <el-table height="400px" :data="detailList2" border style="width: 100%;">
+        <el-table-column v-for="(item,index) in columnDetailList2" :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">
+        </el-table-column>
+      </el-table>
+      <el-footer style="height:35px;margin-top: 15px;text-align:center">
+        <el-button type="primary" @click="detailModal2 = 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>
+              <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="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>
+          </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>
+          </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>
+
+    <!-- rqrq - 库存预览弹窗（发货通知单只有绿色和红色） -->
+    <el-dialog title="库存预览" :close-on-click-modal="false" v-drag :visible.sync="previewDialogVisible" width="90%">
+      <div v-loading="previewLoading">
+        <el-table :data="previewData" height="400" border :row-style="getRowStyle" highlight-current-row
+          style="width: 100%">
+          <el-table-column prop="partNo" label="物料编号" sortable min-width="80"></el-table-column>
+          <el-table-column prop="requiredQty" label="需求数量" min-width="80" align="right"></el-table-column>
+          <el-table-column prop="productionOrderNo" label="发货单" sortable min-width="100"></el-table-column>
+          <el-table-column prop="bomLineNo" label="行号" min-width="60"></el-table-column>
+          <el-table-column label="是否满足" sortable min-width="80" 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="matchedBarcodes" label="匹配条码" min-width="500" 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>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="pushToWcs" :disabled="pushLoading">
+          {{ pushLoading ? '推送中...' : '推送至WCS' }}
+        </el-button>
+        <el-button @click="previewDialogVisible = false" :disabled="pushLoading">关闭</el-button>
+      </div>
+    </el-dialog>
+
+    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
+
+  </div>
+</template>
+
+<script>
+import {
+  searchNoOrderNotifyHeader,
+  getNotifyNoOrderDetailByType,
+  noOrderList,
+  saveNoOrderMaterialDetail,
+  getNoOrderMaterialList
+} from '@/api/orderIssure/noOrderIssueNotify.js'
+import {
+  getSiteAndBuByUserName,
+  createNotify,
+  closeInboundNotification,
+  checkUserHasUnissueShipment,
+  cancelIssueShipment,
+  checkShipmentInventory,
+  pushShipmentInventoryToWcs,
+  deleteNotifyUnissue,
+} from '@/api/shipment/shipmentIssue.js'
+import Chooselist from '@/views/modules/common/Chooselist_eam'
+import { getChooselist } from '@/api/chooselist/chooselist.js'
+import {
+  getTableDefaultListLanguage,
+  getTableUserListLanguage,
+} from '@/api/table.js'
+export default {
+  components: {
+    Chooselist,
+  },
+  data() {
+    return {
+      columnsProp: ['createBy', 'updateBy'],
+      // 导出 start
+      exportData: [],
+      exportName: '收货入库' + this.dayjs().format('YYYYMMDDHHmmss'),
+      exportHeader: ['收货入库'],
+      exportFooter: [],
+      exportList: [],
+      // 导出 end
+      tagNo: '',
+      tagType: '',
+      searchData: {
+        site: '',
+        userName: this.$store.state.user.name,
+        orderNo: '',
+        orderType: '',
+        orderStatus: '',
+        orderStatusList: [],
+        startDate: '',
+        endDate: '',
+        page: 1,
+        limit: 10,
+      },
+      detailSearchData: {
+        site: '',
+        buNo: '',
+        orderNo: '',
+        partNo: '',
+        partDesc: '',
+        partNos: '',
+        orderType: '',
+        relatedOrderNo: '',
+        status: '',
+        page: 1,
+        limit: 10,
+      },
+      height: 200,
+      secondHeight: 200,
+      pageIndex: 1,
+      pageSize: 20,
+      totalPage: 0,
+      pageIndex2: 1,
+      pageSize2: 20,
+      totalPage2: 0,
+      modalFlag: false,
+      modalDisableFlag: false,
+      notifyOrderData: {
+        partNo: '',
+        orderno: '',
+        itemno: '',
+        seqno: '',
+        partDesc: '',
+        qtyrequired: '',
+        sResourceid: '',
+        issureQty: '',
+        locationNo: '',
+        needDate: '',
+      },
+      modalData: {
+        site: '',
+        bu: '',
+        buNo: '',
+        flag: '',
+        orderNo: '',
+        orderType: '',
+        orderStatus: '',
+        requiredInboundDate: '',
+        supplierId: '',
+        supplierName: '',
+        remarks: '',
+        createdBy: '',
+        updatedBy: '',
+      },
+      seqNoData: {
+        site: localStorage.getItem('site'),
+        bu: '',
+        orderno: '',
+        seqno: '',
+        sResourceid: '',
+        sWorkcenterno: '',
+        operatorId: '',
+        sShiftno: '',
+        startDate: '',
+        endDate: '',
+      },
+      dataList: [],
+      detailList: [],
+      userBuList: [],
+      inboundSelection: [],
+      inboundDetailSelection: [],
+      partSelections1: [],
+      partSelections2: [],
+      partList1: [],
+      partList2: [],
+      dataListLoading: false,
+      // 展示列集
+      columnList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 610,
+          serialNumber: '610Table1OrderNo',
+          tableId: '610Table1',
+          tableName: '收货入库任务表',
+          columnProp: 'notifyNo',
+          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: 610,
+          serialNumber: '610Table1OrderType',
+          tableId: '610Table1',
+          tableName: '收货入库任务表',
+          columnProp: 'orderType',
+          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: 610,
+          serialNumber: '610Table1OrderStatus',
+          tableId: '610Table1',
+          tableName: '收货入库任务表',
+          columnProp: 'status',
+          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: 610,
+          serialNumber: '610Table1SupplierId',
+          tableId: '610Table1',
+          tableName: '收货入库任务表',
+          columnProp: 'supplierId',
+          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: 610,
+          serialNumber: '610Table1SupplierName',
+          tableId: '610Table1',
+          tableName: '收货入库任务表',
+          columnProp: 'supplierName',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '供应商名称',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 200,
+        }, */
+        {
+          userId: this.$store.state.user.name,
+          functionId: 610,
+          serialNumber: '610Table1RequiredInboundDate',
+          tableId: '610Table1',
+          tableName: '收货入库任务表',
+          columnProp: 'notifyDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '申请单日期',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 610,
+          serialNumber: '610Table1CreatedDate',
+          tableId: '610Table1',
+          tableName: '收货入库任务表',
+          columnProp: 'enteredDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '创建时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 170,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 610,
+          serialNumber: '610Table1CreatedBy',
+          tableId: '610Table1',
+          tableName: '收货入库任务表',
+          columnProp: 'username',
+          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: 610,
+          serialNumber: '610Table1UpdatedDate',
+          tableId: '610Table1',
+          tableName: '收货入库任务表',
+          columnProp: 'updatedDate',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '更新时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 170,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 610,
+          serialNumber: '610Table1UpdatedBy',
+          tableId: '610Table1',
+          tableName: '收货入库任务表',
+          columnProp: 'updatedBy',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '更新人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        }, */
+      ],
+      columnList2: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2Orderno',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'orderNo',
+          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: '701001Table2Itemno',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'itemNo',
+          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: '701001Table2ItemDesc',
+          tableId: '701001Table2',
+          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: '701001Table2PartNo',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'partNo',
+          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: '701001Table2Qtyrequired',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'qtyRequired',
+          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: '701001Table2Qtyreported',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'qtyReported',
+          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: '701001Table2SScheduleddate',
+          tableId: '701001Table2',
+          tableName: '查询工单',
+          columnProp: 'sScheduledDate',
+          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: '701001Table2SWorkcenterno',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'sWorkCenterNo',
+          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: '701001Table2WorkCenterDesc',
+          tableId: '701001Table2',
+          tableName: '查询工单',
+          columnProp: 'workCenterDesc',
+          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: '701001Table2SResourceid',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'sResourceID',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '机台编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 60,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2ResourceDesc',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'resourceDesc',
+          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: '701001Table2OperatorDesc',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'operatorDesc',
+          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: 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: '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,
+        },
+        {
+          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,
+        },
+      ],
+      columnDetailList: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 444002,
+          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: 444002,
+          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: 444002,
+          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: 444002,
+          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: 444002,
+          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: 444002,
+          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,
+        },
+      ],
+      rules: {
+        bu: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        orderType: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur', 'change'],
+          },
+        ],
+        requiredInboundDate: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur', 'change'],
+          },
+        ],
+      },
+      searchLoading: false,
+      saveLoading: false,
+      activeTable: 'inboundDetail',
+      detailModal: false,
+      authSearch: false,
+      authSave: false,
+      authUpdate: false,
+      authDelete: false,
+      authArchive: false,
+      authClose: false,
+      authIssue: false,
+      editBatchVisible: false,
+      menuId: this.$route.meta.menuId,
+      tempWareHouseRow: {},
+      detailList2: [],
+      detailModal2: false,
+      currentRow: {},
+      seqNoList: [],
+      seqNoModalFlag: false,
+      saveSeqNoModalFlag: false,
+      bomLoadFlag: false,
+      sobomList: [],
+      itemNo: '',
+      materialModalFlag: false,
+      sobomData: {},
+      notifyNo: '',
+      // 选择物料弹框相关
+      selectMaterialModalFlag: false,
+      availableMaterialList: [], // 左侧可选物料列表
+      selectedMaterialList: [], // 右侧已选物料列表
+      availableMaterialSelections: [], // 左侧选中的行
+      selectedMaterialSelections: [], // 右侧选中的行
+      selectMaterialLoading: false,
+      modelCode: '', // 模板编号
+      modelName: '', // 模板名称
+      // 左侧表格分页相关
+      availableMaterialPage: 1, // 当前页码
+      availableMaterialLimit: 100, // 每页条数
+      availableMaterialTotal: 0, // 总条数
+      componentPartNo: '', // 物料编码搜索
+      // 申请明细弹框相关
+      isMaterialDetailModal: false, // 标识是否从申请明细弹框打开选择物料弹框
+      clickrow: {},
+      // rqrq - 库存预览相关变量
+      previewDialogVisible: false,
+      previewLoading: false,
+      pushLoading: false,
+      previewData: [],
+      currentNotifyRow: null,
+    }
+  },
+
+  mounted() {
+    this.$nextTick(() => {
+      this.height = window.innerHeight / 2 - 100
+      /*第二个表格高度的动态调整*/
+      this.secondHeight = window.innerHeight - this.height - 170
+    })
+  },
+
+  created() {
+    // 按钮控制
+    this.getButtonAuthData()
+    // 获取用户的 site 和 bu
+    //this.getSiteAndBuByUserName()
+    // 动态列
+    //this.getTableUserColumn(this.$route.meta.menuId + 'table1', 1)
+    //this.getTableUserColumn(this.$route.meta.menuId + 'table2', 2)
+    if (!this.authSearch) {
+      // 获取数据列表
+      this.getDataList()
+    }
+  },
+
+  methods: {
+    // 获取用户的bu
+    getSiteAndBuByUserName() {
+      let tempData = {
+        username: this.$store.state.user.name,
+      }
+      getSiteAndBuByUserName(tempData).then(({ data }) => {
+        if (data.code === 0) {
+          this.userBuList = data.rows
+        }
+      })
+    },
+
+    // 获取数据列表
+    getDataList() {
+      this.searchData.limit = this.pageSize
+      this.searchData.page = this.pageIndex
+      this.searchData.orderStatus = this.searchData.orderStatusList.join(',')
+      console.log('this.', this.searchData)
+
+      this.searchLoading = true
+      searchNoOrderNotifyHeader(this.searchData)
+        .then(({ data }) => {
+          if (data.code === 0) {
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
+            console.log('this.dataList', this.dataList)
+
+            // 判断是否全部存在数据
+            if (this.dataList.length > 0) {
+              // 设置选中行并高亮第一行
+              this.$nextTick(() => {
+                this.$refs.inboundTable.setCurrentRow(this.dataList[0])
+                this.currentRow = JSON.parse(JSON.stringify(this.dataList[0]))
+                // 调用getNotifyNoDetail方法获取入库明细
+                this.getNotifyNoOrderDetailByType()
+              })
+            } else {
+              this.currentRow = {}
+              this.detailList = []
+            }
+          }
+        })
+        .finally(() => {
+          this.searchLoading = false
+        })
+    },
+
+    // 每页数
+    sizeChangeHandle(val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+
+    // 当前页
+    currentChangeHandle(val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+
+    // 子明细每页数
+    sizeChangeHandle2(val) {
+      this.pageSize2 = val
+      this.pageIndex2 = 1
+      this.searchTypeChange()
+    },
+
+    // 子明细当前页
+    currentChangeHandle2(val) {
+      this.pageIndex2 = val
+      this.searchTypeChange()
+    },
+
+    saveModal() {
+      this.modalData = {
+        flag: '1',
+        site: '',
+        orderNo: '',
+        orderType: '',
+        orderStatus: '',
+        requiredInboundDate: '',
+        supplierId: '',
+        supplierName: '',
+        remarks: '',
+        createdBy: this.$store.state.user.name,
+      }
+      this.modalDisableFlag = false
+      this.modalFlag = true
+    },
+
+    updateModal(row) {
+      if (this.currentRow.orderType === '采购入库') {
+        this.$message.warning('采购入库单据不能编辑！')
+        return
+      }
+      this.modalData = {
+        flag: '2',
+        site: row.site,
+        bu: row.site + '_' + row.buNo,
+        buNo: row.buNo,
+        orderNo: row.orderNo,
+        orderType: row.orderType,
+        requiredInboundDate: row.requiredInboundDate,
+        supplierId: row.supplierId,
+        supplierName: row.supplierName,
+        remarks: row.remarks,
+        updatedBy: this.$store.state.user.name,
+      }
+      this.modalDisableFlag = true
+      this.modalFlag = true
+    },
+
+    saveData() {
+      if (this.modalData.orderType === '' || this.modalData.orderType == null) {
+        this.$message.warning('请选择单据类型！')
+        return
+      }
+      if (
+        this.modalData.requiredInboundDate === '' ||
+        this.modalData.requiredInboundDate == null
+      ) {
+        this.$message.warning('请选择要求入库日期！')
+        return
+      }
+      this.saveLoading = true
+      if (this.modalData.flag === '1') {
+        // 新增
+        this.modalData.orderType = '退料入库'
+        this.modalData.site = localStorage.getItem('site')
+        createNotify(this.modalData)
+          .then(({ data }) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.modalFlag = false
+              this.$message.success('操作成功')
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+          .finally(() => {
+            this.saveLoading = false
+          })
+      } else {
+        // 修改
+        updateInboundNotification(this.modalData)
+          .then(({ data }) => {
+            if (data && data.code === 0) {
+              this.getDataList()
+              this.modalFlag = false
+              this.$message.success('操作成功')
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+          .finally(() => {
+            this.saveLoading = false
+          })
+      }
+    },
+
+    // 删除
+    deleteModal() {
+      if (this.currentRow.orderType === '采购入库') {
+        this.$message.warning('采购入库单据不能编辑！')
+        return
+      }
+      if (this.inboundSelection.length === 0) {
+        this.$message.warning('请勾选要删除的单据！')
+        return
+      }
+      this.$confirm(
+        `是否删除该 ` + this.inboundSelection.length + ` 条记录?`,
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }
+      ).then(() => {
+        let tempData = {
+          submitList: this.inboundSelection,
+        }
+        deleteInboundNotification(tempData).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.getDataList()
+            this.inboundSelection = []
+            this.$message.success('操作成功')
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      })
+    },
+
+    // 归档
+    archiveModal() {},
+
+    // 关闭
+    closeModal(row) {
+      this.$confirm(`确认关闭 ` + row.notifyNo + ` 记录?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        closeInboundNotification(row).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.getDataList()
+            this.$message.success('操作成功')
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      })
+    },
+
+    // 下达
+    issueModal(row) {
+      if (this.currentRow.orderType === '采购入库') {
+        this.$message.warning('采购入库单据不能编辑！')
+        return
+      }
+      issueInboundNotification(row).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.getDataList()
+          this.$message.success('操作成功')
+        } else {
+          this.$message.error(data.msg)
+        }
+      })
+    },
+
+    // 列表表格选择替换
+    tabClick(tab, event) {
+      // 刷新列表数据
+      this.refreshCurrentTabTable()
+    },
+
+    // 当前值发生变化的时候修改
+    changeCurrentRow(row, oldRow) {
+      // 判断是否是获取焦点的事件
+      if (row) {
+        this.currentRow = JSON.parse(JSON.stringify(row))
+        //刷新当前页表
+        this.getNotifyNoOrderDetailByType()
+      }
+    },
+
+    // 复选
+    selectionInbound(val) {
+      this.inboundSelection = val
+    },
+
+    // 明细复选
+    selectionInboundDetail(val) {
+      this.inboundDetailSelection = val
+    },
+
+    rowStyle({ row }) {
+      if (this.currentRow.notifyNo === row.notifyNo) {
+        return { 'background-color': '#E8F7F6', cursor: 'pointer' }
+      }
+    },
+
+    // 单机选中信息
+    inboundClickRow(row, column) {
+      console.log('row', row)
+
+      this.currentRow = JSON.parse(JSON.stringify(row))
+      // 点击主表行时，立即刷新并加载入库明细
+      this.getNotifyNoOrderDetailByType()
+    },
+
+    // 刷新页签的table数据
+    refreshCurrentTabTable() {
+      if (this.activeTable === 'inboundDetail') {
+        this.getInboundDetail()
+      }
+    },
+
+    // 查询物料缺陷跟踪
+    getInboundDetail() {
+      let templateData = {
+        site: this.currentRow.site,
+        buNo: this.currentRow.buNo,
+        orderNo: this.currentRow.orderNo,
+      }
+      /* getInboundDetail(templateData).then(({ data }) => {
+        this.detailList = data.rows
+      }) */
+    },
+
+    // 新增明细
+    addInboundDetailModal() {
+      if (this.currentRow.orderType === '采购入库') {
+        this.$message.warning('采购入库单据不能编辑！')
+        return
+      }
+      this.detailSearchData = {
+        site: this.currentRow.site,
+        buNo: this.currentRow.buNo,
+        orderNo: this.currentRow.orderNo,
+        orderType: this.currentRow.orderType,
+        relatedOrderNo: '',
+        status: '',
+        partNo: '',
+        partDesc: '',
+        partNos: '',
+        page: 1,
+        limit: 10,
+      }
+      this.partSelections1 = []
+      this.partSelections2 = []
+      this.partList1 = []
+      this.partList2 = []
+      this.pageIndex2 = 1
+      this.pageSize2 = 20
+      this.totalPage2 = 0
+      if (this.currentRow.orderType === '生产入库') {
+        this.detailSearchData.status = '已开工'
+      }
+      this.handleGetProjectPartList()
+    },
+
+    handleGetProjectPartList() {
+      this.detailSearchData.limit = this.pageSize2
+      this.detailSearchData.page = this.pageIndex2
+      getInboundPartList(this.detailSearchData).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.partList1 = data.page.list
+          this.pageIndex2 = data.page.currPage
+          this.pageSize2 = data.page.pageSize
+          this.totalPage2 = data.page.totalCount
+          this.detailModal = true
+        }
+      })
+    },
+
+    chooseSOSModal() {
+      this.seqNoData = {
+        site: localStorage.getItem('site'),
+        orderno: '',
+        seqno: '',
+        sResourceid: '',
+        sWorkcenterno: '',
+        operatorId: '',
+        sShiftno: '',
+        startDate: this.dayjs().format('YYYY-MM-DD'),
+        endDate: this.dayjs().format('YYYY-MM-DD'),
+      }
+      this.searchSOSRouting()
+      this.seqNoModalFlag = true
+    },
+    searchSOSRouting() {
+      getSOScheduledRoutingListForIssure(this.seqNoData).then(({ data }) => {
+        if (data.code === 0) {
+          this.seqNoList = data.rows
+        }
+      })
+    },
+    // 可选物料
+    partClickRow1(row) {
+      this.$refs.partTable1.toggleRowSelection(row)
+    },
+
+    // 已有物料
+    partClickRow2(row) {
+      this.$refs.partTable2.toggleRowSelection(row)
+    },
+
+    selectionPart1(val) {
+      this.partSelections1 = val
+    },
+
+    selectionPart2(val) {
+      this.partSelections2 = val
+    },
+    chooseSOS(row) {
+      if (this.dataList.length > 0) {
+        let stop = false
+        for (let i = 0; i < this.dataList.length; i++) {
+          if (this.dataList[i].seqNo == row.seqno) {
+            stop = true
+          }
+        }
+        if (stop) {
+          this.$alert('已经选择过此派工单，请返回点击明细直接操作！!', '提示', {
+            confirmButtonText: '确定',
+          })
+          return false
+        }
+      }
+
+      this.notifyOrderData.partNo = row.partNo
+      this.notifyOrderData.orderNo = row.orderNo
+      this.notifyOrderData.itemNo = row.itemNo
+      this.notifyOrderData.seqNo = row.seqNo
+      this.notifyOrderData.partDesc = row.partDesc
+      this.notifyOrderData.qtyRequired = row.qtyRequired
+      this.notifyOrderData.sResourceID = row.sResourceID
+      this.notifyOrderData.issureQty = ''
+      this.notifyOrderData.needDate = this.dayjs().format('YYYY-MM-DD HH:mm')
+      this.notifyOrderData.locationNo = row.sResourceID
+      this.saveSeqNoModalFlag = true
+    },
+
+    qtyAllForSeqNo() {
+      this.notifyOrderData.issureQty = this.notifyOrderData.qtyRequired
+    },
+
+    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
+      if (this.dataList.length > 0) {
+        let stop = false
+        for (let i = 0; i < this.dataList.length; i++) {
+          if (this.dataList[i].seqNo == row.seqno) {
+            stop = true
+          }
+        }
+        if (stop) {
+          this.$alert('已经选择过此工单，请返回点击明细直接操作！!', '提示', {
+            confirmButtonText: '确定',
+          })
+          return false
+        }
+      }
+      this.$confirm('确定选择工单' + row.seqno + '?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        let inData = {
+          site: localStorage.getItem('site'),
+          notifyNo: this.notifyNo,
+          fGPartNo: row.partNo,
+          sOOrderNo: row.orderno,
+          opsItemNo: row.itemno,
+          seqNo: row.seqno,
+          locationNo: row.locationNo,
+          needDate: row.needDate,
+          issureQty: row.issureQty,
+        }
+        saveSOIssueNotifyOrderList(inData).then(({ data }) => {
+          if (data.code === 0) {
+            this.saveSeqNoModalFlag = false
+            this.getNotifyNoOrderDetailByType()
+            this.enterSOS(row)
+            this.itemNo = data.itemNo
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+      })
+    },
+    getNotifyNoOrderDetailByType() {
+      if (!this.currentRow || !this.currentRow.notifyNo) {
+        this.detailList = []
+        return
+      }
+
+      let inData = {
+        site: this.currentRow.site || localStorage.getItem('site'),
+        notifyNo: this.currentRow.notifyNo,
+      }
+
+      getNotifyNoOrderDetailByType(inData)
+        .then(({ data }) => {
+          if (data.code === 0) {
+            this.detailList = data.rows || []
+          } else {
+            this.detailList = []
+          }
+        })
+        .catch(() => {
+          this.detailList = []
+        })
+    },
+    enterSOS(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: localStorage.getItem('site'),
+        notifyNo: this.notifyNo,
+        orderno: 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
+        }
+      })
+    },
+    // 改变事件
+    searchTypeChange() {
+      // 使用 map 提取 partNo 并加上单引号
+      let partNos = this.partList2.map((part) => part.partNo)
+      // 使用 join 将 partNo 连接成一个字符串
+      this.detailSearchData.partNos = partNos.join(',')
+      this.handleGetProjectPartList()
+    },
+
+    // 添加物料
+    addPart() {
+      if (this.partSelections1 == null || this.partSelections1.length === 0) {
+        this.$message.warning('请选择可选物料！')
+        return
+      }
+      this.partSelections1.forEach((item) => {
+        this.partList2.push(item)
+      })
+      this.searchTypeChange()
+    },
+
+    // 删除物料
+    deletePart() {
+      if (this.partSelections2 == null || this.partSelections2.length === 0) {
+        this.$message.warning('请选择已选物料！')
+        return
+      }
+      this.partSelections2.forEach((item) => {
+        // 使用 filter 过滤掉 partList2 中与 selection.part_no 相同的项
+        this.partList2 = this.partList2.filter(
+          (part) => part.partNo !== item.partNo
+        )
+      })
+      this.searchTypeChange()
+    },
+
+    // 新增明细
+    saveInboundDetail() {
+      let tempData = {
+        orderNo: this.detailSearchData.orderNo,
+        createdBy: this.$store.state.user.name,
+        partList: this.partList2,
+      }
+      this.saveLoading = true
+      saveInboundDetail(tempData)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.getInboundDetail()
+            this.detailModal = false
+            this.$message.success('操作成功')
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+        .finally(() => {
+          this.saveLoading = false
+        })
+    },
+
+    // 删除物料缺陷跟踪
+    deleteInboundDetail() {
+      if (this.currentRow.orderType === '采购入库') {
+        this.$message.warning('采购入库单据不能编辑！')
+        return
+      }
+      if (this.inboundDetailSelection.length === 0) {
+        this.$message.warning('请勾选要删除的单据！')
+        return
+      }
+      this.$confirm(
+        `是否删除该 ` + this.inboundDetailSelection.length + ` 条记录?`,
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }
+      ).then(() => {
+        let tempData = {
+          submitList: this.inboundDetailSelection,
+        }
+        deleteInboundDetail(tempData).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.getInboundDetail()
+            this.inboundDetailSelection = []
+            this.$message.success('操作成功')
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      })
+    },
+
+    // 批量编辑模态框
+    editBatchModel() {
+      if (this.currentRow.orderType === '采购入库') {
+        this.$message.warning('采购入库单据不能编辑！')
+        return
+      }
+      if (this.editBatchVisible) {
+        this.editBatchVisible = false
+      } else {
+        this.editBatchVisible = true
+      }
+    },
+
+    // 批量保存
+    batchModel() {
+      let params = []
+      params = this.detailList
+      this.saveLoading = true
+      updateInboundDetail(params)
+        .then(({ data }) => {
+          if (data && data.code === 0) {
+            this.getInboundDetail()
+            this.$message.success(data.msg)
+            this.editBatchVisible = false
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+        .finally(() => {
+          this.saveLoading = false
+        })
+    },
+
+    // 入库明细
+    inboundDetailModal(row) {
+      getInboundDetail2(row).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.detailList2 = data.rows
+        } else {
+          this.detailList2 = []
+        }
+      })
+      this.detailModal2 = true
+    },
+
+    // 库位输入校验
+    supplierBlur(tagNo) {
+      let tempData = {
+        tagno: tagNo,
+        conditionSql:
+          " and SupplierID = '" +
+          this.modalData.supplierId +
+          "'" +
+          " and site = '" +
+          this.modalData.site +
+          "'",
+      }
+      getChooselist(tempData).then(({ data }) => {
+        if (data && data.code === 0) {
+          if (data.baseListData.length > 0) {
+            this.modalData.supplierId = data.baseListData[0].SupplierID
+            this.modalData.supplierName = data.baseListData[0].SupplierName
+          } else {
+            this.modalData.supplierName = ''
+          }
+        }
+      })
+    },
+
+    chooseWareHouse(row) {
+      this.tempWareHouseRow = row
+      this.getBaseList(20)
+    },
+    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.currentRow.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.getNotifyNoOrderDetailByType()
+          this.$message.success('操作成功')
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定',
+          })
+        }
+      })
+    },
+
+    // 获取基础数据列表S
+    getBaseList(val, type) {
+      this.tagNo = val
+      this.tagType = type
+      this.$nextTick(() => {
+        let strVal = ''
+        if (val === 506) {
+          strVal = this.modalData.supplierId
+          this.$refs.baseList.init(val, strVal)
+        }
+        if (val === 20) {
+          strVal = this.tempWareHouseRow.inWarehouse
+          this.$refs.baseList.init(val, strVal)
+        }
+      })
+    },
+
+    // 列表方法的回调
+    getBaseData(val) {
+      if (this.tagNo === 506) {
+        this.modalData.supplierId = val.SupplierID
+        this.modalData.supplierName = val.SupplierName
+      }
+      if (this.tagNo === 20) {
+        this.tempWareHouseRow.inWarehouse = val.WareHouseID
+        this.tempWareHouseRow.inWarehouseName = val.WareHouseName
+        console.log(this.tempWareHouseRow)
+      }
+    },
+
+    async exportExcel() {
+      this.searchData.limit = -1
+      this.searchData.page = 1
+      excel.exportTable({
+        url: '/inbound/searchInboundNotification',
+        columnMapping: this.columnList, //可以直接用table，不需要的列就剔除
+        mergeSetting: [], //需要合并的列
+        params: this.searchData,
+        fileName: this.exportName + '.xlsx',
+        rowFetcher: (res) => res.data,
+        columnFormatter: [],
+        dropColumns: [],
+      })
+    },
+
+    // 动态列开始 获取 用户保存的 格式列
+    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) {
+          switch (columnId) {
+            case 1:
+              this.columnList = data.rows
+              break
+          }
+        } else {
+          this.getColumnList(tableId, columnId)
+        }
+      })
+    },
+
+    enterSOSDetail(row) {
+      let rows = {
+        site: this.$store.state.user.site,
+        notifyNo: this.currentRow.notifyNo,
+        soorderNo: row.soorderNo,
+        seqNo: row.seqNo,
+        partNo: row.fgpartNo,
+        itemNo: row.itemNo,
+      }
+      this.clickrow = row
+      this.searchUnissueNotifyMaterialList(rows)
+    },
+    searchUnissueNotifyMaterialList(row) {
+      this.bomLoadFlag = true
+      this.materialModalFlag = true
+      this.sobomData = {
+        orderNo: row.soorderNo || '',
+        seqNo: row.seqNo || '',
+        partNo: row.partNo || row.fgpartNo || '',
+      }
+      getNoOrderMaterialList(row)
+        .then(({ data }) => {
+          if (data.code === 0) {
+            this.sobomList = data.rows
+          }
+        })
+        .finally(() => {
+          this.bomLoadFlag = false
+        })
+    },
+    // 从申请明细弹框打开选择物料弹框
+    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
+    },
+    // 加载可选物料列表
+    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) => {
+        // 检查是否已存在（使用partNo作为唯一标识）
+        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（使用clickrow中的itemNo）
+          item.itemNo = this.clickrow.itemNo
+          item.notifyNo = this.clickrow.notifyNo || this.currentRow.notifyNo
+          item.soorderNo = this.clickrow.soorderNo
+          item.site = this.$store.state.user.site
+          // 确保componentPartNo存在
+          if (!item.componentPartNo) {
+            item.componentPartNo = item.partNo
+          }
+        })
+        // 将右侧"已有物料"列表的完整数据替换sobomList（包括原有和新增的）
+        this.sobomList = selectedItems
+        
+        this.isMaterialDetailModal = false
+      }
+
+      // 关闭弹框
+      this.selectMaterialModalFlag = false
+
+      // 清空数据
+      this.availableMaterialList = []
+      this.selectedMaterialList = []
+      this.availableMaterialSelections = []
+      this.selectedMaterialSelections = []
+
+      this.$message.success('操作成功')
+    },
+    // 删除
+    deleteNotifySOS(row) {
+      this.$confirm(`是否删除这个工单的申请信息?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          deleteNotifyUnissue(row).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.getNotifyNoOrderDetailByType()
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {},
+              })
+            } else {
+              this.$alert(data.msg, '错误', {
+                confirmButtonText: '确定',
+              })
+            }
+          })
+        })
+        .catch(() => {})
+    },
+
+    // 获取 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
+          }
+        }
+      })
+    },
+
+    //获取按钮的权限数据
+    getButtonAuthData() {
+      if (this.$store.state.user.id === 1) {
+        return
+      }
+      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')
+      let archiveFlag = this.isAuth(this.menuId + ':archive')
+      let closeFlag = this.isAuth(this.menuId + ':close')
+      let issueFlag = this.isAuth(this.menuId + ':issue')
+      //处理页面的权限数据
+      this.authSearch = !searchFlag
+      this.authSave = !saveFlag
+      this.authUpdate = !updateFlag
+      this.authDelete = !deleteFlag
+      this.authArchive = !archiveFlag
+      this.authClose = !closeFlag
+      this.authIssue = !issueFlag
+    },
+
+    /**
+     * @Description 取消下达处理方法 - rqrq
+     * @param row 当前行数据
+     */
+    cancelIssueShipmentHandle(row) {
+      // 先判断发起人是否有未下达的shipment申请单 - rqrq
+      let checkData = {
+        site: row.site,
+        username: row.username,
+      }
+
+      checkUserHasUnissueShipment(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,
+                }
+
+                cancelIssueShipment(cancelData)
+                  .then(({ data }) => {
+                    if (data && data.code === 0) {
+                      this.$message.success('取消下达成功')
+                      // 重新加载数据 - rqrq
+                      this.getDataList()
+                    } else {
+                      this.$alert(data.msg, '错误', {
+                        confirmButtonText: '确定',
+                      })
+                    }
+                  })
+                  .catch(() => {
+                    this.$message.error('取消下达失败')
+                  })
+              })
+              .catch(() => {
+                // 用户取消操作 - rqrq
+              })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+        .catch(() => {
+          this.$message.error('检查用户申请单失败')
+        })
+    },
+
+    /**
+     * @Description 预览库存（发货通知单，只考虑立库） - rqrq
+     * @param row 当前申请单行数据
+     */
+    previewInventory(row) {
+      this.currentNotifyRow = row
+      this.previewDialogVisible = true
+      this.previewLoading = true
+      this.previewData = []
+
+      let inData = {
+        site: row.site,
+        notifyNo: row.notifyNo,
+      }
+
+      checkShipmentInventory(inData)
+        .then(({ data }) => {
+          this.previewLoading = false
+          if (data && data.code === 0) {
+            this.previewData = data.rows || []
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定',
+            })
+          }
+        })
+        .catch(() => {
+          this.previewLoading = false
+          this.$message.error('获取库存预览失败')
+        })
+    },
+
+    /**
+     * @Description 推送至WCS（发货通知单） - rqrq
+     */
+    pushToWcs() {
+      if (!this.previewData || this.previewData.length === 0) {
+        this.$message.warning('没有可推送的数据')
+        return
+      }
+
+      // 检查是否有满足条件的数据（orderSatisfactionStatus === 1，绿色） - rqrq
+      const validData = this.previewData.filter(
+        (item) => item.orderSatisfactionStatus === 1
+      )
+      if (validData.length === 0) {
+        this.$message.warning('没有满足库存要求的订单，无法推送')
+        return
+      }
+
+      this.$confirm('确认推送至WCS?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.pushLoading = true
+
+          let pushData = {
+            site: this.currentNotifyRow.site,
+            notifyNo: this.currentNotifyRow.notifyNo,
+            shipmentInventoryList: this.previewData,
+          }
+
+          pushShipmentInventoryToWcs(pushData)
+            .then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: '推送WCS成功',
+                  type: 'success',
+                  duration: 1500,
+                })
+                this.previewDialogVisible = false
+                this.getDataList() // 刷新列表
+              } else {
+                this.$alert(data.msg, '错误', {
+                  confirmButtonText: '确定',
+                })
+              }
+            })
+            .catch(() => {
+              this.$message.error('推送WCS失败')
+            })
+            .finally(() => {
+              this.pushLoading = false
+            })
+        })
+        .catch(() => {
+          // 用户取消 - rqrq
+        })
+    },
+
+    /**
+     * @Description 表格行样式（发货通知单：绿色=满足，红色=不满足） - rqrq
+     */
+    getRowStyle({ row }) {
+      if (row.orderSatisfactionStatus === 1) {
+        return { backgroundColor: '#67C23A20' } // 绿色背景
+      } else if (row.orderSatisfactionStatus === 3) {
+        return { backgroundColor: '#F56C6C20' } // 红色背景
+      }
+      return {}
+    },
+  },
+}
+</script>
+<style scoped>
+/deep/ .customer-tab .el-tabs__content {
+  padding: 5px !important;
+}
+
+.el-table /deep/ .cell {
+  height: auto;
+  line-height: 1.5;
+}
+
+/* rqrq - 匹配条码列自动换行显示 */
+/deep/ .wrap-text-column .cell {
+  white-space: normal !important;
+  word-break: break-all !important;
+  line-height: 1.5 !important;
+}
+</style>