Merge branch 'main' into ltf

# Conflicts:
#	src/views/unitPages/myTask/audit.vue

src/views/auditPages/assetsManagement/assetsAuth.vue

@@ -2756,6 +2756,14 @@
                 </myUpload>
               </el-form-item>
             </el-row>
+            <el-row style="margin: 10px 0;" v-if="ruleForm.bfyy">
+              <span class="top-title-box">报废原因</span>
+            </el-row>
+            <el-row style="margin: 20px 0;">
+              <el-form-item>
+                <div>{{ruleForm.bfyy}}</div>
+              </el-form-item>
+            </el-row>
           </div>
           <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="$route.query.pageType !== 'look'">
             <el-button type="danger" @click="sendBack">取消</el-button>

src/views/unitPages/myAssets/assetsAuth.vue

@@ -2756,6 +2756,14 @@
                 </myUpload>
               </el-form-item>
             </el-row>
+            <el-row style="margin: 10px 0;" v-if="ruleForm.bfyy">
+              <span class="top-title-box">报废原因</span>
+            </el-row>
+            <el-row style="margin: 20px 0;">
+              <el-form-item>
+                <div>{{ruleForm.bfyy}}</div>
+              </el-form-item>
+            </el-row>
           </div>
         </el-form>
       </div>

src/views/unitPages/myAssets/index.vue

@@ -238,7 +238,7 @@ export default {
       const elementHeight = element.offsetHeight;
       const headerHeight = header.offsetHeight;
       const paginationtHeight = pagination.offsetHeight;
-      this.tabHeader = elementHeight - headerHeight - paginationtHeight - 80;
+      this.tabHeader = elementHeight - headerHeight - paginationtHeight - 120;
     }
   },
 }