new

2019-09-18 10:15:45 +08:00
parent 02d1678fff 4a39ba8190
commit 93eb6ec5c5
61 changed files with 7778 additions and 24 deletions
--- a/src/views/TechnologyCenter/ImportChangeParts/index.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/index.vue
@@ -5,7 +5,11 @@
        <div style="overflow: hidden">
          <div style="margin-bottom: 10px;">
            <span>项目：</span>
+<<<<<<< HEAD
            <el-select v-model="projectValue" filterable size="small" style="margin-top: 3px" placeholder="项目名称">
+=======
+            <el-select v-model="projectValue" filterable size="small" placeholder="项目名称">
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              <el-option
                v-for="item in project"
                :key="item.value"