退料申请单修改

src/api/orderIssure/inboundNotification.js

@@ -4,4 +4,5 @@ export const getSiteAndBuByUserName = data => createAPI(`/orderIssure/issureNoti
 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 getNotifyNoDetail= data => createAPI(`/orderUnissue/unissueNotify/getNotifyNoDetail`,'post',data)
+export const getNotifyNoDetail= data => createAPI(`/orderUnissue/unissueNotify/getNotifyNoDetail`,'post',data)
+export const searchNotifyMaterialList= data => createAPI(`/orderUnissue/unissueNotify/searchNotifyMaterialList`,'post',data)

src/views/modules/orderIssure/inboundNotification.vue

@@ -127,9 +127,9 @@
     <el-tabs v-model="activeTable" style="width: 100%" :style="{height: secondHeight + 'px'}" type="border-card"
       @tab-click="tabClick" class="customer-tab">
       <el-tab-pane label="入库明细" name="inboundDetail">
-        <el-form label-position="top" style="margin-left: 2px;">
+        <!-- <el-form label-position="top" style="margin-left: 2px;">
           <el-button type="primary" @click="deleteInboundDetail()" icon="el-icon-delete">删除</el-button>
-        </el-form>
+        </el-form> -->
         <el-table :data="detailList" :height="secondHeight - 68" border @selection-change="selectionInboundDetail"
           v-loading="searchLoading" style="width: 100%;">
           <el-table-column type="selection" header-align="center" align="center" width="50">
@@ -173,7 +173,7 @@
           </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>
+              <el-link style="cursor: pointer" @click="enterSOSDetail(scope.row)">入库明细</el-link>
             </template>
           </el-table-column>
         </el-table>
@@ -466,6 +466,48 @@
         <el-button type="primary" @click="detailModal2 = false">关闭</el-button>
       </el-footer>
     </el-dialog>
+    <el-dialog title="申请明细" :close-on-click-modal="false" v-drag :visible.sync="materialModalFlag" width="900px">
+      <!-- <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item :label="'生产订单号'">
+              <el-input v-model="sobomData.orderNo" disabled></el-input>
+            </el-form-item>
+          </el-col> 
+          <el-col :span="6">
+            <el-form-item :label="'产品编码'">
+              <el-input v-model="sobomData.partNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form> -->
+      <div class="yzzTable">
+        <el-table :height="400" :data="sobomList" border style="width: 100%;">
+          <el-table-column v-for="(item,index) in columnList3" :key="index" :sortable="item.columnSortable"
+            :prop="item.columnProp" :header-align="item.headerAlign" :show-overflow-tooltip="item.showOverflowTooltip"
+            :align="item.align" :fixed="item.fixed==''?false:item.fixed" :min-width="item.columnWidth"
+            :label="item.columnLabel">
+            <template slot-scope="scope">
+              <div v-if="item.columnProp === 'qtyToUnissue'">
+                <el-input v-model="scope.row.qtyToUnissue" style="height: 11px; width: 98%;" :step="0" :min="0"></el-input>
+              </div>
+              <div v-else-if="item.columnProp === 'remark'">
+                <el-input v-model="scope.row.remark" style="padding: 0;width: 100%"></el-input>
+              </div>
+              <div v-else>
+                <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
+                <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                    style="width: 100px; height: 80px" /></span>
+
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="materialModalFlag=false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
 
     <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
 
@@ -478,6 +520,7 @@ import {
   searchNotifyHeader,
   createNotify,
   getNotifyNoDetail,
+  searchNotifyMaterialList,
 } from '@/api/orderIssure/inboundNotification.js'
 import Chooselist from '@/views/modules/common/Chooselist_eam'
 import { getChooselist } from '@/api/chooselist/chooselist.js'
@@ -990,6 +1033,80 @@ export default {
           columnWidth: 100,
         },
       ],
+      columnList3: [
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table3ComponentPartNo',
+          tableId: '701001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'componentPartNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '物料编码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 80,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table3PartDesc',
+          tableId: '701001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'componentPartDesc',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '物料描述',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 120,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table3QtyToIssue',
+          tableId: '701001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'qtyToUnissue',
+          headerAlign: 'center',
+          align: 'right',
+          columnLabel: '本次退货数量',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 60,
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 701001,
+          serialNumber: '701001Table3Remark',
+          tableId: '701001Table3',
+          tableName: '领料申请BOM子表',
+          columnProp: 'remark',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '备注',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150,
+        },
+      ],
       columnDetailList: [
         {
           userId: this.$store.state.user.name,
@@ -1027,7 +1144,7 @@ export default {
           fixed: '',
           columnWidth: 80,
         },
-        {
+        /* {
           userId: this.$store.state.user.name,
           functionId: 701001,
           serialNumber: '701001Table2PartNo',
@@ -1045,8 +1162,8 @@ export default {
           fixed: '',
           columnWidth: 120,
           showOverflowTooltip: true,
-        },
-        {
+        }, */
+        /* {
           userId: this.$store.state.user.name,
           functionId: 701001,
           serialNumber: '701001Table2Qtyrequired',
@@ -1063,7 +1180,7 @@ export default {
           status: true,
           fixed: '',
           columnWidth: 80,
-        },
+        }, */
         {
           userId: this.$store.state.user.name,
           functionId: 701001,
@@ -1073,7 +1190,7 @@ export default {
           columnProp: 'unissureQty',
           headerAlign: 'center',
           align: 'right',
-          columnLabel: '报工数量',
+          columnLabel: '退料数量',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1088,10 +1205,10 @@ export default {
           serialNumber: '701001Table2SScheduleddate',
           tableId: '701001Table2',
           tableName: '查询工单',
-          columnProp: 'startDate',
+          columnProp: 'needDate',
           headerAlign: 'center',
           align: 'left',
-          columnLabel: '工单开始日期',
+          columnLabel: '退料时间',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
@@ -1100,7 +1217,7 @@ export default {
           fixed: '',
           columnWidth: 100,
         },
-        {
+       /*  {
           userId: this.$store.state.user.name,
           functionId: 701001,
           serialNumber: '701001Table2SScheduleddate',
@@ -1118,7 +1235,7 @@ export default {
           fixed: '',
           columnWidth: 100,
         },
-       /*  {
+        {
           userId: this.$store.state.user.name,
           functionId: 701001,
           serialNumber: '701001Table2SWorkcenterno',
@@ -1317,6 +1434,9 @@ export default {
       bomLoadFlag: false,
       sobomList: [],
       itemNo: '',
+      materialModalFlag: false,
+      sobomData:{},
+      notifyNo:'',
     }
   },
 
@@ -2093,6 +2213,30 @@ export default {
       })
     },
 
+    enterSOSDetail(row) {
+      let rows = {
+        site: this.$store.state.user.site,
+        notifyNo: this.currentRow.notifyNo,
+        soorderNo: row.soorderNo,
+        seqNo: row.seqNo,
+        partNo: row.fgpartNo,
+        itemNo: row.itemNo,
+      }
+
+      this.searchUnissueNotifyMaterialList(rows)
+    },
+    searchUnissueNotifyMaterialList(row){
+      this.bomLoadFlag = true
+      this.materialModalFlag = true
+      searchNotifyMaterialList(row).then(({ data }) => {
+        if (data.code === 0) {
+          this.sobomList = data.rows    
+        }
+      }).finally(() => {
+        this.bomLoadFlag = false
+      })
+    },
+
     // 获取 tableDefault 列
     async getColumnList(tableId, columnId) {
       let queryTable = {

src/views/modules/productionInbound/productionInboundRequest.vue

@@ -1594,7 +1594,7 @@ export default {
         let inData = {
           site: this.$store.state.user.site,
           notifyNo: this.notifyNo,
-          fgPartNo: row.partNo,
+          fgpartNo: row.partNo,
           soorderNo: row.orderNo,
           opsItemNo: row.itemNo,
           seqNo: row.seqNo,
@@ -1629,7 +1629,7 @@ export default {
         notifyNo: this.notifyNo,
         soorderNo: row.soorderNo,
         seqNo: row.seqNo,
-        partNo: row.fgPartNo,
+        partNo: row.fgpartNo,
         itemNo: row.itemNo,
       }