diff --git a/src/components/mycomponents/addImg.vue b/src/components/mycomponents/addImg.vue index d027f2e..cb405da 100644 --- a/src/components/mycomponents/addImg.vue +++ b/src/components/mycomponents/addImg.vue @@ -113,6 +113,7 @@ export default { }, Confirm() { this.dialogVisible = false + console.log(1111111111111, this.selectImage) this.$emit('successEvent', this.selectImage) }, handleBeforeRemove(file, fileList) { diff --git a/src/components/mycomponents/addImgconfig/imageComponent.vue b/src/components/mycomponents/addImgconfig/imageComponent.vue index f23f8d6..01c3ecd 100644 --- a/src/components/mycomponents/addImgconfig/imageComponent.vue +++ b/src/components/mycomponents/addImgconfig/imageComponent.vue @@ -16,7 +16,7 @@ @@ -35,6 +35,7 @@ export default { showUpload: false, selectList: [], fileList: [], + loadings: false } }, mounted() { @@ -44,14 +45,20 @@ export default { this.showUpload = true; }, async doSubmit() { - let res = await API.add({ - pictureClassifyId: this.activedata, - urls: this.fileList - }) - if (res.code == 200) { - this.showUpload = false; - this.fileList = [] - this.$emit('getList') + if (this.fileList.length) { + this.loadings = true + let res = await API.add({ + pictureClassifyId: this.activedata, + urls: this.fileList + }) + if (res.code == 200) { + this.loadings = false + this.showUpload = false; + this.fileList = [] + this.$emit('getList') + } + } else { + } }, deleteImg(d) { diff --git a/src/views/devices/config/edit.ts b/src/views/devices/config/edit.ts index 9f23b2d..2f17ebf 100644 --- a/src/views/devices/config/edit.ts +++ b/src/views/devices/config/edit.ts @@ -16,8 +16,10 @@ const modalConfig: IModalConfig = { formAction: function (data) { let obj = { ...data } obj.printType = data.printType.join(',') - obj.categoryIds = JSON.stringify(data.categoryIdsArr) - obj.categoryList = JSON.stringify(data.categoryIdsArr) + if (data.categoryIdsArr) { + obj.categoryIds = JSON.stringify(data.categoryIdsArr) + obj.categoryList = JSON.stringify(data.categoryIdsArr) + } return printerApi.edit(obj); }, beforeSubmit(data) { diff --git a/src/views/devices/printer.vue b/src/views/devices/printer.vue index a0ccb7a..e7b4b1b 100644 --- a/src/views/devices/printer.vue +++ b/src/views/devices/printer.vue @@ -128,6 +128,7 @@ async function handleEditClick(row: IObject) { // 根据id获取数据进行填充 let data = await UserAPI.get(row.id); data.printType = data.printType.split(','); + if (data.categoryIds) { data.categoryIdsArr = JSON.parse(data.categoryIds) }