Merge remote-tracking branch 'origin/material-ui' into material-ui

src/views/material/stquery/deviceStatusRecord.vue

@@ -70,13 +70,13 @@
           <el-table-column label="在库数量" align="center" prop="storeNum" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <!-- 当 manageType 为 '编码' 时，使用可点击的 span -->
-              <span class="clickText" @click="openRecords(scope.row)">
+              <span class="clickText" v-if="scope.row.manageType=='编码'" @click="openRecords(scope.row)">
                 {{ scope.row.storeNum }}
               </span>
               <!-- 否则，直接显示数字 -->
-              <!-- <span v-else>
+              <span v-else>
               {{ scope.row.storeNum }}
-              </span> -->
+              </span>
             </template>
           </el-table-column>
           <el-table-column label="在用数量" align="center" prop="usNum" :show-overflow-tooltip="true">