| @@ -465,7 +465,6 @@ export default { | |||||
| }, | }, | ||||
| //更新文件回显 | //更新文件回显 | ||||
| afterRead(file) { | afterRead(file) { | ||||
| console.log(file); | |||||
| this.$forceUpdate(); | this.$forceUpdate(); | ||||
| }, | }, | ||||
| //删除图片 | //删除图片 | ||||
| @@ -516,7 +515,6 @@ export default { | |||||
| } | } | ||||
| //户型图查询 | //户型图查询 | ||||
| houseList().then(res => { | houseList().then(res => { | ||||
| console.log(res) | |||||
| res.rows.map(item => { | res.rows.map(item => { | ||||
| this.houseType.push({ value:item.id, text: item.name}); | this.houseType.push({ value:item.id, text: item.name}); | ||||
| }); | }); | ||||
| @@ -529,7 +527,6 @@ export default { | |||||
| this.showHouse = true; | this.showHouse = true; | ||||
| } | } | ||||
| }); | }); | ||||
| console.log(response.data) | |||||
| this.applicationDetail = response.data; | this.applicationDetail = response.data; | ||||
| this.parameter.houseApplyStatus = response.data.tHouseApplyProposer.houseApplyStatus; | this.parameter.houseApplyStatus = response.data.tHouseApplyProposer.houseApplyStatus; | ||||
| let currentProcessKey = response.data.currentProcessKey; | let currentProcessKey = response.data.currentProcessKey; | ||||
| @@ -548,13 +545,11 @@ export default { | |||||
| treeSingleProcessView(this.parameter).then(res => { | treeSingleProcessView(this.parameter).then(res => { | ||||
| this.fileArray = res.rows | this.fileArray = res.rows | ||||
| this.params.tableId = this.id; | this.params.tableId = this.id; | ||||
| console.log(res.rows) | |||||
| for (let i = 0 ; i < res.rows.length ; i++){ | for (let i = 0 ; i < res.rows.length ; i++){ | ||||
| this.params.fileType = res.rows[i].fileType; | this.params.fileType = res.rows[i].fileType; | ||||
| this.fileArray[i].findList = []; | this.fileArray[i].findList = []; | ||||
| //获取文件集合 | //获取文件集合 | ||||
| attachmentFind(this.params).then(res2 => { | attachmentFind(this.params).then(res2 => { | ||||
| console.log(res2.data) | |||||
| for (let j = 0 ; j < res2.data.length ; j++){ | for (let j = 0 ; j < res2.data.length ; j++){ | ||||
| this.fileArray[i].findList[j] = {url:'http://192.168.31.239:8080'+ res2.data[j].fileUrl, isImage: true , id:res2.data[j].id} ; | this.fileArray[i].findList[j] = {url:'http://192.168.31.239:8080'+ res2.data[j].fileUrl, isImage: true , id:res2.data[j].id} ; | ||||
| this.$forceUpdate(); | this.$forceUpdate(); | ||||
| @@ -580,7 +575,6 @@ export default { | |||||
| }, | }, | ||||
| //选择建房类型 | //选择建房类型 | ||||
| onConfirmBuildingType(data){ | onConfirmBuildingType(data){ | ||||
| console.log(data) | |||||
| this.buildingTypeValue = data.text; | this.buildingTypeValue = data.text; | ||||
| this.applicationDetail.tHouseApplyProposedSituation.buildingType = data.value; | this.applicationDetail.tHouseApplyProposedSituation.buildingType = data.value; | ||||
| this.showBuildingType = false; | this.showBuildingType = false; | ||||
| @@ -593,21 +587,18 @@ export default { | |||||
| }, | }, | ||||
| //选择房屋构造 | //选择房屋构造 | ||||
| onConfirmHousingStructure(data){ | onConfirmHousingStructure(data){ | ||||
| console.log(data) | |||||
| this.housingStructureValue = data.text; | this.housingStructureValue = data.text; | ||||
| this.applicationDetail.tHouseApplyProposedSituation.housingStructure = data.value; | this.applicationDetail.tHouseApplyProposedSituation.housingStructure = data.value; | ||||
| this.showHousingStructure = false; | this.showHousingStructure = false; | ||||
| }, | }, | ||||
| //选择户型 | //选择户型 | ||||
| onConfirmHouseType(data){ | onConfirmHouseType(data){ | ||||
| console.log(data) | |||||
| this.houseTypeValue = data.text; | this.houseTypeValue = data.text; | ||||
| this.applicationDetail.tHouseApplyProposedSituation.houseTypeId = data.value; | this.applicationDetail.tHouseApplyProposedSituation.houseTypeId = data.value; | ||||
| this.showHouseType = false; | this.showHouseType = false; | ||||
| }, | }, | ||||
| //选择性别 | //选择性别 | ||||
| onConfirmSex(data){ | onConfirmSex(data){ | ||||
| console.log(data) | |||||
| this.sexValue = data.text; | this.sexValue = data.text; | ||||
| this.applicationDetail.tHouseApplyProposer.sex = data.value; | this.applicationDetail.tHouseApplyProposer.sex = data.value; | ||||
| this.showSex = false; | this.showSex = false; | ||||
| @@ -625,12 +616,11 @@ export default { | |||||
| }, | }, | ||||
| //删除家庭成员 | //删除家庭成员 | ||||
| deleteFamily(index){ | deleteFamily(index){ | ||||
| console.log(index) | |||||
| this.applicationDetail.tHouseApplyFamilyMembers.splice(index,1) | this.applicationDetail.tHouseApplyFamilyMembers.splice(index,1) | ||||
| }, | }, | ||||
| //是否有宅基地选项改变 | //是否有宅基地选项改变 | ||||
| existHomesteadChange(name){ | existHomesteadChange(name){ | ||||
| console.log(this.applicationDetail.tHouseApplyCurrentSituation) | |||||
| if (name == 'Y'){ | if (name == 'Y'){ | ||||
| if (this.applicationDetail.tHouseApplyCurrentSituation == null){ | if (this.applicationDetail.tHouseApplyCurrentSituation == null){ | ||||
| //现宅基地情况 | //现宅基地情况 | ||||
| @@ -666,7 +656,6 @@ export default { | |||||
| }, | }, | ||||
| //图纸选择改变 | //图纸选择改变 | ||||
| designPaperChange(name){ | designPaperChange(name){ | ||||
| console.log(name) | |||||
| if(name == 2){ | if(name == 2){ | ||||
| this.showHouse = true; | this.showHouse = true; | ||||
| }else{ | }else{ | ||||
| @@ -683,9 +672,6 @@ export default { | |||||
| while (n--) { | while (n--) { | ||||
| u8arr[n] = bstr.charCodeAt(n); | u8arr[n] = bstr.charCodeAt(n); | ||||
| } | } | ||||
| console.log(new File([u8arr], `${filename}.${suffix}`, { | |||||
| type: mime, | |||||
| })) | |||||
| return new File([u8arr], `${filename}.${suffix}`, { | return new File([u8arr], `${filename}.${suffix}`, { | ||||
| type: mime, | type: mime, | ||||
| }); | }); | ||||
| @@ -696,24 +682,26 @@ export default { | |||||
| let form = {}; | let form = {}; | ||||
| form.fileList=[]; | form.fileList=[]; | ||||
| this.fileList.tableId = this.id; | this.fileList.tableId = this.id; | ||||
| const params = new FormData() | |||||
| params.append('tableId', this.id) | |||||
| params.append('tableName', 't_house_apply_proposer') | |||||
| params.append('bizPath', 't_house_apply_proposer') | |||||
| for (let i = 0 ; i < this.fileArray.length ; i++){ | for (let i = 0 ; i < this.fileArray.length ; i++){ | ||||
| if (this.fileArray[i].findList == null || this.fileArray[i].findList == undefined || this.fileArray[i].findList == ''){ | if (this.fileArray[i].findList == null || this.fileArray[i].findList == undefined || this.fileArray[i].findList == ''){ | ||||
| continue | continue | ||||
| } | } | ||||
| for (let j = 0 ; j < this.fileArray[i].findList.length ; j++){ | for (let j = 0 ; j < this.fileArray[i].findList.length ; j++){ | ||||
| params.set('fileType', this.fileArray[i].fileType) | |||||
| const params = new FormData() | |||||
| params.append('tableId', this.id) | |||||
| params.append('tableName', 't_house_apply_proposer') | |||||
| params.append('bizPath', 't_house_apply_proposer') | |||||
| params.append('fileType', this.fileArray[i].fileType) | |||||
| if (this.fileArray[i].findList[j].url){ | if (this.fileArray[i].findList[j].url){ | ||||
| console.log("跳过原图--------------------") | |||||
| continue; | continue; | ||||
| } | } | ||||
| params.set('file', this.base64toFile(this.fileArray[i].findList[j].content)) | |||||
| console.log(this.base64toFile(this.fileArray[i].findList[j].content)) | |||||
| params.append('file', this.base64toFile(this.fileArray[i].findList[j].content)) | |||||
| attach(params).then(res => { | attach(params).then(res => { | ||||
| console.log(res) | |||||
| form.fileList.push(res.id); | form.fileList.push(res.id); | ||||
| }); | }); | ||||
| } | } | ||||
| @@ -723,11 +711,8 @@ export default { | |||||
| form.tHouseApproveVillageOptions=this.applicationDetail.tHouseApproveVillageOptions; | form.tHouseApproveVillageOptions=this.applicationDetail.tHouseApproveVillageOptions; | ||||
| form.tHouseApplyCurrentSituation=this.applicationDetail.tHouseApplyCurrentSituation; | form.tHouseApplyCurrentSituation=this.applicationDetail.tHouseApplyCurrentSituation; | ||||
| form.tHouseApplyProposedSituation=this.applicationDetail.tHouseApplyProposedSituation; | form.tHouseApplyProposedSituation=this.applicationDetail.tHouseApplyProposedSituation; | ||||
| console.log(form); | |||||
| console.log(this.fileArray) | |||||
| setTimeout(function(){ | setTimeout(function(){ | ||||
| saveHouseBaseInfo(form).then(res => { | saveHouseBaseInfo(form).then(res => { | ||||
| console.log(res) | |||||
| if(res.code = 200){ | if(res.code = 200){ | ||||
| that.$toast.success('保存成功'); | that.$toast.success('保存成功'); | ||||
| } | } | ||||