生产退料修改

src/api/orderIssure/inboundNotification.js

@@ -3,4 +3,5 @@ import { createAPI } from "@/utils/httpRequest.js";
 export const getSiteAndBuByUserName = data => createAPI(`/orderIssure/issureNotify/getSiteAndBuByUserName`,'post',data)
 export const searchNotifyHeader= data => createAPI(`/orderUnissue/unissueNotify/searchUnissueNotifyHeader`,'post',data)
 export const createNotify = data => createAPI(`/orderIssure/issureNotify/createNotify`,'post',data)
-export const getSOScheduledRoutingListForIssure= data => createAPI(`/orderIssure/issureNotify/getSOScheduledRoutingListForIssure`,'post',data)
+export const getSOScheduledRoutingListForIssure= data => createAPI(`/orderIssure/issureNotify/getSOScheduledRoutingListForIssure`,'post',data)
+export const getNotifyNoDetail= data => createAPI(`/orderUnissue/unissueNotify/getNotifyNoDetail`,'post',data)

src/views/modules/orderIssure/inboundNotification.vue

@@ -27,7 +27,8 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item style="margin-top: 23px;">
-        <laber style="margin-left: -9px;font-size: 19px"></laber>
+        <!-- <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"
@@ -130,7 +131,7 @@
           <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"
-          style="width: 100%;">
+          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"
@@ -143,7 +144,7 @@
                   style="width: 100px; height: 80px" /></span>
             </template>
           </el-table-column>
-          <el-table-column prop="requiredQty" header-align="center" align="right" min-width="100" label="要求入库数量">
+          <!-- <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"
@@ -169,7 +170,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="actualStockInQty" header-align="center" align="right" min-width="100" label="实际入库数量">
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column fixed="right" header-align="center" align="center" width="90" label="操作">
             <template slot-scope="scope">
               <el-link style="cursor: pointer" @click="inboundDetailModal(scope.row)">入库明细</el-link>
@@ -476,6 +477,7 @@ import {
   getSiteAndBuByUserName,
   searchNotifyHeader,
   createNotify,
+  getNotifyNoDetail,
 } from '@/api/orderIssure/inboundNotification.js'
 import Chooselist from '@/views/modules/common/Chooselist_eam'
 import { getChooselist } from '@/api/chooselist/chooselist.js'
@@ -486,7 +488,6 @@ import {
 import {
   getSOScheduledRoutingListForIssure,
   saveSOIssueNotifyOrderList,
-  getNotifyNoDetail,
 } from '@/api/orderIssure/soIssueNotify.js'
 export default {
   components: {
@@ -991,36 +992,51 @@ export default {
       ],
       columnDetailList: [
         {
-          columnProp: 'relatedOrderNo',
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2Orderno',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'soorderNo',
           headerAlign: 'center',
-          align: 'left',
-          columnLabel: '关联单号',
+          align: 'center',
+          columnLabel: '生产订单',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100,
+          columnWidth: 120,
         },
         {
-          columnProp: 'relatedOrderLineNo',
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2PartNo',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'fgpartNo',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '关联单行号',
+          columnLabel: '物料编码',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 100,
+          columnWidth: 80,
         },
         {
-          columnProp: 'partNo',
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2PartNo',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'partDesc',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '物料编码',
+          columnLabel: '物料名称',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1028,25 +1044,108 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 120,
+          showOverflowTooltip: true,
         },
         {
-          columnProp: 'partDesc',
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2Qtyrequired',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'lotSize',
+          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: 'unissureQty',
+          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: '701001Table2SScheduleddate',
+          tableId: '701001Table2',
+          tableName: '查询工单',
+          columnProp: 'startDate',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '物料名称',
+          columnLabel: '工单开始日期',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 200,
+          columnWidth: 100,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2SScheduleddate',
+          tableId: '701001Table2',
+          tableName: '查询工单',
+          columnProp: 'finishDate',
+          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,
         },
         {
-          columnProp: 'unit',
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table2WorkCenterDesc',
+          tableId: '701001Table2',
+          tableName: '查询工单',
+          columnProp: 'workCenterDesc',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '单位',
+          columnLabel: '加工中心名称',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1055,6 +1154,42 @@ export default {
           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: '701001Table2OperatorDesc',
+          tableId: '701001Table2',
+          tableName: '查询派工单',
+          columnProp: 'operatorDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '操作员',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100,
+        },*/
       ],
       columnDetailList2: [
         {
@@ -1199,8 +1334,8 @@ export default {
     // 获取用户的 site 和 bu
     //this.getSiteAndBuByUserName()
     // 动态列
-    this.getTableUserColumn(this.$route.meta.menuId + 'table1', 1)
-    this.getTableUserColumn(this.$route.meta.menuId + 'table2', 2)
+    //this.getTableUserColumn(this.$route.meta.menuId + 'table1', 1)
+    //this.getTableUserColumn(this.$route.meta.menuId + 'table2', 2)
     if (!this.authSearch) {
       // 获取数据列表
       this.getDataList()
@@ -1235,14 +1370,20 @@ export default {
             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.$refs.inboundTable.setCurrentRow(this.dataList[0])
-              this.inboundClickRow(this.dataList[0])
+              // 设置选中行并高亮第一行
+              this.$nextTick(() => {
+                this.$refs.inboundTable.setCurrentRow(this.dataList[0])
+                this.currentRow = JSON.parse(JSON.stringify(this.dataList[0]))
+                // 调用getNotifyNoDetail方法获取入库明细
+                this.getNotifyNoDetail()
+              })
             } else {
               this.currentRow = {}
-              this.refreshCurrentTabTable()
+              this.detailList = []
             }
           }
         })
@@ -1445,7 +1586,7 @@ export default {
       if (row) {
         this.currentRow = JSON.parse(JSON.stringify(row))
         //刷新当前页表
-        this.refreshCurrentTabTable()
+        this.getNotifyNoDetail()
       }
     },
 
@@ -1460,14 +1601,18 @@ export default {
     },
 
     rowStyle({ row }) {
-      if (this.currentRow.orderNo === row.orderNo) {
+      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.getNotifyNoDetail()
     },
 
     // 刷新页签的table数据
@@ -1484,9 +1629,9 @@ export default {
         buNo: this.currentRow.buNo,
         orderNo: this.currentRow.orderNo,
       }
-      getInboundDetail(templateData).then(({ data }) => {
+      /* getInboundDetail(templateData).then(({ data }) => {
         this.detailList = data.rows
-      })
+      }) */
     },
 
     // 新增明细
@@ -1669,14 +1814,24 @@ export default {
       })
     },
     getNotifyNoDetail() {
+      if (!this.currentRow || !this.currentRow.notifyNo) {
+        this.detailList = []
+        return
+      }
+      
       let inData = {
-        site: localStorage.getItem('site'),
-        notifyNo: this.notifyNo,
+        site: this.currentRow.site || localStorage.getItem('site'),
+        notifyNo: this.currentRow.notifyNo,
       }
+      
       getNotifyNoDetail(inData).then(({ data }) => {
         if (data.code === 0) {
-          this.dataList = data.rows
+          this.detailList = data.rows || []
+        } else {
+          this.detailList = []
         }
+      }).catch(() => {
+        this.detailList = []
       })
     },
     enterSOS(row) {