408249787 2 years ago
parent
commit
63ea7c36ae
2 changed files with 5 additions and 3 deletions
  1. 4 2
      src/views/sb/info/SbInfo.vue
  2. 1 1
      src/views/sb/info/modules/ImportFormUpdate.vue

+ 4 - 2
src/views/sb/info/SbInfo.vue

@@ -130,10 +130,10 @@
                 <a-icon type="upload"/>
                 新增设备和标准导入
               </a-button>
-              <!--              <a-button style="margin-left:8px;" type="primary" @click="doImportForUpdate">
+              <a-button style="margin-left:8px;" type="primary" @click="doImportForUpdate">
                 <a-icon type="upload"/>
                 修改导入
-              </a-button>-->
+              </a-button>
               <a-button style="margin-left: 8px" type="primary" icon="printer" @click="handlePrintBatch()">批量打印</a-button>
               <a-button style="margin-left: 8px" type="primary" icon="reload" @click="handleMeasureBatch()">批量检定</a-button>
               <a-button style="margin-left: 8px" v-if="$auth('sb-infos-generate-code-all')" :loading="confirmLoading" type="primary" @click="batchGenerate()">重新生成二维码</a-button>
@@ -687,11 +687,13 @@ export default {
     doExport () {
       const parameter = {
         ...this.queryParam,
+        sbIds: this.selectedRowKeys,
         dataScope: {
           sortBy: 'asc',
           sortName: 'no'
         }
       }
+      console.log(parameter)
       exportSbInfo(parameter).then(file => {
         this.BaseTool.UPLOAD.downLoadExportExcel(file)
       })

+ 1 - 1
src/views/sb/info/modules/ImportFormUpdate.vue

@@ -51,7 +51,7 @@ export default {
       this.useCompany = useCompany
       this.useProject = useProject
       this.modalTitle = '设备修改导入'
-      this.type = 2
+      this.type = 4
     },
     handleRemove (file) {
       const index = this.fileList.indexOf(file)