ERP相关_站位计划维护配套需求单明细修改

applications/dee-mes/src/privateComponents/components/MatchRequestItemsCon/index.vue

@@ -37,13 +37,13 @@
                 label="序号"
                 align="center"
               />
-              <el-table-column label="操作">
+              <!-- <el-table-column label="操作">
                 <template slot-scope="scope">
                   <span class="btn-icon-s" title="删除" @click="deleteOccupy(scope.row,props.row)">
                     <img src="/icons/c-remove.png" alt="">
                   </span>
                 </template>
-              </el-table-column>
+              </el-table-column> -->
               <el-table-column
                 v-for="(item,index) in internalColumn"
                 :key="index"
@@ -69,13 +69,13 @@
           :label="item.title"
           :min-width="item.minWidth"
         />
-        <el-table-column label="其他库房详情" min-width="110">
+        <!-- <el-table-column label="其他库房详情" min-width="110">
           <template slot-scope="scope">
             <span class="link" @click="openDetails(scope,'otherStorageZoneItems')">
               {{ scope.row.otherCenterAmount }}
             </span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="其他物料占用详情" min-width="140">
           <template slot-scope="scope">
             <span class="link" @click="openDetails(scope,'otherMatchOccupyItems')">
@@ -147,18 +147,18 @@ export default {
         { 'title': '版本', 'key': 'elecHardwareConfPieceNo' }
       ],
       internalColumn: [
-        { 'title': '验收单编号', 'key': 'inventory.testNo' },
-        { 'title': '库位', 'key': 'inventory.workunit' },
+        { 'title': '验收单编号', 'key': 'testNo' },
+        { 'title': '库位', 'key': 'workUnit' },
         { 'title': '分配数量', 'key': 'allocatedAmount' },
         { 'title': '退库中数量', 'key': 'backAmount' },
         { 'title': '已退库数量', 'key': 'backedAmount' },
         { 'title': '出库类型', 'key': 'outType', 'minWidth': 100 },
-        { 'title': '批次号', 'key': 'inventory.lotNo' },
-        { 'title': '序列号', 'key': 'inventory.serno' },
-        { 'title': '入库时间', 'key': 'inventory.createTime' },
-        { 'title': '状态', 'key': 'outStorageState' },
-        { 'title': '架次', 'key': 'inventory.sorties' },
-        { 'title': '版次', 'key': 'inventory.softConfPieceNo' }
+        { 'title': '批次号', 'key': 'batchNumber' },
+        { 'title': '序列号', 'key': 'serNo' },
+        { 'title': '入库时间', 'key': 'inStorageTime' },
+        { 'title': '状态', 'key': 'state' },
+        { 'title': '架次', 'key': 'sorties' },
+        { 'title': '版次', 'key': 'versionNo' }
       ],
       tableData: [],
       dialogTitle: '',
@@ -188,24 +188,25 @@ export default {
       return resData
     },
     tools() {
-      const data = [{
-        name: '占用',
-        icon: '/icons/c-creatBook.png',
-        handler: {
-          click: () => {
-            this.HandleBeforeOccupy()
-          }
-        }
-      },
-      {
-        name: '发起配套出库申请',
-        icon: '/icons/c-sensN.png',
-        handler: {
-          click: () => {
-            this.handleSubmit()
-          }
-        }
-      },
+      const data = [
+      //   {
+      //   name: '占用',
+      //   icon: '/icons/c-creatBook.png',
+      //   handler: {
+      //     click: () => {
+      //       this.HandleBeforeOccupy()
+      //     }
+      //   }
+      // },
+      // {
+      //   name: '发起配套出库申请',
+      //   icon: '/icons/c-sensN.png',
+      //   handler: {
+      //     click: () => {
+      //       this.handleSubmit()
+      //     }
+      //   }
+      // },
         {
           name: this.hideMaterial ? '显示材料' : '隐藏材料',
           icon: '/icons/c-scan.png',
@@ -268,12 +269,7 @@ export default {
       get(`/ExtSupportingItem/searchTakeInfo?supportingItemId=${row.id}`).then(res => {
         this.tableData.forEach((item, index) => {
           if (item.id === row.id) {
-            item.internalDataList = res.items.map(row => {
-              row.outType = row.subTypeDisplayName.slice(0, 2)
-              row.backedAmount = row.backedAmount || 0
-              row.backAmount = row.backAmount || 0
-              return row
-            })
+            item.internalDataList = res.items
           }
         })
       }).catch(err => {