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

src/views/materialsStation/equipment/equipmentRecord/index.vue

@@ -226,13 +226,13 @@
       <el-table-column label="数量" align="center" prop="allNum" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <!-- 当 manageType 为 '编码' 时，使用可点击的 span -->
-          <span class="clickText" @click="openRecords(scope.row)">
+          <span v-if="scope.row.manageType == '编码' || (scope.row.manageType == '数量' && scope.row.bzFlag == 0)" class="clickText" @click="openRecords(scope.row)">
             {{ scope.row.allNum }}
           </span>
           <!-- 否则，直接显示数字 -->
-          <!-- <span v-else>
+          <span v-else>
             {{ scope.row.allNum }}
-          </span> -->
+          </span>
         </template>
       </el-table-column>
     </el-table>
@@ -501,6 +501,9 @@ export default {
           label: item.teamName,   // 工程名称字段
           value: item.teamName
         }))
+        if (this.queryParams.subUnitName) {
+          this.teamOptions = this.teamOptions.filter(item => item.value !== '站内库存')
+        }
       } catch (e) {
         console.error('获取班组下拉失败:', e)
       }
@@ -623,6 +626,7 @@ export default {
       this.dialogQuery.typeId = row.typeId
       this.dialogQuery.proId = row.proId
       this.dialogQuery.teamId = row.teamId || ''
+      this.dialogQuery.subFlag = row.subUnitName == '分包直领' ? 0 : null
       this.openRecord = true
       this.getStoreCodeList()
     },