Browse Source

导出导入修改

dev_web_online
陈薪名 2 years ago
parent
commit
126ae00828
  1. 3
      fe/PC/src/api/wms-api.js
  2. 5
      fe/PC/src/components/newAndEdiDialog/index.vue
  3. 32
      fe/PC/src/mixins/mixins.js
  4. 16
      fe/PC/src/views/basicData/ItemsManage/AQL.vue

3
fe/PC/src/api/wms-api.js

@ -122,6 +122,9 @@ export function postImport(data, url,isSpecial) {
return request({
url: baseURL + _url,
method: 'post',
headers: {
'Content-Type': 'multipart/form-data;'
},
data
})
}

5
fe/PC/src/components/newAndEdiDialog/index.vue

@ -24,6 +24,7 @@
@push="DataPush(arguments)"
@submitForm="FormClick(arguments)"
@radioChange="radioChange"
@changeSelect="changeSelect"
>
<template v-if="showmyTable">
<el-form-item class="formTable-box" prop="details">
@ -219,6 +220,10 @@ export default {
//selection
handleSelectionChange(val) {
this.$emit("handleSelectionChange", val);
},
// formchange
changeSelect(prop,val ) {
this.$emit("changeSelect", prop, val)
}
}
}

32
fe/PC/src/mixins/mixins.js

@ -259,7 +259,6 @@ export const mixins = {
// fd.append("method", val[1].method)
// fd.append("isAllowPartImport", val[1].isAllowPartImport=='0'?true:false)
// })
// 目前只有单文件上传,写法只适用于单文件上传
fileName = formFile[0].name
rd.readAsDataURL(formFile[0])
@ -272,15 +271,24 @@ export const mixins = {
// 特殊导入接口判断
let _uploadURL = that.importUploadURL || that.URL
let _isSpecial = that.importUploadURL ? true : false
fileStorageCreate(params).then( createRes => {
// fileStorageCreate(params).then( createRes => {
// let importParams = {
// fileType: 1, //文件类型 固定1
// method: val[1].method, //导入方式 0 更新 1 追加 2 覆盖
// isAllowPartImport: val[1].isAllowPartImport=='0'?true:false, //是否部分错误导入
// route: _isSpecial ? _uploadURL : _uploadURL + '/import', //路由
// function: menuName, //菜单名
// blobName: menuName,
// file: params.bytes
// }
let importParams = {
fileType: 1, //文件类型 固定1
method: val[1].method, //导入方式 0 更新 1 追加 2 覆盖
isAllowPartImport: val[1].isAllowPartImport=='0'?true:false, //是否部分错误导入
route: _isSpecial ? _uploadURL : _uploadURL + '/import', //路由
function: menuName, //菜单名
blobName: createRes,
company: window.SITE_CONFIG['company']
fileType: null, //文件类型 固定1
method: 'Append', //导入方式 0 更新 1 追加 2 覆盖
isAllowPartImport: null, //是否部分错误导入
route: null, //路由
function: null, //菜单名
blobName: null,
file: params.bytes
}
postImport(importParams, _uploadURL, _isSpecial).then(res => {
// 判断是否有错误记录
@ -335,9 +343,9 @@ export const mixins = {
that.displayDialog.importDialog = false;
that.paging()
})
}).catch(err => {
console.log(err)
})
// }).catch(err => {
// console.log(err)
// })
}
} else {
that.$errorMsg('请按照提示继续操作')

16
fe/PC/src/views/basicData/ItemsManage/AQL.vue

@ -25,7 +25,7 @@
:httpOverallSearchData="httpOverallSearchData"
>
</tablePagination>
<!-- 新增与编辑 -->
<!-- 新增与编辑 @changeSelect="changeSelect"-->
<newAndEdiDialog
:loading="Loading.newAndEdiLoading"
:active="active"
@ -41,6 +41,7 @@
@FormSubmit="FormSubmit"
@close="FormClose"
@goBack="goBack"
></newAndEdiDialog>
<!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
<!-- methodValue 导入方式默认选项 是否局部导入 默认选项 -->
@ -218,6 +219,19 @@ export default {
mounted () {
this.paging();
},
methods: {
// changeSelect(prop, val) {
// if (prop == 'isUsePercent') {
// if (val) {
// this.editRules.cerateRule.samplePercent[1].required = true
// this.editRules.editRule.samplePercent[1].required = true
// } else {
// this.editRules.cerateRule.samplePercent[1].required = false
// this.editRules.editRule.samplePercent[1].required = false
// }
// }
// }
}
};
</script>
<style lang="scss" scoped>

Loading…
Cancel
Save