From 341f183e21a0afd1097acb6f06afbb6414cbe28e Mon Sep 17 00:00:00 2001 From: 2509699674 <2509699647@qq.com> Date: Tue, 17 Dec 2024 09:55:46 +0800 Subject: [PATCH] '最新' --- yanshouban/src/api/fangli.js | 12 ++++++++++++ yanshouban/src/api/manage.js | 20 ++++++++++++++++++++ yanshouban/src/api/rentalMan.js | 10 ++++++++++ yanshouban/src/utils/jiami.js | 16 ++++++++-------- yanshouban/src/utils/request.js | 8 ++++---- yanshouban/src/views/active/couponlist/component/shopList.vue | 3 +-- yanshouban/src/views/activity/activityBian.vue | 10 ++++++++++ yanshouban/src/views/activity/activityBz.vue | 19 +++++++++++++++++-- yanshouban/src/views/activity/activitySp.vue | 1 + yanshouban/src/views/activity/index.vue | 75 ++++++++++++++++++++++++++++++++++++++++++++++----------------------------- yanshouban/src/views/ads/fangli/index.vue | 37 ++++++++++++++++++++++++------------- yanshouban/src/views/advertisement/advertisingReview/advertisingReview.vue | 38 ++++++++++++++++++++++++++++++++++++-- yanshouban/src/views/atmosphere/atmosphereBian.vue | 11 +++++++++++ yanshouban/src/views/atmosphere/atmosphereBz.vue | 28 +++++++++++++++++++++------- yanshouban/src/views/atmosphere/atmosphereGl.vue | 76 ++++++++++++++++++++++++++++++++++++++++++++-------------------------------- yanshouban/src/views/atmosphere/atmosphereSp.vue | 3 ++- yanshouban/src/views/business/autd/index.vue | 2 +- yanshouban/src/views/business/businessList/index.vue | 27 +++++++++++++++------------ yanshouban/src/views/couponmanagement/coupon.vue | 2 +- yanshouban/src/views/customer/icManagement/index.vue | 16 ++++++++++++++++ yanshouban/src/views/customer/icReview/index.vue | 17 +++++++++++++++++ yanshouban/src/views/customer/rUser/index.vue | 1 - yanshouban/src/views/customer/rsaManagement/index.vue | 16 ++++++++++++++++ yanshouban/src/views/customer/rsaReview/index.vue | 16 ++++++++++++++++ yanshouban/src/views/ipm/followup/index.vue | 25 ++++++++++++++++++++++++- yanshouban/src/views/media/mediaMana.vue | 30 +++++++++++++++++++++++++++++- yanshouban/src/views/online/QRCode/index.vue | 2 +- yanshouban/src/views/online/QRFunds/index.vue | 2 +- yanshouban/src/views/serve/MarkActivity/index.vue | 4 ++++ yanshouban/src/views/shopRental/renewalMan/index.vue | 30 ++++++++++++++++++++++++++++-- yanshouban/src/views/shopRental/rentTermination/index.vue | 30 +++++++++++++++++++++++++++--- yanshouban/src/views/shopRental/rentalMan/index.vue | 34 +++++++++++++++++++++++++++++----- yanshouban/src/views/shopRental/warning/index.vue | 49 +++++++++++++++++++++++++++++++++++-------------- yanshouban/src/views/stockControl/inventory/index.vue | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------- yanshouban/src/views/stockControl/stocksForewarn/index.vue | 50 +++++++++++++++++++++++++++++++++++++++----------- yanshouban/vue.config.js | 2 +- 36 files changed, 626 insertions(+), 168 deletions(-) diff --git a/yanshouban/src/api/fangli.js b/yanshouban/src/api/fangli.js index b610121..e56303f 100644 --- a/yanshouban/src/api/fangli.js +++ b/yanshouban/src/api/fangli.js @@ -34,3 +34,15 @@ export function fangDel(data) { data }) } + +// 导入管理模板 +export const excelAdd = (data = {}) => { + return request({ + url: '/cereBusinessPlan/excelAdd', + method: 'post', + data, + headers: { + 'Content-type': 'multipart/form-data' + } + }) +} diff --git a/yanshouban/src/api/manage.js b/yanshouban/src/api/manage.js index eb8929c..6b12664 100644 --- a/yanshouban/src/api/manage.js +++ b/yanshouban/src/api/manage.js @@ -85,3 +85,23 @@ export function daoqi(data) { data }) } +// 退租决算打印 + +export function pdfManagementOfFinalAccountsForRentals(data) { + return request({ + url: '/cereLeasingInformation/pdfManagementOfFinalAccountsForRentals', + method: 'post', + data, + responseType: 'blob' + }) +} +// 续租管理打印 + +export function pdfLeaseRenewalManagement(data) { + return request({ + url: '/cereLeasingInformation/pdfLeaseRenewalManagement', + method: 'post', + data, + responseType: 'blob' + }) +} diff --git a/yanshouban/src/api/rentalMan.js b/yanshouban/src/api/rentalMan.js index 92585f6..b64a963 100644 --- a/yanshouban/src/api/rentalMan.js +++ b/yanshouban/src/api/rentalMan.js @@ -51,3 +51,13 @@ export function excelLeaseRenewalManagement(data) { responseType: 'blob' }) } + +// PDF打印 +export function pdfRentOutQueryByPage(data) { + return request({ + url: '/cereLeasingInformation/pdfRentOutQueryByPage', + method: 'post', + data, + responseType: 'blob' + }) +} diff --git a/yanshouban/src/utils/jiami.js b/yanshouban/src/utils/jiami.js index b914a7e..af9895c 100644 --- a/yanshouban/src/utils/jiami.js +++ b/yanshouban/src/utils/jiami.js @@ -1,7 +1,7 @@ // 文本加密 import { sm4 } from 'sm-crypto'; -const DEFAULT_KEY ="cda4442f102f6396cca76902e37ad7cb"; -const DEFAULT_IV = "8bd8a83221742166c7532b7275a7fe9c"; +const DEFAULT_KEY ="cda4442f102f6396eea76902e37ad7cb"; +const DEFAULT_IV = "8bd8a83221742111c7532b7275a7fe9c"; export const encrypt = (str) => {     if(!str) {         return '' @@ -11,7 +11,7 @@ export const encrypt = (str) => {         mode: 'cbc',         padding: 'pkcs#7'         }) -    return 'ENC(' + encryptStr + ')' +    return encryptStr } // 文本解密 @@ -19,12 +19,12 @@ export const decrypt = (str) => {     if(!str) {         return ''     } -    if(str.indexOf('ENC(') === -1) { -        return str -    } -    const str_ = str.replace('ENC(', '').replace(')', '') +//     if(str.indexOf('ENC(') === -1) { +//         return str +//     } +//     const str_ = str.replace('ENC(', '').replace(')', '')     try {         -        const decryptStr = sm4.decrypt(str_, DEFAULT_KEY, { +        const decryptStr = sm4.decrypt(str, DEFAULT_KEY, {             iv: DEFAULT_IV,             mode: 'cbc',             padding: 'pkcs#7' diff --git a/yanshouban/src/utils/request.js b/yanshouban/src/utils/request.js index ccc88a8..45810fa 100644 --- a/yanshouban/src/utils/request.js +++ b/yanshouban/src/utils/request.js @@ -11,9 +11,9 @@ import { } from '@/utils/auth' const host = window.location.host; let PREFIX; -if (host == '172.16.61.48' || host == '172.16.61.49 :5173' || host =='172.16.61.123:9003') { +if (host == '172.16.61.48' || host == '172.16.61.49:5173' || host =='172.16.61.123:9003') { // PREFIX = 'https://jdc.scjysm.asia:1443/meserver/admin-server'; - PREFIX = 'https://jy.scjysm.asia:18086/meserver/admin-server'; + PREFIX = 'https://jy.scjysm.asia:18086/admin-server'; // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server'; // PREFIX = 'http://172.16.61.48/meserver/admin-server'; }else if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'){ @@ -21,14 +21,14 @@ if (host == '172.16.61.48' || host == '172.16.61.49 :5173' || host =='172.16.61. // PREFIX = 'http://172.16.61.48/meserver/admin-server'; // PREFIX = 'http://192.168.2.213:9003'; // PREFIX = 'http://8.130.38.56:8019/admin-server'; - PREFIX = 'http://192.168.8.106:9003'; + PREFIX = 'http://192.168.2.7:9003'; // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server'; // PREFIX = 'https://jy.scjysm.asia:18086/admin-server'; // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server'; // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server' }else{ - PREFIX = '/admin-server'; + PREFIX = 'https://jy.scjysm.asia:18086/admin-server'; } diff --git a/yanshouban/src/views/active/couponlist/component/shopList.vue b/yanshouban/src/views/active/couponlist/component/shopList.vue index 15cbb93..0af7772 100644 --- a/yanshouban/src/views/active/couponlist/component/shopList.vue +++ b/yanshouban/src/views/active/couponlist/component/shopList.vue @@ -116,7 +116,6 @@ export default { search () { }, - // businessListGetAll // 初始化查询所有数据 async getAll(formInline) { const res = await businessListGetAll(formInline) @@ -124,7 +123,7 @@ export default { this.tableData = res.data.list this.tableData.map(res=>{ res.shopPhone = this.$decrypt(res.shopPhone) - res.shopPassword = this.$decrypt(res.shopPassword) + // res.shopPassword = this.$decrypt(res.shopPassword) res.idCardNum = this.$decrypt(res.idCardNum) res.emailAddress = this.$decrypt(res.emailAddress) res.shopAdress = this.$decrypt(res.shopAdress) diff --git a/yanshouban/src/views/activity/activityBian.vue b/yanshouban/src/views/activity/activityBian.vue index 0445476..ee031a7 100644 --- a/yanshouban/src/views/activity/activityBian.vue +++ b/yanshouban/src/views/activity/activityBian.vue @@ -69,6 +69,16 @@ + + + + + + + + + +
diff --git a/yanshouban/src/views/activity/activityBz.vue b/yanshouban/src/views/activity/activityBz.vue index 1369e10..f601bca 100644 --- a/yanshouban/src/views/activity/activityBz.vue +++ b/yanshouban/src/views/activity/activityBz.vue @@ -88,6 +88,16 @@ + + + + + + + + + + @@ -297,7 +307,9 @@
取消 - 确定 + 暂存 + + 确定
@@ -393,6 +405,7 @@ eventTheme: '', //活动主题 sponsor: '', //活动主办方 participants: '', //活动参与方 + rangeSetting:'', mainPurpose: '', //活动主要目的 coverPoster: '', //封面海报 internalLaborCostEstimation: '', //内部人工成本预估 @@ -558,7 +571,7 @@ }, //保存 - onSubmit() { + onSubmit(val) { // pdf.save('output.pdf') let that = this let FlieName = this.ruleForm.planName @@ -614,6 +627,7 @@ // } this.$refs.jibenFrom.validate((valid) => { if (valid) { + this.ruleForm.isDraft = val add(this.ruleForm).then(res => { this.$message({ message: '保存成功', @@ -735,6 +749,7 @@ eventTheme: '', //活动主题 sponsor: '', //活动主办方 participants: '', //活动参与方 + rangeSetting:'', mainPurpose: '', //活动主要目的 coverPoster: '', //封面海报 internalLaborCostEstimation: '', //内部人工成本预估 diff --git a/yanshouban/src/views/activity/activitySp.vue b/yanshouban/src/views/activity/activitySp.vue index 5ae93c9..19ab978 100644 --- a/yanshouban/src/views/activity/activitySp.vue +++ b/yanshouban/src/views/activity/activitySp.vue @@ -664,6 +664,7 @@ pageNumber: 1, pageSize: 10, dataOwnership: '1', + isDraft:0 }, multipleSelection: [], options: [{ diff --git a/yanshouban/src/views/activity/index.vue b/yanshouban/src/views/activity/index.vue index e6443ce..503f989 100644 --- a/yanshouban/src/views/activity/index.vue +++ b/yanshouban/src/views/activity/index.vue @@ -548,15 +548,14 @@ - + -
- 上传附件 -
+ :show-file-list="true" v-if="zhixingBian"> + +点击上传 +
{{zhixingList.feedbackContent}}
 @@ -1111,9 +1110,8 @@ @@ -1232,9 +1230,11 @@ text: '活动主要目的', eventTheme: '' }, { - id: '5', - name: '状态', - eventTheme: '待审核' + id: 0, + name: '范围设置', + planName: '', + text: '状态', + eventTheme: '' }], internalLaborCostEstimation: '', externalLaborCostEstimation: '', @@ -1309,11 +1309,13 @@ expectedDirectBenefits: '', //直接收益 expectedIndirectBenefits: '', //间接收益 createDate: '', //创建时间 + feedbackContent:'' }, //执行效果列表 pageindex: { pageNumber: 1, pageSize: 10, - dataOwnership: '1' + dataOwnership: '1', + isDraft:0 }, multipleSelection: [], options: [], @@ -1416,7 +1418,8 @@ pageNumber: 1, pageSize: 10, dataOwnership: '1', - classificationCode:data.id + classificationCode:data.id, + isDraft:0 } const res = await queryByPage(pageindex) this.tableData = res.data.content @@ -1426,7 +1429,8 @@ this.pageindex={ pageNumber: 1, pageSize: 10, - dataOwnership: '1' + dataOwnership: '1', + isDraft:0 } const res = await queryByPage(this.pageindex) this.tableData = res.data.content @@ -1476,6 +1480,7 @@ dataOwnership: '1', pageNumber: 1, pageSize: 10, + auditTime:0 }) this.tableData = res.data.content } else if (this.planName == '' && this.eventTheme != '') { @@ -1484,6 +1489,7 @@ dataOwnership: '1', pageNumber: 1, pageSize: 10, + auditTime:0 }) this.tableData = res.data.content } else { @@ -1493,6 +1499,7 @@ dataOwnership: '1', pageNumber: 1, pageSize: 10, + auditTime:0 }) this.tableData = res.data.content } @@ -1500,6 +1507,7 @@ }, //详情点击 handleEditForm(item) { + this.fileData = [] this.zhixingList = { planTime:[], planName: '', //活动名称 @@ -1521,6 +1529,7 @@ expectedDirectBenefits: '', //直接收益 expectedIndirectBenefits: '', //间接收益 createDate: '', //创建时间 + feedbackContent:'' } //执行效果列表 actPage({ detailsId: item.id, @@ -1585,8 +1594,8 @@ that.tableData1[2].planName = res.data.content[0].sponsor that.tableData1[3].eventTheme = res.data.content[0].participants that.tableData1[3].planName = res.data.content[0].mainPurpose - - that.tableData1[4].eventTheme = this.getStatus(res.data.content[0].state) + that.tableData1[4].planName = this.getStatus(res.data.content[0].state) + that.tableData1[4].eventTheme = res.data.content[0].rangeSetting //活动成本信息 that.internalLaborCostEstimation = res.data.content[0].internalLaborCostEstimation that.externalLaborCostEstimation = res.data.content[0].externalLaborCostEstimation @@ -1661,6 +1670,9 @@ }, //执行效果保存 async bianji() { + if(this.fileData.length !=0){ + this.zhixingList.feedbackContent = this.fileData[0].url + } if (this.zhiXing) { this.zhixingList.eventStartTime = this.zhixingList.planTime[0] this.zhixingList.eventEndTime = this.zhixingList.planTime[1] @@ -2115,11 +2127,15 @@ }, handleUploadSuccess(response, file, fileList) { - console.log(response, file, fileList) - // this.fileData.push(file) + const fileMsg = { + name:file.name, + url: file.response.data.url, + } + // 将文件地址存储在 uploadedFiles 数组中 + this.fileData.push(fileMsg); }, handleRemove(){ - + this.fileData = [] }, daoru(){ @@ -2130,7 +2146,8 @@ let pageindex = { pageNumber: 1, pageSize: 10, - dataOwnership: '1' + dataOwnership: '1', + isDraft:1 } queryByPage(pageindex).then(res=>{ this.caoList = res.data.content @@ -2138,7 +2155,7 @@ this.caogaoshow =true }, - shiyong(val,item){ + shiyong(item){ const h = this.$createElement; this.$msgbox({ @@ -2153,14 +2170,14 @@ customClass: 'oe-dialog-btn', beforeClose: (action, instance, done) => { if (action === 'confirm') { - // contentEdit({ - // id: item.id, - // draftStatus:1 - // }).then(res => { - // this.getAll() - // this.getcaogao() - // done(); - // }) + xiangedit({ + id:item.id, + isDraft:0 + }).then(res => { + this.getAll() + this.caogao() + done(); + }) } else { done(); } diff --git a/yanshouban/src/views/ads/fangli/index.vue b/yanshouban/src/views/ads/fangli/index.vue index 299ebed..5335f9d 100644 --- a/yanshouban/src/views/ads/fangli/index.vue +++ b/yanshouban/src/views/ads/fangli/index.vue @@ -44,11 +44,15 @@ @click="addbuss" >新增 - + + >导入 --> 审核流程配置 -
+
启用
-
+
禁用
@@ -199,22 +203,22 @@
-
- 审核流程配置
+ - +
- 确定 - 取消 + 取消
@@ -247,8 +251,8 @@ import { fangAdd, fangEdit, fangDel, + excelAdd }from '../../../api/fangli' - import upimg from "@/components/ImageUpload/index" import addxin from "./addform" import xiang from "./bianform" @@ -256,6 +260,7 @@ export default { components: {upimg,addxin,xiang}, data() { return { + fileData:[], detbox: false, // 详情 edit: true, // 编辑 formInline: { @@ -550,6 +555,12 @@ export default { this.peiShow = true this.peiId = item.id }, + daoru(file){ + // const fileMsg = { + // name:file.name, + // url: file.response.data.url, + // } + }, } } diff --git a/yanshouban/src/views/advertisement/advertisingReview/advertisingReview.vue b/yanshouban/src/views/advertisement/advertisingReview/advertisingReview.vue index a4d9c68..2e66483 100644 --- a/yanshouban/src/views/advertisement/advertisingReview/advertisingReview.vue +++ b/yanshouban/src/views/advertisement/advertisingReview/advertisingReview.vue @@ -943,7 +943,15 @@ this.pageindex.advertisingSpaceType ='实体广告位' this.tableData = res.data.content this.total = res.data.content.length this.xxNum = res.data.content.length - + this.tableData.map(res=>{ + res.lesseeName = this.$decrypt(res.lesseeName) + res.contactPhone = this.$decrypt(res.contactPhone) + res.idCardNumber = this.$decrypt(res.idCardNumber) + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode) + res.legalRepresentative = this.$decrypt(res.legalRepresentative) + res.address = this.$decrypt(res.address) + res.emailAddress = this.$decrypt(res.emailAddress) + }) const stList = await AdvertiserInfoGetAll(pageindex) this.stNum = stList.data.content.length @@ -957,7 +965,15 @@ this.pageindex.advertisingSpaceType ='实体广告位' this.tableData = res.data.content this.total = res.data.content.length this.stNum = res.data.content.length - + this.tableData.map(res=>{ + res.lesseeName = this.$decrypt(res.lesseeName) + res.contactPhone = this.$decrypt(res.contactPhone) + res.idCardNumber = this.$decrypt(res.idCardNumber) + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode) + res.legalRepresentative = this.$decrypt(res.legalRepresentative) + res.address = this.$decrypt(res.address) + res.emailAddress = this.$decrypt(res.emailAddress) + }) const stList = await AdvertiserInfoGetAll(pageindex) this.xxNum = stList.data.content.length } @@ -1008,6 +1024,15 @@ this.pageindex.advertisingSpaceType ='实体广告位' this.tableData = res.data.content this.total = res.data.content.length this.xxNum = res.data.content.length + this.tableData.map(res=>{ + res.lesseeName = this.$decrypt(res.lesseeName) + res.contactPhone = this.$decrypt(res.contactPhone) + res.idCardNumber = this.$decrypt(res.idCardNumber) + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode) + res.legalRepresentative = this.$decrypt(res.legalRepresentative) + res.address = this.$decrypt(res.address) + res.emailAddress = this.$decrypt(res.emailAddress) + }) let pageindex={ pageNumber: 1, pageSize: 10, @@ -1023,6 +1048,15 @@ this.pageindex.advertisingSpaceType ='实体广告位' this.tableData = res.data.content this.total = res.data.content.length this.stNum = res.data.content.length + this.tableData.map(res=>{ + res.lesseeName = this.$decrypt(res.lesseeName) + res.contactPhone = this.$decrypt(res.contactPhone) + res.idCardNumber = this.$decrypt(res.idCardNumber) + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode) + res.legalRepresentative = this.$decrypt(res.legalRepresentative) + res.address = this.$decrypt(res.address) + res.emailAddress = this.$decrypt(res.emailAddress) + }) let pageindex={ pageNumber: 1, pageSize: 10, diff --git a/yanshouban/src/views/atmosphere/atmosphereBian.vue b/yanshouban/src/views/atmosphere/atmosphereBian.vue index 1b203c5..ce2fcd1 100644 --- a/yanshouban/src/views/atmosphere/atmosphereBian.vue +++ b/yanshouban/src/views/atmosphere/atmosphereBian.vue @@ -66,6 +66,17 @@ + + + + + + + + + + +
diff --git a/yanshouban/src/views/atmosphere/atmosphereBz.vue b/yanshouban/src/views/atmosphere/atmosphereBz.vue index 8060066..5da25e5 100644 --- a/yanshouban/src/views/atmosphere/atmosphereBz.vue +++ b/yanshouban/src/views/atmosphere/atmosphereBz.vue @@ -91,7 +91,16 @@ - + + + + + + + + + + @@ -297,12 +306,14 @@
- 保存 - - - 取消 + 取消 + + 暂存 + + 保存 + +
@@ -393,6 +404,7 @@ uploadFileUrl: uploadUrl, // 请求地址 eventTheme:'',//活动主题 sponsor:'',//活动主办方 participants:'',//活动参与方 + rangeSetting:'', mainPurpose:'',//活动主要目的 coverPoster:'',//封面海报 internalLaborCostEstimation:'',//内部人工成本预估 @@ -504,7 +516,7 @@ uploadFileUrl: uploadUrl, // 请求地址 // } }, //保存 - onSubmit(){ + onSubmit(val){ this.updateCurrentTime(); let that = this let FlieName = this.ruleForm.planName @@ -559,6 +571,7 @@ uploadFileUrl: uploadUrl, // 请求地址 // } this.$refs.jibenFrom.validate((valid) => { if (valid) { + this.ruleForm.isDraft = val add(this.ruleForm).then(res=>{ this.$message({ message: '保存成功', @@ -681,6 +694,7 @@ this.tuxiangData = { eventTheme: '', //活动主题 sponsor: '', //活动主办方 participants: '', //活动参与方 + rangeSetting:'', mainPurpose: '', //活动主要目的 coverPoster: '', //封面海报 internalLaborCostEstimation: '', //内部人工成本预估 diff --git a/yanshouban/src/views/atmosphere/atmosphereGl.vue b/yanshouban/src/views/atmosphere/atmosphereGl.vue index f2f6bb0..d266900 100644 --- a/yanshouban/src/views/atmosphere/atmosphereGl.vue +++ b/yanshouban/src/views/atmosphere/atmosphereGl.vue @@ -541,15 +541,14 @@ - + -
- 上传附件 -
+ :show-file-list="true" v-if="zhixingBian"> + +点击上传 +
{{zhixingList.feedbackContent}}
 @@ -1106,9 +1105,8 @@ @@ -1222,9 +1220,11 @@ components: { addAct,atmbians}, text: '活动主要目的', eventTheme: '' },{ - id: '5', - name: '状态', - eventTheme: '待审核' + id:0, + name: '范围设置', + planName: '', + text: '状态', + eventTheme: '' }], internalLaborCostEstimation:'', externalLaborCostEstimation:'', @@ -1304,7 +1304,8 @@ components: { addAct,atmbians}, pageindex: { pageNumber: 1, pageSize: 10, - dataOwnership:'2' + dataOwnership:'2', + isDraft:0 }, multipleSelection:[],//选择的数据 options: [], @@ -1377,7 +1378,7 @@ components: { addAct,atmbians}, //查询全数据 async getAll() { const res = await queryByPage((this.pageindex)) - console.log(res.data) + this.tableData = res.data.content this.total = res.data.content.length let page = { @@ -1407,12 +1408,13 @@ components: { addAct,atmbians}, })); }, async handleNodeClick(data){ - console.log('Node clicked:', data); + let pageindex= { pageNumber: 1, pageSize: 10, dataOwnership: '2', - classificationCode:data.id + classificationCode:data.id, + isDraft:0 } const res = await queryByPage(pageindex) this.tableData = res.data.content @@ -1422,7 +1424,8 @@ components: { addAct,atmbians}, this.pageindex={ pageNumber: 1, pageSize: 10, - dataOwnership: '2' + dataOwnership: '2', + isDraft:0 } const res = await queryByPage(this.pageindex) this.tableData = res.data.content @@ -1497,7 +1500,9 @@ components: { addAct,atmbians}, }, //执行效果保存 async bianji() { - console.log(this.zhiXing) + if(this.fileData.length !=0){ + this.zhixingList.feedbackContent = this.fileData[0].url + } if(this.zhiXing){ this.zhixingList.eventStartTime = this.zhixingList.planTime[0] this.zhixingList.eventEndTime=this.zhixingList.planTime[1] @@ -1519,6 +1524,7 @@ components: { addAct,atmbians}, }, //详情点击 handleEditForm(item) { + this.fileData = [] this.zhixingList={ planTime: [], planName: '', //活动名称 @@ -1600,8 +1606,8 @@ components: { addAct,atmbians}, that.tableData1[2].planName = res.data.content[0].sponsor that.tableData1[3].eventTheme = res.data.content[0].participants that.tableData1[3].planName = res.data.content[0].mainPurpose - // that.tableData1[4].eventTheme = res.data.content[0].state - that.tableData1[4].eventTheme = this.getStatus(res.data.content[0].state) + that.tableData1[4].planName = this.getStatus(res.data.content[0].state) + that.tableData1[4].eventTheme = res.data.content[0].rangeSetting //活动成本信息 that.internalLaborCostEstimation=res.data.content[0].internalLaborCostEstimation that.externalLaborCostEstimation=res.data.content[0].externalLaborCostEstimation @@ -2079,11 +2085,15 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic }, handleUploadSuccess(response, file, fileList) { - console.log(response, file, fileList) - // this.fileData.push(file) + const fileMsg = { + name:file.name, + url: file.response.data.url, + } + // 将文件地址存储在 uploadedFiles 数组中 + this.fileData.push(fileMsg); }, handleRemove(){ - +this.fileData=[] }, daoru(){ @@ -2092,7 +2102,8 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic let pageindex = { pageNumber: 1, pageSize: 10, - dataOwnership: '2' + dataOwnership: '2', + isDraft:1 } queryByPage(pageindex).then(res=>{ this.caoList = res.data.content @@ -2100,7 +2111,7 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic this.caogaoshow =true }, - shiyong(val,item){ + shiyong(item){ const h = this.$createElement; this.$msgbox({ @@ -2115,14 +2126,15 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic customClass: 'oe-dialog-btn', beforeClose: (action, instance, done) => { if (action === 'confirm') { - // contentEdit({ - // id: item.id, - // draftStatus:1 - // }).then(res => { - // this.getAll() - // this.getcaogao() - // done(); - // }) + xiangedit({ + id: item.id, + draftStatus:1, + isDraft:0 + }).then(res => { + this.getAll() + this.caogao() + done(); + }) } else { done(); } diff --git a/yanshouban/src/views/atmosphere/atmosphereSp.vue b/yanshouban/src/views/atmosphere/atmosphereSp.vue index 23f5487..9894b65 100644 --- a/yanshouban/src/views/atmosphere/atmosphereSp.vue +++ b/yanshouban/src/views/atmosphere/atmosphereSp.vue @@ -912,7 +912,8 @@ pageindex: { pageNumber: 1, pageSize: 10, - dataOwnership: '2' + dataOwnership: '2', + isDraft:0 }, multipleSelection: [], options: [{ diff --git a/yanshouban/src/views/business/autd/index.vue b/yanshouban/src/views/business/autd/index.vue index 8d130e6..4448e47 100644 --- a/yanshouban/src/views/business/autd/index.vue +++ b/yanshouban/src/views/business/autd/index.vue @@ -450,7 +450,7 @@ export default { this.total = res.data.total this.tableData.map(res=>{ res.shopPhone = this.$decrypt(res.shopPhone) - res.shopPassword = this.$decrypt(res.shopPassword) + // res.shopPassword = this.$decrypt(res.shopPassword) res.emailAddress = this.$decrypt(res.emailAddress) res.idCardNum = this.$decrypt(res.idCardNum) }) diff --git a/yanshouban/src/views/business/businessList/index.vue b/yanshouban/src/views/business/businessList/index.vue index 94de591..225e38c 100644 --- a/yanshouban/src/views/business/businessList/index.vue +++ b/yanshouban/src/views/business/businessList/index.vue @@ -899,8 +899,7 @@ export default { addCheck (ruleForm) { this.$refs[ruleForm].validate(valid => { if (valid) { - console.log(this.userState) - console.log(this.ruleForm) + // if (this.personPhone !== '') { // this.ruleForm.chargePersonPhone = this.personPhone // } @@ -1052,21 +1051,25 @@ export default { }) }, - // businessListGetAll + // 初始化查询所有数据 - async getAll (formInline) { + async getAll(formInline) { const res = await businessListGetAll(formInline) this.total = res.data.total this.tableData = res.data.list - this.tableData.map(res=>{ - res.shopPhone = this.$decrypt(res.shopPhone) - res.shopPassword = this.$decrypt(res.shopPassword) - res.idCardNum = this.$decrypt(res.idCardNum) - res.emailAddress = this.$decrypt(res.emailAddress) - res.shopAdress = this.$decrypt(res.shopAdress) - res.legalRepresentative = this.$decrypt(res.legalRepresentative) - res.chargePersonPhone = this.$decrypt(res.chargePersonPhone) + + this.tableData.map(item=>{ + + item.shopPhone = this.$decrypt(item.shopPhone) + item.shopPassword = this.$decrypt(item.shopPassword) + item.idCardNum = this.$decrypt(item.idCardNum) + item.emailAddress = this.$decrypt(item.emailAddress) + item.shopAdress = this.$decrypt(item.shopAdress) + item.legalRepresentative = this.$decrypt(item.legalRepresentative) + item.chargePersonPhone = this.$decrypt(item.chargePersonPhone) + }) + }, // 编辑号码 inputPhone () { diff --git a/yanshouban/src/views/couponmanagement/coupon.vue b/yanshouban/src/views/couponmanagement/coupon.vue index 3dad718..2aa6c46 100644 --- a/yanshouban/src/views/couponmanagement/coupon.vue +++ b/yanshouban/src/views/couponmanagement/coupon.vue @@ -226,7 +226,7 @@ this.shopList = res1.data.list this.shopList.map(res=>{ res.shopPhone = this.$decrypt(res.shopPhone) - res.shopPassword = this.$decrypt(res.shopPassword) + // res.shopPassword = this.$decrypt(res.shopPassword) res.idCardNum = this.$decrypt(res.idCardNum) res.emailAddress = this.$decrypt(res.emailAddress) res.shopAdress = this.$decrypt(res.shopAdress) diff --git a/yanshouban/src/views/customer/icManagement/index.vue b/yanshouban/src/views/customer/icManagement/index.vue index 2efdb70..bf0cba3 100644 --- a/yanshouban/src/views/customer/icManagement/index.vue +++ b/yanshouban/src/views/customer/icManagement/index.vue @@ -507,6 +507,14 @@ const res = await icManAll(this.pageindex); this.tableData = res.data.content this.total = res.data.content.length + this.tableData.map(res=>{ + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode) + res.legalRepresentative = this.$decrypt(res.legalRepresentative) + res.address = this.$decrypt(res.address) + res.emailAddress = this.$decrypt(res.emailAddress) + res.contactName = this.$decrypt(res.contactName) + res.contactPhone = this.$decrypt(res.contactPhone) + }) }, // 编辑确认 async msgeditS() { @@ -610,6 +618,14 @@ const res = await icManAll(this.formSel) this.tableData = res.data.content this.total = res.data.content.length + this.tableData.map(res=>{ + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode) + res.legalRepresentative = this.$decrypt(res.legalRepresentative) + res.address = this.$decrypt(res.address) + res.emailAddress = this.$decrypt(res.emailAddress) + res.contactName = this.$decrypt(res.contactName) + res.contactPhone = this.$decrypt(res.contactPhone) + }) }, // 详情点击 diff --git a/yanshouban/src/views/customer/icReview/index.vue b/yanshouban/src/views/customer/icReview/index.vue index e28f717..137fcc4 100644 --- a/yanshouban/src/views/customer/icReview/index.vue +++ b/yanshouban/src/views/customer/icReview/index.vue @@ -821,6 +821,14 @@ export default { const res = await icManAll(this.pageindex) this.tableData = res.data.content this.total = res.data.content.length + this.tableData.map(res=>{ + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode) + res.legalRepresentative = this.$decrypt(res.legalRepresentative) + res.address = this.$decrypt(res.address) + res.emailAddress = this.$decrypt(res.emailAddress) + res.contactName = this.$decrypt(res.contactName) + res.contactPhone = this.$decrypt(res.contactPhone) + }) }, bianjilist(item) { @@ -835,7 +843,16 @@ export default { const res = await icManAll(this.formSel) this.tableData = res.data.content this.total = res.data.content.length + this.tableData.map(res=>{ + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode) + res.legalRepresentative = this.$decrypt(res.legalRepresentative) + res.address = this.$decrypt(res.address) + res.emailAddress = this.$decrypt(res.emailAddress) + res.contactName = this.$decrypt(res.contactName) + res.contactPhone = this.$decrypt(res.contactPhone) + }) }, + // 详情点击 async handleEditForm(item) { this.secondData = item; diff --git a/yanshouban/src/views/customer/rUser/index.vue b/yanshouban/src/views/customer/rUser/index.vue index 45295b0..f483340 100644 --- a/yanshouban/src/views/customer/rUser/index.vue +++ b/yanshouban/src/views/customer/rUser/index.vue @@ -335,7 +335,6 @@ } from '@/utils/request' import { - businessListGetAll, businessListSave, businessListGetById, businessListUpdate, diff --git a/yanshouban/src/views/customer/rsaManagement/index.vue b/yanshouban/src/views/customer/rsaManagement/index.vue index 932211e..a697dcf 100644 --- a/yanshouban/src/views/customer/rsaManagement/index.vue +++ b/yanshouban/src/views/customer/rsaManagement/index.vue @@ -803,6 +803,14 @@ const res = await rsaManAll(this.pageindex); this.tableData = res.data.content; this.total = res.data.content.length + this.tableData.map(res=>{ + res.contactPhone = this.$decrypt(res.contactPhone) + res.idCardNumber = this.$decrypt(res.idCardNumber) + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode) + res.legalRepresentative = this.$decrypt(res.legalRepresentative) + res.address = this.$decrypt(res.address) + res.emailAddress = this.$decrypt(res.emailAddress) + }) const ziyuan = await getAlls(this.pageindex) const ggw = await map1(this.pageindex) this.ziyuanData = [...ziyuan.data.content,...ggw.data.content] @@ -1010,6 +1018,14 @@ async getshen(item){ const res = await rsaManAll(this.formSel) this.tableData = res.data.content this.total = res.data.content.length + this.tableData.map(res=>{ + res.contactPhone = this.$decrypt(res.contactPhone) + res.idCardNumber = this.$decrypt(res.idCardNumber) + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode) + res.legalRepresentative = this.$decrypt(res.legalRepresentative) + res.address = this.$decrypt(res.address) + res.emailAddress = this.$decrypt(res.emailAddress) + }) }, mingClose(){ this.multipleSelection =[] diff --git a/yanshouban/src/views/customer/rsaReview/index.vue b/yanshouban/src/views/customer/rsaReview/index.vue index 7e8588b..f9455c6 100644 --- a/yanshouban/src/views/customer/rsaReview/index.vue +++ b/yanshouban/src/views/customer/rsaReview/index.vue @@ -929,6 +929,14 @@ export default { const res = await rsaManAll(this.pageindex); this.tableData = res.data.content; this.total = res.data.content.length + this.tableData.map(res=>{ + res.contactPhone = this.$decrypt(res.contactPhone) + res.idCardNumber = this.$decrypt(res.idCardNumber) + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode) + res.legalRepresentative = this.$decrypt(res.legalRepresentative) + res.address = this.$decrypt(res.address) + res.emailAddress = this.$decrypt(res.emailAddress) + }) }, // 查询 async onSubmit() { @@ -936,6 +944,14 @@ export default { const res = await rsaManAll(this.formSel) this.tableData = res.data.content this.total = res.data.content.length + this.tableData.map(res=>{ + res.contactPhone = this.$decrypt(res.contactPhone) + res.idCardNumber = this.$decrypt(res.idCardNumber) + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode) + res.legalRepresentative = this.$decrypt(res.legalRepresentative) + res.address = this.$decrypt(res.address) + res.emailAddress = this.$decrypt(res.emailAddress) + }) }, diff --git a/yanshouban/src/views/ipm/followup/index.vue b/yanshouban/src/views/ipm/followup/index.vue index 9858f86..34061df 100644 --- a/yanshouban/src/views/ipm/followup/index.vue +++ b/yanshouban/src/views/ipm/followup/index.vue @@ -658,11 +658,27 @@ const res = await genGetAll(this.pageindex) this.tableData = res.data.content this.total = res.data.content.length + this.tableData.map(res=>{ + res.contactPhone = this.$decrypt(res.contactPhone) + res.idCardNumber = this.$decrypt(res.idCardNumber) + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode) + res.legalRepresentative = this.$decrypt(res.legalRepresentative) + res.address = this.$decrypt(res.address) + res.emailAddress = this.$decrypt(res.emailAddress) + }) const ziyuan = await getAlls(this.pageindex) const ggw = await map1(this.pageindex) this.ziyuanData = [...ziyuan.data.content,...ggw.data.content] const kehu = await icManAll(this.pageindex); this.kehuData = kehu.data.content + this.kehuData.map(res=>{ + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode) + res.legalRepresentative = this.$decrypt(res.legalRepresentative) + res.address = this.$decrypt(res.address) + res.emailAddress = this.$decrypt(res.emailAddress) + res.contactName = this.$decrypt(res.contactName) + res.contactPhone = this.$decrypt(res.contactPhone) + }) }, // 新增确定按钮 @@ -796,7 +812,14 @@ const res = await genGetAll(this.formSel) this.tableData = res.data.content this.total = res.data.content.length - + this.tableData.map(res=>{ + res.contactPhone = this.$decrypt(res.contactPhone) + res.idCardNumber = this.$decrypt(res.idCardNumber) + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode) + res.legalRepresentative = this.$decrypt(res.legalRepresentative) + res.address = this.$decrypt(res.address) + res.emailAddress = this.$decrypt(res.emailAddress) + }) }, //重置按钮 resetting() { diff --git a/yanshouban/src/views/media/mediaMana.vue b/yanshouban/src/views/media/mediaMana.vue index 2330e7f..d638a53 100644 --- a/yanshouban/src/views/media/mediaMana.vue +++ b/yanshouban/src/views/media/mediaMana.vue @@ -120,7 +120,7 @@ -
+
@@ -145,6 +145,9 @@ 返回 + 生成PDF + 确定 @@ -523,6 +526,8 @@ import addAct from "./mediaMannaAdd" import wangEditor from "@/components/editor/index"; import upimg from "@/components/ImageUpload/index" + import html2canvas from 'html2canvas' + import jsPDF from 'jspdf' export default { components: { addAct,wangEditor,upimg}, data() { @@ -604,6 +609,29 @@ components: { addAct,wangEditor,upimg}, }, methods: { + async daochu(){ + + const content = this.$refs.contentToConvert; + + // 使用 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'); + + }, //查询全数据 async getAll() { const res = await tuiGetAll(this.pageindex) diff --git a/yanshouban/src/views/online/QRCode/index.vue b/yanshouban/src/views/online/QRCode/index.vue index 6bbe83a..7b49b0f 100644 --- a/yanshouban/src/views/online/QRCode/index.vue +++ b/yanshouban/src/views/online/QRCode/index.vue @@ -177,7 +177,7 @@ export default { this.tableData = res.data.list this.tableData.map(res=>{ res.shopPhone = this.$decrypt(res.shopPhone) - res.shopPassword = this.$decrypt(res.shopPassword) + // res.shopPassword = this.$decrypt(res.shopPassword) res.idCardNum = this.$decrypt(res.idCardNum) res.emailAddress = this.$decrypt(res.emailAddress) res.shopAdress = this.$decrypt(res.shopAdress) diff --git a/yanshouban/src/views/online/QRFunds/index.vue b/yanshouban/src/views/online/QRFunds/index.vue index fea8c8f..b2e7a89 100644 --- a/yanshouban/src/views/online/QRFunds/index.vue +++ b/yanshouban/src/views/online/QRFunds/index.vue @@ -177,7 +177,7 @@ export default { this.tableData = res.data.list this.tableData.map(res=>{ res.shopPhone = this.$decrypt(res.shopPhone) - res.shopPassword = this.$decrypt(res.shopPassword) + // res.shopPassword = this.$decrypt(res.shopPassword) res.idCardNum = this.$decrypt(res.idCardNum) res.emailAddress = this.$decrypt(res.emailAddress) res.shopAdress = this.$decrypt(res.shopAdress) diff --git a/yanshouban/src/views/serve/MarkActivity/index.vue b/yanshouban/src/views/serve/MarkActivity/index.vue index 4aef8dc..51efe4d 100644 --- a/yanshouban/src/views/serve/MarkActivity/index.vue +++ b/yanshouban/src/views/serve/MarkActivity/index.vue @@ -684,6 +684,10 @@ const res = await Registration(page) this.mingList = res.data this.baoming = true + this.mingList.map(res=>{ + res.userName = this.$decrypt(res.userName) + res.userPhone = this.$decrypt(res.userPhone) + }) } } diff --git a/yanshouban/src/views/shopRental/renewalMan/index.vue b/yanshouban/src/views/shopRental/renewalMan/index.vue index b8d21fa..a19df53 100644 --- a/yanshouban/src/views/shopRental/renewalMan/index.vue +++ b/yanshouban/src/views/shopRental/renewalMan/index.vue @@ -39,6 +39,7 @@
导出 + 打印
@@ -793,7 +794,7 @@
下载 - +
@@ -817,7 +818,8 @@ updateList, queryById, cereLeasingById, - cereLeasingEdit + cereLeasingEdit, + pdfLeaseRenewalManagement } from '../../../api/manage.js' import { rentalGetAll, @@ -932,6 +934,30 @@ }, methods: { + async dayin(){ + let res = await pdfLeaseRenewalManagement(this.pageindex) + if(!res){ + return + } + const blob = new Blob([res], { type: 'application/pdf' }) + const fileName = '续租管理.pdf' + 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) + } + + + }, chenge(val){ this.formSel={ affiliation: '', diff --git a/yanshouban/src/views/shopRental/rentTermination/index.vue b/yanshouban/src/views/shopRental/rentTermination/index.vue index fdab819..bd0c486 100644 --- a/yanshouban/src/views/shopRental/rentTermination/index.vue +++ b/yanshouban/src/views/shopRental/rentTermination/index.vue @@ -41,6 +41,8 @@ 导出 + 打印 +
@@ -640,8 +642,7 @@
下载 - +
@@ -662,7 +663,7 @@ contractDel, updateList, queryById, - + pdfManagementOfFinalAccountsForRentals, cereLeasingEdit } from '../../../api/manage.js' import { @@ -794,7 +795,30 @@ this.total = res.data.numberOfElements this.tableData = res.data.content }, + async dayin(){ + let res = await pdfManagementOfFinalAccountsForRentals(this.pageindex) + if(!res){ + return + } + const blob = new Blob([res], { type: 'application/pdf' }) + const fileName = '退租决算管理.pdf' + 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) + } + + }, // 退租确定按钮 addCheck(val) { this.ggXin = false diff --git a/yanshouban/src/views/shopRental/rentalMan/index.vue b/yanshouban/src/views/shopRental/rentalMan/index.vue index 7c7f39f..95e0be8 100644 --- a/yanshouban/src/views/shopRental/rentalMan/index.vue +++ b/yanshouban/src/views/shopRental/rentalMan/index.vue @@ -39,6 +39,7 @@ style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">批量导出 --> 导出 + 打印 @@ -965,7 +966,7 @@
下载 - +
@@ -987,10 +988,10 @@ rentalGetAll, rentalDel, rentalAdd, - excelRentOutQueryByPage + excelRentOutQueryByPage, + pdfRentOutQueryByPage } from '../../../api/rentalMan.js' import { - businessListGetAll, businessListSave, businessListGetById, businessListUpdate, @@ -1227,7 +1228,7 @@ import { pdf.addImage(imgData, 'PNG', 10, 10, imgWidth, imgHeight); // 10, 10 是图像在 PDF 中的位置（mm） // 保存 PDF 文件 - pdf.save('downloaded.pdf'); + pdf.save('入住单.pdf'); }, // 出租单查看 outlook(item){ @@ -1236,7 +1237,6 @@ import { this.outdan = true }, delList(){ - const h = this.$createElement; this.$msgbox({ title: '消息', @@ -1286,6 +1286,30 @@ import { }) }, + async dayin(){ + let res = await pdfRentOutQueryByPage(this.pageindex) + if(!res){ + return + } + const blob = new Blob([res], { type: 'application/pdf' }) + const fileName = '出租管理.pdf' + 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) + } + + }, + } } diff --git a/yanshouban/src/views/shopRental/warning/index.vue b/yanshouban/src/views/shopRental/warning/index.vue index 1168a1b..cd868b0 100644 --- a/yanshouban/src/views/shopRental/warning/index.vue +++ b/yanshouban/src/views/shopRental/warning/index.vue @@ -115,27 +115,18 @@
- + - + - + - + - - - - - - - - - @@ -728,6 +719,9 @@ cereLeasingByPage, daoqi } from '../../../api/manage.js' + import { + ManaAdd + } from '../../../api/PerWorkstation.js' export default { data() { return { @@ -827,9 +821,36 @@ }, // 新增确定按钮 async addCheck(val) { - this.ggXin = false + if(this.index == 2){ + let pageMsg = { + content:this.zhong.reasonApplication, + createdAt:this.nowTime(), + postType:'立即发布', + receiverMerchant:'电商商家', + status:'1', + title:'到期提醒' + } + await ManaAdd(pageMsg) + this.$message({ + message: '发送成功', + type: 'success' + }) + } + this.ggXin = false }, + + nowTime(){ + 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}`; + }, // 获取时间 currentTime(){ let date = new Date(); diff --git a/yanshouban/src/views/stockControl/inventory/index.vue b/yanshouban/src/views/stockControl/inventory/index.vue index 284045a..41f4516 100644 --- a/yanshouban/src/views/stockControl/inventory/index.vue +++ b/yanshouban/src/views/stockControl/inventory/index.vue @@ -1,7 +1,10 @@ @@ -177,8 +205,9 @@ - 取 消 - 确 定 + 取 消 + 确 定 @@ -199,8 +228,9 @@ - 取 消 - 确 定 + 取 消 + 确 定 @@ -402,7 +432,9 @@ export default { //@import url(); 引入公共css类 @import url("../../../styles/elDialog.scss"); .pending { - padding: 30px; + padding: 0 20px 20px 20px; + min-height: calc(100vh - 50px - 20px); + background-color: #Fff; } .fenye { margin-top: 20px; @@ -445,4 +477,18 @@ export default { } } } + .tableBtn { + display: inline-block; + margin-right: 10px; + } + + .greens { + color: #3F9B6A ; + } + ::v-deep .buttonHover:hover{ + color:#3f9b6a !important; + border-color: #c5e1d2 !important; + background-color: #ecf5f0 !important; + outline: none; + } diff --git a/yanshouban/src/views/stockControl/stocksForewarn/index.vue b/yanshouban/src/views/stockControl/stocksForewarn/index.vue index 22fedad..53f6dc6 100644 --- a/yanshouban/src/views/stockControl/stocksForewarn/index.vue +++ b/yanshouban/src/views/stockControl/stocksForewarn/index.vue @@ -19,17 +19,24 @@
- + - + - + + - +
@@ -161,10 +168,10 @@ export default { anNum:'', }, formSel:{ - shopname:'', - rkr:'', - sTime:'', - rTime:'' + productName:'', + createTime:'', + page: 1, + pageSize: 10 }, formInline: { searchType: '1', @@ -202,7 +209,28 @@ export default { }, // 查询 search () { - + this.total = 1; + this.formSel.page = 1; + this.getAll(this.formSel); + }, + resetting(){ + this.formSel = { + productName:'', + createTime:'', + page: 1, + pageSize: 10 + } + this.formInline = { + searchType: '1', + search: '', // 搜索字段 + state: '', + // afterState: '', // 售后状态 0-无售后 1-售后中 2-售后成功 3-售后关闭 + dates: [], // 下单时间数组 + page: 1, + shopName: '', + pageSize: 10 + } + this.getAll(this.formInline) }, async kucunSet(){ const yuzhi={ diff --git a/yanshouban/vue.config.js b/yanshouban/vue.config.js index df890d6..8a09324 100644 --- a/yanshouban/vue.config.js +++ b/yanshouban/vue.config.js @@ -67,7 +67,7 @@ module.exports = { // changeOrigin: true, // }, '/meserver/admin-server/':{ - target: 'https://jy.scjysm.asia:18086/meserver/admin-server/', // 测试 + target: 'https://jy.scjysm.asia:18086/admin-server/', // 测试 // target: 'http://172.16.61.123:8080/meserver/admin-server/', // 测试 // https://jy.scjysm.asia:18086/admin-server http://172.16.61.123:8080/meserver/admin-server/ https://wjdc.scjysm.asia1443/cdwlMall/admin-server // target: 'http://localhost:9003/', // 平台端 -- libgit2 0.21.4