Merge branch 'test' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into test

src/api/system/file/index.js

@@ -126,6 +126,20 @@ export async function downLoadBom() {
   download(res.data, 'BOM导入模板.xls');
 }
 
+//批量导入BOM模板
+
+export async function downBatchLoadBom() {
+  const res = await request.post(
+    '/main/bomCategory/downLoadTemplateBatch',
+    {},
+    {
+      responseType: 'blob'
+    }
+  );
+  console.log(res.data, '***********');
+  download(res.data, 'BOM批量导入模板.xls');
+}
+
 /**
  * 删除文件
  */

src/views/material/BOMmanage/components/BOM-search.vue

@@ -72,7 +72,7 @@
           >
 
           <el-button
-            v-if="isUpload"
+            v-if="isUpload && $hasPermission('main:categoryparam:saveBom')"
             @click="uploadFile"
             type="primary"
             size="mini"

src/views/material/BOMmanage/components/import-dialog.vue

@@ -52,7 +52,7 @@
 
 <script>
   import { batchImportPBom } from '@/api/system/file/index.js';
-  import { downLoadBom } from '@/api/system/file/index.js';
+  import { downBatchLoadBom } from '@/api/system/file/index.js';
 
   export default {
     props: {
@@ -108,7 +108,7 @@
       },
 
       downLoadTemplate() {
-        downLoadBom();
+        downBatchLoadBom();
       },
 
       // 文件上传

src/views/material/BOMmanage/components/workmanship.vue

@@ -179,7 +179,7 @@
 
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
-          <el-link
+          <!-- <el-link
             type="primary"
             :underline="false"
             icon="el-icon-edit"
@@ -187,7 +187,7 @@
             v-if="attributeData.status != 1"
           >
             修改
-          </el-link>
+          </el-link> -->
           <el-link
             type="primary"
             :underline="false"