From cc312afb2e2bddd7eed46cb9666089b4318a177c Mon Sep 17 00:00:00 2001 From: 2509699674 <2509699647@qq.com> Date: Wed, 18 Dec 2024 18:46:04 +0800 Subject: [PATCH] '最新' --- admin-web-master/src/api/inr.js | 9 +++++++++ admin-web-master/src/views/ipm/inr/index.vue | 22 ++++------------------ wenjuan/.env.development | 8 ++++---- yanshouban/src/api/activityBz.js | 32 ++++++++++++++++++++++++++++++++ yanshouban/src/api/business.js | 13 +++++++++++++ yanshouban/src/api/inr.js | 9 +++++++++ yanshouban/src/api/manage.js | 13 +++++++++++++ yanshouban/src/api/planningBz.js | 12 ++++++++++++ yanshouban/src/views/activity/activitySp.vue | 2 +- yanshouban/src/views/activity/index.vue | 199 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------ yanshouban/src/views/ads/fangli/index.vue | 31 +++++++++++++++++++------------ yanshouban/src/views/advertisement/index.vue | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- yanshouban/src/views/atmosphere/atmosphereGl.vue | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------- yanshouban/src/views/atmosphere/atmosphereSp.vue | 2 +- yanshouban/src/views/business/businessList/index.vue | 41 +++++++++++++++++++++++++++++++++++------ yanshouban/src/views/customer/yixiang/index.vue | 1421 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yanshouban/src/views/detect/admap.vue | 32 ++++++++++++++++++++++++++------ yanshouban/src/views/detect/analyse.vue | 513 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- yanshouban/src/views/ipm/inr/index.vue | 45 ++++++++++++++++++++++++++++----------------- yanshouban/src/views/member/memberList/details.vue | 5 +++++ yanshouban/src/views/online/QRCode/index.vue | 2 +- yanshouban/src/views/online/QRFunds/index.vue | 3 ++- yanshouban/src/views/scheme/addressguan.vue | 443 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ yanshouban/src/views/scheme/planningBz.vue | 32 ++++++++++++++++++++++++++++---- yanshouban/src/views/scheme/sam.vue | 16 +++++++++++++--- yanshouban/src/views/serve/kefuServe/index.vue | 4 ++-- yanshouban/src/views/setup/user/index.vue | 8 ++++++-- yanshouban/src/views/shopRental/manage/index.vue | 34 +++++++++++++++++++++++++++------- yanshouban/src/views/shopRental/renewalMan/index.vue | 5 +++-- yanshouban/src/views/shopRental/rentTermination/index.vue | 5 +++-- yanshouban/src/views/shopRental/rentalMan/index.vue | 4 ++++ 31 files changed, 2743 insertions(+), 401 deletions(-) create mode 100644 yanshouban/src/views/customer/yixiang/index.vue create mode 100644 yanshouban/src/views/scheme/addressguan.vue diff --git a/admin-web-master/src/api/inr.js b/admin-web-master/src/api/inr.js index 03cca2c..ddfd437 100644 --- a/admin-web-master/src/api/inr.js +++ b/admin-web-master/src/api/inr.js @@ -28,3 +28,12 @@ export function tanDel(data) { data }) } +// 谈判列表导出 +export function excelQueryByPage(data) { + return request({ + url: '/cereNegotiationDetails/excelQueryByPage', + method: 'post', + data, + responseType:blob + }) +} diff --git a/admin-web-master/src/views/ipm/inr/index.vue b/admin-web-master/src/views/ipm/inr/index.vue index 4cff704..3d85b9f 100644 --- a/admin-web-master/src/views/ipm/inr/index.vue +++ b/admin-web-master/src/views/ipm/inr/index.vue @@ -626,24 +626,10 @@ const res = await tanGetAll(this.formSel) await tanDel({id:item.id}) this.getAll() }, - gitOut(){ - let add =[] - this.tableData.map(item=>{ - - let obj ={ - intentCustomerName:'', - customerLevel:'', - contactPhone:'', - nextFollowUpStartTime:'' - } - obj.intentCustomerName = item.cereFollowDetails.cereCustomerInfo.intentCustomerName - obj.contactPhone = item.cereFollowDetails.cereCustomerInfo.contactPhone - obj.customerLevel = item.cereFollowDetails.cereCustomerInfo.customerLevel - obj.nextFollowUpStartTime = item.nextNegotiationStartTime - add.push(obj) - - }) - }, + // async gitOut(){ + // await excelQueryByPage(this.pageindex) + + // }, } } diff --git a/wenjuan/.env.development b/wenjuan/.env.development index 68dc6bb..5986f04 100644 --- a/wenjuan/.env.development +++ b/wenjuan/.env.development @@ -3,12 +3,12 @@ ENV = 'development' # base api VUE_APP_BASE_API = '/dev-api' -# VUE_APP_DOMAIN_PREFIX_1='http://192.168.2.133:9003' -# VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.133:9007' + VUE_APP_DOMAIN_PREFIX_1='http://192.168.2.7:9003' + VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.7:9007' # VUE_APP_DOMAIN_PREFIX_1='https://h5.028wlkj.com/cdwlMall/meserver/admin-server/' # VUE_APP_DOMAIN_PREFIX_2='https://h5.028wlkj.com/cdwlMall/meserver/api' - VUE_APP_DOMAIN_PREFIX_1='https://jy.scjysm.asia:18086/meserver/admin-server/' - VUE_APP_DOMAIN_PREFIX_2='https://jy.scjysm.asia:18086/meserver/api' +# VUE_APP_DOMAIN_PREFIX_1='http://jy.scjysm.asia:18086/meserver/admin-server/' +# VUE_APP_DOMAIN_PREFIX_2='https://jy.scjysm.asia:18086/meserver/api' # 开发环境 # 演示环境 # VUE_APP_DOMAIN_PREFIX = '/api' diff --git a/yanshouban/src/api/activityBz.js b/yanshouban/src/api/activityBz.js index c25c87c..de78c29 100644 --- a/yanshouban/src/api/activityBz.js +++ b/yanshouban/src/api/activityBz.js @@ -205,3 +205,35 @@ export function copy(data) { data }) } + + +// 审核流程导出 +export function excelQueryByPage(data) { + return request({ + url: '/cereEventDetails/excelQueryByPage', + method: 'post', + data, + responseType: 'blob' + }) +} + +// 导入 +export function excelAdd(data) { + return request({ + url: '/cereEventDetails/excelAdd', + method: 'post', + data, + headers: { + 'Content-type': 'multipart/form-data' + } + }) +} + +// 效果评估 +export function effectEvaluation(data) { + return request({ + url: `/cereEventDetails/effectEvaluation/${data.id}`, + method: 'get', + data + }) +} diff --git a/yanshouban/src/api/business.js b/yanshouban/src/api/business.js index 7a95d7e..da1f9e4 100644 --- a/yanshouban/src/api/business.js +++ b/yanshouban/src/api/business.js @@ -145,3 +145,16 @@ export function wordDelete(data) { data }) } + + +// 导入商家 +export function excelAdd(data) { + return request({ + url: '/cereBasicInformationShop/excelAdd', + method: 'post', + data, + headers: { + 'Content-type': 'multipart/form-data' + } + }) +} diff --git a/yanshouban/src/api/inr.js b/yanshouban/src/api/inr.js index 03cca2c..efa6965 100644 --- a/yanshouban/src/api/inr.js +++ b/yanshouban/src/api/inr.js @@ -28,3 +28,12 @@ export function tanDel(data) { data }) } +// 谈判列表导出 +export function excelQueryByPage(data) { + return request({ + url: '/cereNegotiationDetails/excelQueryByPage', + method: 'post', + data, + responseType: 'blob' + }) +} diff --git a/yanshouban/src/api/manage.js b/yanshouban/src/api/manage.js index 6b12664..ccad9ae 100644 --- a/yanshouban/src/api/manage.js +++ b/yanshouban/src/api/manage.js @@ -105,3 +105,16 @@ export function pdfLeaseRenewalManagement(data) { responseType: 'blob' }) } + +// 合同导入 + +export function excelAdd(data) { + return request({ + url: '/cereContractInformation/excelAdd', + method: 'post', + data, + headers: { + 'Content-type': 'multipart/form-data' + } + }) +} diff --git a/yanshouban/src/api/planningBz.js b/yanshouban/src/api/planningBz.js index dfa0d98..7cb3901 100644 --- a/yanshouban/src/api/planningBz.js +++ b/yanshouban/src/api/planningBz.js @@ -44,3 +44,15 @@ export function queryById(data) { }) } +// 导入规划模板 +export const excelAdd = (data = {}) => { + return request({ + url: '/cereInvestmentPlanningManagement/excelAdd', + method: 'post', + data, + headers: { + 'Content-type': 'multipart/form-data' + } + }) +} + diff --git a/yanshouban/src/views/activity/activitySp.vue b/yanshouban/src/views/activity/activitySp.vue index 19ab978..2a9852e 100644 --- a/yanshouban/src/views/activity/activitySp.vue +++ b/yanshouban/src/views/activity/activitySp.vue @@ -57,7 +57,7 @@ {{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}} - + diff --git a/yanshouban/src/views/activity/index.vue b/yanshouban/src/views/activity/index.vue index 503f989..d8fb7b5 100644 --- a/yanshouban/src/views/activity/index.vue +++ b/yanshouban/src/views/activity/index.vue @@ -22,14 +22,24 @@
-
+
新增 删除 效果对比 - 导入 + + 导入 + 草稿箱 + 审核流程导出
@@ -54,7 +64,7 @@
{{ node.label }} - +
@@ -84,7 +94,7 @@ {{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}} - + @@ -95,7 +105,7 @@
执行情况
上传到OA
-
效果评估
+
效果评估
复制
@@ -124,7 +134,7 @@ -
+
@@ -277,77 +287,6 @@
-
@@ -572,6 +511,9 @@
+
+ 下载 +
@@ -792,37 +734,37 @@
吸引游客流量
-
4289人
-
+45%
+
{{fenxiData.expectedAttractTraffic}}人
+
{{fenxiData.expectedAttractTrafficAnalyse}}%
参与人数
-
4289人
-
+45%
+
{{fenxiData.expectedParticipation}}人
+
{{fenxiData.expectedParticipationAnalyse}}%
直接收益
-
4289人
-
+45%
+
{{fenxiData.expectedDirectBenefits}}
+
{{fenxiData.expectedDirectBenefitsAnalysis}}%
间接收益
-
4289人
-
+45%
+
{{fenxiData.expectedIndirectBenefits}}
+
{{fenxiData.expectedIndirectBenefitsAnalysis}}%
投入生产比
-
4289人
-
+45%
+
{{fenxiData.incomeAnalysis}}%
+
{{fenxiData.incomeAnalysis}}%
-
效果分析
-
+ +
@@ -1148,12 +1090,17 @@ cereAdd, cereEdit, cereDel, - copy + copy, + excelQueryByPage, + excelAdd, + effectEvaluation } from '../../api/activityBz' import addAct from "./activityBz" import actbians from "./activityBian" import * as echarts from 'echarts' import Vue from 'vue' + import html2canvas from 'html2canvas' + import jsPDF from 'jspdf' import { uploadUrl } from '@/utils/request' @@ -1165,6 +1112,8 @@ data() { return { uploadFileUrl: uploadUrl, // 请求地址 + daoData:[], + fenxiData:{}, fileData:[], addAct: false, //新增页 actbianMsg: { @@ -1899,6 +1848,9 @@ }, xiaoguo(item) { + effectEvaluation({id:item.id}).then(res=>{ + this.fenxiData = res.data + }) this.xiaoguoBox = true this.$nextTick(() => { this.shopLiu(this.$refs.shopL); @@ -2137,9 +2089,14 @@ handleRemove(){ this.fileData = [] }, - daoru(){ - - }, + daoru(response, file, fileList){ + this.daoData.push(file.raw) + const formDate = new FormData() + formDate.append('file', this.daoData[0]) + excelAdd(formDate).then(res => { + this.getAll() + }) + }, caogao(){ @@ -2186,6 +2143,56 @@ }, + async daochu(){ + let res = await excelQueryByPage(this.pageindex) + if(!res){ + return + } + const blob = new Blob([res], { type: 'application/vnd.ms-excel' }) + const fileName = '审核流程.xls' + if ('download' in document.createElement('a')) { + // 非IE下载 + const elink = document.createElement('a') + elink.download = fileName + elink.style.display = 'none' + elink.href = URL.createObjectURL(blob) + document.body.appendChild(elink) + elink.click() + URL.revokeObjectURL(elink.href) // 释放URL 对象 + document.body.removeChild(elink) + } else { + // IE10+下载 + navigator.msSaveBlob(blob, fileName) + } + this.$message({ + message: '导出成功', + type: 'success' + }) + + + }, + // 下载 + async downloadPdf() { + const content = this.$refs.actXiang; + + // 使用 html2canvas 将 div 渲染为画布 + const canvas = await html2canvas(content); + + // 获取画布的图像数据 + const imgData = canvas.toDataURL('image/png'); + + // 创建一个新的 PDF 文档 + const pdf = new jsPDF('p', 'mm', 'a4'); + + // 添加图像到 PDF，第二个参数是图像格式，第三个参数是缩放比例 + const imgWidth = 190; // 图像的宽度（mm） + const imgHeight = (canvas.height * imgWidth) / canvas.width; // 保持图像的宽高比 + + pdf.addImage(imgData, 'PNG', 10, 10, imgWidth, imgHeight); // 10, 10 是图像在 PDF 中的位置（mm） + + // 保存 PDF 文件 + pdf.save('活动方案.pdf'); + }, } } diff --git a/yanshouban/src/views/ads/fangli/index.vue b/yanshouban/src/views/ads/fangli/index.vue index 5335f9d..1d2f457 100644 --- a/yanshouban/src/views/ads/fangli/index.vue +++ b/yanshouban/src/views/ads/fangli/index.vue @@ -38,17 +38,22 @@
-
+
新增 - +
投放
下架
+
+ 审核流程配置 +
更改状态
删除
@@ -753,8 +756,30 @@
+ +
+
审核流程配置
+ + + + + + +
+ 确定 + 取消 + +
+ +
+ + @@ -864,7 +889,12 @@ xsNum:0, stNum:0, hetongList:{}, - auditStatusNum:'' + auditStatusNum:'', + peiForm:{ + auditTime:'' + }, + peiShow:false, + peiId:'' } }, created() { @@ -1163,7 +1193,25 @@ await updateList({id:this.secondData.id,auditStatus:'5'}) this.steatShow = false this.getAll() + }, + async peiCheck(){ + if(this.peiForm.auditTime ==''){ + this.$message({ + message: '请填写审核提醒时间', + }) + return; } + await fangEdit({id:this.peiId,auditTime:this.peiForm.auditTime}) + this.peiShow = false + this.getAll() + }, + peizhi(item){ + this.peiForm = { + auditTime:'' + } + this.peiShow = true + this.peiId = item.id + }, } } diff --git a/yanshouban/src/views/atmosphere/atmosphereGl.vue b/yanshouban/src/views/atmosphere/atmosphereGl.vue index d266900..f932320 100644 --- a/yanshouban/src/views/atmosphere/atmosphereGl.vue +++ b/yanshouban/src/views/atmosphere/atmosphereGl.vue @@ -22,13 +22,23 @@
-
+
新增 删除 效果对比 - 导入 + + 导入 + 草稿箱 + 审核流程导出
@@ -82,7 +92,7 @@ {{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}} - + @@ -93,7 +103,7 @@
执行情况
上传到OA
-
效果评估
+
效果评估
复制
@@ -123,7 +133,7 @@ -
+
@@ -562,9 +572,11 @@ 保存
-
+
+ 下载 +
@@ -613,37 +625,37 @@
吸引游客流量
-
4289人
-
+45%
+
{{fenxiData.expectedAttractTraffic}}人
+
{{fenxiData.expectedAttractTrafficAnalyse}}%
参与人数
-
4289人
-
+45%
+
{{fenxiData.expectedParticipation}}人
+
{{fenxiData.expectedParticipationAnalyse}}%
直接收益
-
4289人
-
+45%
+
{{fenxiData.expectedDirectBenefits}}
+
{{fenxiData.expectedDirectBenefitsAnalysis}}%
间接收益
-
4289人
-
+45%
+
{{fenxiData.expectedIndirectBenefits}}
+
{{fenxiData.expectedIndirectBenefitsAnalysis}}%
投入生产比
-
4289人
-
+45%
+
{{fenxiData.incomeAnalysis}}%
+
{{fenxiData.incomeAnalysis}}%
-
效果分析
-
+ +
@@ -1143,12 +1155,17 @@ cereGet, cereAdd, cereEdit, - cereDel + cereDel, + excelQueryByPage, + excelAdd, + effectEvaluation } from '../../api/activityBz' import addAct from "./atmosphereBz" import atmbians from "./atmosphereBian" import * as echarts from 'echarts' import Vue from 'vue' + import html2canvas from 'html2canvas' + import jsPDF from 'jspdf' import { uploadUrl } from '@/utils/request' @@ -1162,6 +1179,7 @@ components: { addAct,atmbians}, acBian:'',//编辑数据 bianshow:false,//编辑页 }, + fenxiData:{}, planName:'', planFen:'', eventTheme:'', @@ -1346,6 +1364,7 @@ components: { addAct,atmbians}, duibiOne:{}, duibiTwo:{}, uploadFileUrl: uploadUrl, // 请求地址 + daoData:[], fileData:[], caoList:[], caogaoshow:false @@ -1472,13 +1491,13 @@ components: { addAct,atmbians}, //查询 async onSubmit(){ if(this.planName != '' && this.eventTheme == ''){ - const res = await danqueryById({planName:this.planName,dataOwnership:'2', pageNumber: 1,pageSize: 10,}) + const res = await danqueryById({planName:this.planName,dataOwnership:'2', pageNumber: 1,pageSize: 10, auditTime:0}) this.tableData = res.data.content }else if(this.planName == '' && this.eventTheme != ''){ - const res = await danqueryById({eventTheme:this.eventTheme,dataOwnership:'2',pageNumber: 1,pageSize: 10,}) + const res = await danqueryById({eventTheme:this.eventTheme,dataOwnership:'2',pageNumber: 1,pageSize: 10, auditTime:0}) this.tableData = res.data.content }else{ - const res = await danqueryById({planName:this.planName,eventTheme:this.eventTheme,dataOwnership:'2',pageNumber: 1,pageSize: 10, }) + const res = await danqueryById({planName:this.planName,eventTheme:this.eventTheme,dataOwnership:'2',pageNumber: 1,pageSize: 10, auditTime:0 }) this.tableData = res.data.content } @@ -1817,6 +1836,9 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic } }, xiaoguo(item) { + effectEvaluation({id:item.id}).then(res=>{ + this.fenxiData = res.data + }) this.xiaoguoBox = true this.$nextTick(() => { this.shopLiu(this.$refs.shopL); @@ -2095,9 +2117,14 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic handleRemove(){ this.fileData=[] }, - daoru(){ - - }, + daoru(response, file, fileList){ + this.daoData.push(file.raw) + const formDate = new FormData() + formDate.append('file', this.daoData[0]) + excelAdd(formDate).then(res => { + this.getAll() + }) + }, caogao(){ let pageindex = { pageNumber: 1, @@ -2143,6 +2170,56 @@ this.fileData=[] }, + async daochu(){ + let res = await excelQueryByPage(this.pageindex) + if(!res){ + return + } + const blob = new Blob([res], { type: 'application/vnd.ms-excel' }) + const fileName = '审核流程.xls' + if ('download' in document.createElement('a')) { + // 非IE下载 + const elink = document.createElement('a') + elink.download = fileName + elink.style.display = 'none' + elink.href = URL.createObjectURL(blob) + document.body.appendChild(elink) + elink.click() + URL.revokeObjectURL(elink.href) // 释放URL 对象 + document.body.removeChild(elink) + } else { + // IE10+下载 + navigator.msSaveBlob(blob, fileName) + } + this.$message({ + message: '导出成功', + type: 'success' + }) + + + }, + // 下载 + async downloadPdf() { + const content = this.$refs.actXiang; + + // 使用 html2canvas 将 div 渲染为画布 + const canvas = await html2canvas(content); + + // 获取画布的图像数据 + const imgData = canvas.toDataURL('image/png'); + + // 创建一个新的 PDF 文档 + const pdf = new jsPDF('p', 'mm', 'a4'); + + // 添加图像到 PDF，第二个参数是图像格式，第三个参数是缩放比例 + const imgWidth = 190; // 图像的宽度（mm） + const imgHeight = (canvas.height * imgWidth) / canvas.width; // 保持图像的宽高比 + + pdf.addImage(imgData, 'PNG', 10, 10, imgWidth, imgHeight); // 10, 10 是图像在 PDF 中的位置（mm） + + // 保存 PDF 文件 + pdf.save('氛围方案.pdf'); + }, } } diff --git a/yanshouban/src/views/atmosphere/atmosphereSp.vue b/yanshouban/src/views/atmosphere/atmosphereSp.vue index 9894b65..7b935c6 100644 --- a/yanshouban/src/views/atmosphere/atmosphereSp.vue +++ b/yanshouban/src/views/atmosphere/atmosphereSp.vue @@ -59,7 +59,7 @@ {{scope.row.state == ''?'待提交':scope.row.state == '1'?'待审批':scope.row.state == '2'?'部门领导审批':scope.row.state == '3'?'公司领导审批':scope.row.state == '4'?'其他审批':scope.row.state == '5'?'审核通过':'已驳回'}} - + diff --git a/yanshouban/src/views/business/businessList/index.vue b/yanshouban/src/views/business/businessList/index.vue index 225e38c..874e737 100644 --- a/yanshouban/src/views/business/businessList/index.vue +++ b/yanshouban/src/views/business/businessList/index.vue @@ -64,14 +64,23 @@
-
+
新增 - + + 导入 +
@@ -659,7 +668,8 @@ import { businessListGetById, businessListUpdate, businessListStart, - delBusinessById + delBusinessById, + excelAdd } from '@/api/business' import upimg from "@/components/ImageUpload/index"; import { @@ -668,11 +678,14 @@ import upimg from "@/components/ImageUpload/index"; import { getAlls as map1 } from '@/api/map1' + import { uploadUrl,token } from '@/utils/request' export default { components: {upimg}, data () { // 这里存放数据 return { + action:uploadUrl, + fileData:[], // 新建商家弹框 dialogVisible: false, activeName: 0, @@ -931,6 +944,15 @@ export default { } if (!this.userState) { + + // this.ruleForm.shopPhone = this.$encrypt(this.ruleForm.shopPhone) + // this.ruleForm.shopPassword = this.$encrypt(this.ruleForm.shopPassword) + // this.ruleForm.idCardNum = this.$encrypt(this.ruleForm.idCardNum) + // this.ruleForm.emailAddress = this.$encrypt(this.ruleForm.emailAddress) + // this.ruleForm.shopAdress = this.$encrypt(this.ruleForm.shopAdress) + // this.ruleForm.legalRepresentative = this.$encrypt(this.ruleForm.legalRepresentative) + // this.ruleForm.chargePersonPhone = this.$encrypt(this.ruleForm.chargePersonPhone) + businessListSave(this.ruleForm).then(res => { if (res.code === '') { @@ -1055,11 +1077,11 @@ export default { // 初始化查询所有数据 async getAll(formInline) { const res = await businessListGetAll(formInline) + this.total = res.data.total this.tableData = res.data.list this.tableData.map(item=>{ - item.shopPhone = this.$decrypt(item.shopPhone) item.shopPassword = this.$decrypt(item.shopPassword) item.idCardNum = this.$decrypt(item.idCardNum) @@ -1067,7 +1089,6 @@ export default { item.shopAdress = this.$decrypt(item.shopAdress) item.legalRepresentative = this.$decrypt(item.legalRepresentative) item.chargePersonPhone = this.$decrypt(item.chargePersonPhone) - }) }, @@ -1125,6 +1146,14 @@ export default { MingDelete(index){ this.ziyuanData.splice(index, 1); }, + daoru(response, file, fileList){ + this.fileData.push(file.raw) + const formDate = new FormData() + formDate.append('file', this.fileData[0]) + excelAdd(formDate).then(res => { + this.getAll(this.formInline) + }) + }, } } diff --git a/yanshouban/src/views/customer/yixiang/index.vue b/yanshouban/src/views/customer/yixiang/index.vue new file mode 100644 index 0000000..6151119 --- /dev/null +++ b/yanshouban/src/views/customer/yixiang/index.vue @@ -0,0 +1,1421 @@ + + + + + + diff --git a/yanshouban/src/views/detect/admap.vue b/yanshouban/src/views/detect/admap.vue index 360ef83..d6ae36d 100644 --- a/yanshouban/src/views/detect/admap.vue +++ b/yanshouban/src/views/detect/admap.vue @@ -51,14 +51,20 @@
-
+ 新增 - + + 导入 +
@@ -136,6 +142,10 @@ + + + + @@ -1511,6 +1521,7 @@ changadd, changedit, changDel, + } from '../../api/information' import { getAlls as getAllMap, @@ -1765,6 +1776,7 @@ mapData: {}, fileData:[], uploadFileUrl: uploadUrl, // 请求地址 +daoData:[] } @@ -2266,6 +2278,14 @@ uploadFileUrl: uploadUrl, // 请求地址 // 将文件地址存储在 uploadedFiles 数组中 this.fileData.push(fileMsg); }, + daoru(response, file, fileList){ + this.daoData.push(file.raw) + const formDate = new FormData() + formDate.append('file', this.daoData[0]) + excelAdd(formDate).then(res => { + this.getAll() + }) + }, } } diff --git a/yanshouban/src/views/detect/analyse.vue b/yanshouban/src/views/detect/analyse.vue index 85a4f4c..dbd51d9 100644 --- a/yanshouban/src/views/detect/analyse.vue +++ b/yanshouban/src/views/detect/analyse.vue @@ -5,32 +5,26 @@
招商资源监测 > 统计分析
+
+
+ + + + 检索 + + 重置 + +
+
+ 导出 + +
+
+
-
-
-
商铺/广告位资源统计
- - - - 检索 - - 重置 - -
- -
+
@@ -264,6 +258,59 @@
--> +
+
+
+
合同情况统计
+ +
+ +
+
+
+
+
商铺/广告位整体经营统计
+ +
+
+
+
+
+
出租、退租、续租统计
+ +
+
+
+
+
@@ -306,7 +353,7 @@
-
签约数量占比
+
合同签约数量占比
+
+
+
位置
+ + +
+
+ 检索 + + 重置 + +
+
+
+ 新增 +
+ + + + + + + + + + + + + + +
+ +
+
+ +
+ + + + + + +
+ 取 消 + 确 定 + +
+
+ +
+ + + + + + diff --git a/yanshouban/src/views/scheme/planningBz.vue b/yanshouban/src/views/scheme/planningBz.vue index e7616d9..4939534 100644 --- a/yanshouban/src/views/scheme/planningBz.vue +++ b/yanshouban/src/views/scheme/planningBz.vue @@ -33,9 +33,19 @@
-
+
新增 + + 导入 +
@@ -312,17 +322,20 @@ addList, updateList, queryById, + excelAdd } from '../../api/planningBz.js' import wangEditor from "@/components/editor/index" import upimg from "@/components/ImageUpload/index" import { uploadUrl } from '@/utils/request' + export default { components: { wangEditor ,upimg}, data() { return { upload:uploadUrl, + fileData:[], formSel: { planningName:'', planningType:'', @@ -450,7 +463,7 @@ this.total = res.data.content.length this.fileList = fileList.slice(-3); }, handleSuccess(file,fileList) { - console.log(file,fileList) + // const fileUrl = response.data.url; const fileMsg = { name:fileList.name, @@ -493,7 +506,10 @@ this.total = res.data.content.length this.secondData.annex = JSON.parse(item.annex) } - this.fileList.push(this.secondData.annex) + if(this.secondData.annex!="" && this.secondData.annex!=''){ + this.fileList.push(this.secondData.annex) + } + // this.secondData.annex = JSON.parse(this.secondData.annex) @@ -599,7 +615,7 @@ this.total = res.data.content.length console.log(file); }, handleRemove(file, fileList) { - console.log(file, fileList); + this.fileList = [] }, //重置按钮 @@ -632,6 +648,14 @@ this.total = res.data.content.length const day = ('0' + date.getDate()).slice(-2); return `${year}-${month}-${day}`; }, + daoru(response, file, fileList){ + this.fileData.push(file.raw) + const formDate = new FormData() + formDate.append('file', this.fileData[0]) + excelAdd(formDate).then(res => { + this.getAll() + }) + }, } } diff --git a/yanshouban/src/views/scheme/sam.vue b/yanshouban/src/views/scheme/sam.vue index 8be5efa..ce9d802 100644 --- a/yanshouban/src/views/scheme/sam.vue +++ b/yanshouban/src/views/scheme/sam.vue @@ -1,6 +1,6 @@ @@ -229,14 +232,16 @@ import wangEditor from "@/components/editor/index" import upimg from "@/components/ImageUpload/index" import samXin from "./samXin" +import addressguan from "./addressguan" import { uploadUrl } from '@/utils/request' export default { - components: { wangEditor ,upimg,samXin}, + components: { wangEditor ,upimg,samXin,addressguan}, data() { return { formInline: {}, + addressShow:false, upload:uploadUrl, plan_Time:[], formSel: { @@ -269,7 +274,8 @@ import samXin from "./samXin" }, fileList: [], paymentDate:[], - leaseDate:[] + leaseDate:[], + modelData:[] } }, @@ -409,6 +415,10 @@ this.getAll() this.xiang = false this.getAll() }, + addClose(msg){ + this.addressShow = msg + this.getAll() + }, } } diff --git a/yanshouban/src/views/serve/kefuServe/index.vue b/yanshouban/src/views/serve/kefuServe/index.vue index 0aeedd3..5dbe2e2 100644 --- a/yanshouban/src/views/serve/kefuServe/index.vue +++ b/yanshouban/src/views/serve/kefuServe/index.vue @@ -23,7 +23,7 @@
- 保修记录 + 报修记录
@@ -39,7 +39,7 @@ {{scope.$index+1}} - + diff --git a/yanshouban/src/views/setup/user/index.vue b/yanshouban/src/views/setup/user/index.vue index f0dcae7..9e918a7 100644 --- a/yanshouban/src/views/setup/user/index.vue +++ b/yanshouban/src/views/setup/user/index.vue @@ -326,10 +326,14 @@ export default { userGetById({ platformUserId: row.platformUserId }).then(res => { this.addForm = res.data this.addForm.roleIds = res.data.ids - console.log(this.addForm) - console.log(this.roleList) +this.addForm.username = this.$decrypt(this.addForm.username) + this.addForm.email = this.$decrypt(this.addForm.email) + this.addForm.password = this.$decrypt(this.addForm.password) + this.addForm.phone = this.$decrypt(this.addForm.phone) // this.addForm.roleIds = [1]; }) + + }, // 删除用户 async del (row) { diff --git a/yanshouban/src/views/shopRental/manage/index.vue b/yanshouban/src/views/shopRental/manage/index.vue index 46afee2..c47a565 100644 --- a/yanshouban/src/views/shopRental/manage/index.vue +++ b/yanshouban/src/views/shopRental/manage/index.vue @@ -37,10 +37,19 @@
-
- + 新增 - + + 导入 +
@@ -1202,9 +1211,7 @@ async } from 'q' import axios from 'axios' - import { - uploadUrl - } from '@/utils/request' +import { uploadUrl,token } from '@/utils/request' import { contractGetAll, contractDel, @@ -1214,13 +1221,15 @@ cereLeasingByPage, cereLeasingEdit, cereLeasingAdd, - cereLeasingDel + cereLeasingDel, + excelAdd } from '../../../api/manage.js' export default { name: 'manage', data() { return { uploadFileUrl: uploadUrl, // 请求地址 + fileData:[], hetongBox: false, //合同 detbox: false, //详情 leixing: true, //切换 @@ -1257,6 +1266,7 @@ promotionVideo: '', promotionImage: '', notes: '', + rentalCondition:0, }, //租赁信息字段 tableData: [{ id:1, @@ -1383,6 +1393,7 @@ biangengPan:false, this.chengeTatle = val }, async getAll(val) { + console.log(this.pageindex) const res = await cereLeasingByPage(this.pageindex) this.tableData = res.data.content this.total = res.data.content.length @@ -1521,6 +1532,7 @@ biangengPan:false, promotionVideo: '', promotionImage: '', notes: '', + rentalCondition:0, }//租赁信息字段 this.heForm={ contractNumber: '', //合同对应的ID @@ -1718,6 +1730,14 @@ this.ggXin = true bianDel(index){ this.biangengTab.splice(index, 1); }, + daoru(response, file, fileList){ + this.fileData.push(file.raw) + const formDate = new FormData() + formDate.append('file', this.fileData[0]) + excelAdd(formDate).then(res => { + this.getAll() + }) + }, } } diff --git a/yanshouban/src/views/shopRental/renewalMan/index.vue b/yanshouban/src/views/shopRental/renewalMan/index.vue index a19df53..fb2a60d 100644 --- a/yanshouban/src/views/shopRental/renewalMan/index.vue +++ b/yanshouban/src/views/shopRental/renewalMan/index.vue @@ -876,7 +876,7 @@ }, pageNumber: 1, pageSize: 10, - + rentalCondition:3 }, xiangData:{}, heData:{}, @@ -892,6 +892,7 @@ pageindex: { pageNumber: 1, pageSize: 10, + rentalCondition:3 }, bianjiBox:1, chengeTatle:1, @@ -1083,7 +1084,7 @@ }, pageNumber: 1, pageSize: 10, - + rentalCondition:3 } this.leaseStartDate = [] this.getAll() diff --git a/yanshouban/src/views/shopRental/rentTermination/index.vue b/yanshouban/src/views/shopRental/rentTermination/index.vue index bd0c486..71e20c7 100644 --- a/yanshouban/src/views/shopRental/rentTermination/index.vue +++ b/yanshouban/src/views/shopRental/rentTermination/index.vue @@ -730,11 +730,12 @@ }, pageNumber: 1, pageSize: 10, - + rentalCondition:2 }, pageindex: { pageNumber: 1, pageSize: 10, + rentalCondition:2 }, bianjiBox: 1, chengeTatle: 1, @@ -948,7 +949,7 @@ }, pageNumber: 1, pageSize: 10, - + rentalCondition:2 } this.leaseStartDate = [] this.getAll() diff --git a/yanshouban/src/views/shopRental/rentalMan/index.vue b/yanshouban/src/views/shopRental/rentalMan/index.vue index 95e0be8..15e6902 100644 --- a/yanshouban/src/views/shopRental/rentalMan/index.vue +++ b/yanshouban/src/views/shopRental/rentalMan/index.vue @@ -1050,10 +1050,12 @@ import { }, pageNumber: 1, pageSize: 10, + rentalCondition:1 }, pageindex: { pageNumber: 1, pageSize: 10, + rentalCondition:1 }, zhong:{ intentionalRent:'', @@ -1104,6 +1106,7 @@ import { }, pageNumber: 1, pageSize: 10, + rentalCondition:1 } this.leixing = !this.leixing @@ -1204,6 +1207,7 @@ import { }, pageNumber: 1, pageSize: 10, + rentalCondition:1 }, this.leaseStartDate = [] this.getAll() -- libgit2 0.21.4