diff --git a/src/assets/images/pdf.png b/src/assets/images/pdf.png new file mode 100644 index 0000000..cf0170e Binary files /dev/null and b/src/assets/images/pdf.png differ diff --git a/src/assets/images/word.png b/src/assets/images/word.png new file mode 100644 index 0000000..4fef0d3 Binary files /dev/null and b/src/assets/images/word.png differ diff --git a/src/views/claimAndRefund/return/dialogFormExame.vue b/src/views/claimAndRefund/return/dialogFormExame.vue index c8e8679..4722698 100644 --- a/src/views/claimAndRefund/return/dialogFormExame.vue +++ b/src/views/claimAndRefund/return/dialogFormExame.vue @@ -101,7 +101,7 @@ label="状态" align="center" class-name="small-padding fixed-width" - prop="status" + prop="backStatus" > 点击上传 - + @@ -388,7 +388,7 @@ - + - + @@ -763,7 +763,7 @@ export default { item.qualifiedNum = item.hgNum item.serviceNum = item.wxNum item.scrapNum = item.bfNum - // item.serviceRemark = item.wxRemark + // item.repairRemark = item.wxRemark // item.scrapRemark = item.bfRemark // item.scrapReason = item.bfReason // item.fileList = item.fileList @@ -851,6 +851,13 @@ export default { this.openNum = true this.dialogIsView = false this.$set(row, 'backNum', row.maxBackNum) //退料数量 + this.$set(row, 'qualifiedNum', undefined) + this.$set(row, 'serviceNum', undefined) + this.$set(row, 'scrapNum', undefined) + this.$set(row, 'repairRemark', undefined) + this.$set(row, 'scrapRemark', undefined) + this.$set(row, 'fileList', []) + this.$set(row, 'scrapReason', undefined) this.returnNum = Number(row.maxBackNum) this.dialogData.typeMange = row.manageType this.dialogData.typeName = row.typeName @@ -860,14 +867,15 @@ export default { this.$set(item, 'qualifiedNum', undefined) this.$set(item, 'serviceNum', undefined) this.$set(item, 'scrapNum', undefined) - this.$set(item, 'serviceRemark', undefined) - this.$set(item, 'scrapRemark', undefined) - this.$set(item, 'fileList', []) - this.$set(item, 'scrapReason', undefined) + // this.$set(item, 'repairRemark', undefined) + // this.$set(item, 'scrapRemark', undefined) + // this.$set(item, 'fileList', undefined) + // this.$set(item, 'scrapReason', undefined) }) this.dialogData.maTypeDetails = row.maTypeDetails } this.numList = [row] + console.log('🚀 ~ handleNumReturn ~ this.numList:', this.numList) // this.getNumList() }, // @@ -913,7 +921,7 @@ export default { this.codeTotal = response.data.total this.codeList.forEach((item) => { this.$set(item, 'fileList', []) - this.$set(item, 'serviceRemark', '') + this.$set(item, 'repairRemark', '') this.$set(item, 'scrapRemark', '') this.$set(item, 'scrapReason', '') }) @@ -954,13 +962,16 @@ export default { } else { data = this.dialogData.maTypeDetails } + console.log('🚀 ~ saveNumReturn ~ data:', data) let arr = [] + let fileList = [] for (const item of data) { let sumUnmber = (item.qualifiedNum || 0) + (item.serviceNum || 0) + (item.scrapNum || 0) if (sumUnmber > item.partNum && sumUnmber > item.num) { this.$modal.msgError('退料总量已大于待退料数量！') return } else { + fileList = item.fileList if (item.qualifiedNum > 0) { let obj = { parentId: parentId, @@ -969,9 +980,9 @@ export default { createBy: this.createBy, backStatus: 1, backNum: item.qualifiedNum, - serviceRemark: item.serviceRemark, - scrapRemark: item.scrapRemark, - fileList: item.fileList, + // repairRemark: item.repairRemark, + // scrapRemark: item.scrapRemark, + // fileList: item.fileList, } arr.push(obj) } @@ -983,9 +994,9 @@ export default { createBy: this.createBy, backStatus: 2, backNum: item.serviceNum, - serviceRemark: item.serviceRemark, - scrapRemark: item.scrapRemark, - fileList: item.fileList, + repairRemark: item.repairRemark, // 待维修备注 + // scrapRemark: item.scrapRemark, + // fileList: item.fileList, } arr.push(obj) } @@ -997,9 +1008,9 @@ export default { createBy: this.createBy, backStatus: 3, backNum: item.scrapNum, - serviceRemark: item.serviceRemark, - scrapRemark: item.scrapRemark, - fileList: item.fileList, + scrapReason: item.scrapReason, // 报废原因 + scrapRemark: item.scrapRemark, // 待报废备注 + // fileList: item.fileList, } arr.push(obj) } @@ -1008,6 +1019,7 @@ export default { let param = { taskId: taskId, arr: arr, + fileList: fileList, } setNumBack(param).then((response) => { if (response.code == 200) { @@ -1033,7 +1045,7 @@ export default { maId: row.maId, scrapReason: row.scrapReason, scrapRemark: row.scrapRemark, - serviceRemark: row.serviceRemark, + repairRemark: row.repairRemark, fileList: row.fileList, }, ] @@ -1075,7 +1087,7 @@ export default { maId: item.maId, scrapReason: item.scrapReason, scrapRemark: item.scrapRemark, - serviceRemark: item.serviceRemark, + repairRemark: item.repairRemark, fileList: item.fileList, } }) @@ -1109,6 +1121,7 @@ export default { fileUrl = item.fileUrl } return { + typeId: row.typeId, fileName: fileName, fileUrl: fileUrl, } @@ -1117,28 +1130,43 @@ export default { }, handlePreview(file) { console.log('🚀 ~ handlePreview ~ file:', file) - // if (file.response) { - // window.open(file.response.data.fileUrl) - // } else { - // window.open(file.fileUrl) - // } + if (file.response) { + window.open(file.response.data.fileUrl) + } else { + window.open(file.fileUrl) + } }, handleExceed(files, fileList) { this.$message.warning( `当前限制选择 5 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`, ) }, + beforeUpload(file) { + const isLtMB = file.size / 1024 / 1024 < 20 + if (!isLtMB) { + this.$message.error('上传文件大小不能超过 20MB!') + } + return isLtMB + }, beforeRemove(file, fileList) { return this.$confirm(`确定移除 ${file.name} ？`) }, - handleSuccess(file, fileList, row) { - console.log(file, fileList, row) - row.fileList = fileList.map((item) => { - return { - fileName: item.response?.data.fileName, - fileUrl: item.response?.data.fileUrl, + handleSuccess(res, file, fileList, row) { + console.log('🚀 ~ handleSuccess ~ res:', res) + console.log('🚀 ~ handleSuccess ~ file:', file) + console.log('🚀 ~ handleSuccess ~ fileList:', fileList) + console.log('🚀 ~ handleSuccess ~ row:', row) + + if (res.code == 200) { + if (!row.fileList) { + row.fileList = [] } - }) + row.fileList.push({ + typeId: row.typeId, + fileName: res.data.fileName, + fileUrl: res.data.fileUrl, + }) + } console.log('🚀 ~ row.fileList=fileList.map ~ row.fileList:', row.fileList) }, }, diff --git a/src/views/repairTest/inventoryScrap/component/addToolsApply.vue b/src/views/repairTest/inventoryScrap/component/addToolsApply.vue index 191429a..5c24010 100644 --- a/src/views/repairTest/inventoryScrap/component/addToolsApply.vue +++ b/src/views/repairTest/inventoryScrap/component/addToolsApply.vue @@ -57,6 +57,7 @@
- -
+ +

编码管理设备

- + + + + - + - + 是 否 @@ -100,7 +89,7 @@ - + + + + +
+ + + + + + + + + + + +
+ +
- 添加配件 - 删除
-
+
取消 保存
@@ -164,16 +180,18 @@ class="demo-dynamic" label-width="100px" > -
+

数量管理设备

+ + + - + - + 是 否 @@ -268,7 +280,7 @@ - + + + + +
+ + + + + + + + + + + +
+ +
- 添加配件 - 删除
-
+
取消 保存
@@ -328,16 +367,12 @@ @@ -723,4 +806,4 @@ export default { margin-right: 3%; margin-top: 10px; } - + diff --git a/src/views/repairTest/repair/dialogTwoForm.vue b/src/views/repairTest/repair/dialogTwoForm.vue index 7c67a7b..772e54b 100644 --- a/src/views/repairTest/repair/dialogTwoForm.vue +++ b/src/views/repairTest/repair/dialogTwoForm.vue @@ -41,7 +41,7 @@ style="width: 350px" > - + + + + +
+ + + + + + + + + + + +
+ +
@@ -200,7 +241,7 @@ style="width: 350px" > - + --> + + + +
+ + + + + + + + + + + +
+ +
@@ -375,6 +457,12 @@ export default { }, data() { return { + uploadUrl: process.env.VUE_APP_BASE_API + '/system/sys/file/upload', // 上传的图片服务器地址 + headers: { + Authorization: 'Bearer ' + localStorage.getItem('token'), + }, + pdfImg: require('@/assets/images/pdf.png'), + wordImg: require('@/assets/images/word.png'), supplierSelectList: [], fullscreenLoading: false, dynamicValidateForm: { @@ -390,6 +478,7 @@ export default { downRate: undefined, downFee: undefined, xiayoufeiyonge_unit: '', + fileList: [], }, ], }, @@ -406,6 +495,7 @@ export default { downRate: undefined, downFee: undefined, xiayoufeiyonge_unit: '', + fileList: [], }, ], }, @@ -502,7 +592,7 @@ export default { selected: 'N', partName: '', repairer: '', - partType: '', + partType: 0, partNum: '', partCost: '', repairContent: '', @@ -517,7 +607,7 @@ export default { selected: 'N', partName: '', repairer: '', - partType: '', + partType: 0, partNum: '', partCost: '', repairContent: '', @@ -626,6 +716,56 @@ export default { } }) }, + handleRemove(file, domain) { + // console.log('🚀 ~ handleRemove ~ this.$refs.upload_attach:', this.$refs.upload_attach[0].uploadFiles) + // console.log('🚀 ~ handleRemove ~ row:', domain.fileList) + // console.log('🚀 ~ handleRemove ~ file:', file) + let fileList = this.$refs.upload_attach[0].uploadFiles + this.$refs.upload_attach[0].uploadFiles = fileList.filter((item) => item.name !== file.name) + // console.log('🚀 ~ handleRemove ~ fileList:', fileList) + domain.fileList = this.$refs.upload_attach[0].uploadFiles.map((item) => { + return { + fileName: item.name, + fileUrl: item.url, + } + }) + console.log('🚀 ~ domain.fileList:', domain.fileList) + }, + handlePreview(file) { + if (file.response) { + window.open(file.response.data.fileUrl) + } else { + window.open(file.fileUrl) + } + }, + handleExceed(files, fileList) { + this.$message.warning( + `当前限制选择 5 个文件，本次选择了 ${files.length} 个文件，共选择了 ${ + files.length + fileList.length + } 个文件`, + ) + }, + beforeUpload(file) { + const isLtMB = file.size / 1024 / 1024 < 20 + if (!isLtMB) { + this.$message.error('上传文件大小不能超过 20MB!') + } + return isLtMB + }, + beforeRemove(file) { + return this.$confirm(`确定移除 ${file.name} ？`) + }, + handleSuccess(file, fileList, row) { + console.log('🚀 ~ handleSuccess ~ row:', row) + console.log('🚀 ~ handleSuccess ~ file:', file) + if (!row.fileList) { + row.fileList = [] + } + row.fileList.push({ + fileName: file.response.data.fileName, + fileUrl: file.response.data.fileUrl, + }) + }, }, }