物资供应总计划

src/views/materials/overallPlanMaterialSupply/index.vue

@@ -1,4 +1,5 @@
 <template>
+<<<<<<< HEAD
     <div class="overall-plan-material-supply">
         <!-- tabPosition="left" -->
         <el-card shadow="always">
@@ -313,3 +314,20 @@ onMounted(() => {
     margin-bottom: 0;
 }
 </style>
+=======
+  <div>init</div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+  setup() {
+    // todo
+    return {};
+  }
+});
+</script>
+
+<style lang="stylus" scoped></style>
+>>>>>>> 90e6ddc21241aecd8dcdfb84d82b9283ab193ccf