diff --git a/src/api/orderIssure/inboundNotification.js b/src/api/orderIssure/inboundNotification.js
new file mode 100644
index 0000000..7c283cd
--- /dev/null
+++ b/src/api/orderIssure/inboundNotification.js
@@ -0,0 +1,5 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+export const getSiteAndBuByUserName = data => createAPI(`/orderIssure/issureNotify/getSiteAndBuByUserName`,'post',data)
+export const searchNotifyHeader= data => createAPI(`/orderIssure/issureNotify/searchNotifyHeader`,'post',data)
+export const createNotify = data => createAPI(`/orderIssure/issureNotify/createNotify`,'post',data)
\ No newline at end of file
diff --git a/src/api/orderIssure/soIssueNotify.js b/src/api/orderIssure/soIssueNotify.js
index 866e629..33fceeb 100644
--- a/src/api/orderIssure/soIssueNotify.js
+++ b/src/api/orderIssure/soIssueNotify.js
@@ -6,4 +6,41 @@ export const createNotify = data => createAPI(`/orderIssure/issureNotify/createN
 export const getUserNotifyNo = data => createAPI(`/orderIssure/issureNotify/getUserNotifyNo`,'post',data)
 export const deleteNotify = data => createAPI(`/orderIssure/issureNotify/deleteNotify`,'post',data)
 export const getNotifyNoDetail = data => createAPI(`/orderIssure/issureNotify/getNotifyNoDetail`,'post',data)
-export const getAllNotifyStatus = data => createAPI(`/sys/enum/list`,'get',data)
\ No newline at end of file
+export const getAllNotifyStatus = data => createAPI(`/sys/enum/list`,'get',data)
+export const searchNotifyHeader= data => createAPI(`/orderIssure/issureNotify/searchNotifyHeader`,'post',data)
+export const getPartList= data => createAPI(`/orderIssure/issureNotify/getPartList`,'post',data)
+
+export const getSOSBOMForIssure= data => createAPI(`/orderIssure/issureNotify/getSOSBOMForIssure`,'post',data)
+export const saveSOIssueNotifyOrderList= data => createAPI(`/orderIssure/issureNotify/saveSOIssueNotifyOrderList`,'post',data)
+export const saveMaterialDetail= data => createAPI(`/orderIssure/issureNotify/saveMaterialDetail`,'post',data)
+
+
+export const deleteNotifySOS= data => createAPI(`/orderIssure/issureNotify/deleteNotifySOS`,'post',data)
+
+export const xiadaNotify= data => createAPI(`/orderIssure/issureNotify/xiadaNotify`,'post',data)
+
+export const searchNotifyOrderList= data => createAPI(`/orderIssure/issureNotify/searchNotifyOrderList`,'post',data)
+
+export const searchNotifyMaterialList= data => createAPI(`/orderIssure/issureNotify/searchNotifyMaterialList`,'post',data)
+
+export const searchSumNotifyMaterialList= data => createAPI(`/orderIssure/issureNotify/searchSumNotifyMaterialList`,'post',data)
+
+export const updateNotifyBu= data => createAPI(`/orderIssure/issureNotify/updateNotifyBu`,'post',data)
+
+export const checkPartStock= data => createAPI(`/orderIssure/issureNotify/checkPartStock`,'post',data)
+export const deleteNotifySOSPlus= data => createAPI(`/orderIssure/issureNotify/deleteNotifySOSPlus`,'post',data)
+export const updateNotifyStatus= data => createAPI(`/orderIssure/issureNotify/updateNotifyStatus`,'post',data)
+export const deleteNotifyMaterial= data => createAPI(`/orderIssure/issureNotify/deleteNotifyMaterial`,'post',data)
+export const saveOtherPart= data => createAPI(`/orderIssure/issureNotify/saveOtherPart`,'post',data)
+export const getNoControlPartList= data => createAPI(`/orderIssure/issureNotify/getNoControlPartList`,'post',data)
+export const searchOtherPart= data => createAPI(`/orderIssure/issureNotify/searchOtherPart`,'post',data)
+export const searchNotifyLog= data => createAPI(`/orderIssure/issureNotify/searchNotifyLog`,'post',data)
+export const deleteNotifyMaterialWithOutLog= data => createAPI(`/orderIssure/issureNotify/deleteNotifyMaterialWithOutLog`,'post',data)
+export const searchNotifyLogClose= data => createAPI(`/orderIssure/issureNotify/searchNotifyLogClose`,'post',data)
+
+
+export const updateNotifyConfirmStatus= data => createAPI(`/orderIssure/issureNotify/updateNotifyConfirmStatus`,'post',data)
+export const updateNotifyBatchConfirmStatus= data => createAPI(`/orderIssure/issureNotify/updateNotifyBatchConfirmStatus`,'post',data)
+
+export const getSiteAndBuByUserName = data => createAPI(`/orderIssure/issureNotify/getSiteAndBuByUserName`,'post',data)
+export const getEamWorkShop = data => createAPI(`/orderIssure/issureNotify/getEamWorkShop`,'post',data)
\ No newline at end of file
diff --git a/src/api/productionInbound/productionInboundRequest.js b/src/api/productionInbound/productionInboundRequest.js
new file mode 100644
index 0000000..c7886d3
--- /dev/null
+++ b/src/api/productionInbound/productionInboundRequest.js
@@ -0,0 +1,8 @@
+import { createAPI } from '@/utils/httpRequest.js'
+
+export const createInboundRequest = data => createAPI('/production/inbound/createRequest', 'post', data)
+export const getInboundRequestDetail = data => createAPI('/production/inbound/getRequestDetail', 'post', data)
+export const deleteInboundRequest = data => createAPI('/production/inbound/deleteRequest', 'post', data)
+export const submitInboundRequest = data => createAPI('/production/inbound/submitRequest', 'post', data)
+export const addInboundRequestDetail = data => createAPI('/production/inbound/addRequestDetail', 'post', data)
+export const deleteInboundRequestDetail = data => createAPI('/production/inbound/deleteRequestDetail', 'post', data) 
\ No newline at end of file
diff --git a/src/views/modules/orderIssure/newSoIssueNotify.vue b/src/views/modules/orderIssure/newSoIssueNotify.vue
index 86d78bc..f50ea5e 100644
--- a/src/views/modules/orderIssure/newSoIssueNotify.vue
+++ b/src/views/modules/orderIssure/newSoIssueNotify.vue
@@ -92,11 +92,11 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="3">
+        <!-- <el-col :span="3">
           <el-form-item :label="' '">
             <el-checkbox v-model="isOutsourcedOrder" @change="queryAllProjectPartModelDetail">外协订单领料</el-checkbox>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
       <el-row :gutter="10" v-if="notifyNo!=''">
         <!-- <el-col :span="3">
@@ -272,7 +272,7 @@
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item :label="'生产订单'">
-              <el-input v-model="notifyOrderData.orderno" disabled></el-input>
+              <el-input v-model="notifyOrderData.orderNo" disabled></el-input>
             </el-form-item>
           </el-col>
           <!-- <el-col :span="6">
@@ -282,31 +282,31 @@
           </el-col> -->
           <el-col :span="6">
             <el-form-item :label="'机台'">
-              <el-input v-model="notifyOrderData.sResourceid" disabled></el-input>
+              <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-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.orderno" disabled></el-input>
+              <el-input v-model="notifyOrderData.partNo" disabled></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="18">
+          <el-col :span="12">
             <el-form-item :label="'物料名称'">
-              <el-input v-model="notifyOrderData.seqno" disabled></el-input>
+              <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: 165px" v-model="notifyOrderData.needDate" type="datetime"
+              <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>
@@ -318,13 +318,13 @@
           </el-col>
           <el-col :span="6">
             <el-form-item :label="'此次领料数量'">
-              <el-input-number v-model="notifyOrderData.issureQty" style="padding: 0;width: 100%" :controls="false"
-                :step="0" :min="0"></el-input-number>
+              <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()">全数领料</el-button>
+              <el-button type="primary" @click="qtyAllForSeqNo()" style="margin-top: 4%;">全数领料</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -367,17 +367,17 @@
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item :label="'生产订单'">
-              <el-input v-model="sobomData.orderno" readonly></el-input>
+              <el-input v-model="sobomData.orderno" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item :label="'派工单号'">
-              <el-input v-model="sobomData.seqno" readonly></el-input>
+              <el-input v-model="sobomData.seqno" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item :label="'产品编码'">
-              <el-input v-model="sobomData.partNo" readonly></el-input>
+              <el-input v-model="sobomData.partNo" disabled></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -390,9 +390,7 @@
             :label="item.columnLabel">
             <template slot-scope="scope">
               <div v-if="item.columnProp === 'qtyToIssue'">
-                <el-input-number v-model="scope.row.qtyToIssue" style="padding: 0;width: 100%" :step="0" :min="0"
-                  :controls="false"></el-input-number>
-
+                <el-input v-model="scope.row.qtyToIssue" style="height: 11px; width: 98%;" :step="0" :min="0"></el-input>
               </div>
               <div v-else-if="item.columnProp === 'remark'">
                 <el-input v-model="scope.row.remark" style="padding: 0;width: 100%"></el-input>
@@ -568,6 +566,30 @@
         <el-button type="primary" @click="saveOtherPartModalFlag=false">关闭</el-button>
       </el-footer>
     </el-dialog>
+    <el-dialog title="选择申请类型" :close-on-click-modal="false" v-drag :visible.sync="showAddNotifyTypeDialog"
+      width="400px">
+      <el-form :inline="true" label-position="top" label-width="500px" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="申请类型">
+              <el-radio-group v-model="selectedNotifyType">
+                <el-radio label="production">生产领料单</el-radio>
+                <el-radio label="outsourced">委外领料单</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注" class="issueNotify">
+              <el-input type="textarea" v-model="selectedNotifyRemark" :rows="3" placeholder="请输入内容" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-footer style="height:30px;text-align:center;">
+        <el-button type="primary" @click="confirmAddNotify()">确认</el-button>
+        <el-button type="primary" @click="showAddNotifyTypeDialog=false">取消</el-button>
+      </el-footer>
+    </el-dialog>
     <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
     <walUploadExcel ref="walUploadExcel" @refreshTable="searchTable" v-drag></walUploadExcel>
   </div>
@@ -580,6 +602,10 @@ import {
   getUserNotifyNo,
   deleteNotify,
   getAllNotifyStatus,
+  getNotifyNoDetail,
+  saveSOIssueNotifyOrderList,
+  getSOSBOMForIssure,
+  saveMaterialDetail,
 } from '@/api/orderIssure/soIssueNotify.js'
 import Chooselist from '@/views/modules/common/Chooselist_eam'
 import walUploadExcel from './walmart_upload_excel.vue'
@@ -602,7 +628,6 @@ export default {
     return {
       activeName: 'sos',
       noControlPartModelFlag: false,
-      isOutsourcedOrder: false,
       buList: [],
       partList: [],
       partList2: [],
@@ -926,7 +951,7 @@ export default {
           serialNumber: '701001Table2Orderno',
           tableId: '701001Table2',
           tableName: '查询派工单',
-          columnProp: 'orderno',
+          columnProp: 'orderNo',
           headerAlign: 'center',
           align: 'center',
           columnLabel: '生产订单',
@@ -944,7 +969,7 @@ export default {
           serialNumber: '701001Table2Itemno',
           tableId: '701001Table2',
           tableName: '查询派工单',
-          columnProp: 'itemno',
+          columnProp: 'itemNo',
           headerAlign: 'center',
           align: 'right',
           columnLabel: '工序',
@@ -1016,7 +1041,7 @@ export default {
           serialNumber: '701001Table2Qtyrequired',
           tableId: '701001Table2',
           tableName: '查询派工单',
-          columnProp: 'qtyrequired',
+          columnProp: 'qtyRequired',
           headerAlign: 'center',
           align: 'right',
           columnLabel: '工单数量',
@@ -1034,7 +1059,7 @@ export default {
           serialNumber: '701001Table2Qtyreported',
           tableId: '701001Table2',
           tableName: '查询派工单',
-          columnProp: 'qtyreported',
+          columnProp: 'qtyReported',
           headerAlign: 'center',
           align: 'right',
           columnLabel: '报工数量',
@@ -1052,7 +1077,7 @@ export default {
           serialNumber: '701001Table2SScheduleddate',
           tableId: '701001Table2',
           tableName: '查询工单',
-          columnProp: 'sScheduleddate',
+          columnProp: 'sScheduledDate',
           headerAlign: 'center',
           align: 'left',
           columnLabel: '工单日期',
@@ -1070,7 +1095,7 @@ export default {
           serialNumber: '701001Table2SWorkcenterno',
           tableId: '701001Table2',
           tableName: '查询派工单',
-          columnProp: 'sWorkcenterno',
+          columnProp: 'sWorkCenterNo',
           headerAlign: 'center',
           align: 'left',
           columnLabel: '加工中心编码',
@@ -1106,7 +1131,7 @@ export default {
           serialNumber: '701001Table2SResourceid',
           tableId: '701001Table2',
           tableName: '查询派工单',
-          columnProp: 'sResourceid',
+          columnProp: 'sResourceID',
           headerAlign: 'center',
           align: 'left',
           columnLabel: '机台编码',
@@ -1340,6 +1365,9 @@ export default {
         umid: '',
         remark: '',
       },
+      showAddNotifyTypeDialog: false,
+      selectedNotifyType: 'production',
+      selectedNotifyRemark:'',
     }
   },
 
@@ -1351,13 +1379,13 @@ export default {
 
   created() {
     // 按钮控制
-    // this.getButtonAuthData()
+    this.getButtonAuthData()
     // 获取用户的 site 和 bu
-    // this.getSiteAndBuByUserName()
+    //this.getSiteAndBuByUserName()
     // 校验用户是否收藏
-    /* this.favoriteIsOk()
+    /* this.favoriteIsOk()*/
 
-      this.getUserNotifyNo() */
+    this.getUserNotifyNo()
     // 动态列
     /* this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
       this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
@@ -1482,14 +1510,15 @@ export default {
         site: this.$store.state.user.site,
         username: this.$store.state.user.name,
       }
+      this.getAllNotifyStatus()
       getUserNotifyNo(inData).then(({ data }) => {
         if (data.code === 0) {
           if (data.row != null) {
             this.notifyNo = data.row.notifyNo
             this.notifyData = data.row
             this.getNotifyNoDetail()
-            this.searchOtherPart('非BOM物料')
-            this.searchOtherPart('不管控物料')
+            /* this.searchOtherPart('非BOM物料')
+            this.searchOtherPart('不管控物料') */
           } else {
             this.notifyNo = ''
             this.notifyData = {
@@ -1534,19 +1563,31 @@ export default {
       })
     },
     addNotify() {
+      this.showAddNotifyTypeDialog = true
+    },
+    confirmAddNotify() {
+      let outWorkOrderFlag = 'N'
+      if (this.selectedNotifyType === 'outsourced') {
+        outWorkOrderFlag = 'Y'
+      } else {
+        outWorkOrderFlag = 'N'
+      }
       let inData = {
         site: this.$store.state.user.site,
         userName: this.$store.state.user.name,
+        outWorkOrderFlag: outWorkOrderFlag,
+        remark: this.selectedNotifyRemark,
       }
+      this.getAllNotifyStatus()
       createNotify(inData).then(({ data }) => {
         if (data.code === 0) {
+          this.showAddNotifyTypeDialog = false
           this.$message({
             message: '操作成功',
             type: 'success',
             duration: 1500,
             onClose: () => {},
           })
-          this.getAllNotifyStatus()
           this.getUserNotifyNo()
         } else {
           this.$alert(data.msg, '错误', {
@@ -1570,16 +1611,18 @@ export default {
           return false
         }
       }
+      console.log("row",row);
+      
       this.notifyOrderData.partNo = row.partNo
-      this.notifyOrderData.orderno = row.orderno
-      this.notifyOrderData.itemno = row.itemno
-      this.notifyOrderData.seqno = row.seqno
+      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.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.notifyOrderData.locationNo = row.sResourceID
       this.saveSeqNoModalFlag = true
     },
     saveSOS() {
@@ -1632,7 +1675,6 @@ export default {
           locationNo: row.locationNo,
           needDate: row.needDate,
           issureQty: row.issureQty,
-          outWorkOrderFlag: 'N',
         }
         saveSOIssueNotifyOrderList(inData).then(({ data }) => {
           if (data.code === 0) {
@@ -1649,7 +1691,7 @@ export default {
       })
     },
     qtyAllForSeqNo() {
-      this.notifyOrderData.issureQty = this.notifyOrderData.qtyrequired
+      this.notifyOrderData.issureQty = this.notifyOrderData.qtyRequired
     },
     qtyAllForBom(row) {
       row.qtyToIssue = row.qtyRequired
@@ -1696,8 +1738,6 @@ export default {
       this.materialModalFlag = false
     },
     chooseSOSModal() {
-      console.log('isOutsourcedOrder', this.isOutsourcedOrder)
-
       this.seqNoData = {
         site: this.$store.state.user.site,
         orderno: '',
@@ -1713,11 +1753,11 @@ export default {
       this.seqNoModalFlag = true
     },
     searchSOSRouting() {
-      /* getSOScheduledRoutingListForIssure(this.seqNoData).then(({ data }) => {
+      getSOScheduledRoutingListForIssure(this.seqNoData).then(({ data }) => {
         if (data.code === 0) {
           this.seqNoList = data.rows
         }
-      }) */
+      })
     },
     saveMaterialDetail() {
       for (let i = 0; i < this.sobomList.length; i++) {
@@ -2127,21 +2167,46 @@ export default {
       }
       getAllNotifyStatus(inData).then(({ data }) => {
         this.notifyStatusList = data
+        console.log('notifyStatusList', this.notifyStatusList)
       })
     },
   },
 }
 </script>
-<style >
+<style scoped>
+
 .board666 .el-table .error-row {
   background: #f86868;
 }
 
+/* 在 <style scoped> 下，使用深度选择器作用到 ElementUI 内部结构 */
+.issueNotify {
+  width: 100%;
+  height: auto;
+}
+.issueNotify /deep/ .el-form-item__content {
+  display: inline !important;
+}
+
 .site-content > .el-tabs > .el-tabs__content > .site-tabs__tools {
   top: 35px;
   height: 40px;
   font-size: 16px;
   line-height: 40px;
 }
+
+.text-right /deep/ .el-input__inner {
+  text-align: right !important;
+}
+
+.text-right /deep/ .el-input-number__input {
+  text-align: right !important;
+}
+
+.yzzTable /deep/.el-table .cell {
+    line-height: 20px;
+    font-size: 12px;
+    height: 20px;
+}
 </style>
 
diff --git a/src/views/modules/orderIssure/searchIssureNotify.vue b/src/views/modules/orderIssure/searchIssureNotify.vue
index 71b80dc..6e67439 100644
--- a/src/views/modules/orderIssure/searchIssureNotify.vue
+++ b/src/views/modules/orderIssure/searchIssureNotify.vue
@@ -1,10 +1,5 @@
 <template>
   <div class="mod-config yzz">
- <!--    <div>-->
-<!--        <span @click="favoriteFunction()">-->
-<!--         <icon-svg :name="favorite?'xiangqufill':'xiangqu'" class="sl-svg"></icon-svg>-->
-<!--        </span>-->
-<!--    </div>-->
     <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
       <el-form :inline="true" label-position="top" style="margin-top: 0px">
         <el-form-item :label="'申请单号'">
@@ -13,6 +8,13 @@
         <el-form-item :label="'申请账号'">
           <el-input v-model="searchData.userName" style="width: 120px"></el-input>
         </el-form-item>
+        <el-form-item label="状态" >
+          <el-select v-model="searchData.status" placeholder="请选择" style="width: 120px">
+            <el-option label="全部" value=""></el-option>
+            <el-option label="已下达" value="已下达"></el-option>
+            <el-option label="已关闭" value="已关闭"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item :label="'申请单日期'">
           <el-date-picker
             style="width: 120px"
@@ -34,13 +36,8 @@
             placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="状态" >
-          <el-select v-model="searchData.status" placeholder="请选择" style="width: 120px">
-            <el-option label="全部" value=""></el-option>
-            <el-option label="已下达" value="已下达"></el-option>
-            <el-option label="已关闭" value="已关闭"></el-option>
-          </el-select>
-        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" style="margin-top: 0px">
         <el-form-item label="是否领料" >
           <el-select v-model="searchData.issueFlag" placeholder="请选择" style="width: 120px">
             <el-option label="全部" value=""></el-option>
@@ -55,18 +52,9 @@
             <el-option label="全部发料" value="全部发料"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="'车间'">
-          <el-select v-model="searchData.workShopList" multiple style="width: 360px">
-            <el-option
-              v-for = "i in workShopList"
-              :key = "i.workShopId"
-              :label = "i.workShopName"
-              :value = "i.workShopId">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item :label="' '">
           <el-button type="primary" @click="searchTable()">查询</el-button>
+          <!-- <el-button type="primary" @click="createNotifyModal()">新增</el-button> -->
           <download-excel
             :fields="fields()"
             :data="exportData"
@@ -132,7 +120,13 @@
 
 
     <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName"  type="border-card"  @tab-click="tabClick">
-      <el-tab-pane label="工单明细" name="detail">
+      <el-tab-pane label="申请单明细" name="detail">
+        <!-- <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -10px;">
+          <el-button @click="createOrderDetail()" type="primary" style="margin-left: 10px;margin-top: 0px">{{'新增'}}
+          </el-button>
+          <el-button @click="editOrderDetail()"  type="primary"  style="margin-left: 10px;margin-top: 0px">{{'编辑'}}
+          </el-button>
+        </el-form> -->
         <el-table
           :data="dataList2"
           :height="height"
@@ -146,7 +140,6 @@
             label="操作">
             <template slot-scope="scope">
               <a type="text" size="small" v-if="currentRow.status==='已下达'" @click="deleteNotifySOSPlus(scope.row)">删除</a>
-
             </template>
           </el-table-column>
           <el-table-column
@@ -344,37 +337,556 @@
         <el-button type="primary" @click="closeModalFlag=false">关闭</el-button>
       </el-footer>
     </el-dialog>
-    <!-- <Chooselist ref="baseList"  @getBaseData="getBaseData"></Chooselist> -->
+
+
+    <el-dialog title="新建领料申请单" :close-on-click-modal="false" v-drag :visible.sync="createNotifyFlag" width="300px">
+      <el-form :inline="true" label-position="top"  style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item :label="'工厂_BU'"  style="width: 97%" >
+              <el-select v-model="notifyData.bu" placeholder="请选择"  style="width: 100%">
+                <el-option
+                    v-for = "i in userBuList"
+                    :key = "i.buNo"
+                    :label = "i.sitename"
+                    :value = "i.buNo">
+                  <span style="float: left;width: 100px">{{ i.sitename }}</span>
+                  <span style="float: right; color: #8492a6;white-space:nowrap;overflow:hidden;text-overflow:ellipsis; font-size: 11px;width: 60px">
+                {{ i.buDesc }}
+              </span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="'是否是委外'" style="width: 97%">
+              <el-radio-group v-model="notifyData.outWorkOrderFlag">
+                <el-radio :label="true" >是</el-radio>
+                <el-radio :label="false" >否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item :label="'备注'" style="width: 97%">
+              <el-input type="textarea" v-model="notifyData.remark" style="width: 100%"></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="saveNotify()">保存</el-button>
+        <el-button type="primary" @click="createNotifyFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <!-- 选择物料模态框 -->
+    <el-dialog
+      width="600px"
+      title="选择物料"
+      :close-on-click-modal="false"
+      :visible.sync="choosePartModalFlag">
+      <el-form :inline="true" label-position="top" label-width="100px">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item style="margin-left: 0px" label="物料编码">
+              <el-input v-model="choosePartData.partNo"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item style="margin-left: 0px" label="物料名称">
+              <el-input v-model="choosePartData.partDesc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item style="margin-left: 0px" label="规格型号">
+              <el-input v-model="choosePartData.spec"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label=" ">
+              <el-button type="primary" @click="searchPartModel">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
+        height="450"
+        :data="choosePartList"
+        border
+        @row-dblclick="choosePart"
+        style="width: 100%;">
+        <el-table-column
+          prop="partNo"
+          header-align="center"
+          align="left"
+          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="spec"
+          header-align="center"
+          align="left"
+          min-width="120"
+          label="规格型号">
+        </el-table-column>
+        <el-table-column
+          prop="sku"
+          header-align="center"
+          align="left"
+          min-width="80"
+          label="SKU">
+        </el-table-column>
+        <el-table-column
+          prop="umid"
+          header-align="center"
+          align="left"
+          min-width="60"
+          label="计量单位">
+        </el-table-column>
+      </el-table>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="choosePartModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <el-dialog title="选择派工单" :close-on-click-modal="false" v-drag :visible.sync="chooseSOSModalFlag" 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="chooseSOSData.orderno"  ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item :label="'派工单号'" >
+              <el-input v-model="chooseSOSData.seqno"  ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item :label="'机台'" >
+              <el-input v-model="chooseSOSData.sResourceid"  ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item :label="'派工日期'" >
+              <el-date-picker
+                style="width: 100%"
+                v-model="chooseSOSData.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="chooseSOSData.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="chooseSOSList"
+        border
+        style="width: 100%;">
+        <el-table-column
+          v-for="(item,index) in chooseSOSColumnList" :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="chooseSOSModalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <el-dialog title="选择工单" :close-on-click-modal="false" v-drag :visible.sync="chooseOrderModalFlag" width="1000px">
+      <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="chooseOrderData.orderNo"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'工单状态'" >
+              <el-select v-model="chooseOrderData.statusList" multiple style="width: 100%" class="single-line-multi-select">
+                <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-option label="已关闭" value="已关闭"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'开始日期'" >
+              <el-date-picker
+                style="width: 100%"
+                v-model="chooseOrderData.date3"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+                      <el-col :span="6">
+            <el-form-item :label="'结束日期'" >
+              <el-date-picker
+                style="width: 100%"
+                v-model="chooseOrderData.date4"
+                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="searchOrder()" style="margin-top: 5px" class="">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
+        :height="400"
+        :data="chooseOrderList"
+        border
+        style="width: 100%;">
+        <el-table-column
+          v-for="(item,index) in chooseOrderColumnList" :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="chooseOrder(scope.row)">选择</a>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="coSizeChangeHandle"
+        @current-change="co_currentChangeHandle"
+        :current-page="co_pageIndex"
+        :page-sizes="[20, 50, 100, 1000]"
+        :page-size="co_pageSize"
+        :total="co_totalPage"
+        layout="total, sizes, prev, pager, next, jumper">
+      </el-pagination>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="chooseOrderModalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <el-dialog title="选择工序" :close-on-click-modal="false" v-drag :visible.sync="chooseOperationModalFlag" width="800px">
+      <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="chooseOperationData.itemDesc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item  >
+              <el-button  type="primary" @click="searchOperation()" style="margin-top: 5px" class="">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
+        :height="400"
+        :data="chooseOperationList"
+        border
+        style="width: 100%;">
+        <el-table-column
+          v-for="(item,index) in chooseOperationColumnList" :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="chooseOperation(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="chooseOperationModalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <el-dialog title="选择机台" :close-on-click-modal="false" v-drag :visible.sync="chooseResourceModalFlag" width="800px">
+      <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="chooseResourceData.resourceId"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="'机台描述'" >
+              <el-input v-model="chooseResourceData.resourceDesc"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item  >
+              <el-button  type="primary" @click="searchResource()" style="margin-top: 5px" class="">查询</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <el-table
+        :height="400"
+        :data="chooseResourceList"
+        border
+        style="width: 100%;">
+        <el-table-column
+          v-for="(item,index) in chooseResourceColumnList" :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="chooseResource(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="chooseResourceModalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+    <el-dialog title="申请单明细" :close-on-click-modal="false" v-drag :visible.sync="saveOrderDetailFlag" width="750px">
+      <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <!-- BOM物料和非BOM物料选择 -->
+        <el-row :gutter="20" style="margin-bottom: 15px;">
+          <el-col :span="24">
+            <el-form-item :label="'物料类型'">
+              <el-radio-group v-model="orderDetailData.materialType" @change="onMaterialTypeChange">
+                <el-radio label="BOM物料">BOM物料</el-radio>
+                <el-radio label="非BOM物料">非BOM物料</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item>
+              <template slot="label">
+                <span v-if="orderDetailData.materialType === '非BOM物料'" slot="label">生产订单</span>
+                <span v-else style="cursor: pointer" slot="label" @click="openChooseOrderModal"><a>生产订单</a></span>
+              </template>
+              <el-input v-model="orderDetailData.orderNo" disabled placeholder="请选择生产订单"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item>
+              <template slot="label">
+                <span v-if="orderDetailData.materialType === '非BOM物料'" slot="label">派工单号</span>
+                <span v-else style="cursor: pointer" slot="label" @click="openChooseSOSModal"><a>派工单号</a></span>
+              </template>
+              <el-input v-model="orderDetailData.seqNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item>
+              <template slot="label">
+                <span v-if="!orderDetailData.orderNo" slot="label">工序名称</span>
+                <span v-else style="cursor: pointer" slot="label" @click="openChooseOperationModal"><a>工序名称</a></span>
+              </template>
+              <el-input v-model="orderDetailData.itemDesc" disabled placeholder="请选择工序"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item>
+              <template slot="label">
+                <span v-if="!orderDetailData.orderNo" slot="label">机台</span>
+                <span v-else style="cursor: pointer" slot="label" @click="openChooseResourceModal"><a>机台</a></span>
+              </template>
+              <el-input v-model="orderDetailData.resourceDesc" disabled placeholder="请选择机台"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item>
+              <template slot="label">
+                <span v-if="orderDetailData.materialType === 'BOM物料'" slot="label">物料编码</span>
+                <span v-else style="cursor: pointer" slot="label" @click="openChoosePartModal"><a>物料编码</a></span>
+              </template>
+              <el-input v-model="orderDetailData.partNo" :disabled="orderDetailData.materialType === 'BOM物料'"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="18">
+            <el-form-item :label="'物料描述'" style="display: block">
+              <el-input v-model="orderDetailData.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="orderDetailData.qtyRequired" disabled style="text-align: right" class="text-right"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="'此次领料数量'" >
+                <el-input-number v-model="orderDetailData.issureQty" style="line-height: 20px;padding: 0;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-date-picker
+                style="width: 165px"
+                v-model="orderDetailData.needDate"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="saveOrderDetail()">保存</el-button>
+        <el-button type="primary" @click="saveOrderDetailFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+
+
   </div>
 </template>
 
 <script>
-/*   import {
+  import {
     searchNotifyHeader
-    ,searchNotifyOrderList
-    ,searchNotifyMaterialList
-    ,searchSumNotifyMaterialList
-    ,deleteNotifySOSPlus
-    ,updateNotifyStatus
-    ,deleteNotifyMaterial
-    ,searchNotifyLog
-    ,searchNotifyLogClose
-  }from "@/api/orderIssure/soIssueNotify.js"
-  import Chooselist from '@/views/modules/common/Chooselist'
-  import {getEamWorkShop} from "@/api/factory/site.js";
+    , searchNotifyOrderList
+    , searchNotifyMaterialList
+    , searchSumNotifyMaterialList
+    , deleteNotifySOSPlus
+    , updateNotifyStatus
+    , deleteNotifyMaterial
+    , searchNotifyLog
+    , searchNotifyLogClose
+    , getSiteAndBuByUserName
+    , createNotify
+    , getSOScheduledRoutingListForIssure
+    , getPartList
+  } from "@/api/orderIssure/soIssueNotify.js"
+  import {
+    searchShopOrderByPaging
+    , getRouteInShopOrder
+  } from "@/api/shopOrder/shopOrder.js"
+  import {
+    searchAllResource
+  } from "@/api/base/site.js"
+
   import {
     getTableDefaultListLanguage,
     getTableUserListLanguage,
   } from "@/api/table.js"
-  import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js' */
+
 
   export default {
-    components: {
-    },
+
     data() {
       return {
         height:200,
-        modelFlag:false,
         activeName: 'detail',
         dataList: [],
         dataList2: [],
@@ -382,7 +894,9 @@
         dataList4: [],
         dataList5: [],
         dataList6: [],
-        addOrUpdateVisible:false,
+        userBuList:[],
+        createNotifyFlag: false,
+        saveOrderDetailFlag: false,
         closeData:{
           site:'',
           notifyNo:'',
@@ -393,25 +907,38 @@
         searchData: {
           page: 1,
           limit: 100,
-          site:this.$store.state.user.site,
+          site:'',
           userName: '',
           notifyNo: '',
           status: '',
           issueFlag: '',
+          loginUserName: this.$store.state.user.name,
           issueResult: '',
-          workShopList: [],
           startDate: this.dayjs().format("YYYY-MM-DD"),
           endDate: this.dayjs().format("YYYY-MM-DD"),
-          sql: " and a.status!='已计划' ",
+          sql: "",
+        },
+        notifyData:{
+          site: '',
+          bu: '',
+          notifyNo: '',
+          notifyDate: '',
+          enteredDate: '',
+          userName: this.$store.state.user.name,
+          userDisplay: '',
+          remark: '',
+          planIssueDate: '',
+          outWorkOrderFlag: false,
         },
-        workShopList: [],
-        exportList:[],
         pageIndex: 1,
         pageSize: 100,
         totalPage: 0,
+        //工单分页
+        co_pageIndex: 1,
+        co_pageSize: 100,
+        co_totalPage: 0,
         dataListLoading: false,
         currentRow:'',
-        headerData:'',
         columnList1:[
           {
             userId: this.$store.state.user.name,
@@ -433,13 +960,13 @@
           },{
             userId: this.$store.state.user.name,
             functionId: 701002,
-            serialNumber: '701002Table1WorkShopName',
+            serialNumber: '701002Table1Bu',
             tableId: "701002Table1",
             tableName: "领料申请主表",
-            columnProp: "workShopName",
+            columnProp: "bu",
             headerAlign: "center",
             align: "center",
-            columnLabel: "车间",
+            columnLabel: "BU",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -484,7 +1011,7 @@
           },{
             userId: this.$store.state.user.name,
             functionId: 701002,
-            serialNumber: '701002Table1UserName',
+            serialNumber: '701002Table1UserDisplay',
             tableId: "701002Table1",
             tableName: "领料申请主表",
             columnProp: "userDisplay",
@@ -574,7 +1101,7 @@
             functionId: 701002,
             serialNumber: '701002Table2ItemNo',
             tableId: "701002Table2",
-            tableName: "申请单工单明细表",
+            tableName: "申请单派工单明细表",
             columnProp: "itemNo",
             headerAlign: "center",
             align: "right",
@@ -592,7 +1119,7 @@
             functionId: 701002,
             serialNumber: '701002Table2NeedDate',
             tableId: "701002Table2",
-            tableName: "申请单工单明细表",
+            tableName: "领料申请派工单子表",
             columnProp: 'needDate',
             headerAlign: "center",
             align: "left",
@@ -609,7 +1136,7 @@
             functionId: 701002,
             serialNumber: '701002Table2SOOrderNo',
             tableId: "701002Table2",
-            tableName: "申请单工单明细表",
+            tableName: "申请单派工单明细表",
             columnProp: "sOOrderNo",
             headerAlign: "center",
             align: "left",
@@ -626,7 +1153,7 @@
             functionId: 701002,
             serialNumber: '701002Table2OpsItemNo',
             tableId: "701002Table2",
-            tableName: "申请单工单明细表",
+            tableName: "申请单派工单明细表",
             columnProp: "opsItemNo",
             headerAlign: "center",
             align: "right",
@@ -643,7 +1170,7 @@
             functionId: 701002,
             serialNumber: '701002Table2ItemDesc',
             tableId: "701002Table2",
-            tableName: "申请单工单明细表",
+            tableName: "申请单派工单明细表",
             columnProp: "itemDesc",
             headerAlign: "center",
             align: "left",
@@ -660,11 +1187,11 @@
             functionId: 701002,
             serialNumber: '701002Table2SeqNo',
             tableId: "701002Table2",
-            tableName: "申请单工单明细表",
+            tableName: "申请单派工单明细表",
             columnProp: "seqNo",
             headerAlign: "center",
             align: "left",
-            columnLabel: "工单号",
+            columnLabel: "派工单号",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -677,11 +1204,11 @@
             functionId: 701002,
             serialNumber: '701002Table2FGPartNo',
             tableId: "701002Table2",
-            tableName: "申请单工单明细表",
+            tableName: "申请单派工单明细表",
             columnProp: "fGPartNo",
             headerAlign: "center",
             align: "left",
-            columnLabel: "工单物料",
+            columnLabel: "派工单物料",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -694,7 +1221,7 @@
             functionId: 701002,
             serialNumber: '701002Table2PartDesc',
             tableId: "701002Table2",
-            tableName: "申请单工单明细表",
+            tableName: "申请单派工单明细表",
             columnProp: "partDesc",
             headerAlign: "center",
             align: "left",
@@ -712,7 +1239,7 @@
             functionId: 701002,
             serialNumber: '701002Table2LocationNo',
             tableId: "701002Table2",
-            tableName: "申请单工单明细表",
+            tableName: "领料申请派工单子表",
             columnProp: 'locationNo',
             headerAlign: "center",
             align: "left",
@@ -731,7 +1258,7 @@
             functionId: 701002,
             serialNumber: '701002Table2IssureQty',
             tableId: "701002Table2",
-            tableName: "申请单工单明细表",
+            tableName: "申请单派工单明细表",
             columnProp: "issureQty",
             headerAlign: "center",
             align: "right",
@@ -925,7 +1452,7 @@
             columnProp: "seqNo",
             headerAlign: "center",
             align: "left",
-            columnLabel: "工单号",
+            columnLabel: "派工单号",
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1279,164 +1806,490 @@
             columnWidth: 300
           },
         ],
-        favorite: false,
-        dataRole: {
-          partTypeDesc: [
-            {
-              required: true,
-              message: ' ',
-              trigger: 'change'
-            }
-          ],
-          partName: [
-            {
-              required: true,
-              message: ' ',
-              trigger: 'change'
-            }
-          ],
-        },
+
         // 导出 start
         exportData: [],
         exportName: '发料申请单'+this.dayjs().format('YYYYMMDDHHmmss'),
         exportHeader: ["发料申请单"],
         exportFooter: [],
         // 导出 end
-      }
-    },
-    mounted () {
-      this.$nextTick(() => {
-        this.height = (window.innerHeight- 250) / 2
-        getEamWorkShop({}).then(({data}) => {
-          if (data && data.code === 0) {
-            this.workShopList=data.rows
-          }
-        })
-      })
-    },
-
-    // watch: {
-    //   searchData: {
-    //     deep: true,
-    //     handler: function (newV, oldV) {
-    //       this.searchData.partNo = this.searchData.partNo.toUpperCase()
-    //     }
-    //   },
-    // },
-    created () {
-      // 按钮控制
-      // this.getButtonAuthData()
-      // 获取用户的 site 和 bu
-      // this.getSiteAndBuByUserName()
-      // 校验用户是否收藏
-      this.favoriteIsOk()
-
-      // 动态列
-      this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
-      this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
-      this.getTableUserColumn(this.$route.meta.menuId+'table3',3)
-      this.getTableUserColumn(this.$route.meta.menuId+'table4',4)
-      this.getTableUserColumn(this.$route.meta.menuId+'table5',5)
-      // if (!this.authSearch) {
-      //   // 获取数据列表
-      //   this.getDataList()
-      // }
-    },
-    methods: {
-      // 动态列开始 获取 用户保存的 格式列
-      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;
-              case 5:
-                this.columnList5 = data.rows
-                break;
-            }
-          } else {
-            this.getColumnList(tableId, columnId)
-          }
-        })
-      },
-
-      // 获取 tableDefault 列
-      async getColumnList (tableId, columnId) {
-        let queryTable= {
-          functionId: this.$route.meta.menuId,
-          tableId: tableId,
-          languageCode: this.$i18n.locale
-        }
-        await getTableDefaultListLanguage(queryTable).then(({data}) => {
-          if (!data.rows.length == 0) {
-            switch (columnId) {
-              case 1:
-                this.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;
-              case 5:
-                this.columnList5 = data.rows
-                break;
-            }
-          } else {
-            // this.showDefault = true.
-          }
-        })
-
-      },
-      // 获取基础数据列表S
-      getBaseList (val, type) {
-        this.tagNo = val
-        this.tagNo1 = type
-        this.$nextTick(() => {
-          let strVal = ''
-          if (val === 1013) {
-            if(type==23) {
-              strVal = this.modelData.supplierId
-            }
-          }
-          this.$refs.baseList.init(val, strVal)
-        })
-      },
-      /* 列表方法的回调 */
-      getBaseData (val) {
-        if (this.tagNo === 23) {
-          if(this.tagNo1==1) {
-            this.modelData.supplierId = val.SupplierID
-            this.modelData.supplierName = val.SupplierName
+        orderDetailData:{
+          orderNo:'',
+          seqNo:'',
+          locationNo:'',
+          qtyrequired:'',
+          issureQty:0,
+          partDesc:'',
+          partNo:'',
+          resourceId:'',
+          resourceDesc:'',
+          needDate:'',
+          itemDesc:'',
+          workCenterNo:'',
+          itemNo:0,
+          materialType:'BOM物料',
+        },
+        chooseSOSModalFlag: false,
+        chooseSOSData: {
+          orderno: '',
+          seqno: '',
+          sResourceid: '',
+          startDate: '',
+          endDate: '',
+        },
+        chooseOrderModalFlag: false,
+        chooseOrderData: {
+          page: 1,
+          limit: 100,
+          orderNo: '',
+          status: '',
+          date3: '',
+          date4: '',
+          statusList: '',
+        },
+        chooseOrderList: [],
+        chooseOperationModalFlag: false,
+        chooseOperationData: {
+          orderNo: '',
+          site: '',
+          itemDesc: ''
+        },
+        chooseOperationList: [],
+        chooseResourceModalFlag: false,
+        chooseResourceData: {
+          site: '',
+          workCenterNo: '',
+          resourceID: '',
+          resourceDesc: '',
+        },
+        chooseResourceList: [],
+        chooseSOSList: [],
+        choosePartModalFlag: false,
+        choosePartData: {
+          site: '',
+          sourceBu: '',
+          partNo: '',
+          partDesc: '',
+          spec: '',
+        },
+        choosePartList: [],
+        chooseSOSColumnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701001,
+            serialNumber: '701001Table2Orderno',
+            tableId: "701001Table2",
+            tableName: "查询派工单",
+            columnProp: 'orderno',
+            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: 701001,
+            serialNumber: '701001Table2Seqno',
+            tableId: "701001Table2",
+            tableName: "查询派工单",
+            columnProp: 'seqno',
+            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: 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: '701001Table2PartDesc',
+            tableId: "701001Table2",
+            tableName: "查询派工单",
+            columnProp: 'partDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '物料描述',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701001,
+            serialNumber: '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: '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: '701001Table2StartDate',
+            tableId: "701001Table2",
+            tableName: "查询派工单",
+            columnProp: 'startDate',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '开始日期',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 100,
+          },
+        ],
+        chooseOrderColumnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701001,
+            serialNumber: '701001Table2Orderno',
+            tableId: "701001Table2",
+            tableName: "查询工单",
+            columnProp: 'orderNo',
+            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: 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: 120,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701001,
+            serialNumber: '701001Table2PartDescription',
+            tableId: "701001Table2",
+            tableName: "查询工单",
+            columnProp: 'partDescription',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '物料描述',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 150,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701001,
+            serialNumber: '701001Table2LotSize',
+            tableId: "701001Table2",
+            tableName: "查询工单",
+            columnProp: 'lotSize',
+            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: '701001Table2Status',
+            tableId: "701001Table2",
+            tableName: "查询工单",
+            columnProp: 'status',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '状态',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+        ],
+        chooseOperationColumnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701001,
+            serialNumber: '701001Table2ItemNo',
+            tableId: "701001Table2",
+            tableName: "查询工序",
+            columnProp: 'itemNo',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '工序号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80,
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701001,
+            serialNumber: '701001Table2OperationDesc',
+            tableId: "701001Table2",
+            tableName: "查询工序",
+            columnProp: 'operationDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '工序名称',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          }
+        ],
+        chooseResourceColumnList: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 701001,
+            serialNumber: '701001Table2ResourceID',
+            tableId: "701001Table2",
+            tableName: "查询机台",
+            columnProp: 'resourceID',
+            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: '701001Table2ResourceDesc',
+            tableId: "701001Table2",
+            tableName: "查询机台",
+            columnProp: 'resourceDesc',
+            headerAlign: "center",
+            align: "left",
+            columnLabel: '机台描述',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 150,
+          },
+        ],
+      }
+    },
+    mounted () {
+      this.$nextTick(() => {
+        this.height = (window.innerHeight- 315) / 2
+      })
+    },
+
+    // watch: {
+    //   searchData: {
+    //     deep: true,
+    //     handler: function (newV, oldV) {
+    //       this.searchData.partNo = this.searchData.partNo.toUpperCase()
+    //     }
+    //   },
+    // },
+    created () {
+      // 动态列
+      this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
+      this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
+      this.getTableUserColumn(this.$route.meta.menuId+'table3',3)
+      this.getTableUserColumn(this.$route.meta.menuId+'table4',4)
+      this.getTableUserColumn(this.$route.meta.menuId+'table5',5)
+      this.getTableUserColumn(this.$route.meta.menuId+'table6',6)
+    },
+    methods: {
+      // 动态列开始 获取 用户保存的 格式列
+      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;
+              case 5:
+                this.columnList5 = data.rows
+                break;
+              case 6:
+                this.columnList6 = data.rows
+                break;
+            }
+          } else {
+            this.getColumnList(tableId, columnId)
           }
+        })
+      },
+
+      // 获取 tableDefault 列
+      async getColumnList (tableId, columnId) {
+        let queryTable= {
+          functionId: this.$route.meta.menuId,
+          tableId: tableId,
+          languageCode: this.$i18n.locale
         }
+        await getTableDefaultListLanguage(queryTable).then(({data}) => {
+          if (data.rows&&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;
+              case 5:
+                this.columnList5 = data.rows
+                break;
+              case 6:
+                this.columnList6 = data.rows
+                break;
+            }
+          } else {
+            // this.showDefault = true.
+          }
+        })
+
       },
+
       // 每页数
-      sizeChangeHandle (val) {
+      sizeChangeHandle (val) {    
         this.pageSize = val
-        this.pageIndex = 1
         this.searchTable()
       },
       // 当前页
@@ -1450,7 +2303,6 @@
       },
       changeData(row){
         this.currentRow = JSON.parse(JSON.stringify(row));
-        this.headerData=row;
         this.refreshCurrentTabTable ();
       },
       refreshCurrentTabTable(){
@@ -1519,12 +2371,6 @@
             this.pageIndex = data.page.currPage
             this.pageSize = data.page.pageSize
             this.totalPage = data.page.totalCount
-            if(this.dataList.length>0){
-              this.$refs.mainTable.setCurrentRow(this.dataList[0]);
-              this.changeData(this.dataList[0])
-            }else {
-              this.changeData(null)
-            }
           } else {
             this.dataList = [];
           }
@@ -1643,16 +2489,183 @@
           })
         })
       },
-      //导出excel
+
+
+//申请单主表新增方法
+      //新增领料申请单模态框
+      createNotifyModal(){
+        let inData={
+          username:this.$store.state.user.name
+        }
+        getSiteAndBuByUserName(inData).then(({data}) =>{
+          if (data && data.code === 0) {
+            this.userBuList=data.rows
+            if (this.userBuList.length > 0) {
+              this.notifyData.bu = this.userBuList[0].buNo
+            }
+          }
+        })
+        this.createNotifyFlag=true
+      },
+      //保存领料申请单
+      saveNotify(){
+        let buValue = this.notifyData.bu
+        let site = buValue.split('_')[0]
+        let bu = buValue.split('_')[1]
+
+        let inData={
+          site: site,
+          bu: bu,
+          userName:this.$store.state.user.name,
+          remark: this.notifyData.remark
+        }
+        createNotify(inData).then(({data})=>{
+          if (data.code === 0) {
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {}
+            })
+            this.createNotifyFlag = false
+            // 刷新主表数据
+            this.searchTable()
+            // 清空表单数据
+            this.notifyData = {
+              site: '',
+              bu: '',
+              notifyNo: '',
+              notifyDate: '',
+              enteredDate: '',
+              userName: this.$store.state.user.name,
+              userDisplay: '',
+              remark: '',
+              planIssueDate: '',
+            }
+          }else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+
+      //新增派工单明细
+      createOrderDetail(){
+        // 检查是否选择了主表行
+        /* if (!this.currentRow || !this.currentRow.notifyNo) {
+          this.$alert('请先选择一条主表记录！', '提示', {
+            confirmButtonText: '确定'
+          })
+          return false
+        } */
+
+        // 清除所有数据，设置默认值
+        this.orderDetailData = {
+          orderno: '',
+          seqno: '',
+          operationNo: '',
+          locationNo: '',
+          qtyrequired: '',
+          issureQty: 0,
+          partDesc: '',
+          partNo: '',
+          resourceId: '',
+          resourceDesc: '',
+          itemDesc: '',
+          itemNo: 0,
+          workCenterNo: '',
+          needDate: '',
+          materialType: 'BOM物料'
+        }
+
+        this.saveOrderDetailFlag = true
+      },
+      //编辑派工单明细
+      editOrderDetail(){
+        // 检查是否选择了明细行
+        if (!this.dataList2 || this.dataList2.length === 0) {
+          this.$alert('请先选择一条明细记录！', '提示', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+
+        // 这里应该实现编辑逻辑
+        this.$message.warning('编辑功能待实现');
+      },
+      saveOrderDetail(){
+        // 数据验证
+        if (!this.orderDetailData.needDate) {
+          this.$alert('请选择要求发料时间！', '提示', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+
+        if (!this.orderDetailData.issureQty || this.orderDetailData.issureQty <= 0) {
+          this.$alert('请填写领取数量！', '提示', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+
+        let inData = {
+          site: this.currentRow.site,
+          bu: this.currentRow.bu,
+          notifyNo: this.currentRow.notifyNo,
+          orderno: this.orderDetailData.orderNo,
+          seqno: this.orderDetailData.seqNo,
+          operationNo: this.orderDetailData.operationNo,
+          locationNo: this.orderDetailData.locationNo,
+          qtyrequired: this.orderDetailData.qtyRequired,
+          issureQty: this.orderDetailData.issureQty,
+          partDesc: this.orderDetailData.partDesc,
+          partNo: this.orderDetailData.partNo,
+          resourceDesc: this.orderDetailData.resourceDesc,
+          resourceId: this.orderDetailData.resourceId,
+          itemDesc: this.orderDetailData.itemDesc,
+          itemNo: this.orderDetailData.itemNo,
+          workCenterNo: this.orderDetailData.workCenterNo,
+          needDate: this.orderDetailData.needDate,
+          username: this.$store.state.user.name,
+        }
+
+        // 这里应该调用相应的API来保存派工单数据
+        // 由于没有具体的API，我们先模拟成功
+        this.$message.success('保存成功')
+        this.saveOrderDetailFlag = false
+
+        // 刷新当前标签页数据
+        this.refreshCurrentTabTable()
+
+        // 清空表单数据
+        this.orderDetailData = {
+          orderno: '',
+          seqno: '',
+          operationNo: '',
+          locationNo: '',
+          qtyrequired: '',
+          issureQty: 0,
+          partDesc: '',
+          partNo: '',
+          resourceId: '',
+          resourceDesc: '',
+          itemDesc: '',
+          itemNo: 0,
+          workCenterNo: '',
+          needDate: '',
+          materialType: 'BOM物料'
+        }
+      },
+
+
       //导出excel
       async createExportData() {
         this.searchData.limit = -1
         this.searchData.page = 1
-        await searchNotifyHeader(this.searchData).then(({data}) => {
-          this.exportList= data.page.list;
-        })
-
-        return this.exportList;
+        const {data} = await searchNotifyHeader(this.searchData)
+        return data.page.list;
       },
       startDownload() {
         //  this.exportData = this.dataList
@@ -1683,39 +2696,348 @@
 
         return ''
       },
-      // 校验用户是否收藏
-      favoriteIsOk () {
-        let userFavorite = {
-          userId: this.$store.state.user.id,
-          languageCode: this.$i18n.locale
+
+
+
+
+      onMaterialTypeChange(value) {
+        // 清空相关字段
+        this.orderDetailData.orderNo = '';
+        this.orderDetailData.seqNo = '';
+        this.orderDetailData.operationNo = '';
+        this.orderDetailData.partNo = '';
+        this.orderDetailData.partDesc = '';
+        this.orderDetailData.locationNo = '';
+        this.orderDetailData.resourceId = '';
+        this.orderDetailData.resourceDesc = '';
+        this.orderDetailData.qtyRequired = '';
+        this.orderDetailData.itemDesc = '';
+        this.orderDetailData.itemNo = '';
+        this.orderDetailData.workCenterNo = '';
+        this.orderDetailData.issureQty = 0;
+      },
+
+
+
+
+      searchSOSRouting() {
+        // 调用API查询派工单信息
+        this.$message.warning('正在查询派工单信息...');
+
+        getSOScheduledRoutingListForIssure(this.chooseSOSData).then(({data}) => {
+          if (data.code === 0) {
+            this.chooseSOSList = data.rows;
+            if (this.chooseSOSList.length === 0) {
+              this.$message.warning('未查询到符合条件的派工单');
+            }
+          } else {
+            this.$message.error(data.msg || '查询失败');
+          }
+        }).catch(error => {
+          console.error('查询派工单失败:', error);
+          this.$message.error('查询失败，请稍后重试');
+        });
+      },
+      openChooseSOSModal() {
+        // 检查是否选择了主表行
+        if (!this.currentRow || !this.currentRow.notifyNo) {
+          this.$alert('请先选择一条主表记录！', '提示', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+
+        // 初始化选择派工单数据
+        this.chooseSOSData = {
+          site: this.currentRow.site,
+          bu: this.currentRow.bu,
+          orderno: '',
+          seqno: '',
+          sResourceid: '',
+          startDate: this.dayjs().format('YYYY-MM-DD'),
+          endDate: this.dayjs().format('YYYY-MM-DD'),
+        }
+
+        // 清空选择列表
+        this.chooseSOSList = []
+
+        // 打开选择模态框
+        this.chooseSOSModalFlag = true
+      },
+      chooseSOS(row) {
+        // 关闭选择模态框
+        this.chooseSOSModalFlag = false
+
+        // 将选择的数据填入到保存派工单模态框中
+        this.orderDetailData.orderNo = row.orderno || row.orderNo || '';
+        this.orderDetailData.seqNo = row.seqno || row.seqNo || '';
+        this.orderDetailData.operationNo = row.operationNo || row.operation || '';
+        this.orderDetailData.locationNo = row.sResourceid || row.locationNo || '';
+        this.orderDetailData.qtyRequired = row.qtyrequired || row.qtyToIssue || '';
+        this.orderDetailData.partDesc = row.partDesc || '';
+        this.orderDetailData.partNo = row.partNo || row.fGPartNo || '';
+        this.orderDetailData.workCenterNo = row.workCenterNo || '';
+        this.orderDetailData.needDate = row.startDate || this.dayjs().format('YYYY-MM-DD HH:mm:ss');
+
+        // 根据物料类型设置
+        if (row.issueType === '非BOM物料') {
+          this.orderDetailData.materialType = '非BOM物料';
+        } else {
+          this.orderDetailData.materialType = 'BOM物料';
         }
-        userFavoriteList(userFavorite).then(({data}) => {
-          for (let i = 0; i < data.list.length; i++) {
-            if (this.$route.meta.menuId === data.list[i].menuId) {
-              this.favorite = true
+
+        this.$message.success('选择派工单成功，数据已填入表单');
+      },
+
+
+//工单选择部分
+      // 打开选择工单模态框
+      openChooseOrderModal() {
+        // 检查是否选择了主表行
+        if (!this.currentRow || !this.currentRow.notifyNo) {
+          this.$alert('请先选择一条主表记录！', '提示', {
+            confirmButtonText: '确定'
+          })
+          return false
+        }
+
+        // 初始化选择工单数据
+        this.chooseOrderData = {
+          page: 1,
+          limit: 100,
+          site: this.currentRow.site,
+          buNo: this.currentRow.bu,
+          user: this.$store.state.user.name,
+          orderNo: '',
+          statusList: ['已下达', '已计划', '已排产'],
+          date3: this.dayjs().format('YYYY-MM-DD'),
+          date4: this.dayjs().format('YYYY-MM-DD'),
+        }
+
+        // 清空选择列表
+        this.chooseOrderList = []
+
+        // 打开选择模态框
+        this.chooseOrderModalFlag = true
+      },
+      // 查询工单信息
+      searchOrder() {
+        this.chooseOrderData.limit = this.co_pageSize
+        this.chooseOrderData.page = this.co_pageIndex
+        searchShopOrderByPaging(this.chooseOrderData).then(({data}) => {
+          if (data.code === 0) {
+            this.chooseOrderList = data.page.list;
+            if (this.chooseOrderList.length === 0) {
+              this.$message.warning('未查询到符合条件的工单');
             }
+            this.co_pageIndex = data.page.currPage
+            this.co_pageSize = data.page.pageSize
+            this.co_totalPage = data.page.totalCount
+          } else {
+            this.chooseOrderList = [];
+            this.$message.error(data.msg || '查询失败');
           }
-        })
+        }).catch(error => {
+          this.chooseOrderList = [];
+          console.error('查询工单失败:', error);
+          this.$message.error('查询失败，请稍后重试');
+        });
       },
+      // 每页数  工单分页信息
+      coSizeChangeHandle(val) {
+        this.co_pageSize = val
+        this.searchOrder()
+      },
+      // 当前页  工单分页信息
+      co_currentChangeHandle(val) {
+        this.co_pageIndex = val
+        this.searchOrder()
+      },
+      // 选择工单
+      chooseOrder(row) {
+        // 关闭选择模态框
+        this.chooseOrderModalFlag = false
 
-      // 收藏 OR 取消收藏
-      favoriteFunction () {
-        let userFavorite = {
-          userId: this.$store.state.user.id,
-          functionId: this.$route.meta.menuId,
+        // 将选择的数据填入到保存派工单模态框中
+        this.orderDetailData.orderNo = row.orderNo || '';
+        this.orderDetailData.partNo = row.partNo || '';
+        this.orderDetailData.partDesc = row.partDescription || '';
+        this.orderDetailData.qtyRequired = row.lotSize || '';
+
+        // 清空相关字段
+        this.orderDetailData.seqNo = '';
+        this.orderDetailData.operationNo = '';
+        this.orderDetailData.locationNo = '';
+      },
+//工序选择部分
+      // 打开选择工序模态框
+      openChooseOperationModal() {
+        // 检查是否选择了工单
+        if (!this.orderDetailData.orderNo) {
+          this.$alert('请先选择工单！', '提示', {
+            confirmButtonText: '确定'
+          })
+          return false
         }
-        if (this.favorite) {
-          removeUserFavorite(userFavorite).then(({data}) => {
-            this.$message.success(data.msg)
-            this.favorite = false
+
+        // 初始化选择工序数据
+        this.chooseOperationData = {
+          orderNo: this.orderDetailData.orderNo,
+          site: this.currentRow.site,
+        }
+
+        // 清空选择列表
+        this.chooseOperationList = []
+
+        // 打开选择模态框
+        this.chooseOperationModalFlag = true
+      },
+      // 查询工序信息
+      searchOperation() {
+        // 调用API查询工序信息
+        getRouteInShopOrder(this.chooseOperationData).then(({data}) => {
+          if (data.code === 0) {
+            this.chooseOperationList = data.dataList;
+            if (this.chooseOperationList.length === 0) {
+              this.$message.warning('未查询到符合条件的工序');
+            }
+          } else {
+            // 清空选择列表
+            this.chooseOperationList = [];
+            this.$message.error(data.msg || '查询失败');
+          }
+        }).catch(error => {
+          // 清空选择列表
+          this.chooseOperationList = [];
+          console.error('查询工序失败:', error);
+          this.$message.error('查询失败，请稍后重试');
+        });
+      },
+      // 选择工序
+      chooseOperation(row) {
+        // 关闭选择模态框
+        this.chooseOperationModalFlag = false
+
+        // 将选择的数据填入到保存派工单模态框中
+        this.orderDetailData.itemDesc = row.operationDesc || '';
+        this.orderDetailData.itemNo = row.itemNo || '';
+        this.orderDetailData.workCenterNo = row.workCenterNo || '';
+
+        this.$message.success('操作成功');
+      },
+//机台选择部分
+      // 打开选择机台模态框
+      openChooseResourceModal() {
+        // 检查是否选择了工单
+        if (!this.orderDetailData.orderNo) {
+          this.$alert('请先选择工单！', '提示', {
+            confirmButtonText: '确定'
           })
-        } else {
-          // 收藏
-          saveUserFavorite(userFavorite).then(({data}) => {
-            this.$message.success(data.msg)
-            this.favorite = true
+          return false
+        }
+
+        // 初始化选择机台数据
+        this.chooseResourceData = {
+          site: this.currentRow.site,
+          workCenterNo: this.orderDetailData.workCenterNo,
+          resourceID: '',
+          resourceDesc: '',
+        }
+
+        // 清空选择列表
+        this.chooseResourceList = []
+
+        // 打开选择模态框
+        this.chooseResourceModalFlag = true
+      },
+      // 查询机台信息
+      searchResource() {
+        // 调用API查询机台信息
+        searchAllResource(this.chooseResourceData).then(({data}) => {
+          if (data.code === 0) {
+            this.chooseResourceList = data.rows;
+            if (this.chooseResourceList.length === 0) {
+              this.$message.warning('未查询到符合条件的机台');
+            }
+          } else {
+            // 清空选择列表
+            this.chooseResourceList = [];
+            this.$message.error(data.msg || '查询失败');
+          }
+        }).catch(error => {
+          // 清空选择列表
+          this.chooseResourceList = [];
+          console.error('查询机台失败:', error);
+          this.$message.error('查询失败，请稍后重试');
+        });
+      },
+      // 选择机台
+      chooseResource(row) {
+        // 关闭选择模态框
+        this.chooseResourceModalFlag = false
+
+        // 将选择的数据填入到保存派工单模态框中
+        this.orderDetailData.resourceId = row.resourceId || '';
+        this.orderDetailData.resourceDesc = row.resourceDesc || '';
+
+        this.$message.success('操作成功');
+      },
+//非BOM物料选择部分
+      // 打开选择物料模态框
+      openChoosePartModal() {
+        // 检查是否选择了主表行
+        if (!this.currentRow || !this.currentRow.notifyNo) {
+          this.$alert('请先选择一条主表记录！', '提示', {
+            confirmButtonText: '确定'
           })
+          return false
+        }
+
+        // 初始化选择物料数据
+        this.choosePartData = {
+          site: this.currentRow.site,
+          sourceBu: this.currentRow.bu,
+          partNo: '',
+          partDesc: '',
+          spec: '',
         }
+
+        // 清空选择列表
+        this.choosePartList = []
+
+        // 打开选择模态框
+        this.choosePartModalFlag = true
+      },
+      // 查询物料信息
+      searchPartModel() {
+        // 调用API查询物料信息
+        this.$message.warning('正在查询物料信息...');
+
+        getPartList(this.choosePartData).then(({data}) => {
+          if (data.code === 0) {
+            this.choosePartList = data.rows;
+            if (this.choosePartList.length === 0) {
+              this.$message.warning('未查询到符合条件的物料');
+            }
+          } else {
+            this.$message.error(data.msg || '查询失败');
+          }
+        }).catch(error => {
+          console.error('查询物料失败:', error);
+          this.$message.error('查询失败，请稍后重试');
+        });
+      },
+      // 选择物料
+      choosePart(row) {
+        // 关闭选择模态框
+        this.choosePartModalFlag = false
+
+        // 将选择的数据填入到保存派工单模态框中
+        this.orderDetailData.partNo = row.partNo || '';
+        this.orderDetailData.partDesc = row.partDesc || '';
+        this.orderDetailData.materialType = '非BOM物料';
+
+        this.$message.success('选择物料成功，数据已填入表单');
       },
     },
 
@@ -1723,4 +3045,41 @@
 </script>
 
 <style scoped>
+/deep/ .el-form-item--medium .el-form-item__content {
+  height: auto;
+}
+.disabled {
+  cursor: not-allowed !important;
+  color: #C0C4CC !important;
+  pointer-events: none;
+}
+
+.text-right >>> .el-input__inner {
+  text-align: right !important;
+}
+
+.text-right >>> .el-input-number__input {
+  text-align: right !important;
+}
+
+.single-line-multi-select >>> .el-select__tags {
+  display: flex;
+  flex-wrap: nowrap;
+  overflow: hidden;
+  white-space: nowrap;
+  max-width: 100%;
+}
+
+.single-line-multi-select >>> .el-tag {
+  flex-shrink: 0;
+  max-width: 100px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.single-line-multi-select >>> .el-select__input {
+  flex-shrink: 0;
+  min-width: 30px;
+}
 </style>