重庆机具bug修复

src/views/base/section/index.vue

@@ -99,12 +99,12 @@
                     {{ formatCurrency(row.costIndicators || '') }}
                 </template>
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
                 label="所属工程项目"
                 align="center"
                 prop="ownPro"
                 show-overflow-tooltip
-            />
+            /> -->
             <el-table-column
                 label="所属上级"
                 align="center"

src/views/repairTest/inventoryScrap/component/queryToolsApply.vue

@@ -75,7 +75,7 @@
         >
       </el-col>
     </el-row> -->
-    <el-table v-loading="loading" :data="equipmentList">
+    <el-table v-loading="loading" :data="equipmentList" style="margin-top:10px">
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column
         label="物资类型"
@@ -212,6 +212,7 @@ export default {
     resetQuery() {
       this.resetForm("maForm");
       this.maForm.keyword = "";
+      this.uploadKey = Date.now();
       this.handleQuery();
     },
     //获取任务详情-列表数据
@@ -299,6 +300,13 @@ export default {
   width: 60px !important;
   margin-bottom: 10px;
 }
+::v-deep .el-upload-list__item {
+  margin-bottom: 20px;
+  overflow: unset !important;
+}
+::v-deep .el-upload-list__item-actions {
+  overflow: unset !important;
+}
 //隐藏图片上传框的css
 ::v-deep.disabled {
   .el-upload--picture-card {
@@ -309,16 +317,76 @@ export default {
   width: 300px;
   height: 100px;
 }
-.accept-img {
-  color: #409eff;
 
-  .a-two {
-    margin-left: 20px;
-  }
-}
 
 .left-tip {
   font-size: 16px;
   letter-spacing: 1px;
 }
+
+.el-input-group__append {
+  padding: 0;
+  .el-button {
+    padding: 0 10px;
+    border: none;
+    height: 100%;
+    &:first-child {
+      border-right: 1px solid #dcdfe6;
+    }
+    &[disabled] {
+      color: #c0c4cc;
+    }
+  }
+}
+
+.el-upload-list__item-thumbnail {
+  height: 145px !important;
+}
+
+.picture-card-container {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  position: relative;
+}
+
+.picture-card {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  justify-content: center;
+
+  // border: 1px solid  #ddd;
+  // border-radius: 4px;
+}
+
+.file-name {
+  width: 90%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  position: absolute;
+  bottom: -35px; 
+  margin-top: 8px;
+  text-align: center;
+  font-size: 12px;
+  color: #333;
+  z-index: 999999;
+}
+
+.file-overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #fff;
+  font-size: 20px;
+}
 </style>

src/views/stquery/deviceInStoreQuery.vue

@@ -213,7 +213,8 @@ export default {
                 time: null, //申请时间
                 unitId: null, //来往单位id
                 proId: null, //工程id
-
+                typeName: '', //机具名称
+                typeModelName: '', //规格型号
                 types: 1, // 1申请列表 2审核列表
             },
             unitList: [], //来往单位集合