diff --git a/admin-web-master/dist (2).zip b/admin-web-master/dist.zip index c9b107d..0463f15 100644 --- a/admin-web-master/dist (2).zip +++ b/admin-web-master/dist.zip diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js index 2f6b840..1036f9b 100644 --- a/admin-web-master/src/api/newly.js +++ b/admin-web-master/src/api/newly.js @@ -1,9 +1,20 @@ import request from '@/utils/request' // import request from '@/utils/request2' +// oa +export function general(data) { + return request({ + url: '/oaInterconnection/general', + method: 'post', + data, + // headers: { + // 'Content-Type': 'Multipart/form-data' + // } + }) +} // 生成合同附件 export function dataInprotDocument(data) { return request({ - url: '/cereContractTemplate/dataInprotDocument ', + url: '/cereContractTemplate/dataInprotDocument', method: 'post', data }) diff --git a/admin-web-master/src/components/ImageUpload/index.vue b/admin-web-master/src/components/ImageUpload/index.vue index a5242c6..de808c1 100644 --- a/admin-web-master/src/components/ImageUpload/index.vue +++ b/admin-web-master/src/components/ImageUpload/index.vue @@ -212,7 +212,7 @@ // 更新当前文件的上传状态 this.reactiveData.filesIng[i].status = 'uploading'; - + console.error(fd) // 调用 miniioupload 方法并等待响应 const res = await miniioupload(fd); list.push(res.data) diff --git a/admin-web-master/src/components/add/addcd.vue b/admin-web-master/src/components/add/addcd.vue index 47224c3..49bb676 100644 --- a/admin-web-master/src/components/add/addcd.vue +++ b/admin-web-master/src/components/add/addcd.vue @@ -65,7 +65,7 @@ --> - +
@@ -192,7 +192,7 @@ }], detailedLocation: [{ required: true, - message: '请输入详细位置', + message: '请地图标点选择位置', trigger: 'blur' }, ], mapMarker: [{ diff --git a/admin-web-master/src/components/add/addht.vue b/admin-web-master/src/components/add/addht.vue index 772f0ad..13224f1 100644 --- a/admin-web-master/src/components/add/addht.vue +++ b/admin-web-master/src/components/add/addht.vue @@ -229,6 +229,8 @@ import { tenantTelephone: this.info.tenantTelephone, shopNumber: this.info.shopNumber, templateInformationUrl:this.templateAttachment, + createDate:this.updateCurrentTime(), + createUser: localStorage.getItem('roleName'), } console.error(from) let info = await this.culfj() @@ -354,31 +356,31 @@ import { }).then(res => { console.error(res) }) - // if(this.info.id) { - // if(this.info.cereBasicInformationShop && this.info.cereBasicInformationShop.id) { - // msgedit({ - // auditStatus: '4', - // id: this.info.id, - // contractNumber: this.formInline.contractNumber - // }) - // } - // if(this.info.cereAdvertisingInformation && this.info.cereAdvertisingInformation.id) { - // AdvertiserInfoEdit({ - // auditStatus: '4', - // id: this.info.id, - // contractId: this.formInline.contractNumber - // }).then(item => { - // this.getAll() - // }) - // } - // if(this.info.cereBasicInformationVenue && this.info.cereBasicInformationVenue.id) { - // msgedit({ - // auditStatus: '4', - // id: this.info.id, - // contractNumber: this.formInline.contractNumber - // }) - // } - // } + if(this.info.id) { + if(this.info.cereBasicInformationShop && this.info.cereBasicInformationShop.id) { + msgedit({ + auditStatus: '4', + id: this.info.id, + contractNumber: this.formInline.contractNumber + }) + } + if(this.info.cereAdvertisingInformation && this.info.cereAdvertisingInformation.id) { + AdvertiserInfoEdit({ + auditStatus: '4', + id: this.info.id, + contractId: this.formInline.contractNumber + }).then(item => { + this.getAll() + }) + } + if(this.info.cereBasicInformationVenue && this.info.cereBasicInformationVenue.id) { + msgedit({ + auditStatus: '4', + id: this.info.id, + contractNumber: this.formInline.contractNumber + }) + } + } this.$emit('removeonaction', '1') } else { this.$message({ diff --git a/admin-web-master/src/components/add/addinformation.vue b/admin-web-master/src/components/add/addinformation.vue index 5e96ae2..b276af1 100644 --- a/admin-web-master/src/components/add/addinformation.vue +++ b/admin-web-master/src/components/add/addinformation.vue @@ -50,7 +50,23 @@ - + + + + + + + + + + + + + + @@ -81,13 +97,8 @@ - - - - - + @@ -205,6 +216,11 @@ message: '请选择商铺类型', trigger: 'blur' }, ], + belongingGreenwaySection: [{ + required: true, + message: '请填写所属绿道段', + trigger: 'blur' + }, ], belongingRegion: [{ required: true, message: '请选择所属区域', @@ -212,7 +228,7 @@ }], detailedLocation: [{ required: true, - message: '请输入详细位置', + message: '请地图标点选择位置', trigger: 'blur' }, ], mapPunctuation: [{ diff --git a/admin-web-master/src/components/add/addmap.vue b/admin-web-master/src/components/add/addmap.vue index 670eb48..5b78a8b 100644 --- a/admin-web-master/src/components/add/addmap.vue +++ b/admin-web-master/src/components/add/addmap.vue @@ -67,7 +67,7 @@ - + +
+ +
@@ -266,9 +269,10 @@ import { getAlls as map1 } from '../../../api/map1' + import allimg from '@/components/chakan/allimg.vue'; export default { components: { - upimg + upimg,allimg }, props: { message: { diff --git a/admin-web-master/src/views/customer/rsaManagement/tanpan.vue b/admin-web-master/src/views/customer/rsaManagement/tanpan.vue index 10ba872..4c29439 100644 --- a/admin-web-master/src/views/customer/rsaManagement/tanpan.vue +++ b/admin-web-master/src/views/customer/rsaManagement/tanpan.vue @@ -102,7 +102,7 @@
-
- + --> +
+ +
@@ -142,6 +145,7 @@ } from '../../../api/inr.js' import upimg from "@/components/ImageUpload/index" import upfile from "@/components/fujianUpload/fujianList" + import allimg from '@/components/chakan/allimg.vue'; import { getAlls } from '../../../api/information.js' @@ -151,7 +155,8 @@ export default { components: { upimg, - upfile + upfile, + allimg }, props: { message: { diff --git a/admin-web-master/src/views/detect/analyse.vue b/admin-web-master/src/views/detect/analyse.vue index 0208f03..63453d3 100644 --- a/admin-web-master/src/views/detect/analyse.vue +++ b/admin-web-master/src/views/detect/analyse.vue @@ -1,6 +1,6 @@