Merge branch 'iscs_dev_mars' of https://e.coding.net/g-pheu9517/grt-iscs/ISCS_Ui_Admin_Base into iscs_dev_mars

src/views/mes/material/Inspectionrecords/index.vue

@@ -196,6 +196,10 @@
         </template>
       </el-table-column>
       <el-table-column label="RFID" align="center" prop="materialsRfid">
+        <template slot-scope="scope">
+          <span v-if="scope.row.materialsRfid">{{scope.row.materialsRfid}}</span>
+          <span v-else>-</span>
+        </template>
       </el-table-column>
       <el-table-column
         label="检查时间"

src/views/mes/material/materialinformation/index.vue

@@ -221,6 +221,10 @@
         align="center"
         prop="cabinetName"
       >
+        <template slot-scope="scope">
+          <span v-if="scope.row.cabinetName">{{scope.row.cabinetName}}</span>
+          <span v-else>-</span>
+        </template>
       </el-table-column>
       <el-table-column label="物资编号" align="center" prop="materialsId">
       </el-table-column>
@@ -256,7 +260,12 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="RFID" align="center" prop="materialsRfid" />
+      <el-table-column label="RFID" align="center" prop="materialsRfid" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.materialsRfid">{{scope.row.materialsRfid}}</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
       <el-table-column label="供应商" align="center" prop="supplier">
       </el-table-column>
       <!--      <el-table-column label="所属柜" align="center" prop="cabinetName" />-->

src/views/mes/material/replacementrecords/index.vue

@@ -143,6 +143,10 @@
     >
 <!--      <el-table-column type="selection" width="55" align="center"/>-->
       <el-table-column label="物资柜" align="center" prop="cabinetName">
+        <template slot-scope="scope">
+          <span v-if="scope.row.cabinetName">{{scope.row.cabinetName}}</span>
+          <span v-else>-</span>
+        </template>
       </el-table-column>
 <!--      <el-table-column label="物资名称" align="center" prop="materialsName" />-->
       <el-table-column label="物资类型" align="center" prop="materialsTypeName" />
@@ -180,6 +184,10 @@
       >
       </el-table-column>
       <el-table-column label="更换时间" align="center" prop="changeDate">
+        <template slot-scope="scope">
+          <span v-if="scope.row.changeDate">{{scope.row.changeDate}}</span>
+          <span v-else>-</span>
+        </template>
       </el-table-column>
 <!--      <el-table-column-->
 <!--        label="操作"-->