From 09d4e1dcd20df522c5f92f97ae2bed5858680594 Mon Sep 17 00:00:00 2001 From: wesley88 <9519127+wesley88@user.noreply.gitee.com> Date: Wed, 22 Jan 2025 17:45:43 +0800 Subject: [PATCH] 1 --- admin-web-master/.env.development | 2 +- admin-web-master/.env.production | 2 +- admin-web-master/package-lock.json | 14 +++++++------- admin-web-master/package.json | 2 +- admin-web-master/src/api/newly.js | 16 ++++++++++++++++ admin-web-master/src/components/add/addfa.vue | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------- admin-web-master/src/components/chakan/fa.vue | 416 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ admin-web-master/src/utils/request2.js | 4 ++-- admin-web-master/src/views/ads/fangAudit/index.vue | 1153 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- admin-web-master/src/views/ads/fangli/index.vue | 99 +++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------- 10 files changed, 915 insertions(+), 958 deletions(-) create mode 100644 admin-web-master/src/components/chakan/fa.vue diff --git a/admin-web-master/.env.development b/admin-web-master/.env.development index ed46290..564b0c5 100644 --- a/admin-web-master/.env.development +++ b/admin-web-master/.env.development @@ -6,7 +6,7 @@ VUE_APP_BASE_API = '/dev-api' # VUE_APP_DOMAIN_PREFIX_1 = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server" # VUE_APP_DOMAIN_PREFIX_1 = "https://jy.scjysm.asia:18086/cdwlMall/atmosphere/atmosphereSp" -VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.125:9003' +VUE_APP_DOMAIN_PREFIX_1='https://jy.scjysm.asia:18086/cdwlMall/admin-server' # VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.245:49013' # VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.38:9003' VUE_APP_DOMAIN_PREFIX_2='https://zhld.028wlkj.com:49008/cdwlMall/business-server' diff --git a/admin-web-master/.env.production b/admin-web-master/.env.production index 6a49dfd..df9ea9e 100644 --- a/admin-web-master/.env.production +++ b/admin-web-master/.env.production @@ -5,7 +5,7 @@ ENV = 'production' VUE_APP_BASE_API = '/prod-api' # VUE_APP_DOMAIN_PREFIX_1 = "http://zhld.028wlkj.com:49008/cdwlMall/admin-server" # VUE_APP_DOMAIN_PREFIX_1 = "https://jy.scjysm.asia:18086/cdwlMall/atmosphere/atmosphereSp" -VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.123:9003' +VUE_APP_DOMAIN_PREFIX_1='https://jy.scjysm.asia:18086/cdwlMall/admin-server' # VUE_APP_DOMAIN_PREFIX_1='http://172.16.61.124:9003' # VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.38:9003' # VUE_APP_DOMAIN_PREFIX_2='https://zhld.028wlkj.com:49008/cdwlMall/business-server' diff --git a/admin-web-master/package-lock.json b/admin-web-master/package-lock.json index e0f4b36..7fa4f58 100644 --- a/admin-web-master/package-lock.json +++ b/admin-web-master/package-lock.json @@ -34,7 +34,7 @@ "swiper": "^5.4.5", "vue": "^2.6.14", "vue-awesome-swiper": "^4.1.1", - "vue-jsonp": "^2.0.0", + "vue-jsonp": "^2.1.0", "vue-lang": "^0.2.5", "vue-quill-editor": "^3.0.6", "vue-router": "3.0.6", @@ -23597,9 +23597,9 @@ } }, "node_modules/vue-jsonp": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/vue-jsonp/-/vue-jsonp-2.0.0.tgz", - "integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA==" + "version": "2.1.0", + "resolved": "https://registry.npmmirror.com/vue-jsonp/-/vue-jsonp-2.1.0.tgz", + "integrity": "sha512-kezmjaAcMWdieO3tWxniC+82DitYUYjR1e2GsWIKHCTf+zhWUt2nPhN3dnmnAVhDQ+po3BspM7sKjiQaIhijUg==" }, "node_modules/vue-lang": { "version": "0.2.5", @@ -43735,9 +43735,9 @@ } }, "vue-jsonp": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/vue-jsonp/-/vue-jsonp-2.0.0.tgz", - "integrity": "sha512-Mzd9GNeuKP5hHFDWZNMWOsCuMILSkA6jo2l4A02wheFz3qqBzH7aSEFTey1BRCZCLizlaf1EqJ5YUtF392KspA==" + "version": "2.1.0", + "resolved": "https://registry.npmmirror.com/vue-jsonp/-/vue-jsonp-2.1.0.tgz", + "integrity": "sha512-kezmjaAcMWdieO3tWxniC+82DitYUYjR1e2GsWIKHCTf+zhWUt2nPhN3dnmnAVhDQ+po3BspM7sKjiQaIhijUg==" }, "vue-lang": { "version": "0.2.5", diff --git a/admin-web-master/package.json b/admin-web-master/package.json index 827bc6e..7d41620 100644 --- a/admin-web-master/package.json +++ b/admin-web-master/package.json @@ -39,7 +39,7 @@ "swiper": "^5.4.5", "vue": "^2.6.14", "vue-awesome-swiper": "^4.1.1", - "vue-jsonp": "^2.0.0", + "vue-jsonp": "^2.1.0", "vue-lang": "^0.2.5", "vue-quill-editor": "^3.0.6", "vue-router": "3.0.6", diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js index c4cf33d..ca1f0c0 100644 --- a/admin-web-master/src/api/newly.js +++ b/admin-web-master/src/api/newly.js @@ -1,5 +1,21 @@ import request from '@/utils/request' import requestnew from '@/utils/request2' +// 获取方案资源 +export function cereBusinessPlanqueryById(data) { + return request({ + url: '/cereBusinessPlan/queryById', + method: 'post', + data + }) +} +// 获取方案 +export function queryAllByLimit(data) { + return request({ + url: '/cereBusinessPlan/queryAllByLimit', + method: 'post', + data + }) +} // 批量修改资源状态 export function modifyResourceStatus(data) { return request({ diff --git a/admin-web-master/src/components/add/addfa.vue b/admin-web-master/src/components/add/addfa.vue index 482cf66..d09ffe1 100644 --- a/admin-web-master/src/components/add/addfa.vue +++ b/admin-web-master/src/components/add/addfa.vue @@ -64,8 +64,8 @@ - - + + @@ -122,7 +122,8 @@ import { cereResourceStrategy, cereBusinessOperationadd, - modifyResourceStatus + modifyResourceStatus, + cereBusinessPlanqueryById } from '@/api/newly.js' export default { components: { @@ -172,7 +173,56 @@ } }, async created() { + if (this.info && this.info.id) { + this.formInline = this.info + console.error({...this.formInline}) + cereBusinessPlanqueryById({id:this.formInline.id}).then(res => { + let c1 = [] + for (let index = 0; index < res.data.resourceList.length; index++) { + const element = res.data.resourceList[index]; + if (element.cereBasicInformationShop.id) { + for (let i = 0; i < element.cereRentalPolicies.length; i++) { + var element1 = element.cereRentalPolicies[i]; + let info = { + cnet:'sp'+element.cereBasicInformationShop.id, + zyinfo:element.cereBasicInformationShop, + num:element.cereRentalPolicies.length, + clinfo:element1 + } + c1.push(info); + } + } + if (element.cereAdvertisingInformation.id) { + for (let i = 0; i < element.cereRentalPolicies.length; i++) { + var element1 = element.cereRentalPolicies[i]; + let info = { + cnet:'gg'+element.cereAdvertisingInformation.id, + zyinfo:element.cereAdvertisingInformation, + num:element.cereRentalPolicies.length, + clinfo:element1 + } + c1.push(info); + } + } + if (element.cereBasicInformationVenue.id) { + for (let i = 0; i < element.cereRentalPolicies.length; i++) { + var element1 = element.cereRentalPolicies[i]; + let info = { + cnet:'cd'+element.cereBasicInformationVenue.id, + zyinfo:element.cereBasicInformationVenue, + num:element.cereRentalPolicies.length, + clinfo:element1 + } + c1.push(info); + } + } + } + console.error(c1) + this.AddData = c1 + }) + } else { + } }, methods: { minSevcl(e) { @@ -263,7 +313,9 @@ //判断alllist是不是数组 if (Array.isArray(alllist)) { for (let i = 0; i < alllist.length; i++) { + console.error(alllist[i]) let cnet = alllist[i].id + alllist[i].clids = alllist[i].clids +'' await this.addclall(alllist[i].id,alllist[i].clids.split(",")) if (i == 0) { c2 = cnet @@ -276,6 +328,7 @@ return } console.error(c2) + await cereBusinessOperationadd({ type: '发布', resourceId: c2, @@ -288,42 +341,63 @@ console.error({ ...this.formInline }) - fangAdd({ - ...this.formInline - }).then(res => { - console.error(res) - this.$message({ - message: '添加成功', - type: 'success' - }) - modifyResourceStatus({ - resourcesId: c2, - status:"1" - }).then(res => { - console.error(res) - }) - this.$emit('removeonaction', '1') - return - if (res.code == 200) { - this.$message({ - message: '添加成功', - type: 'success' - }) - modifyResourceStatus({ - resourcesId: c2, - status:"1" - }).then(res => { - console.error(res) - }) - this.$emit('removeonaction', '1') - } else { - this.$message({ - message: res.msg, - type: 'error' - }) - } + + // return + if(this.formInline.id) { + this.formInline.updateTime = this.updateCurrentTime() + this.formInline.updateUser = localStorage.getItem('roleName') + fangEdit({ + ...this.formInline + }).then(res => { + console.error(res) + if (res.code == 200) { + this.$message({ + message: '修改成功', + type: 'success' + }) + modifyResourceStatus({ + resourcesId: c2, + status:"1" + }).then(res => { + console.error(res) + }) + this.$emit('removeonaction', '1') + } else { + this.$message({ + message: res.msg, + type: 'error' + }) + } - }) + }) + } else { + this.formInline.createTime = this.updateCurrentTime() + this.formInline.createUser = localStorage.getItem('roleName') + fangAdd({ + ...this.formInline + }).then(res => { + console.error(res) + if (res.code == 200) { + this.$message({ + message: '添加成功', + type: 'success' + }) + modifyResourceStatus({ + resourcesId: c2, + status:"1" + }).then(res => { + console.error(res) + }) + this.$emit('removeonaction', '1') + } else { + this.$message({ + message: res.msg, + type: 'error' + }) + } + + }) + } }, async add() { this.$refs.heForm.validate((valid) => { @@ -346,6 +420,19 @@ } }) }, + //获取当前时间 + updateCurrentTime() { + const now = new Date(); + const year = now.getFullYear(); + const month = (now.getMonth() + 1).toString().padStart(2, '0'); + const day = now.getDate().toString().padStart(2, '0'); + const hours = now.getHours().toString().padStart(2, '0'); + const minutes = now.getMinutes().toString().padStart(2, '0'); + const seconds = now.getSeconds().toString().padStart(2, '0'); + + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; + }, + close() { this.$emit('removeonaction', '1') }, @@ -459,7 +546,7 @@ info.children.push(elementnew) if(elementnew.clinfo && elementnew.clinfo.id) { if(i == 0) { - info.clids = elementnew.clinfo.id + info.clids = elementnew.clinfo.id+'' } else { info.clids = info.clids + ','+elementnew.clinfo.id } diff --git a/admin-web-master/src/components/chakan/fa.vue b/admin-web-master/src/components/chakan/fa.vue new file mode 100644 index 0000000..547ff48 --- /dev/null +++ b/admin-web-master/src/components/chakan/fa.vue @@ -0,0 +1,416 @@ + + + + diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js index f387d47..efaf7f6 100644 --- a/admin-web-master/src/utils/request2.js +++ b/admin-web-master/src/utils/request2.js @@ -16,8 +16,8 @@ let hostall = window.location.href; let baseURL = '' // || host === 'localhost:9528' if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { - // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_2; - baseURL = 'http://172.16.61.125:9004'; + baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; + // baseURL = 'http://172.16.61.125:9004'; // baseURL = 'https://jy.scjysm.asia:18086/merchant-business'; } else { console.error('---------------------') diff --git a/admin-web-master/src/views/ads/fangAudit/index.vue b/admin-web-master/src/views/ads/fangAudit/index.vue index 326be10..1643f6b 100644 --- a/admin-web-master/src/views/ads/fangAudit/index.vue +++ b/admin-web-master/src/views/ads/fangAudit/index.vue @@ -1,27 +1,28 @@ - - diff --git a/admin-web-master/src/views/ads/fangli/index.vue b/admin-web-master/src/views/ads/fangli/index.vue index 612690b..8fd0186 100644 --- a/admin-web-master/src/views/ads/fangli/index.vue +++ b/admin-web-master/src/views/ads/fangli/index.vue @@ -2,26 +2,25 @@
-
招商资源监测 > 商铺基本信息
+
招商方案管理 > 招商方案管理
- - + + + - - - + + + + + - - -
@@ -45,42 +44,35 @@ {{scope.$index +1 }} - - + + - - - - - + - + - - + - + @@ -103,7 +95,7 @@
-
商铺基本信息 > 招商方案管理 > 新增
@@ -112,17 +104,17 @@
-
-
商铺基本信息 > +
招商方案管理 > 查看
-
+
-->
- +
-
商铺基本信息 > 招商方案管理 > {{contractChangeReason}}
@@ -149,16 +141,18 @@ getAlls } from '@/api/information'; import add from '@/components/add/addfa' - import resourceCommodity from '@/components/resourceCommodity/index' + import fa from '@/components/chakan/fa' import { fangGetAll, fangDel, + fangEdit } from '@/api/fangli' import cl from '@/components/change/cl.vue' import { cereResourceStrategy, editStatus, cereBusinessOperationadd, + queryAllByLimit } from '@/api/newly.js' export default { data() { @@ -173,7 +167,7 @@ pagequery: { // belongingRegion:'', // shopName:'', - pageNumber: 1, + pageNumber: 0, pageSize: 10, // belongingGreenwaySection:'', // belongingDepartment:'' @@ -193,7 +187,7 @@ components: { cl, add, - resourceCommodity, + fa, }, async created() { this.getAll() @@ -297,25 +291,15 @@ cancelButtonText: '取消', type: 'warning' }).then(() => { - editList({ - ...row, - publishStatus: e + fangEdit({ + id: row.id, + auditStatus: e }).then(res => { - console.error(res) if (res.code == 200) { this.$message({ message: tit + '成功', type: 'success' }) - cereBusinessOperationadd({ - type:tit, - resourceId: 'sp'+row.id, - operator: localStorage.getItem('roleName'), - operationTime: that.gettime() - }).then(res => { - console.error(res) - }) - this.removeonaction('1') } else { this.$message({ @@ -323,7 +307,6 @@ type: 'error' }) } - }) }) }, @@ -337,7 +320,7 @@ this.onaction = '4' }, async getAll() { - const res = await fangGetAll(this.pagequery) + const res = await queryAllByLimit(this.pagequery) this.tableData = res.data.content this.total = res.data.totalElements }, @@ -388,7 +371,7 @@ customClass: 'oe-dialog-btn', beforeClose: (action, instance, done) => { if (action === 'confirm') { - delList({ + fangDel({ id: item.id }).then(res => { this.$message({ -- libgit2 0.21.4