Merge remote-tracking branch 'origin/develop' into develop

2021-07-08 22:35:18 +08:00
parent 280f526c79 6aba9c3cd5
commit 19e3294fb1
33 changed files with 3119 additions and 2964 deletions
@@ -127,11 +127,11 @@
                   size="mini"
                   @click="deleteStandFromKind(2)"
                   v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'"><i class="iconfont">&#xe611;</i>移除标准</el-button>
-        <el-button class="common-button-default"
-                   size="mini"
-                   :loading="searching"
-                   @click="uploadImportModal(1)"
-                   v-btn-permission="'86a8f92390bb4dcd7f1c2176c183c943'"><i class="iconfont">&#xe825;</i>模板下载</el-button>
+<!--        <el-button class="common-button-default"-->
+<!--                   size="mini"-->
+<!--                   :loading="searching"-->
+<!--                   @click="uploadImportModal(1)"-->
+<!--                   v-btn-permission="'86a8f92390bb4dcd7f1c2176c183c943'"><i class="iconfont">&#xe825;</i>模板下载</el-button>-->
        <el-button class="common-button-default"
                   size="mini"
                   @click="configurationStandard"