更新

src/views/Inventory/PurchaseInRecord/index.vue

@@ -48,7 +48,7 @@
           <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchRecord()">查询</el-button>
         </el-row>
       </div>
-      <h4 style="margin-top: 0">采购合同件</h4>
+      <h4 style="margin-top: 0">采购合同入库</h4>
       <el-table :data="tableData1" border stripe size="mini" style="width: 100%;" height="400">
         <el-table-column label="名称" align="center" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -92,7 +92,7 @@
           @size-change="handleSizeChange1"
           @current-change="handleCurrentChange1"/>
       </div>
-      <h4>离线合同件</h4>
+      <h4>离线合同入库</h4>
       <el-table :data="tableData2" border stripe size="mini" style="width: 100%;" height="400">
         <el-table-column label="名称" align="center" width="120" show-overflow-tooltip>
           <template slot-scope="scope">

src/views/Inventory/PurchasePartsStorage/index.vue

@@ -37,12 +37,12 @@
         </el-table-column>
         <el-table-column label="名称" width="150px" align="center" show-overflow-tooltip prop="物料名称">
           <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
+            {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
           </template>
         </el-table-column>
         <el-table-column label="规格型号" width="180px" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.物料规格 + '&nbsp;' + scope.row.物料型号 }}
+            {{ scope.row.物料规格 ? scope.row.物料规格 : '-' + '&nbsp;' + scope.row.物料型号 ? scope.row.零件图号 : '-' }}
           </template>
         </el-table-column>
         <el-table-column label="采购数量" align="center" width="100" show-overflow-tooltip prop="数量">