diff --git a/src/views/claimAndreturn/picking/outbound/index.vue b/src/views/claimAndreturn/picking/outbound/index.vue index b383bfb..dab1035 100644 --- a/src/views/claimAndreturn/picking/outbound/index.vue +++ b/src/views/claimAndreturn/picking/outbound/index.vue @@ -233,7 +233,7 @@ - + @@ -269,6 +269,16 @@ + + + @@ -340,6 +350,17 @@ +
+ + +
@@ -527,6 +548,7 @@ export default { //编码表单-车牌号 carCode: undefined, remark: undefined, + createTime: '', }, numOutForm: { //数量表单-车牌号 @@ -538,6 +560,7 @@ export default { pageNum: 1, pageSize: 10, maCode: undefined, + createTime: '', }, outTotal: 0, //编码弹窗分页-总数 outCodeList: [], //编码弹窗表格数据 @@ -558,6 +581,13 @@ export default { leaseOutData: {}, openFileVisible: false, fileList: [], + pickerOptions: { + disabledDate(date) { + const today = new Date(); + today.setHours(0, 0, 0, 0); // 清除时分秒,方便比较 + return date.getTime() > today.getTime(); // 禁止选择今天之后的日期 + }, + } } }, created() { @@ -744,6 +774,7 @@ export default { leaseType: this.leaseType, maModel: this.outObj.maModel, maName: this.outObj.maName, + createTime: this.codeOutForm.createTime, // remark: this.outCodeList.find((v) => v.maId == item).remark, } return obj @@ -765,6 +796,7 @@ export default { saveNumOut() { this.outNumList[0].carCode = this.numOutForm.carCode this.outNumList[0].remark = this.numOutForm.remark + this.outNumList[0].createTime = this.numOutForm.createTime this.outNumList[0].leaseType = this.leaseType let param = this.outNumList // console.log(param, '数量出库时参数') @@ -804,6 +836,7 @@ export default { this.leaseOutDetailParams.typeId = row.typeId this.onHandleQuery().then(() => { this.outRecordVisible = true + this.outTime = [] }) }, /* 打开出库单 */ diff --git a/src/views/claimAndreturn/return/receive/component/handlePage.vue b/src/views/claimAndreturn/return/receive/component/handlePage.vue index 4472300..b92c084 100644 --- a/src/views/claimAndreturn/return/receive/component/handlePage.vue +++ b/src/views/claimAndreturn/return/receive/component/handlePage.vue @@ -238,6 +238,8 @@ class="upload-demo" :action="uploadUrl" :headers="headers" + :data="{ fileType: 'sx' }" + :multiple="false" accept="image/*,application/pdf" :limit="5" :file-list="scope.row.fileList" @@ -1131,9 +1133,9 @@ export default { handlePreview(file) { console.log('🚀 ~ handlePreview ~ file:', file) if (file.response) { - window.open(file.response.data.fileUrl) + window.open(process.env.VUE_APP_BASE_API + '/system'+ file.response.data.fileUrl) } else { - window.open(file.fileUrl) + window.open(process.env.VUE_APP_BASE_API + '/system'+ file.fileUrl) } }, handleExceed(files, fileList) { diff --git a/src/views/repairTest/repair/dialogOneForm.vue b/src/views/repairTest/repair/dialogOneForm.vue index 77495be..b6a20c3 100644 --- a/src/views/repairTest/repair/dialogOneForm.vue +++ b/src/views/repairTest/repair/dialogOneForm.vue @@ -123,9 +123,10 @@ class="upload-demo" :action="uploadUrl" :headers="headers" + :data="{ fileType: 'sx' }" list-type="picture-card" accept="image/*,application/pdf,.doc,.docx" - multiple + :multiple="false" :limit="5" :file-list="domain.fileList" :before-upload="beforeUpload" @@ -136,18 +137,18 @@
- + @@ -318,7 +319,7 @@ :headers="headers" list-type="picture-card" accept="image/*,application/pdf,.doc,.docx" - multiple + :multiple="false" :limit="5" :file-list="domain.fileList" :before-upload="beforeUpload" @@ -329,18 +330,18 @@
- + @@ -702,19 +703,17 @@ export default { this.isRequired = false } }, + isPDF(file) { + console.log('🚀 ~ isPDF ~ file:', file) + console.log(file?.fileName && /\.(pdf)$/i.test(file.fileName)) + return file?.fileName && /\.(pdf)$/i.test(file.fileName); + }, + isWord(file) { + return file?.fileName && /\.(docx?|wps)$/i.test(file.fileName); + }, 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('🚀 ~ handleRemove ~ file:', file) + domain.fileList.splice(domain.fileList.indexOf(file), 1) console.log('🚀 ~ domain.fileList:', domain.fileList) }, handlePreview(file) { @@ -738,9 +737,6 @@ export default { } return isLtMB }, - beforeRemove(file) { - return this.$confirm(`确定移除 ${file.name} ?`) - }, handleSuccess(file, fileList, row) { console.log('🚀 ~ handleSuccess ~ row:', row) console.log('🚀 ~ handleSuccess ~ file:', file) @@ -749,7 +745,7 @@ export default { } row.fileList.push({ fileName: file.response.data.fileName, - fileUrl: file.response.data.fileUrl, + fileUrl: process.env.VUE_APP_BASE_API + '/system'+ file.response.data.fileUrl, }) }, // 获取配件总费用 diff --git a/src/views/repairTest/repair/dialogTwoForm copy.vue b/src/views/repairTest/repair/dialogTwoForm copy.vue deleted file mode 100644 index 6346901..0000000 --- a/src/views/repairTest/repair/dialogTwoForm copy.vue +++ /dev/null @@ -1,825 +0,0 @@ - - - diff --git a/src/views/repairTest/repair/dialogTwoForm.vue b/src/views/repairTest/repair/dialogTwoForm.vue index ef658cc..808b996 100644 --- a/src/views/repairTest/repair/dialogTwoForm.vue +++ b/src/views/repairTest/repair/dialogTwoForm.vue @@ -134,9 +134,10 @@ class="upload-demo" :action="uploadUrl" :headers="headers" + :data="{ fileType: 'sx' }" list-type="picture-card" accept="image/*,application/pdf,.doc,.docx" - multiple + :multiple="false" :limit="5" :file-list="domain.fileList" :before-upload="beforeUpload" @@ -147,18 +148,18 @@
- + @@ -321,9 +322,10 @@ class="upload-demo" :action="uploadUrl" :headers="headers" + :data="{ fileType: 'sx' }" list-type="picture-card" accept="image/*,application/pdf,.doc,.docx" - multiple + :multiple="false" :limit="5" :file-list="domain.fileList" :before-upload="beforeUpload" @@ -334,18 +336,18 @@
- + @@ -697,18 +699,7 @@ 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, - } - }) + domain.fileList.splice(domain.fileList.indexOf(file), 1) console.log('🚀 ~ domain.fileList:', domain.fileList) }, handlePreview(file) { @@ -743,7 +734,7 @@ export default { } row.fileList.push({ fileName: file.response.data.fileName, - fileUrl: file.response.data.fileUrl, + fileUrl: process.env.VUE_APP_BASE_API + '/system'+ file.response.data.fileUrl, }) }, }, diff --git a/src/views/repairTest/testExamine/index.vue b/src/views/repairTest/testExamine/index.vue index 8c7482e..185a3d0 100644 --- a/src/views/repairTest/testExamine/index.vue +++ b/src/views/repairTest/testExamine/index.vue @@ -295,6 +295,8 @@ class="upload-demo" :action="uploadUrl" :headers="headers" + :data="{ fileType: 'sx' }" + :multiple="false" accept="image/*,application/pdf,.doc,.docx" :limit="5" :on-preview="handlePreview" @@ -1138,9 +1140,9 @@ export default { handlePreview(file) { console.log('🚀 ~ handlePreview ~ file:', file) if (file.response) { - window.open(file.response.data.fileUrl) + window.open(process.env.VUE_APP_BASE_API + '/system'+ file.response.data.fileUrl) } else { - window.open(file.fileUrl) + window.open(process.env.VUE_APP_BASE_API + '/system'+ file.fileUrl) } }, handleExceed(files, fileList) {