whj 11 months ago
parent
commit
0f5852f996
3 changed files with 30 additions and 9 deletions
  1. 10 1
      src/api/sb/info.js
  2. 3 4
      src/views/sb/info/SbInfoC.vue
  3. 17 4
      src/views/sb/info/modules/ImportMeasure.vue

+ 10 - 1
src/api/sb/info.js

@@ -454,7 +454,16 @@ export function exportSpareBom (parameter) {
     responseType: 'blob'
   })
 }
-
+export function exportTemplate () {
+  return axios({
+    url: '/sb/infos/export/yiBiao/template',
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    },
+    responseType: 'blob'
+  })
+}
 export function exportSbInfo2 (parameter) {
   return axios({
     url: '/sb/infos/export2?' + stringify(parameter),

+ 3 - 4
src/views/sb/info/SbInfoC.vue

@@ -1002,15 +1002,13 @@ export default {
       })
     },
     handleBackBatch (status) {
-      let sbIds = []
-      const length = this.selectedRows.length
+      const length = this.selectedRowKeys.length
       if (length === 0) {
         this.$message.info('请选择设备')
         return
       }
-      sbIds = this.selectedRows.map((item) => item.id)
       const modal = this.$refs.backForm
-      modal.base(sbIds, status)
+      modal.base(this.selectedRowKeys, status)
     },
     handleStart (record) {
       const modal = this.$refs.baseModalStatusLog
@@ -1080,6 +1078,7 @@ export default {
           ? this.queryParam.checkDateEnd.format(this.BaseTool.Date.PICKER_NORM_DATE_PATTERN)
           : null
       }
+      this.$refs.table.clearSelected()
       this.$refs.table.refresh()
     },
     onSelectChange (selectedRowKeys, selectedRows) {

+ 17 - 4
src/views/sb/info/modules/ImportMeasure.vue

@@ -12,9 +12,17 @@
         :labelCol="BaseTool.Constant.labelCol"
         :wrapperCol="BaseTool.Constant.wrapperCol"
       >
-        <a-upload :fileList="fileList" @change="handleChange" :remove="handleRemove" :beforeUpload="beforeUpload">
-          <a-button> <a-icon type="upload" />选择上传文件</a-button>
-        </a-upload>
+        <a-row>
+          <a-col :span="20">
+            <a-upload :fileList="fileList" @change="handleChange" :remove="handleRemove" :beforeUpload="beforeUpload">
+              <a-button> <a-icon type="upload" />选择上传文件</a-button>
+            </a-upload>
+          </a-col>
+          <a-col :span="4">
+            <a-button type="primary" @click="handleDownload"> <a-icon type="download" />下载模板</a-button>
+          </a-col>
+        </a-row>
+
       </a-form-item>
     </a-form>
     <p style="color: red">注意事项:<br/>
@@ -29,7 +37,7 @@
 </template>
 
 <script>
-import { importBatchMeasure } from '@/api/sb/info'
+import { importBatchMeasure, exportTemplate } from '@/api/sb/info'
 
 export default {
   name: 'SbModelBomImportForm',
@@ -100,6 +108,11 @@ export default {
           })
       })
     },
+    handleDownload () {
+      exportTemplate().then(file => {
+        this.BaseTool.UPLOAD.downLoadExportExcel(file)
+      })
+    },
     handleCancel (values) {
       this.visible = false
       this.confirmLoading = false