diff --git a/src/api/goods/index.js b/src/api/goods/index.js index 19189c5..2384f15 100644 --- a/src/api/goods/index.js +++ b/src/api/goods/index.js @@ -138,7 +138,7 @@ export function addPrice (data) { export function exportData (data) { return axios({ url: api.exportData, - method: 'get', + method: 'post', data: data }) } \ No newline at end of file diff --git a/src/views/dataCenter/goods/Create.vue b/src/views/dataCenter/goods/Create.vue index 5aed0d2..bb8cc92 100644 --- a/src/views/dataCenter/goods/Create.vue +++ b/src/views/dataCenter/goods/Create.vue @@ -643,7 +643,6 @@ export default { handleSubmit (e) { e.preventDefault() // 表单验证 - console.log(this.form) const { form: { validateFields }, ruleList } = this validateFields((errors, values) => { // 定位到错误的tab选项卡 @@ -733,16 +732,12 @@ export default { // 选择地区后的回调 handleAreaSubmit (result) { - - // console.log(JSON.stringify(this.ruleList)) const { custom: { scene, item } } = result - console.log(item,'KKKKKKKK') item.region = result.selectedCityIds item.region_text = result.selectedText if (scene === 'add') { this.ruleList.push(item) } - console.log( this.ruleList,'3333333333') }, // 排除的城市id集(已存在的城市id集) diff --git a/src/views/dataCenter/goods/Update.vue b/src/views/dataCenter/goods/Update.vue index 37ac7af..c8052a9 100644 --- a/src/views/dataCenter/goods/Update.vue +++ b/src/views/dataCenter/goods/Update.vue @@ -368,7 +368,7 @@

- 点击添加销售区域 + 点击添加销售区域 @@ -600,6 +600,7 @@ export default { // 第二次赋值 (适用于动态渲染的form-item) this.$nextTick(() => { this.form.setFieldsValue(GoodsModel.getFieldsValue2()) + this.ruleList = this.formData.goods.rules?this.formData.goods.rules:[] this.onForceUpdate() }) } @@ -767,15 +768,6 @@ export default { if (scene === 'add') { this.ruleList.push(item) } - // if (this.ruleList.length > 0) { - // let region = [] - // let region_text = [] - // this.ruleList.forEach(function (item) { - // region = region.concat(item.region) - // region_text = region_text.concat(item.region_text) - // }) - // this.ruleList = [{ key: 0, region: region, region_text: region_text }] - // } }, // 排除的城市id集(已存在的城市id集) diff --git a/src/views/dataCenter/goods/modify.vue b/src/views/dataCenter/goods/modify.vue index b3185b7..501c73e 100644 --- a/src/views/dataCenter/goods/modify.vue +++ b/src/views/dataCenter/goods/modify.vue @@ -7,7 +7,7 @@

点击选择文件,或者将文件拖拽至此区域

-

仅支持 .xls, .xlsx 格式的excel文件,限2M以内

+

仅支持.csv 格式的excel文件,限2M以内

@@ -81,14 +81,6 @@ export default { // 上传文件之前的钩子 beforeUpload(file) { - let testmsg = file.name.substring(file.name.lastIndexOf('.') + 1) - const extension = testmsg === 'xlsx' - const extension2 = testmsg === 'xls' - // 验证文件大小 - if (!extension && !extension2) { - this.$message.error('只能上传 xlsx 或者 xls 文件') - return false - } const fileSizeMb = file.size / 1024 / 1024 if (fileSizeMb > this.uploadSizeLimit) { this.$message.error(`上传的文件大小不能超出${this.uploadSizeLimit}MB`) diff --git a/src/views/dataCenter/goods/modules/MultiSpec.vue b/src/views/dataCenter/goods/modules/MultiSpec.vue index bfa93c9..11b75ce 100644 --- a/src/views/dataCenter/goods/modules/MultiSpec.vue +++ b/src/views/dataCenter/goods/modules/MultiSpec.vue @@ -324,7 +324,7 @@ export default {