diff --git a/src/api/manage.js b/src/api/manage.js index eb4f340..199d928 100644 --- a/src/api/manage.js +++ b/src/api/manage.js @@ -202,3 +202,40 @@ export function getCurrentTime() { let ss = new Date().getSeconds()<10 ? '0'+new Date().getSeconds() : new Date().getSeconds(); return yy+'-'+mm+'-'+dd+' '+hh+':'+mf+':'+ss; } + +/** + * 获取文件id + * @param arry + * @returns {string|null} + */ +export function getStringArry(arry) { + if (!arry || arry == '') return null; + if (arry.length > 0) { + var uuid = '' + var arr = [] + for (var i = 0; i < arry.length; i++) { + arr.push(arry[i].id) + } + uuid = arr.join(',') + return uuid + } +} +export function getRecord(data) { + let newFileList = [] + if (data.fileId != null && data.id != '') { + var text = data.ossFileList + for (var i = 0; i < text.length; i++) { + var name = text[i].filename + var fileJson = { + name: text[i].fileName, + url: text[i].url, + size: text[i].fileSize, + id: text[i].id, + fileType: text[i].fileType + } + newFileList.push(fileJson) + } + } + data.fileId = newFileList + return data +} \ No newline at end of file diff --git a/src/components/jeecg/JUpload.vue b/src/components/jeecg/JUpload.vue index a0f899f..a421c0b 100644 --- a/src/components/jeecg/JUpload.vue +++ b/src/components/jeecg/JUpload.vue @@ -65,10 +65,11 @@ name: 'JUpload', data(){ return { - uploadAction:window._CONFIG['domianURL']+"/sys/upload/uploadMinio", + uploadAction:window._CONFIG['domianURL']+"/sys/upload", headers:{}, fileList: [], newFileList: [], + result: '', uploadGoOn:true, previewVisible: false, //---------------------------- begin 图片左右换位置 ------------------------------------- @@ -101,7 +102,7 @@ default:"temp" }, value:{ - type:[String,Array], + type:[Object, Array, String, Number], required:false }, // update-begin- --- author:wangshuai ------ date:20190929 ---- for:Jupload组件增加是否能够点击 @@ -145,7 +146,8 @@ let val = this.value if (val instanceof Array) { if(this.returnUrl){ - this.initFileList(val.join(',')) + this.initFileListArr(val); + // this.initFileList(val.join(',')) }else{ this.initFileListArr(val); } @@ -172,26 +174,33 @@ }, methods:{ - initFileListArr(val){ - if(!val || val.length==0){ - this.fileList = []; - return; + initFileListArr(val) { + console.log('999999',val) + if (!val || val.length == 0) { + this.fileList = [] + return } - let fileList = []; - for(var a=0;a0){ fileList = fileList.slice(-this.number); @@ -266,8 +276,13 @@ if(info.file.response.success){ fileList = fileList.map((file) => { if (file.response) { - let reUrl = file.response.message; - file.url = getFileAccessHttpUrl(reUrl); + let reUrl + if (file.response.message == '') { + reUrl = file.response.result.url + } else { + reUrl = file.response.message + } + file.url = getFileAccessHttpUrl(reUrl) } return file; }); @@ -280,28 +295,25 @@ } this.fileList = fileList if(info.file.status==='done' || info.file.status === 'removed'){ - //returnUrl为true时仅返回文件路径 - if(this.returnUrl){ - this.handlePathChange() - }else{ - //returnUrl为false时返回文件名称、文件路径及文件大小 - this.newFileList = []; - for(var a=0;a + + + + + @@ -106,12 +111,13 @@ const VALIDATE_NO_PASSED = Symbol() import pick from 'lodash.pick' - import { getAction,httpAction,getCurrentTime } from '@/api/manage' + import { getAction,httpAction,getCurrentTime,getStringArry,getRecord } from '@/api/manage' import { FormTypes, getRefPromise,validateFormAndTables } from '@/utils/JEditableTableUtil' import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' import JFormContainer from '@/components/jeecg/JFormContainer' import JDate from '@/components/jeecg/JDate' import JUpload from '@/components/jeecg/JUpload' + import FileList from '@/components/jeecg/FileList' import JSelectCompany from '@/components/jeecgbiz/JSelectCompany' import JSelectDepart from '@/components/jeecgbiz/JSelectDepart' import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep' @@ -126,6 +132,7 @@ JFormContainer, JDate, JUpload, + FileList, JSelectDepart, JSelectUserByDep, JDictSelectTag, @@ -336,10 +343,9 @@ ] }, url: { - getForm:'/actBusiness/getForm', add: '/hy/processUdgetPlan/add', edit: '/hy/processUdgetPlan/edit', - queryById: '/hy/processUdgetPlan/queryById', + getForm: '/hy/processUdgetPlan/queryById', selectdeparment:'/sys/selectByUser', descriptionRake: "/description/processDescription/descriptionName", merchandiseNewsList: "/merchandisenews/processMerchandiseNews/merchandiseNewsList", @@ -589,8 +595,7 @@ this.btndisabled = true; var r = this.processData; this.getAction(this.url.getForm,{ - tableId:r.tableId, - tableName:r.tableName, + id:r.tableId }).then((res)=>{ if (res.success){ let formData = res.result; @@ -631,6 +636,13 @@ /** 调用完edit()方法之后会自动调用此方法 */ editAfter() { console.log("这是编辑回显数据",this.data) + if (this.data.id != null && this.data.id != '' && this.data.id != undefined && this.data.fileId != null && this.data.fileId != '') { + //1、文件回显 + console.log('++++++++++++++>',getRecord(this.data)) + this.data = getRecord(this.data) + + } + console.log('+++++++++898989+++++>',this.data) let fieldval = pick(this.data, 'id','company', 'createTime', 'sysOrgCode', 'createBy', 'materialType', 'processPlan', 'needTime', 'orderNumber', 'fileId') this.$nextTick(() => { this.form.setFieldsValue(fieldval) @@ -691,7 +703,7 @@ throw this.throwNotFunction('classifyIntoFormData') } let formData = this.classifyIntoFormData(allValues) - + formData.fileId = getStringArry(formData.fileId) if (new Date(formData.createTime).getTime()/100>new Date(formData.needTime).getTime()/100){ this.$message.error("需求时间不能小于当前流程发起时间") return; diff --git a/src/views/processmaterials/modules/ProcessUdgetPlanForm.vue b/src/views/processmaterials/modules/ProcessUdgetPlanForm.vue index dbedcc0..0bc4023 100644 --- a/src/views/processmaterials/modules/ProcessUdgetPlanForm.vue +++ b/src/views/processmaterials/modules/ProcessUdgetPlanForm.vue @@ -49,6 +49,11 @@ + + + + + @@ -73,7 +78,7 @@