材料

2025-07-04 19:56:28 +08:00
parent 7f5300b4f4
commit 96216b0a21
20 changed files with 3697 additions and 9 deletions
--- a/src/views/project/contractorMaterial/component/contractorMaterialRecord.vue
+++ b/src/views/project/contractorMaterial/component/contractorMaterialRecord.vue
@ -22,10 +22,6 @@
        </el-card>
      </div>
    </transition>
-<<<<<<< HEAD
-=======
-
->>>>>>> 64b04286e36ef42ab8a27f17406454b185d48e80
    <el-card shadow="never">
      <template #header>
        <el-row :gutter="10" class="mb8">