webapp / GreenwayWeb

Commit 341f183e21a0afd1097acb6f06afbb6414cbe28e

Authored by 杨鑫
1 parent 0822f2ee

'最新'

Inline Side-by-side
Showing 36 changed files with 626 additions and 168 deletions
yanshouban/src/api/fangli.js
  View file @341f183
@@ -34,3 +34,15 @@ export function fangDel(data) { @@ -34,3 +34,15 @@ export function fangDel(data) {
34 data 34 data
35 }) 35 })
36 } 36 }
  37 +
  38 +// 导入管理模板
  39 +export const excelAdd = (data = {}) => {
  40 + return request({
  41 + url: '/cereBusinessPlan/excelAdd',
  42 + method: 'post',
  43 + data,
  44 + headers: {
  45 + 'Content-type': 'multipart/form-data'
  46 + }
  47 + })
  48 +}
yanshouban/src/api/manage.js
  View file @341f183
@@ -85,3 +85,23 @@ export function daoqi(data) { @@ -85,3 +85,23 @@ export function daoqi(data) {
85 data 85 data
86 }) 86 })
87 } 87 }
  88 +// 退租决算打印
  89 +
  90 +export function pdfManagementOfFinalAccountsForRentals(data) {
  91 + return request({
  92 + url: '/cereLeasingInformation/pdfManagementOfFinalAccountsForRentals',
  93 + method: 'post',
  94 + data,
  95 + responseType: 'blob'
  96 + })
  97 +}
  98 +// 续租管理打印
  99 +
  100 +export function pdfLeaseRenewalManagement(data) {
  101 + return request({
  102 + url: '/cereLeasingInformation/pdfLeaseRenewalManagement',
  103 + method: 'post',
  104 + data,
  105 + responseType: 'blob'
  106 + })
  107 +}
yanshouban/src/api/rentalMan.js
  View file @341f183
@@ -51,3 +51,13 @@ export function excelLeaseRenewalManagement(data) { @@ -51,3 +51,13 @@ export function excelLeaseRenewalManagement(data) {
51 responseType: 'blob' 51 responseType: 'blob'
52 }) 52 })
53 } 53 }
  54 +
  55 +// PDF打印
  56 +export function pdfRentOutQueryByPage(data) {
  57 + return request({
  58 + url: '/cereLeasingInformation/pdfRentOutQueryByPage',
  59 + method: 'post',
  60 + data,
  61 + responseType: 'blob'
  62 + })
  63 +}
yanshouban/src/utils/jiami.js
  View file @341f183
1 // 文本加密 1 // 文本加密
2 import { sm4 } from 'sm-crypto'; 2 import { sm4 } from 'sm-crypto';
3 -const DEFAULT_KEY ="cda4442f102f6396cca76902e37ad7cb";  
4 -const DEFAULT_IV = "8bd8a83221742166c7532b7275a7fe9c"; 3 +const DEFAULT_KEY ="cda4442f102f6396eea76902e37ad7cb";
  4 +const DEFAULT_IV = "8bd8a83221742111c7532b7275a7fe9c";
5 export const encrypt = (str) => { 5 export const encrypt = (str) => {
6     if(!str) { 6     if(!str) {
7         return '' 7         return ''
@@ -11,7 +11,7 @@ export const encrypt = (str) => { @@ -11,7 +11,7 @@ export const encrypt = (str) => {
11         mode: 'cbc', 11         mode: 'cbc',
12         padding: 'pkcs#7' 12         padding: 'pkcs#7'
13         }) 13         })
14 -    return 'ENC(' + encryptStr + ')' 14 +    return encryptStr
15 } 15 }
16 16
17 // 文本解密 17 // 文本解密
@@ -19,12 +19,12 @@ export const decrypt = (str) => { @@ -19,12 +19,12 @@ export const decrypt = (str) => {
19     if(!str) { 19     if(!str) {
20         return '' 20         return ''
21     } 21     }
22 -    if(str.indexOf('ENC(') === -1) {  
23 -        return str  
24 -    }  
25 -    const str_ = str.replace('ENC(', '').replace(')', '') 22 +//     if(str.indexOf('ENC(') === -1) {
  23 +//         return str
  24 +//     }
  25 +//     const str_ = str.replace('ENC(', '').replace(')', '')
26     try {         26     try {        
27 -        const decryptStr = sm4.decrypt(str_, DEFAULT_KEY, { 27 +        const decryptStr = sm4.decrypt(str, DEFAULT_KEY, {
28             iv: DEFAULT_IV, 28             iv: DEFAULT_IV,
29             mode: 'cbc', 29             mode: 'cbc',
30             padding: 'pkcs#7' 30             padding: 'pkcs#7'
yanshouban/src/utils/request.js
  View file @341f183
@@ -11,9 +11,9 @@ import { @@ -11,9 +11,9 @@ import {
11 } from '@/utils/auth' 11 } from '@/utils/auth'
12 const host = window.location.host; 12 const host = window.location.host;
13 let PREFIX; 13 let PREFIX;
14 -if (host == '172.16.61.48' || host == '172.16.61.49 :5173' || host =='172.16.61.123:9003') { 14 +if (host == '172.16.61.48' || host == '172.16.61.49:5173' || host =='172.16.61.123:9003') {
15 // PREFIX = 'https://jdc.scjysm.asia:1443/meserver/admin-server'; 15 // PREFIX = 'https://jdc.scjysm.asia:1443/meserver/admin-server';
16 - PREFIX = 'https://jy.scjysm.asia:18086/meserver/admin-server'; 16 + PREFIX = 'https://jy.scjysm.asia:18086/admin-server';
17 // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server'; 17 // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server';
18 // PREFIX = 'http://172.16.61.48/meserver/admin-server'; 18 // PREFIX = 'http://172.16.61.48/meserver/admin-server';
19 }else if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'){ 19 }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. @@ -21,14 +21,14 @@ if (host == '172.16.61.48' || host == '172.16.61.49 :5173' || host =='172.16.61.
21 // PREFIX = 'http://172.16.61.48/meserver/admin-server'; 21 // PREFIX = 'http://172.16.61.48/meserver/admin-server';
22 // PREFIX = 'http://192.168.2.213:9003'; 22 // PREFIX = 'http://192.168.2.213:9003';
23 // PREFIX = 'http://8.130.38.56:8019/admin-server'; 23 // PREFIX = 'http://8.130.38.56:8019/admin-server';
24 - PREFIX = 'http://192.168.8.106:9003'; 24 + PREFIX = 'http://192.168.2.7:9003';
25 // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server'; 25 // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server';
26 // PREFIX = 'https://jy.scjysm.asia:18086/admin-server'; 26 // PREFIX = 'https://jy.scjysm.asia:18086/admin-server';
27 // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server'; 27 // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server';
28 // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server' 28 // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server'
29 29
30 }else{ 30 }else{
31 - PREFIX = '/admin-server'; 31 + PREFIX = 'https://jy.scjysm.asia:18086/admin-server';
32 } 32 }
33 33
34 34
yanshouban/src/views/active/couponlist/component/shopList.vue
  View file @341f183
@@ -116,7 +116,6 @@ export default { @@ -116,7 +116,6 @@ export default {
116 search () { 116 search () {
117 117
118 }, 118 },
119 - // businessListGetAll  
120 // 初始化查询所有数据 119 // 初始化查询所有数据
121 async getAll(formInline) { 120 async getAll(formInline) {
122 const res = await businessListGetAll(formInline) 121 const res = await businessListGetAll(formInline)
@@ -124,7 +123,7 @@ export default { @@ -124,7 +123,7 @@ export default {
124 this.tableData = res.data.list 123 this.tableData = res.data.list
125 this.tableData.map(res=>{ 124 this.tableData.map(res=>{
126 res.shopPhone = this.$decrypt(res.shopPhone) 125 res.shopPhone = this.$decrypt(res.shopPhone)
127 - res.shopPassword = this.$decrypt(res.shopPassword) 126 + // res.shopPassword = this.$decrypt(res.shopPassword)
128 res.idCardNum = this.$decrypt(res.idCardNum) 127 res.idCardNum = this.$decrypt(res.idCardNum)
129 res.emailAddress = this.$decrypt(res.emailAddress) 128 res.emailAddress = this.$decrypt(res.emailAddress)
130 res.shopAdress = this.$decrypt(res.shopAdress) 129 res.shopAdress = this.$decrypt(res.shopAdress)
yanshouban/src/views/activity/activityBian.vue
  View file @341f183
@@ -69,6 +69,16 @@ @@ -69,6 +69,16 @@
69 </el-form-item> 69 </el-form-item>
70 </el-col> 70 </el-col>
71 </el-row> 71 </el-row>
  72 + <el-row :gutter="20">
  73 + <el-col :span="12">
  74 + <el-form-item label="范围设置" class="grid-content bg-purple" prop="sponsor">
  75 + <el-select v-model="secondData.rangeSetting" placeholder="请选择" style="width: 100%">
  76 + <el-option label="活动绿道段内" value="活动绿道段内"></el-option>
  77 + <el-option label="活动场地内" value="活动场地内"></el-option>
  78 + </el-select>
  79 + </el-form-item>
  80 + </el-col>
  81 + </el-row>
72 <div style="padding: 10px"> 82 <div style="padding: 10px">
73 <el-row :gutter="20"> 83 <el-row :gutter="20">
74 <el-col :span="12"> 84 <el-col :span="12">
yanshouban/src/views/activity/activityBz.vue
  View file @341f183
@@ -88,6 +88,16 @@ @@ -88,6 +88,16 @@
88 </el-form-item> 88 </el-form-item>
89 </el-col> 89 </el-col>
90 </el-row> 90 </el-row>
  91 + <el-row :gutter="20">
  92 + <el-col :span="12">
  93 + <el-form-item label="范围设置" class="grid-content bg-purple" prop="sponsor">
  94 + <el-select v-model="ruleForm.rangeSetting" placeholder="请选择" style="width: 100%">
  95 + <el-option label="活动绿道段内" value="活动绿道段内"></el-option>
  96 + <el-option label="活动场地内" value="活动场地内"></el-option>
  97 + </el-select>
  98 + </el-form-item>
  99 + </el-col>
  100 + </el-row>
91 <el-row :gutter="20"> 101 <el-row :gutter="20">
92 <el-col :span="12"> 102 <el-col :span="12">
93 <el-form-item label="活动主要目的" prop="mainPurpose" class="grid-content bg-purple"> 103 <el-form-item label="活动主要目的" prop="mainPurpose" class="grid-content bg-purple">
@@ -297,7 +307,9 @@ @@ -297,7 +307,9 @@
297 <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0"> 307 <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
298 <el-button @click="close" style="background-color: #3F9B6A;color: #fff;">取消 308 <el-button @click="close" style="background-color: #3F9B6A;color: #fff;">取消
299 </el-button> 309 </el-button>
300 - <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff;">确定 310 + <el-button @click="onSubmit(1)" style="background-color: #3F9B6A;color: #fff;">暂存
  311 + </el-button>
  312 + <el-button @click="onSubmit(0)" style="background-color: #3F9B6A;color: #fff;">确定
301 </el-button> 313 </el-button>
302 </div> 314 </div>
303 </div> 315 </div>
@@ -393,6 +405,7 @@ @@ -393,6 +405,7 @@
393 eventTheme: '', //活动主题 405 eventTheme: '', //活动主题
394 sponsor: '', //活动主办方 406 sponsor: '', //活动主办方
395 participants: '', //活动参与方 407 participants: '', //活动参与方
  408 + rangeSetting:'',
396 mainPurpose: '', //活动主要目的 409 mainPurpose: '', //活动主要目的
397 coverPoster: '', //封面海报 410 coverPoster: '', //封面海报
398 internalLaborCostEstimation: '', //内部人工成本预估 411 internalLaborCostEstimation: '', //内部人工成本预估
@@ -558,7 +571,7 @@ @@ -558,7 +571,7 @@
558 571
559 }, 572 },
560 //保存 573 //保存
561 - onSubmit() { 574 + onSubmit(val) {
562 // pdf.save('output.pdf') 575 // pdf.save('output.pdf')
563 let that = this 576 let that = this
564 let FlieName = this.ruleForm.planName 577 let FlieName = this.ruleForm.planName
@@ -614,6 +627,7 @@ @@ -614,6 +627,7 @@
614 // } 627 // }
615 this.$refs.jibenFrom.validate((valid) => { 628 this.$refs.jibenFrom.validate((valid) => {
616 if (valid) { 629 if (valid) {
  630 + this.ruleForm.isDraft = val
617 add(this.ruleForm).then(res => { 631 add(this.ruleForm).then(res => {
618 this.$message({ 632 this.$message({
619 message: '保存成功', 633 message: '保存成功',
@@ -735,6 +749,7 @@ @@ -735,6 +749,7 @@
735 eventTheme: '', //活动主题 749 eventTheme: '', //活动主题
736 sponsor: '', //活动主办方 750 sponsor: '', //活动主办方
737 participants: '', //活动参与方 751 participants: '', //活动参与方
  752 + rangeSetting:'',
738 mainPurpose: '', //活动主要目的 753 mainPurpose: '', //活动主要目的
739 coverPoster: '', //封面海报 754 coverPoster: '', //封面海报
740 internalLaborCostEstimation: '', //内部人工成本预估 755 internalLaborCostEstimation: '', //内部人工成本预估
yanshouban/src/views/activity/activitySp.vue
  View file @341f183
@@ -664,6 +664,7 @@ @@ -664,6 +664,7 @@
664 pageNumber: 1, 664 pageNumber: 1,
665 pageSize: 10, 665 pageSize: 10,
666 dataOwnership: '1', 666 dataOwnership: '1',
  667 + isDraft:0
667 }, 668 },
668 multipleSelection: [], 669 multipleSelection: [],
669 options: [{ 670 options: [{
yanshouban/src/views/activity/index.vue
  View file @341f183
@@ -548,15 +548,14 @@ @@ -548,15 +548,14 @@
548 548
549 </el-row> 549 </el-row>
550 <el-row :gutter="20"> 550 <el-row :gutter="20">
551 - <el-col :span="8"> 551 + <el-col :span="24">
552 <el-form-item label="反馈内容" class="grid-content bg-purple" prop="name"> 552 <el-form-item label="反馈内容" class="grid-content bg-purple" prop="name">
553 <el-upload class="upload-demo" ref="upload" :on-remove="handleRemove" 553 <el-upload class="upload-demo" ref="upload" :on-remove="handleRemove"
554 :action="uploadFileUrl" :on-success="handleUploadSuccess" :file-list="fileData" 554 :action="uploadFileUrl" :on-success="handleUploadSuccess" :file-list="fileData"
555 - :show-file-list="false" v-if="zhixingBian">  
556 - <div style="color: #2d8a58;margin-left: 10px;" slot="trigger">  
557 - 上传附件  
558 - </div> 555 + :show-file-list="true" v-if="zhixingBian">
  556 + <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;" class="buttonHover" v-if="fileData.length==0">+点击上传</el-button>
559 </el-upload> 557 </el-upload>
  558 + <div v-else>{{zhixingList.feedbackContent}}</div>
560 </el-form-item> 559 </el-form-item>
561 </el-col> 560 </el-col>
562 561
@@ -1111,9 +1110,8 @@ @@ -1111,9 +1110,8 @@
1111 </el-table-column> 1110 </el-table-column>
1112 <el-table-column label="操作" width="350"> 1111 <el-table-column label="操作" width="350">
1113 <template slot-scope="scope"> 1112 <template slot-scope="scope">
1114 - <div @click="shiyong(1,scope.row)" class="tableBtn greens">使用</div>  
1115 - <div class="tableBtn greens" @click="handleEditForm(scope.row)">执行情况</div>  
1116 - <div @click="actBian(scope.row)" class="tableBtn greens" v-if="scope.row.state == ''">修改</div> 1113 + <div @click="shiyong(scope.row)" class="tableBtn greens">使用</div>
  1114 + <!-- <div @click="actBian(scope.row)" class="tableBtn greens" v-if="scope.row.state == ''">修改</div> -->
1117 <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div> 1115 <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div>
1118 </template> 1116 </template>
1119 </el-table-column> 1117 </el-table-column>
@@ -1232,9 +1230,11 @@ @@ -1232,9 +1230,11 @@
1232 text: '活动主要目的', 1230 text: '活动主要目的',
1233 eventTheme: '' 1231 eventTheme: ''
1234 }, { 1232 }, {
1235 - id: '5',  
1236 - name: '状态',  
1237 - eventTheme: '待审核' 1233 + id: 0,
  1234 + name: '范围设置',
  1235 + planName: '',
  1236 + text: '状态',
  1237 + eventTheme: ''
1238 }], 1238 }],
1239 internalLaborCostEstimation: '', 1239 internalLaborCostEstimation: '',
1240 externalLaborCostEstimation: '', 1240 externalLaborCostEstimation: '',
@@ -1309,11 +1309,13 @@ @@ -1309,11 +1309,13 @@
1309 expectedDirectBenefits: '', //直接收益 1309 expectedDirectBenefits: '', //直接收益
1310 expectedIndirectBenefits: '', //间接收益 1310 expectedIndirectBenefits: '', //间接收益
1311 createDate: '', //创建时间 1311 createDate: '', //创建时间
  1312 + feedbackContent:''
1312 }, //执行效果列表 1313 }, //执行效果列表
1313 pageindex: { 1314 pageindex: {
1314 pageNumber: 1, 1315 pageNumber: 1,
1315 pageSize: 10, 1316 pageSize: 10,
1316 - dataOwnership: '1' 1317 + dataOwnership: '1',
  1318 + isDraft:0
1317 }, 1319 },
1318 multipleSelection: [], 1320 multipleSelection: [],
1319 options: [], 1321 options: [],
@@ -1416,7 +1418,8 @@ @@ -1416,7 +1418,8 @@
1416 pageNumber: 1, 1418 pageNumber: 1,
1417 pageSize: 10, 1419 pageSize: 10,
1418 dataOwnership: '1', 1420 dataOwnership: '1',
1419 - classificationCode:data.id 1421 + classificationCode:data.id,
  1422 + isDraft:0
1420 } 1423 }
1421 const res = await queryByPage(pageindex) 1424 const res = await queryByPage(pageindex)
1422 this.tableData = res.data.content 1425 this.tableData = res.data.content
@@ -1426,7 +1429,8 @@ @@ -1426,7 +1429,8 @@
1426 this.pageindex={ 1429 this.pageindex={
1427 pageNumber: 1, 1430 pageNumber: 1,
1428 pageSize: 10, 1431 pageSize: 10,
1429 - dataOwnership: '1' 1432 + dataOwnership: '1',
  1433 + isDraft:0
1430 } 1434 }
1431 const res = await queryByPage(this.pageindex) 1435 const res = await queryByPage(this.pageindex)
1432 this.tableData = res.data.content 1436 this.tableData = res.data.content
@@ -1476,6 +1480,7 @@ @@ -1476,6 +1480,7 @@
1476 dataOwnership: '1', 1480 dataOwnership: '1',
1477 pageNumber: 1, 1481 pageNumber: 1,
1478 pageSize: 10, 1482 pageSize: 10,
  1483 + auditTime:0
1479 }) 1484 })
1480 this.tableData = res.data.content 1485 this.tableData = res.data.content
1481 } else if (this.planName == '' && this.eventTheme != '') { 1486 } else if (this.planName == '' && this.eventTheme != '') {
@@ -1484,6 +1489,7 @@ @@ -1484,6 +1489,7 @@
1484 dataOwnership: '1', 1489 dataOwnership: '1',
1485 pageNumber: 1, 1490 pageNumber: 1,
1486 pageSize: 10, 1491 pageSize: 10,
  1492 + auditTime:0
1487 }) 1493 })
1488 this.tableData = res.data.content 1494 this.tableData = res.data.content
1489 } else { 1495 } else {
@@ -1493,6 +1499,7 @@ @@ -1493,6 +1499,7 @@
1493 dataOwnership: '1', 1499 dataOwnership: '1',
1494 pageNumber: 1, 1500 pageNumber: 1,
1495 pageSize: 10, 1501 pageSize: 10,
  1502 + auditTime:0
1496 }) 1503 })
1497 this.tableData = res.data.content 1504 this.tableData = res.data.content
1498 } 1505 }
@@ -1500,6 +1507,7 @@ @@ -1500,6 +1507,7 @@
1500 }, 1507 },
1501 //详情点击 1508 //详情点击
1502 handleEditForm(item) { 1509 handleEditForm(item) {
  1510 + this.fileData = []
1503 this.zhixingList = { 1511 this.zhixingList = {
1504 planTime:[], 1512 planTime:[],
1505 planName: '', //活动名称 1513 planName: '', //活动名称
@@ -1521,6 +1529,7 @@ @@ -1521,6 +1529,7 @@
1521 expectedDirectBenefits: '', //直接收益 1529 expectedDirectBenefits: '', //直接收益
1522 expectedIndirectBenefits: '', //间接收益 1530 expectedIndirectBenefits: '', //间接收益
1523 createDate: '', //创建时间 1531 createDate: '', //创建时间
  1532 + feedbackContent:''
1524 } //执行效果列表 1533 } //执行效果列表
1525 actPage({ 1534 actPage({
1526 detailsId: item.id, 1535 detailsId: item.id,
@@ -1585,8 +1594,8 @@ @@ -1585,8 +1594,8 @@
1585 that.tableData1[2].planName = res.data.content[0].sponsor 1594 that.tableData1[2].planName = res.data.content[0].sponsor
1586 that.tableData1[3].eventTheme = res.data.content[0].participants 1595 that.tableData1[3].eventTheme = res.data.content[0].participants
1587 that.tableData1[3].planName = res.data.content[0].mainPurpose 1596 that.tableData1[3].planName = res.data.content[0].mainPurpose
1588 -  
1589 - that.tableData1[4].eventTheme = this.getStatus(res.data.content[0].state) 1597 + that.tableData1[4].planName = this.getStatus(res.data.content[0].state)
  1598 + that.tableData1[4].eventTheme = res.data.content[0].rangeSetting
1590 //活动成本信息 1599 //活动成本信息
1591 that.internalLaborCostEstimation = res.data.content[0].internalLaborCostEstimation 1600 that.internalLaborCostEstimation = res.data.content[0].internalLaborCostEstimation
1592 that.externalLaborCostEstimation = res.data.content[0].externalLaborCostEstimation 1601 that.externalLaborCostEstimation = res.data.content[0].externalLaborCostEstimation
@@ -1661,6 +1670,9 @@ @@ -1661,6 +1670,9 @@
1661 }, 1670 },
1662 //执行效果保存 1671 //执行效果保存
1663 async bianji() { 1672 async bianji() {
  1673 + if(this.fileData.length !=0){
  1674 + this.zhixingList.feedbackContent = this.fileData[0].url
  1675 + }
1664 if (this.zhiXing) { 1676 if (this.zhiXing) {
1665 this.zhixingList.eventStartTime = this.zhixingList.planTime[0] 1677 this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
1666 this.zhixingList.eventEndTime = this.zhixingList.planTime[1] 1678 this.zhixingList.eventEndTime = this.zhixingList.planTime[1]
@@ -2115,11 +2127,15 @@ @@ -2115,11 +2127,15 @@
2115 2127
2116 }, 2128 },
2117 handleUploadSuccess(response, file, fileList) { 2129 handleUploadSuccess(response, file, fileList) {
2118 - console.log(response, file, fileList)  
2119 - // this.fileData.push(file) 2130 + const fileMsg = {
  2131 + name:file.name,
  2132 + url: file.response.data.url,
  2133 + }
  2134 + // 将文件地址存储在 uploadedFiles 数组中
  2135 + this.fileData.push(fileMsg);
2120 }, 2136 },
2121 handleRemove(){ 2137 handleRemove(){
2122 - 2138 + this.fileData = []
2123 }, 2139 },
2124 daoru(){ 2140 daoru(){
2125 2141
@@ -2130,7 +2146,8 @@ @@ -2130,7 +2146,8 @@
2130 let pageindex = { 2146 let pageindex = {
2131 pageNumber: 1, 2147 pageNumber: 1,
2132 pageSize: 10, 2148 pageSize: 10,
2133 - dataOwnership: '1' 2149 + dataOwnership: '1',
  2150 + isDraft:1
2134 } 2151 }
2135 queryByPage(pageindex).then(res=>{ 2152 queryByPage(pageindex).then(res=>{
2136 this.caoList = res.data.content 2153 this.caoList = res.data.content
@@ -2138,7 +2155,7 @@ @@ -2138,7 +2155,7 @@
2138 this.caogaoshow =true 2155 this.caogaoshow =true
2139 2156
2140 }, 2157 },
2141 - shiyong(val,item){ 2158 + shiyong(item){
2142 2159
2143 const h = this.$createElement; 2160 const h = this.$createElement;
2144 this.$msgbox({ 2161 this.$msgbox({
@@ -2153,14 +2170,14 @@ @@ -2153,14 +2170,14 @@
2153 customClass: 'oe-dialog-btn', 2170 customClass: 'oe-dialog-btn',
2154 beforeClose: (action, instance, done) => { 2171 beforeClose: (action, instance, done) => {
2155 if (action === 'confirm') { 2172 if (action === 'confirm') {
2156 - // contentEdit({  
2157 - // id: item.id,  
2158 - // draftStatus:1  
2159 - // }).then(res => {  
2160 - // this.getAll()  
2161 - // this.getcaogao()  
2162 - // done();  
2163 - // }) 2173 + xiangedit({
  2174 + id:item.id,
  2175 + isDraft:0
  2176 + }).then(res => {
  2177 + this.getAll()
  2178 + this.caogao()
  2179 + done();
  2180 + })
2164 } else { 2181 } else {
2165 done(); 2182 done();
2166 } 2183 }
yanshouban/src/views/ads/fangli/index.vue
  View file @341f183
@@ -44,11 +44,15 @@ @@ -44,11 +44,15 @@
44 @click="addbuss" 44 @click="addbuss"
45 >新增</el-button 45 >新增</el-button
46 > 46 >
47 - <!-- <el-button 47 + <!-- <el-upload class="upload-demo" ref="upload"
  48 + :action="action" :on-success="daoru" :file-list="fileData"
  49 + :auto-upload="true">
  50 + <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;" class="buttonHover">导入</el-button>
  51 + </el-upload> -->
  52 + <!-- <el-button
48 style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" 53 style="background-color: #3F9B6A;color: #fff;padding:8px 15px;"
49 @click="daoru" 54 @click="daoru"
50 - >导入</el-button  
51 - > --> 55 + >导入</el-button> -->
52 </div> 56 </div>
53 <!-- 表格 --> 57 <!-- 表格 -->
54 <el-table 58 <el-table
@@ -171,10 +175,10 @@ @@ -171,10 +175,10 @@
171 <div class="tableBtn greens" v-if="scope.row.auditStatus =='1'" @click="peizhi(scope.row)"> 175 <div class="tableBtn greens" v-if="scope.row.auditStatus =='1'" @click="peizhi(scope.row)">
172 审核流程配置 176 审核流程配置
173 </div> 177 </div>
174 - <div class="tableBtn greens" v-if="scope.row.enableStatus== 1 &&scope.row.auditStatus =='2'" @click="qiyong(scope.row,0)"> 178 + <div class="tableBtn greens" v-if="scope.row.enableStatus== 1 || scope.row.enableStatus == null &&scope.row.auditStatus =='2'" @click="qiyong(scope.row,0)">
175 启用 179 启用
176 </div> 180 </div>
177 - <div class="tableBtn greens" v-if="scope.row.enableStatus == 0 &&scope.row.auditStatus =='2' " @click="qiyong(scope.row,1)"> 181 + <div class="tableBtn greens" v-if="scope.row.enableStatus == 0 &&scope.row.auditStatus =='2' " @click="qiyong(scope.row,1)">
178 禁用 182 禁用
179 </div> 183 </div>
180 <div class="tableBtn greens" @click="delGuan(scope.row)" > 184 <div class="tableBtn greens" @click="delGuan(scope.row)" >
@@ -199,22 +203,22 @@ @@ -199,22 +203,22 @@
199 </div> 203 </div>
200 </div> 204 </div>
201 </div> 205 </div>
202 - <el-dialog :visible.sync="peiShow" custom-class='bian_css' style="padding: 0;" width="75%" 206 + <el-dialog :visible.sync="peiShow" custom-class='bian_css' style="padding: 0;" width="45%"
203 :close-on-press-escape="false" center :close-on-click-modal="false" class="dialog_css_Xq" :show-close="false"> 207 :close-on-press-escape="false" center :close-on-click-modal="false" class="dialog_css_Xq" :show-close="false">
204 <div style="padding:20px;"> 208 <div style="padding:20px;">
205 - <el-form label-position="right" ref="jibenFrom" :model="peiForm" :rules="peiFormRules" label-width="140px" 209 + <div style="font-size: 14px;padding-bottom: 20px;color: #000;">审核流程配置</div>
  210 + <el-form label-position="right" ref="jibenFrom" :model="peiForm" label-width="140px"
206 style="position: relative"> 211 style="position: relative">
207 <el-form-item label="审核提醒时间" class="grid-content bg-purple device-from" prop="planName"> 212 <el-form-item label="审核提醒时间" class="grid-content bg-purple device-from" prop="planName">
208 - <el-date-picker style="width:160px;margin-right:5px" v-model="peiForm.auditTime"  
209 - value-format="yyyy-M-d" type="daterange" range-separator="-" start-placeholder=""  
210 - end-placeholder="" prefix-icon="none" > 213 + <el-date-picker style="width:240px;margin-right:5px" v-model="peiForm.auditTime"
  214 + value-format="yyyy-MM-dd HH:mm:ss" type="datetime" prefix-icon="none" >
211 </el-date-picker> 215 </el-date-picker>
212 </el-form-item> 216 </el-form-item>
213 </el-form> 217 </el-form>
214 <div style="padding-top:20px;display:flex;justify-content: flex-end;"> 218 <div style="padding-top:20px;display:flex;justify-content: flex-end;">
215 - <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" 219 + <el-button style="background-color: #3F9B6A;color: #fff"
216 @click="peiCheck">确定</el-button> 220 @click="peiCheck">确定</el-button>
217 - <el-button @click="peiShow = false" style="background-color: #3F9B6A;color: #fff">取消</el-button> 221 + <el-button @click="peiShow = false" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" class="buttonHover">取消</el-button>
218 222
219 </div> 223 </div>
220 224
@@ -247,8 +251,8 @@ import { @@ -247,8 +251,8 @@ import {
247 fangAdd, 251 fangAdd,
248 fangEdit, 252 fangEdit,
249 fangDel, 253 fangDel,
  254 + excelAdd
250 }from '../../../api/fangli' 255 }from '../../../api/fangli'
251 -  
252 import upimg from "@/components/ImageUpload/index" 256 import upimg from "@/components/ImageUpload/index"
253 import addxin from "./addform" 257 import addxin from "./addform"
254 import xiang from "./bianform" 258 import xiang from "./bianform"
@@ -256,6 +260,7 @@ export default { @@ -256,6 +260,7 @@ export default {
256 components: {upimg,addxin,xiang}, 260 components: {upimg,addxin,xiang},
257 data() { 261 data() {
258 return { 262 return {
  263 + fileData:[],
259 detbox: false, // 详情 264 detbox: false, // 详情
260 edit: true, // 编辑 265 edit: true, // 编辑
261 formInline: { 266 formInline: {
@@ -550,6 +555,12 @@ export default { @@ -550,6 +555,12 @@ export default {
550 this.peiShow = true 555 this.peiShow = true
551 this.peiId = item.id 556 this.peiId = item.id
552 }, 557 },
  558 + daoru(file){
  559 + // const fileMsg = {
  560 + // name:file.name,
  561 + // url: file.response.data.url,
  562 + // }
  563 + },
553 } 564 }
554 } 565 }
555 </script> 566 </script>
yanshouban/src/views/advertisement/advertisingReview/advertisingReview.vue
  View file @341f183
@@ -943,7 +943,15 @@ this.pageindex.advertisingSpaceType =&#39;实体广告位&#39; @@ -943,7 +943,15 @@ this.pageindex.advertisingSpaceType =&#39;实体广告位&#39;
943 this.tableData = res.data.content 943 this.tableData = res.data.content
944 this.total = res.data.content.length 944 this.total = res.data.content.length
945 this.xxNum = res.data.content.length 945 this.xxNum = res.data.content.length
946 - 946 + this.tableData.map(res=>{
  947 + res.lesseeName = this.$decrypt(res.lesseeName)
  948 + res.contactPhone = this.$decrypt(res.contactPhone)
  949 + res.idCardNumber = this.$decrypt(res.idCardNumber)
  950 + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
  951 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  952 + res.address = this.$decrypt(res.address)
  953 + res.emailAddress = this.$decrypt(res.emailAddress)
  954 + })
947 const stList = await AdvertiserInfoGetAll(pageindex) 955 const stList = await AdvertiserInfoGetAll(pageindex)
948 this.stNum = stList.data.content.length 956 this.stNum = stList.data.content.length
949 957
@@ -957,7 +965,15 @@ this.pageindex.advertisingSpaceType =&#39;实体广告位&#39; @@ -957,7 +965,15 @@ this.pageindex.advertisingSpaceType =&#39;实体广告位&#39;
957 this.tableData = res.data.content 965 this.tableData = res.data.content
958 this.total = res.data.content.length 966 this.total = res.data.content.length
959 this.stNum = res.data.content.length 967 this.stNum = res.data.content.length
960 - 968 + this.tableData.map(res=>{
  969 + res.lesseeName = this.$decrypt(res.lesseeName)
  970 + res.contactPhone = this.$decrypt(res.contactPhone)
  971 + res.idCardNumber = this.$decrypt(res.idCardNumber)
  972 + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
  973 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  974 + res.address = this.$decrypt(res.address)
  975 + res.emailAddress = this.$decrypt(res.emailAddress)
  976 + })
961 const stList = await AdvertiserInfoGetAll(pageindex) 977 const stList = await AdvertiserInfoGetAll(pageindex)
962 this.xxNum = stList.data.content.length 978 this.xxNum = stList.data.content.length
963 } 979 }
@@ -1008,6 +1024,15 @@ this.pageindex.advertisingSpaceType =&#39;实体广告位&#39; @@ -1008,6 +1024,15 @@ this.pageindex.advertisingSpaceType =&#39;实体广告位&#39;
1008 this.tableData = res.data.content 1024 this.tableData = res.data.content
1009 this.total = res.data.content.length 1025 this.total = res.data.content.length
1010 this.xxNum = res.data.content.length 1026 this.xxNum = res.data.content.length
  1027 + this.tableData.map(res=>{
  1028 + res.lesseeName = this.$decrypt(res.lesseeName)
  1029 + res.contactPhone = this.$decrypt(res.contactPhone)
  1030 + res.idCardNumber = this.$decrypt(res.idCardNumber)
  1031 + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
  1032 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  1033 + res.address = this.$decrypt(res.address)
  1034 + res.emailAddress = this.$decrypt(res.emailAddress)
  1035 + })
1011 let pageindex={ 1036 let pageindex={
1012 pageNumber: 1, 1037 pageNumber: 1,
1013 pageSize: 10, 1038 pageSize: 10,
@@ -1023,6 +1048,15 @@ this.pageindex.advertisingSpaceType =&#39;实体广告位&#39; @@ -1023,6 +1048,15 @@ this.pageindex.advertisingSpaceType =&#39;实体广告位&#39;
1023 this.tableData = res.data.content 1048 this.tableData = res.data.content
1024 this.total = res.data.content.length 1049 this.total = res.data.content.length
1025 this.stNum = res.data.content.length 1050 this.stNum = res.data.content.length
  1051 + this.tableData.map(res=>{
  1052 + res.lesseeName = this.$decrypt(res.lesseeName)
  1053 + res.contactPhone = this.$decrypt(res.contactPhone)
  1054 + res.idCardNumber = this.$decrypt(res.idCardNumber)
  1055 + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
  1056 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  1057 + res.address = this.$decrypt(res.address)
  1058 + res.emailAddress = this.$decrypt(res.emailAddress)
  1059 + })
1026 let pageindex={ 1060 let pageindex={
1027 pageNumber: 1, 1061 pageNumber: 1,
1028 pageSize: 10, 1062 pageSize: 10,
yanshouban/src/views/atmosphere/atmosphereBian.vue
  View file @341f183
@@ -66,6 +66,17 @@ @@ -66,6 +66,17 @@
66 </el-form-item> 66 </el-form-item>
67 </el-col> 67 </el-col>
68 </el-row> 68 </el-row>
  69 + <el-row :gutter="20">
  70 + <el-col :span="8">
  71 + <el-form-item label="范围设置" class="grid-content bg-purple" prop="sponsor">
  72 + <el-select v-model="secondData.rangeSetting" placeholder="请选择" style="width: 100%">
  73 + <el-option label="活动绿道段内" value="活动绿道段内"></el-option>
  74 + <el-option label="活动场地内" value="活动场地内"></el-option>
  75 + </el-select>
  76 + </el-form-item>
  77 + </el-col>
  78 +
  79 + </el-row>
69 <div style="padding: 10px"> 80 <div style="padding: 10px">
70 <el-row :gutter="20"> 81 <el-row :gutter="20">
71 <el-form-item label="活动封面海报" prop="cover_poster" class="grid-content bg-purple"> 82 <el-form-item label="活动封面海报" prop="cover_poster" class="grid-content bg-purple">
yanshouban/src/views/atmosphere/atmosphereBz.vue
  View file @341f183
@@ -91,7 +91,16 @@ @@ -91,7 +91,16 @@
91 </el-form-item> 91 </el-form-item>
92 </el-col> 92 </el-col>
93 </el-row> 93 </el-row>
94 - 94 +<el-row :gutter="20">
  95 + <el-col :span="12">
  96 + <el-form-item label="范围设置" class="grid-content bg-purple" prop="sponsor">
  97 + <el-select v-model="ruleForm.rangeSetting" placeholder="请选择" style="width: 100%">
  98 + <el-option label="活动绿道段内" value="活动绿道段内"></el-option>
  99 + <el-option label="活动场地内" value="活动场地内"></el-option>
  100 + </el-select>
  101 + </el-form-item>
  102 + </el-col>
  103 + </el-row>
95 <el-row :gutter="20"> 104 <el-row :gutter="20">
96 <el-col :span="12"> 105 <el-col :span="12">
97 <el-form-item label="活动封面海报" prop="cover_poster" class="grid-content bg-purple"> 106 <el-form-item label="活动封面海报" prop="cover_poster" class="grid-content bg-purple">
@@ -297,12 +306,14 @@ @@ -297,12 +306,14 @@
297 </el-tab-pane> 306 </el-tab-pane>
298 </el-tabs> 307 </el-tabs>
299 <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0"> 308 <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
300 - <el-button plain @click="onSubmit" size="mini" style="background-color: #3F9B6A;color: #fff;">保存  
301 - </el-button>  
302 - <!-- <el-button plain @click="zancun" size="mini" style="background-color: #3F9B6A;color: #fff;">暂存  
303 - </el-button> -->  
304 - <el-button plain @click="close" size="mini" style="background-color: #3F9B6A;color: #fff;">取消 309 + <el-button plain @click="close" size="mini" style="background-color: #3F9B6A;color: #fff;">取消
  310 + </el-button>
  311 + <el-button @click="onSubmit(1)" style="background-color: #3F9B6A;color: #fff;">暂存
  312 + </el-button>
  313 + <el-button plain @click="onSubmit(0)" size="mini" style="background-color: #3F9B6A;color: #fff;">保存
305 </el-button> 314 </el-button>
  315 +
  316 +
306 </div> 317 </div>
307 </div> 318 </div>
308 319
@@ -393,6 +404,7 @@ uploadFileUrl: uploadUrl, // 请求地址 @@ -393,6 +404,7 @@ uploadFileUrl: uploadUrl, // 请求地址
393 eventTheme:'',//活动主题 404 eventTheme:'',//活动主题
394 sponsor:'',//活动主办方 405 sponsor:'',//活动主办方
395 participants:'',//活动参与方 406 participants:'',//活动参与方
  407 + rangeSetting:'',
396 mainPurpose:'',//活动主要目的 408 mainPurpose:'',//活动主要目的
397 coverPoster:'',//封面海报 409 coverPoster:'',//封面海报
398 internalLaborCostEstimation:'',//内部人工成本预估 410 internalLaborCostEstimation:'',//内部人工成本预估
@@ -504,7 +516,7 @@ uploadFileUrl: uploadUrl, // 请求地址 @@ -504,7 +516,7 @@ uploadFileUrl: uploadUrl, // 请求地址
504 // } 516 // }
505 }, 517 },
506 //保存 518 //保存
507 - onSubmit(){ 519 + onSubmit(val){
508 this.updateCurrentTime(); 520 this.updateCurrentTime();
509 let that = this 521 let that = this
510 let FlieName = this.ruleForm.planName 522 let FlieName = this.ruleForm.planName
@@ -559,6 +571,7 @@ uploadFileUrl: uploadUrl, // 请求地址 @@ -559,6 +571,7 @@ uploadFileUrl: uploadUrl, // 请求地址
559 // } 571 // }
560 this.$refs.jibenFrom.validate((valid) => { 572 this.$refs.jibenFrom.validate((valid) => {
561 if (valid) { 573 if (valid) {
  574 + this.ruleForm.isDraft = val
562 add(this.ruleForm).then(res=>{ 575 add(this.ruleForm).then(res=>{
563 this.$message({ 576 this.$message({
564 message: '保存成功', 577 message: '保存成功',
@@ -681,6 +694,7 @@ this.tuxiangData = { @@ -681,6 +694,7 @@ this.tuxiangData = {
681 eventTheme: '', //活动主题 694 eventTheme: '', //活动主题
682 sponsor: '', //活动主办方 695 sponsor: '', //活动主办方
683 participants: '', //活动参与方 696 participants: '', //活动参与方
  697 + rangeSetting:'',
684 mainPurpose: '', //活动主要目的 698 mainPurpose: '', //活动主要目的
685 coverPoster: '', //封面海报 699 coverPoster: '', //封面海报
686 internalLaborCostEstimation: '', //内部人工成本预估 700 internalLaborCostEstimation: '', //内部人工成本预估
yanshouban/src/views/atmosphere/atmosphereGl.vue
  View file @341f183
@@ -541,15 +541,14 @@ @@ -541,15 +541,14 @@
541 541
542 </el-row> 542 </el-row>
543 <el-row :gutter="20"> 543 <el-row :gutter="20">
544 - <el-col :span="8"> 544 + <el-col :span="24">
545 <el-form-item label="反馈内容" class="grid-content bg-purple" prop="name"> 545 <el-form-item label="反馈内容" class="grid-content bg-purple" prop="name">
546 <el-upload class="upload-demo" ref="upload" :on-remove="handleRemove" 546 <el-upload class="upload-demo" ref="upload" :on-remove="handleRemove"
547 :action="uploadFileUrl" :on-success="handleUploadSuccess" :file-list="fileData" 547 :action="uploadFileUrl" :on-success="handleUploadSuccess" :file-list="fileData"
548 - :show-file-list="false" v-if="zhixingBian">  
549 - <div style="color: #2d8a58;margin-left: 10px;" slot="trigger">  
550 - 上传附件  
551 - </div> 548 + :show-file-list="true" v-if="zhixingBian">
  549 + <el-button style="background-color: #fff;color: #3F9B6A;border: 1px solid #dcdfe6;" class="buttonHover" v-if="fileData.length==0">+点击上传</el-button>
552 </el-upload> 550 </el-upload>
  551 + <div v-else>{{zhixingList.feedbackContent}}</div>
553 </el-form-item> 552 </el-form-item>
554 </el-col> 553 </el-col>
555 554
@@ -1106,9 +1105,8 @@ @@ -1106,9 +1105,8 @@
1106 </el-table-column> 1105 </el-table-column>
1107 <el-table-column label="操作" width="350"> 1106 <el-table-column label="操作" width="350">
1108 <template slot-scope="scope"> 1107 <template slot-scope="scope">
1109 - <div @click="shiyong(1,scope.row)" class="tableBtn greens">使用</div>  
1110 - <div class="tableBtn greens" @click="handleEditForm(scope.row)">执行情况</div>  
1111 - <div @click="actBian(scope.row)" class="tableBtn greens" v-if="scope.row.state == ''">修改</div> 1108 + <div @click="shiyong(scope.row)" class="tableBtn greens">使用</div>
  1109 + <!-- <div @click="actBian(scope.row)" class="tableBtn greens" v-if="scope.row.state == ''">修改</div> -->
1112 <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div> 1110 <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div>
1113 </template> 1111 </template>
1114 </el-table-column> 1112 </el-table-column>
@@ -1222,9 +1220,11 @@ components: { addAct,atmbians}, @@ -1222,9 +1220,11 @@ components: { addAct,atmbians},
1222 text: '活动主要目的', 1220 text: '活动主要目的',
1223 eventTheme: '' 1221 eventTheme: ''
1224 },{ 1222 },{
1225 - id: '5',  
1226 - name: '状态',  
1227 - eventTheme: '待审核' 1223 + id:0,
  1224 + name: '范围设置',
  1225 + planName: '',
  1226 + text: '状态',
  1227 + eventTheme: ''
1228 }], 1228 }],
1229 internalLaborCostEstimation:'', 1229 internalLaborCostEstimation:'',
1230 externalLaborCostEstimation:'', 1230 externalLaborCostEstimation:'',
@@ -1304,7 +1304,8 @@ components: { addAct,atmbians}, @@ -1304,7 +1304,8 @@ components: { addAct,atmbians},
1304 pageindex: { 1304 pageindex: {
1305 pageNumber: 1, 1305 pageNumber: 1,
1306 pageSize: 10, 1306 pageSize: 10,
1307 - dataOwnership:'2' 1307 + dataOwnership:'2',
  1308 + isDraft:0
1308 }, 1309 },
1309 multipleSelection:[],//选择的数据 1310 multipleSelection:[],//选择的数据
1310 options: [], 1311 options: [],
@@ -1377,7 +1378,7 @@ components: { addAct,atmbians}, @@ -1377,7 +1378,7 @@ components: { addAct,atmbians},
1377 //查询全数据 1378 //查询全数据
1378 async getAll() { 1379 async getAll() {
1379 const res = await queryByPage((this.pageindex)) 1380 const res = await queryByPage((this.pageindex))
1380 - console.log(res.data) 1381 +
1381 this.tableData = res.data.content 1382 this.tableData = res.data.content
1382 this.total = res.data.content.length 1383 this.total = res.data.content.length
1383 let page = { 1384 let page = {
@@ -1407,12 +1408,13 @@ components: { addAct,atmbians}, @@ -1407,12 +1408,13 @@ components: { addAct,atmbians},
1407 })); 1408 }));
1408 }, 1409 },
1409 async handleNodeClick(data){ 1410 async handleNodeClick(data){
1410 - console.log('Node clicked:', data); 1411 +
1411 let pageindex= { 1412 let pageindex= {
1412 pageNumber: 1, 1413 pageNumber: 1,
1413 pageSize: 10, 1414 pageSize: 10,
1414 dataOwnership: '2', 1415 dataOwnership: '2',
1415 - classificationCode:data.id 1416 + classificationCode:data.id,
  1417 + isDraft:0
1416 } 1418 }
1417 const res = await queryByPage(pageindex) 1419 const res = await queryByPage(pageindex)
1418 this.tableData = res.data.content 1420 this.tableData = res.data.content
@@ -1422,7 +1424,8 @@ components: { addAct,atmbians}, @@ -1422,7 +1424,8 @@ components: { addAct,atmbians},
1422 this.pageindex={ 1424 this.pageindex={
1423 pageNumber: 1, 1425 pageNumber: 1,
1424 pageSize: 10, 1426 pageSize: 10,
1425 - dataOwnership: '2' 1427 + dataOwnership: '2',
  1428 + isDraft:0
1426 } 1429 }
1427 const res = await queryByPage(this.pageindex) 1430 const res = await queryByPage(this.pageindex)
1428 this.tableData = res.data.content 1431 this.tableData = res.data.content
@@ -1497,7 +1500,9 @@ components: { addAct,atmbians}, @@ -1497,7 +1500,9 @@ components: { addAct,atmbians},
1497 }, 1500 },
1498 //执行效果保存 1501 //执行效果保存
1499 async bianji() { 1502 async bianji() {
1500 - console.log(this.zhiXing) 1503 + if(this.fileData.length !=0){
  1504 + this.zhixingList.feedbackContent = this.fileData[0].url
  1505 + }
1501 if(this.zhiXing){ 1506 if(this.zhiXing){
1502 this.zhixingList.eventStartTime = this.zhixingList.planTime[0] 1507 this.zhixingList.eventStartTime = this.zhixingList.planTime[0]
1503 this.zhixingList.eventEndTime=this.zhixingList.planTime[1] 1508 this.zhixingList.eventEndTime=this.zhixingList.planTime[1]
@@ -1519,6 +1524,7 @@ components: { addAct,atmbians}, @@ -1519,6 +1524,7 @@ components: { addAct,atmbians},
1519 }, 1524 },
1520 //详情点击 1525 //详情点击
1521 handleEditForm(item) { 1526 handleEditForm(item) {
  1527 + this.fileData = []
1522 this.zhixingList={ 1528 this.zhixingList={
1523 planTime: [], 1529 planTime: [],
1524 planName: '', //活动名称 1530 planName: '', //活动名称
@@ -1600,8 +1606,8 @@ components: { addAct,atmbians}, @@ -1600,8 +1606,8 @@ components: { addAct,atmbians},
1600 that.tableData1[2].planName = res.data.content[0].sponsor 1606 that.tableData1[2].planName = res.data.content[0].sponsor
1601 that.tableData1[3].eventTheme = res.data.content[0].participants 1607 that.tableData1[3].eventTheme = res.data.content[0].participants
1602 that.tableData1[3].planName = res.data.content[0].mainPurpose 1608 that.tableData1[3].planName = res.data.content[0].mainPurpose
1603 - // that.tableData1[4].eventTheme = res.data.content[0].state  
1604 - that.tableData1[4].eventTheme = this.getStatus(res.data.content[0].state) 1609 + that.tableData1[4].planName = this.getStatus(res.data.content[0].state)
  1610 + that.tableData1[4].eventTheme = res.data.content[0].rangeSetting
1605 //活动成本信息 1611 //活动成本信息
1606 that.internalLaborCostEstimation=res.data.content[0].internalLaborCostEstimation 1612 that.internalLaborCostEstimation=res.data.content[0].internalLaborCostEstimation
1607 that.externalLaborCostEstimation=res.data.content[0].externalLaborCostEstimation 1613 that.externalLaborCostEstimation=res.data.content[0].externalLaborCostEstimation
@@ -2079,11 +2085,15 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic @@ -2079,11 +2085,15 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic
2079 2085
2080 }, 2086 },
2081 handleUploadSuccess(response, file, fileList) { 2087 handleUploadSuccess(response, file, fileList) {
2082 - console.log(response, file, fileList)  
2083 - // this.fileData.push(file) 2088 + const fileMsg = {
  2089 + name:file.name,
  2090 + url: file.response.data.url,
  2091 + }
  2092 + // 将文件地址存储在 uploadedFiles 数组中
  2093 + this.fileData.push(fileMsg);
2084 }, 2094 },
2085 handleRemove(){ 2095 handleRemove(){
2086 - 2096 +this.fileData=[]
2087 }, 2097 },
2088 daoru(){ 2098 daoru(){
2089 2099
@@ -2092,7 +2102,8 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic @@ -2092,7 +2102,8 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic
2092 let pageindex = { 2102 let pageindex = {
2093 pageNumber: 1, 2103 pageNumber: 1,
2094 pageSize: 10, 2104 pageSize: 10,
2095 - dataOwnership: '2' 2105 + dataOwnership: '2',
  2106 + isDraft:1
2096 } 2107 }
2097 queryByPage(pageindex).then(res=>{ 2108 queryByPage(pageindex).then(res=>{
2098 this.caoList = res.data.content 2109 this.caoList = res.data.content
@@ -2100,7 +2111,7 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic @@ -2100,7 +2111,7 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic
2100 this.caogaoshow =true 2111 this.caogaoshow =true
2101 2112
2102 }, 2113 },
2103 - shiyong(val,item){ 2114 + shiyong(item){
2104 2115
2105 const h = this.$createElement; 2116 const h = this.$createElement;
2106 this.$msgbox({ 2117 this.$msgbox({
@@ -2115,14 +2126,15 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic @@ -2115,14 +2126,15 @@ that.expectedAttractTraffic=res.data.content[0].expectedAttractTraffic
2115 customClass: 'oe-dialog-btn', 2126 customClass: 'oe-dialog-btn',
2116 beforeClose: (action, instance, done) => { 2127 beforeClose: (action, instance, done) => {
2117 if (action === 'confirm') { 2128 if (action === 'confirm') {
2118 - // contentEdit({  
2119 - // id: item.id,  
2120 - // draftStatus:1  
2121 - // }).then(res => {  
2122 - // this.getAll()  
2123 - // this.getcaogao()  
2124 - // done();  
2125 - // }) 2129 + xiangedit({
  2130 + id: item.id,
  2131 + draftStatus:1,
  2132 + isDraft:0
  2133 + }).then(res => {
  2134 + this.getAll()
  2135 + this.caogao()
  2136 + done();
  2137 + })
2126 } else { 2138 } else {
2127 done(); 2139 done();
2128 } 2140 }
yanshouban/src/views/atmosphere/atmosphereSp.vue
  View file @341f183
@@ -912,7 +912,8 @@ @@ -912,7 +912,8 @@
912 pageindex: { 912 pageindex: {
913 pageNumber: 1, 913 pageNumber: 1,
914 pageSize: 10, 914 pageSize: 10,
915 - dataOwnership: '2' 915 + dataOwnership: '2',
  916 + isDraft:0
916 }, 917 },
917 multipleSelection: [], 918 multipleSelection: [],
918 options: [{ 919 options: [{
yanshouban/src/views/business/autd/index.vue
  View file @341f183
@@ -450,7 +450,7 @@ export default { @@ -450,7 +450,7 @@ export default {
450 this.total = res.data.total 450 this.total = res.data.total
451 this.tableData.map(res=>{ 451 this.tableData.map(res=>{
452 res.shopPhone = this.$decrypt(res.shopPhone) 452 res.shopPhone = this.$decrypt(res.shopPhone)
453 - res.shopPassword = this.$decrypt(res.shopPassword) 453 + // res.shopPassword = this.$decrypt(res.shopPassword)
454 res.emailAddress = this.$decrypt(res.emailAddress) 454 res.emailAddress = this.$decrypt(res.emailAddress)
455 res.idCardNum = this.$decrypt(res.idCardNum) 455 res.idCardNum = this.$decrypt(res.idCardNum)
456 }) 456 })
yanshouban/src/views/business/businessList/index.vue
  View file @341f183
@@ -899,8 +899,7 @@ export default { @@ -899,8 +899,7 @@ export default {
899 addCheck (ruleForm) { 899 addCheck (ruleForm) {
900 this.$refs[ruleForm].validate(valid => { 900 this.$refs[ruleForm].validate(valid => {
901 if (valid) { 901 if (valid) {
902 - console.log(this.userState)  
903 - console.log(this.ruleForm) 902 +
904 // if (this.personPhone !== '') { 903 // if (this.personPhone !== '') {
905 // this.ruleForm.chargePersonPhone = this.personPhone 904 // this.ruleForm.chargePersonPhone = this.personPhone
906 // } 905 // }
@@ -1052,21 +1051,25 @@ export default { @@ -1052,21 +1051,25 @@ export default {
1052 1051
1053 }) 1052 })
1054 }, 1053 },
1055 - // businessListGetAll 1054 +
1056 // 初始化查询所有数据 1055 // 初始化查询所有数据
1057 - async getAll (formInline) { 1056 + async getAll(formInline) {
1058 const res = await businessListGetAll(formInline) 1057 const res = await businessListGetAll(formInline)
1059 this.total = res.data.total 1058 this.total = res.data.total
1060 this.tableData = res.data.list 1059 this.tableData = res.data.list
1061 - this.tableData.map(res=>{  
1062 - res.shopPhone = this.$decrypt(res.shopPhone)  
1063 - res.shopPassword = this.$decrypt(res.shopPassword)  
1064 - res.idCardNum = this.$decrypt(res.idCardNum)  
1065 - res.emailAddress = this.$decrypt(res.emailAddress)  
1066 - res.shopAdress = this.$decrypt(res.shopAdress)  
1067 - res.legalRepresentative = this.$decrypt(res.legalRepresentative)  
1068 - res.chargePersonPhone = this.$decrypt(res.chargePersonPhone) 1060 +
  1061 + this.tableData.map(item=>{
  1062 +
  1063 + item.shopPhone = this.$decrypt(item.shopPhone)
  1064 + item.shopPassword = this.$decrypt(item.shopPassword)
  1065 + item.idCardNum = this.$decrypt(item.idCardNum)
  1066 + item.emailAddress = this.$decrypt(item.emailAddress)
  1067 + item.shopAdress = this.$decrypt(item.shopAdress)
  1068 + item.legalRepresentative = this.$decrypt(item.legalRepresentative)
  1069 + item.chargePersonPhone = this.$decrypt(item.chargePersonPhone)
  1070 +
1069 }) 1071 })
  1072 +
1070 }, 1073 },
1071 // 编辑号码 1074 // 编辑号码
1072 inputPhone () { 1075 inputPhone () {
yanshouban/src/views/couponmanagement/coupon.vue
  View file @341f183
@@ -226,7 +226,7 @@ @@ -226,7 +226,7 @@
226 this.shopList = res1.data.list 226 this.shopList = res1.data.list
227 this.shopList.map(res=>{ 227 this.shopList.map(res=>{
228 res.shopPhone = this.$decrypt(res.shopPhone) 228 res.shopPhone = this.$decrypt(res.shopPhone)
229 - res.shopPassword = this.$decrypt(res.shopPassword) 229 + // res.shopPassword = this.$decrypt(res.shopPassword)
230 res.idCardNum = this.$decrypt(res.idCardNum) 230 res.idCardNum = this.$decrypt(res.idCardNum)
231 res.emailAddress = this.$decrypt(res.emailAddress) 231 res.emailAddress = this.$decrypt(res.emailAddress)
232 res.shopAdress = this.$decrypt(res.shopAdress) 232 res.shopAdress = this.$decrypt(res.shopAdress)
yanshouban/src/views/customer/icManagement/index.vue
  View file @341f183
@@ -507,6 +507,14 @@ @@ -507,6 +507,14 @@
507 const res = await icManAll(this.pageindex); 507 const res = await icManAll(this.pageindex);
508 this.tableData = res.data.content 508 this.tableData = res.data.content
509 this.total = res.data.content.length 509 this.total = res.data.content.length
  510 + this.tableData.map(res=>{
  511 + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
  512 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  513 + res.address = this.$decrypt(res.address)
  514 + res.emailAddress = this.$decrypt(res.emailAddress)
  515 + res.contactName = this.$decrypt(res.contactName)
  516 + res.contactPhone = this.$decrypt(res.contactPhone)
  517 + })
510 }, 518 },
511 // 编辑确认 519 // 编辑确认
512 async msgeditS() { 520 async msgeditS() {
@@ -610,6 +618,14 @@ @@ -610,6 +618,14 @@
610 const res = await icManAll(this.formSel) 618 const res = await icManAll(this.formSel)
611 this.tableData = res.data.content 619 this.tableData = res.data.content
612 this.total = res.data.content.length 620 this.total = res.data.content.length
  621 + this.tableData.map(res=>{
  622 + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
  623 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  624 + res.address = this.$decrypt(res.address)
  625 + res.emailAddress = this.$decrypt(res.emailAddress)
  626 + res.contactName = this.$decrypt(res.contactName)
  627 + res.contactPhone = this.$decrypt(res.contactPhone)
  628 + })
613 }, 629 },
614 630
615 // 详情点击 631 // 详情点击
yanshouban/src/views/customer/icReview/index.vue
  View file @341f183
@@ -821,6 +821,14 @@ export default { @@ -821,6 +821,14 @@ export default {
821 const res = await icManAll(this.pageindex) 821 const res = await icManAll(this.pageindex)
822 this.tableData = res.data.content 822 this.tableData = res.data.content
823 this.total = res.data.content.length 823 this.total = res.data.content.length
  824 + this.tableData.map(res=>{
  825 + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
  826 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  827 + res.address = this.$decrypt(res.address)
  828 + res.emailAddress = this.$decrypt(res.emailAddress)
  829 + res.contactName = this.$decrypt(res.contactName)
  830 + res.contactPhone = this.$decrypt(res.contactPhone)
  831 + })
824 }, 832 },
825 833
826 bianjilist(item) { 834 bianjilist(item) {
@@ -835,7 +843,16 @@ export default { @@ -835,7 +843,16 @@ export default {
835 const res = await icManAll(this.formSel) 843 const res = await icManAll(this.formSel)
836 this.tableData = res.data.content 844 this.tableData = res.data.content
837 this.total = res.data.content.length 845 this.total = res.data.content.length
  846 + this.tableData.map(res=>{
  847 + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
  848 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  849 + res.address = this.$decrypt(res.address)
  850 + res.emailAddress = this.$decrypt(res.emailAddress)
  851 + res.contactName = this.$decrypt(res.contactName)
  852 + res.contactPhone = this.$decrypt(res.contactPhone)
  853 + })
838 }, 854 },
  855 +
839 // 详情点击 856 // 详情点击
840 async handleEditForm(item) { 857 async handleEditForm(item) {
841 this.secondData = item; 858 this.secondData = item;
yanshouban/src/views/customer/rUser/index.vue
  View file @341f183
@@ -335,7 +335,6 @@ @@ -335,7 +335,6 @@
335 } from '@/utils/request' 335 } from '@/utils/request'
336 336
337 import { 337 import {
338 - businessListGetAll,  
339 businessListSave, 338 businessListSave,
340 businessListGetById, 339 businessListGetById,
341 businessListUpdate, 340 businessListUpdate,
yanshouban/src/views/customer/rsaManagement/index.vue
  View file @341f183
@@ -803,6 +803,14 @@ @@ -803,6 +803,14 @@
803 const res = await rsaManAll(this.pageindex); 803 const res = await rsaManAll(this.pageindex);
804 this.tableData = res.data.content; 804 this.tableData = res.data.content;
805 this.total = res.data.content.length 805 this.total = res.data.content.length
  806 + this.tableData.map(res=>{
  807 + res.contactPhone = this.$decrypt(res.contactPhone)
  808 + res.idCardNumber = this.$decrypt(res.idCardNumber)
  809 + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
  810 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  811 + res.address = this.$decrypt(res.address)
  812 + res.emailAddress = this.$decrypt(res.emailAddress)
  813 + })
806 const ziyuan = await getAlls(this.pageindex) 814 const ziyuan = await getAlls(this.pageindex)
807 const ggw = await map1(this.pageindex) 815 const ggw = await map1(this.pageindex)
808 this.ziyuanData = [...ziyuan.data.content,...ggw.data.content] 816 this.ziyuanData = [...ziyuan.data.content,...ggw.data.content]
@@ -1010,6 +1018,14 @@ async getshen(item){ @@ -1010,6 +1018,14 @@ async getshen(item){
1010 const res = await rsaManAll(this.formSel) 1018 const res = await rsaManAll(this.formSel)
1011 this.tableData = res.data.content 1019 this.tableData = res.data.content
1012 this.total = res.data.content.length 1020 this.total = res.data.content.length
  1021 + this.tableData.map(res=>{
  1022 + res.contactPhone = this.$decrypt(res.contactPhone)
  1023 + res.idCardNumber = this.$decrypt(res.idCardNumber)
  1024 + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
  1025 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  1026 + res.address = this.$decrypt(res.address)
  1027 + res.emailAddress = this.$decrypt(res.emailAddress)
  1028 + })
1013 }, 1029 },
1014 mingClose(){ 1030 mingClose(){
1015 this.multipleSelection =[] 1031 this.multipleSelection =[]
yanshouban/src/views/customer/rsaReview/index.vue
  View file @341f183
@@ -929,6 +929,14 @@ export default { @@ -929,6 +929,14 @@ export default {
929 const res = await rsaManAll(this.pageindex); 929 const res = await rsaManAll(this.pageindex);
930 this.tableData = res.data.content; 930 this.tableData = res.data.content;
931 this.total = res.data.content.length 931 this.total = res.data.content.length
  932 + this.tableData.map(res=>{
  933 + res.contactPhone = this.$decrypt(res.contactPhone)
  934 + res.idCardNumber = this.$decrypt(res.idCardNumber)
  935 + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
  936 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  937 + res.address = this.$decrypt(res.address)
  938 + res.emailAddress = this.$decrypt(res.emailAddress)
  939 + })
932 }, 940 },
933 // 查询 941 // 查询
934 async onSubmit() { 942 async onSubmit() {
@@ -936,6 +944,14 @@ export default { @@ -936,6 +944,14 @@ export default {
936 const res = await rsaManAll(this.formSel) 944 const res = await rsaManAll(this.formSel)
937 this.tableData = res.data.content 945 this.tableData = res.data.content
938 this.total = res.data.content.length 946 this.total = res.data.content.length
  947 + this.tableData.map(res=>{
  948 + res.contactPhone = this.$decrypt(res.contactPhone)
  949 + res.idCardNumber = this.$decrypt(res.idCardNumber)
  950 + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
  951 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  952 + res.address = this.$decrypt(res.address)
  953 + res.emailAddress = this.$decrypt(res.emailAddress)
  954 + })
939 955
940 }, 956 },
941 957
yanshouban/src/views/ipm/followup/index.vue
  View file @341f183
@@ -658,11 +658,27 @@ @@ -658,11 +658,27 @@
658 const res = await genGetAll(this.pageindex) 658 const res = await genGetAll(this.pageindex)
659 this.tableData = res.data.content 659 this.tableData = res.data.content
660 this.total = res.data.content.length 660 this.total = res.data.content.length
  661 + this.tableData.map(res=>{
  662 + res.contactPhone = this.$decrypt(res.contactPhone)
  663 + res.idCardNumber = this.$decrypt(res.idCardNumber)
  664 + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
  665 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  666 + res.address = this.$decrypt(res.address)
  667 + res.emailAddress = this.$decrypt(res.emailAddress)
  668 + })
661 const ziyuan = await getAlls(this.pageindex) 669 const ziyuan = await getAlls(this.pageindex)
662 const ggw = await map1(this.pageindex) 670 const ggw = await map1(this.pageindex)
663 this.ziyuanData = [...ziyuan.data.content,...ggw.data.content] 671 this.ziyuanData = [...ziyuan.data.content,...ggw.data.content]
664 const kehu = await icManAll(this.pageindex); 672 const kehu = await icManAll(this.pageindex);
665 this.kehuData = kehu.data.content 673 this.kehuData = kehu.data.content
  674 + this.kehuData.map(res=>{
  675 + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
  676 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  677 + res.address = this.$decrypt(res.address)
  678 + res.emailAddress = this.$decrypt(res.emailAddress)
  679 + res.contactName = this.$decrypt(res.contactName)
  680 + res.contactPhone = this.$decrypt(res.contactPhone)
  681 + })
666 }, 682 },
667 683
668 // 新增确定按钮 684 // 新增确定按钮
@@ -796,7 +812,14 @@ @@ -796,7 +812,14 @@
796 const res = await genGetAll(this.formSel) 812 const res = await genGetAll(this.formSel)
797 this.tableData = res.data.content 813 this.tableData = res.data.content
798 this.total = res.data.content.length 814 this.total = res.data.content.length
799 - 815 + this.tableData.map(res=>{
  816 + res.contactPhone = this.$decrypt(res.contactPhone)
  817 + res.idCardNumber = this.$decrypt(res.idCardNumber)
  818 + res.unifiedSocialCreditCode = this.$decrypt(res.unifiedSocialCreditCode)
  819 + res.legalRepresentative = this.$decrypt(res.legalRepresentative)
  820 + res.address = this.$decrypt(res.address)
  821 + res.emailAddress = this.$decrypt(res.emailAddress)
  822 + })
800 }, 823 },
801 //重置按钮 824 //重置按钮
802 resetting() { 825 resetting() {
yanshouban/src/views/media/mediaMana.vue
  View file @341f183
@@ -120,7 +120,7 @@ @@ -120,7 +120,7 @@
120 <!-- 详情活动方案 --> 120 <!-- 详情活动方案 -->
121 <el-dialog :title="wangShow==false?'修改页 ':'详情页'" :visible.sync="ggXin" custom-class='bian_css' style="padding: 0;" width="65s%" 121 <el-dialog :title="wangShow==false?'修改页 ':'详情页'" :visible.sync="ggXin" custom-class='bian_css' style="padding: 0;" width="65s%"
122 center :close-on-click-modal="false" :close-on-press-escape="false" :show-close='false'> 122 center :close-on-click-modal="false" :close-on-press-escape="false" :show-close='false'>
123 - <div style="padding: 10px 20px;"> 123 + <div style="padding: 10px 20px;" ref="contentToConvert">
124 <el-form ref="ruleFormInfo" :model="secondData" label-width="120px" 124 <el-form ref="ruleFormInfo" :model="secondData" label-width="120px"
125 style="position: relative"> 125 style="position: relative">
126 <el-form-item label="方案标题" class="grid-content bg-purple device-from" prop="name"> 126 <el-form-item label="方案标题" class="grid-content bg-purple device-from" prop="name">
@@ -145,6 +145,9 @@ @@ -145,6 +145,9 @@
145 <el-button @click="ggXin=false" 145 <el-button @click="ggXin=false"
146 style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;" class="buttonHover">返回 146 style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;" class="buttonHover">返回
147 </el-button> 147 </el-button>
  148 + <el-button @click="daochu" v-if="wangShow"
  149 + style="color: #fff;background-color: #3F9B6A;">生成PDF
  150 + </el-button>
148 <el-button @click="TuiEdit" v-if="!wangShow" 151 <el-button @click="TuiEdit" v-if="!wangShow"
149 style="color: #fff;background-color: #3F9B6A;">确定 152 style="color: #fff;background-color: #3F9B6A;">确定
150 </el-button> 153 </el-button>
@@ -523,6 +526,8 @@ @@ -523,6 +526,8 @@
523 import addAct from "./mediaMannaAdd" 526 import addAct from "./mediaMannaAdd"
524 import wangEditor from "@/components/editor/index"; 527 import wangEditor from "@/components/editor/index";
525 import upimg from "@/components/ImageUpload/index" 528 import upimg from "@/components/ImageUpload/index"
  529 + import html2canvas from 'html2canvas'
  530 + import jsPDF from 'jspdf'
526 export default { 531 export default {
527 components: { addAct,wangEditor,upimg}, 532 components: { addAct,wangEditor,upimg},
528 data() { 533 data() {
@@ -604,6 +609,29 @@ components: { addAct,wangEditor,upimg}, @@ -604,6 +609,29 @@ components: { addAct,wangEditor,upimg},
604 609
605 }, 610 },
606 methods: { 611 methods: {
  612 + async daochu(){
  613 +
  614 + const content = this.$refs.contentToConvert;
  615 +
  616 + // 使用 html2canvas 将 div 渲染为画布
  617 + const canvas = await html2canvas(content);
  618 +
  619 + // 获取画布的图像数据
  620 + const imgData = canvas.toDataURL('image/png');
  621 +
  622 + // 创建一个新的 PDF 文档
  623 + const pdf = new jsPDF('p', 'mm', 'a4');
  624 +
  625 + // 添加图像到 PDF，第二个参数是图像格式，第三个参数是缩放比例
  626 + const imgWidth = 190; // 图像的宽度（mm）
  627 + const imgHeight = (canvas.height * imgWidth) / canvas.width; // 保持图像的宽高比
  628 +
  629 + pdf.addImage(imgData, 'PNG', 10, 10, imgWidth, imgHeight); // 10, 10 是图像在 PDF 中的位置（mm）
  630 +
  631 + // 保存 PDF 文件
  632 + pdf.save('媒体推广.pdf');
  633 +
  634 + },
607 //查询全数据 635 //查询全数据
608 async getAll() { 636 async getAll() {
609 const res = await tuiGetAll(this.pageindex) 637 const res = await tuiGetAll(this.pageindex)
yanshouban/src/views/online/QRCode/index.vue
  View file @341f183
@@ -177,7 +177,7 @@ export default { @@ -177,7 +177,7 @@ export default {
177 this.tableData = res.data.list 177 this.tableData = res.data.list
178 this.tableData.map(res=>{ 178 this.tableData.map(res=>{
179 res.shopPhone = this.$decrypt(res.shopPhone) 179 res.shopPhone = this.$decrypt(res.shopPhone)
180 - res.shopPassword = this.$decrypt(res.shopPassword) 180 + // res.shopPassword = this.$decrypt(res.shopPassword)
181 res.idCardNum = this.$decrypt(res.idCardNum) 181 res.idCardNum = this.$decrypt(res.idCardNum)
182 res.emailAddress = this.$decrypt(res.emailAddress) 182 res.emailAddress = this.$decrypt(res.emailAddress)
183 res.shopAdress = this.$decrypt(res.shopAdress) 183 res.shopAdress = this.$decrypt(res.shopAdress)
yanshouban/src/views/online/QRFunds/index.vue
  View file @341f183
@@ -177,7 +177,7 @@ export default { @@ -177,7 +177,7 @@ export default {
177 this.tableData = res.data.list 177 this.tableData = res.data.list
178 this.tableData.map(res=>{ 178 this.tableData.map(res=>{
179 res.shopPhone = this.$decrypt(res.shopPhone) 179 res.shopPhone = this.$decrypt(res.shopPhone)
180 - res.shopPassword = this.$decrypt(res.shopPassword) 180 + // res.shopPassword = this.$decrypt(res.shopPassword)
181 res.idCardNum = this.$decrypt(res.idCardNum) 181 res.idCardNum = this.$decrypt(res.idCardNum)
182 res.emailAddress = this.$decrypt(res.emailAddress) 182 res.emailAddress = this.$decrypt(res.emailAddress)
183 res.shopAdress = this.$decrypt(res.shopAdress) 183 res.shopAdress = this.$decrypt(res.shopAdress)
yanshouban/src/views/serve/MarkActivity/index.vue
  View file @341f183
@@ -684,6 +684,10 @@ @@ -684,6 +684,10 @@
684 const res = await Registration(page) 684 const res = await Registration(page)
685 this.mingList = res.data 685 this.mingList = res.data
686 this.baoming = true 686 this.baoming = true
  687 + this.mingList.map(res=>{
  688 + res.userName = this.$decrypt(res.userName)
  689 + res.userPhone = this.$decrypt(res.userPhone)
  690 + })
687 } 691 }
688 692
689 } 693 }
yanshouban/src/views/shopRental/renewalMan/index.vue
  View file @341f183
@@ -39,6 +39,7 @@ @@ -39,6 +39,7 @@
39 <div> 39 <div>
40 <el-button 40 <el-button
41 style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" @click="daochu">导出</el-button> 41 style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" @click="daochu">导出</el-button>
  42 + <el-button @click="dayin" style="background-color: #3F9B6A;color: #fff">打印</el-button>
42 </div> 43 </div>
43 44
44 </div> 45 </div>
@@ -793,7 +794,7 @@ @@ -793,7 +794,7 @@
793 794
794 <div style="justify-content:flex-end;margin:20px 20px 0 0;display:flex;"> 795 <div style="justify-content:flex-end;margin:20px 20px 0 0;display:flex;">
795 <el-button @click="downloadPdf" style="background-color: #3F9B6A;color: #fff">下载</el-button> 796 <el-button @click="downloadPdf" style="background-color: #3F9B6A;color: #fff">下载</el-button>
796 - <!-- <el-button style="background-color: #3F9B6A;color: #fff">打印</el-button> --> 797 +
797 <!-- <el-button style="background-color: #3F9B6A;color: #fff">发送</el-button> --> 798 <!-- <el-button style="background-color: #3F9B6A;color: #fff">发送</el-button> -->
798 799
799 </div> 800 </div>
@@ -817,7 +818,8 @@ @@ -817,7 +818,8 @@
817 updateList, 818 updateList,
818 queryById, 819 queryById,
819 cereLeasingById, 820 cereLeasingById,
820 - cereLeasingEdit 821 + cereLeasingEdit,
  822 + pdfLeaseRenewalManagement
821 } from '../../../api/manage.js' 823 } from '../../../api/manage.js'
822 import { 824 import {
823 rentalGetAll, 825 rentalGetAll,
@@ -932,6 +934,30 @@ @@ -932,6 +934,30 @@
932 934
933 }, 935 },
934 methods: { 936 methods: {
  937 + async dayin(){
  938 + let res = await pdfLeaseRenewalManagement(this.pageindex)
  939 + if(!res){
  940 + return
  941 + }
  942 + const blob = new Blob([res], { type: 'application/pdf' })
  943 + const fileName = '续租管理.pdf'
  944 + if ('download' in document.createElement('a')) {
  945 + // 非IE下载
  946 + const elink = document.createElement('a')
  947 + elink.download = fileName
  948 + elink.style.display = 'none'
  949 + elink.href = URL.createObjectURL(blob)
  950 + document.body.appendChild(elink)
  951 + elink.click()
  952 + URL.revokeObjectURL(elink.href) // 释放URL 对象
  953 + document.body.removeChild(elink)
  954 + } else {
  955 + // IE10+下载
  956 + navigator.msSaveBlob(blob, fileName)
  957 + }
  958 +
  959 +
  960 + },
935 chenge(val){ 961 chenge(val){
936 this.formSel={ 962 this.formSel={
937 affiliation: '', 963 affiliation: '',
yanshouban/src/views/shopRental/rentTermination/index.vue
  View file @341f183
@@ -41,6 +41,8 @@ @@ -41,6 +41,8 @@
41 </el-button> 41 </el-button>
42 <el-button @click="daochu" style="background-color: #3F9B6A;color: #fff">导出 42 <el-button @click="daochu" style="background-color: #3F9B6A;color: #fff">导出
43 </el-button> 43 </el-button>
  44 + <el-button @click="dayin" style="background-color: #3F9B6A;color: #fff">打印</el-button>
  45 +
44 </div> 46 </div>
45 <!-- 表格 --> 47 <!-- 表格 -->
46 48
@@ -640,8 +642,7 @@ @@ -640,8 +642,7 @@
640 </div> 642 </div>
641 <div style="justify-content:flex-end;margin:20px 20px 0 0;display:flex;"> 643 <div style="justify-content:flex-end;margin:20px 20px 0 0;display:flex;">
642 <el-button @click="downloadPdf" style="background-color: #3F9B6A;color: #fff">下载</el-button> 644 <el-button @click="downloadPdf" style="background-color: #3F9B6A;color: #fff">下载</el-button>
643 - <!-- <el-button style="background-color: #3F9B6A;color: #fff">打印</el-button>  
644 - <el-button style="background-color: #3F9B6A;color: #fff">发送</el-button> --> 645 +
645 646
646 </div> 647 </div>
647 </div> 648 </div>
@@ -662,7 +663,7 @@ @@ -662,7 +663,7 @@
662 contractDel, 663 contractDel,
663 updateList, 664 updateList,
664 queryById, 665 queryById,
665 - 666 + pdfManagementOfFinalAccountsForRentals,
666 cereLeasingEdit 667 cereLeasingEdit
667 } from '../../../api/manage.js' 668 } from '../../../api/manage.js'
668 import { 669 import {
@@ -794,7 +795,30 @@ @@ -794,7 +795,30 @@
794 this.total = res.data.numberOfElements 795 this.total = res.data.numberOfElements
795 this.tableData = res.data.content 796 this.tableData = res.data.content
796 }, 797 },
  798 + async dayin(){
  799 + let res = await pdfManagementOfFinalAccountsForRentals(this.pageindex)
  800 + if(!res){
  801 + return
  802 + }
  803 + const blob = new Blob([res], { type: 'application/pdf' })
  804 + const fileName = '退租决算管理.pdf'
  805 + if ('download' in document.createElement('a')) {
  806 + // 非IE下载
  807 + const elink = document.createElement('a')
  808 + elink.download = fileName
  809 + elink.style.display = 'none'
  810 + elink.href = URL.createObjectURL(blob)
  811 + document.body.appendChild(elink)
  812 + elink.click()
  813 + URL.revokeObjectURL(elink.href) // 释放URL 对象
  814 + document.body.removeChild(elink)
  815 + } else {
  816 + // IE10+下载
  817 + navigator.msSaveBlob(blob, fileName)
  818 + }
797 819
  820 +
  821 + },
798 // 退租确定按钮 822 // 退租确定按钮
799 addCheck(val) { 823 addCheck(val) {
800 this.ggXin = false 824 this.ggXin = false
yanshouban/src/views/shopRental/rentalMan/index.vue
  View file @341f183
@@ -39,6 +39,7 @@ @@ -39,6 +39,7 @@
39 style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">批量导出</el-button> --> 39 style="background-color: #3F9B6A;color: #fff;padding:8px 15px;">批量导出</el-button> -->
40 <el-button 40 <el-button
41 style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" @click="daochu">导出</el-button> 41 style="background-color: #3F9B6A;color: #fff;padding:8px 15px;" @click="daochu">导出</el-button>
  42 + <el-button @click="dayin" style="background-color: #3F9B6A;color: #fff">打印</el-button>
42 </div> 43 </div>
43 </div> 44 </div>
44 <!-- 表格 --> 45 <!-- 表格 -->
@@ -965,7 +966,7 @@ @@ -965,7 +966,7 @@
965 966
966 <div style="justify-content:flex-end;margin:20px 20px 0 0;display:flex;"> 967 <div style="justify-content:flex-end;margin:20px 20px 0 0;display:flex;">
967 <el-button @click="downloadPdf" style="background-color: #3F9B6A;color: #fff">下载</el-button> 968 <el-button @click="downloadPdf" style="background-color: #3F9B6A;color: #fff">下载</el-button>
968 - <!-- <el-button style="background-color: #3F9B6A;color: #fff">打印</el-button> --> 969 +
969 <!-- <el-button style="background-color: #3F9B6A;color: #fff">发送</el-button> --> 970 <!-- <el-button style="background-color: #3F9B6A;color: #fff">发送</el-button> -->
970 971
971 </div> 972 </div>
@@ -987,10 +988,10 @@ @@ -987,10 +988,10 @@
987 rentalGetAll, 988 rentalGetAll,
988 rentalDel, 989 rentalDel,
989 rentalAdd, 990 rentalAdd,
990 - excelRentOutQueryByPage 991 + excelRentOutQueryByPage,
  992 + pdfRentOutQueryByPage
991 } from '../../../api/rentalMan.js' 993 } from '../../../api/rentalMan.js'
992 import { 994 import {
993 - businessListGetAll,  
994 businessListSave, 995 businessListSave,
995 businessListGetById, 996 businessListGetById,
996 businessListUpdate, 997 businessListUpdate,
@@ -1227,7 +1228,7 @@ import { @@ -1227,7 +1228,7 @@ import {
1227 pdf.addImage(imgData, 'PNG', 10, 10, imgWidth, imgHeight); // 10, 10 是图像在 PDF 中的位置（mm） 1228 pdf.addImage(imgData, 'PNG', 10, 10, imgWidth, imgHeight); // 10, 10 是图像在 PDF 中的位置（mm）
1228 1229
1229 // 保存 PDF 文件 1230 // 保存 PDF 文件
1230 - pdf.save('downloaded.pdf'); 1231 + pdf.save('入住单.pdf');
1231 }, 1232 },
1232 // 出租单查看 1233 // 出租单查看
1233 outlook(item){ 1234 outlook(item){
@@ -1236,7 +1237,6 @@ import { @@ -1236,7 +1237,6 @@ import {
1236 this.outdan = true 1237 this.outdan = true
1237 }, 1238 },
1238 delList(){ 1239 delList(){
1239 -  
1240 const h = this.$createElement; 1240 const h = this.$createElement;
1241 this.$msgbox({ 1241 this.$msgbox({
1242 title: '消息', 1242 title: '消息',
@@ -1286,6 +1286,30 @@ import { @@ -1286,6 +1286,30 @@ import {
1286 }) 1286 })
1287 1287
1288 }, 1288 },
  1289 + async dayin(){
  1290 + let res = await pdfRentOutQueryByPage(this.pageindex)
  1291 + if(!res){
  1292 + return
  1293 + }
  1294 + const blob = new Blob([res], { type: 'application/pdf' })
  1295 + const fileName = '出租管理.pdf'
  1296 + if ('download' in document.createElement('a')) {
  1297 + // 非IE下载
  1298 + const elink = document.createElement('a')
  1299 + elink.download = fileName
  1300 + elink.style.display = 'none'
  1301 + elink.href = URL.createObjectURL(blob)
  1302 + document.body.appendChild(elink)
  1303 + elink.click()
  1304 + URL.revokeObjectURL(elink.href) // 释放URL 对象
  1305 + document.body.removeChild(elink)
  1306 + } else {
  1307 + // IE10+下载
  1308 + navigator.msSaveBlob(blob, fileName)
  1309 + }
  1310 +
  1311 + },
  1312 +
1289 } 1313 }
1290 } 1314 }
1291 </script> 1315 </script>
yanshouban/src/views/shopRental/warning/index.vue
  View file @341f183
@@ -115,27 +115,18 @@ @@ -115,27 +115,18 @@
115 <div > 115 <div >
116 <div style="margin-bottom: 20px;"> 116 <div style="margin-bottom: 20px;">
117 <el-form ref="form" :model="zhong" label-width="80px"> 117 <el-form ref="form" :model="zhong" label-width="80px">
118 - <el-form-item label="甲方"> 118 + <el-form-item label="甲方" v-if="index != 2">
119 <el-input v-model="zhong.lessorName" disabled></el-input> 119 <el-input v-model="zhong.lessorName" disabled></el-input>
120 </el-form-item> 120 </el-form-item>
121 - <el-form-item label="乙方"> 121 + <el-form-item label="乙方" v-if="index != 2">
122 <el-input v-model="zhong.tenantName" disabled></el-input> 122 <el-input v-model="zhong.tenantName" disabled></el-input>
123 </el-form-item> 123 </el-form-item>
124 - <el-form-item label="合同编号"> 124 + <el-form-item label="合同编号" v-if="index != 2">
125 <el-input v-model="zhong.contractNumber" disabled></el-input> 125 <el-input v-model="zhong.contractNumber" disabled></el-input>
126 </el-form-item> 126 </el-form-item>
127 - <el-form-item label="起止时间"> 127 + <el-form-item label="起止时间" v-if="index != 2">
128 <el-input v-model="zhong.leaseStartDate" disabled></el-input> 128 <el-input v-model="zhong.leaseStartDate" disabled></el-input>
129 </el-form-item> 129 </el-form-item>
130 - <el-form-item label="月租金" v-if="index ==2">  
131 - <el-input v-model="zhong.contractAmount" disabled ></el-input>  
132 - </el-form-item>  
133 - <el-form-item label="缴费日期" v-if="index ==2">  
134 - <el-input v-model="zhong.contractAmount" disabled ></el-input>  
135 - </el-form-item>  
136 - <el-form-item label="逾期" v-if="index ==2">  
137 - <el-input v-model="zhong.name" disabled ></el-input>  
138 - </el-form-item>  
139 <el-form-item label="申请人" v-if="index !=2"> 130 <el-form-item label="申请人" v-if="index !=2">
140 <el-input v-model="zhong.application" ></el-input> 131 <el-input v-model="zhong.application" ></el-input>
141 </el-form-item> 132 </el-form-item>
@@ -728,6 +719,9 @@ @@ -728,6 +719,9 @@
728 cereLeasingByPage, 719 cereLeasingByPage,
729 daoqi 720 daoqi
730 } from '../../../api/manage.js' 721 } from '../../../api/manage.js'
  722 + import {
  723 + ManaAdd
  724 + } from '../../../api/PerWorkstation.js'
731 export default { 725 export default {
732 data() { 726 data() {
733 return { 727 return {
@@ -827,9 +821,36 @@ @@ -827,9 +821,36 @@
827 }, 821 },
828 // 新增确定按钮 822 // 新增确定按钮
829 async addCheck(val) { 823 async addCheck(val) {
830 - this.ggXin = false  
831 824
  825 + if(this.index == 2){
  826 + let pageMsg = {
  827 + content:this.zhong.reasonApplication,
  828 + createdAt:this.nowTime(),
  829 + postType:'立即发布',
  830 + receiverMerchant:'电商商家',
  831 + status:'1',
  832 + title:'到期提醒'
  833 + }
  834 + await ManaAdd(pageMsg)
  835 + this.$message({
  836 + message: '发送成功',
  837 + type: 'success'
  838 + })
  839 + }
  840 + this.ggXin = false
832 }, 841 },
  842 +
  843 + nowTime(){
  844 + const now = new Date();
  845 + const year = now.getFullYear();
  846 + const month = (now.getMonth() + 1).toString().padStart(2, '0');
  847 + const day = now.getDate().toString().padStart(2, '0');
  848 + const hours = now.getHours().toString().padStart(2, '0');
  849 + const minutes = now.getMinutes().toString().padStart(2, '0');
  850 + const seconds = now.getSeconds().toString().padStart(2, '0');
  851 +
  852 + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
  853 + },
833 // 获取时间 854 // 获取时间
834 currentTime(){ 855 currentTime(){
835 let date = new Date(); 856 let date = new Date();
yanshouban/src/views/stockControl/inventory/index.vue
  View file @341f183
1 <!-- --> 1 <!-- -->
2 <template> 2 <template>
3 - <div> 3 + <div style="background-color:#f7f7f7;padding:10px 10px;">
4 <div class="pending"> 4 <div class="pending">
  5 + <div style="height:58px;line-height:58px;">
  6 + <div style="color:#0006"> <span>库存管理</span> <span style="padding:0 5px;">></span> <span style="color:#000000e6">商铺库存</span></div>
  7 + </div>
5 <!-- 搜索 --> 8 <!-- 搜索 -->
6 <div class="formSearch"> 9 <div class="formSearch">
7 <el-form :inline="true" :model="formInline" class="demo-form-inline"> 10 <el-form :inline="true" :model="formInline" class="demo-form-inline">
@@ -37,9 +40,10 @@ @@ -37,9 +40,10 @@
37 /> 40 />
38 </el-form-item> 41 </el-form-item>
39 <el-form-item> 42 <el-form-item>
40 - <el-button type="primary" plain @click="search">查询</el-button>  
41 - <el-button plain @click="clear">重置</el-button>  
42 - <el-button type="success" plain @click="productDataExport">导出商品</el-button> 43 + <el-button style="background-color: #3F9B6A;color: #fff" @click="search">查询</el-button>
  44 + <el-button class="buttonHover"
  45 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="clear">重置</el-button>
  46 + <el-button style="background-color: #3F9B6A;color: #fff" @click="productDataExport">导出商品</el-button>
43 <!-- <span 47 <!-- <span
44 v-for="(item, index) in btnList" 48 v-for="(item, index) in btnList"
45 :key="index" 49 :key="index"
@@ -58,8 +62,7 @@ @@ -58,8 +62,7 @@
58 ref="multipleTable" 62 ref="multipleTable"
59 v-loading="loading" 63 v-loading="loading"
60 :data="tableData" 64 :data="tableData"
61 - border  
62 - :header-cell-style="{ background: '#EEF3FF', color: '#333333' }" 65 + :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
63 tooltip-effect="dark" 66 tooltip-effect="dark"
64 style="width: 100%" 67 style="width: 100%"
65 > 68 >
@@ -116,7 +119,32 @@ @@ -116,7 +119,32 @@
116 </el-table-column> 119 </el-table-column>
117 <el-table-column label="操作" width="200"> 120 <el-table-column label="操作" width="200">
118 <template slot-scope="scope"> 121 <template slot-scope="scope">
119 - <div class="btnList"> 122 + <div class="tableBtn greens"
  123 + v-if="scope.row.shelveState == 1"
  124 + slot="reference"
  125 + style="margin-right: 10px"
  126 + type="text"
  127 + @click="OutForced(scope.row)" >
  128 + 强制下架
  129 + </div>
  130 + <div class="tableBtn greens"
  131 + v-if="scope.row.shelveState == 1"
  132 + type="text"
  133 + @click="setFictitious(scope.row)">
  134 + 虚拟销量
  135 + </div>
  136 + <div class="tableBtn greens"
  137 + v-if="scope.row.shelveState == 2"
  138 + type="text"
  139 + @click="examineShow(scope.row)" >
  140 + 审核
  141 + </div>
  142 + <div class="tableBtn greens"
  143 + type="text"
  144 + @click="Godetails(scope.row)" >
  145 + 查看详情
  146 + </div>
  147 + <!-- <div class="btnList">
120 <el-button 148 <el-button
121 v-if="scope.row.shelveState == 1" 149 v-if="scope.row.shelveState == 1"
122 slot="reference" 150 slot="reference"
@@ -138,7 +166,7 @@ @@ -138,7 +166,7 @@
138 type="text" 166 type="text"
139 @click="Godetails(scope.row)" 167 @click="Godetails(scope.row)"
140 >查看详情</el-button> 168 >查看详情</el-button>
141 - </div> 169 + </div> -->
142 </template> 170 </template>
143 </el-table-column> 171 </el-table-column>
144 </el-table> 172 </el-table>
@@ -177,8 +205,9 @@ @@ -177,8 +205,9 @@
177 </el-form-item> 205 </el-form-item>
178 </el-form> 206 </el-form>
179 <span slot="footer" class="dialog-footer"> 207 <span slot="footer" class="dialog-footer">
180 - <el-button @click="examineVisible = false">取 消</el-button>  
181 - <el-button type="primary" @click="submintUs">确 定</el-button> 208 + <el-button class="buttonHover"
  209 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="examineVisible = false">取 消</el-button>
  210 + <el-button style="background-color: #3F9B6A;color: #fff" @click="submintUs">确 定</el-button>
182 </span> 211 </span>
183 </el-dialog> 212 </el-dialog>
184 <!-- 设置虚拟销量 --> 213 <!-- 设置虚拟销量 -->
@@ -199,8 +228,9 @@ @@ -199,8 +228,9 @@
199 </el-form-item> 228 </el-form-item>
200 </el-form> 229 </el-form>
201 <span slot="footer" class="dialog-footer"> 230 <span slot="footer" class="dialog-footer">
202 - <el-button @click="FictitiousVisible = false">取 消</el-button>  
203 - <el-button type="primary" @click="FicSubmintUs">确 定</el-button> 231 + <el-button class="buttonHover"
  232 + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;" @click="FictitiousVisible = false">取 消</el-button>
  233 + <el-button style="background-color: #3F9B6A;color: #fff" @click="FicSubmintUs">确 定</el-button>
204 </span> 234 </span>
205 </el-dialog> 235 </el-dialog>
206 <add-commodity ref="addCommodity" :examine-show="examineShow" @reset="reset" /> 236 <add-commodity ref="addCommodity" :examine-show="examineShow" @reset="reset" />
@@ -402,7 +432,9 @@ export default { @@ -402,7 +432,9 @@ export default {
402 //@import url(); 引入公共css类 432 //@import url(); 引入公共css类
403 @import url("../../../styles/elDialog.scss"); 433 @import url("../../../styles/elDialog.scss");
404 .pending { 434 .pending {
405 - padding: 30px; 435 + padding: 0 20px 20px 20px;
  436 + min-height: calc(100vh - 50px - 20px);
  437 + background-color: #Fff;
406 } 438 }
407 .fenye { 439 .fenye {
408 margin-top: 20px; 440 margin-top: 20px;
@@ -445,4 +477,18 @@ export default { @@ -445,4 +477,18 @@ export default {
445 } 477 }
446 } 478 }
447 } 479 }
  480 + .tableBtn {
  481 + display: inline-block;
  482 + margin-right: 10px;
  483 + }
  484 +
  485 + .greens {
  486 + color: #3F9B6A ;
  487 + }
  488 + ::v-deep .buttonHover:hover{
  489 + color:#3f9b6a !important;
  490 + border-color: #c5e1d2 !important;
  491 + background-color: #ecf5f0 !important;
  492 + outline: none;
  493 + }
448 </style> 494 </style>
yanshouban/src/views/stockControl/stocksForewarn/index.vue
  View file @341f183
@@ -19,17 +19,24 @@ @@ -19,17 +19,24 @@
19 <div :class="fut?'formSearch':'collapsed'" ref="formSearch"> 19 <div :class="fut?'formSearch':'collapsed'" ref="formSearch">
20 <el-form :inline="true" :model="formSel" label-width="auto"> 20 <el-form :inline="true" :model="formSel" label-width="auto">
21 <el-form-item label="商品名称"> 21 <el-form-item label="商品名称">
22 - <el-input v-model="formSel.shopname" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/> 22 + <el-input v-model="formSel.productName" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/>
23 </el-form-item> 23 </el-form-item>
24 - <el-form-item label="入库人"> 24 + <!-- <el-form-item label="入库人">
25 <el-input v-model="formSel.rkr" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/> 25 <el-input v-model="formSel.rkr" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/>
26 - </el-form-item> 26 + </el-form-item> -->
27 <el-form-item label="上架时间"> 27 <el-form-item label="上架时间">
28 - <el-input v-model="formSel.stime" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/> 28 + <el-date-picker
  29 + v-model="formSel.createTime"
  30 + type="datetime"
  31 + value-format="yyyy-MM-dd HH:mm:ss"
  32 + prefix-icon="none"
  33 + style="width: 178px;margin-right: 5px;"
  34 + placeholder="选择日期时间">
  35 + </el-date-picker>
29 </el-form-item> 36 </el-form-item>
30 - <el-form-item label="入库时间"> 37 + <!-- <el-form-item label="入库时间">
31 <el-input v-model="formSel.rtime" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/> 38 <el-input v-model="formSel.rtime" placeholder="请输入方案编号" size="mini" style="width: 178px;margin-right: 5px;"/>
32 - </el-form-item> 39 + </el-form-item> -->
33 </el-form> 40 </el-form>
34 </div> 41 </div>
35 </div> 42 </div>
@@ -161,10 +168,10 @@ export default { @@ -161,10 +168,10 @@ export default {
161 anNum:'', 168 anNum:'',
162 }, 169 },
163 formSel:{ 170 formSel:{
164 - shopname:'',  
165 - rkr:'',  
166 - sTime:'',  
167 - rTime:'' 171 + productName:'',
  172 + createTime:'',
  173 + page: 1,
  174 + pageSize: 10
168 }, 175 },
169 formInline: { 176 formInline: {
170 searchType: '1', 177 searchType: '1',
@@ -202,7 +209,28 @@ export default { @@ -202,7 +209,28 @@ export default {
202 }, 209 },
203 // 查询 210 // 查询
204 search () { 211 search () {
205 - 212 + this.total = 1;
  213 + this.formSel.page = 1;
  214 + this.getAll(this.formSel);
  215 + },
  216 + resetting(){
  217 + this.formSel = {
  218 + productName:'',
  219 + createTime:'',
  220 + page: 1,
  221 + pageSize: 10
  222 + }
  223 + this.formInline = {
  224 + searchType: '1',
  225 + search: '', // 搜索字段
  226 + state: '',
  227 + // afterState: '', // 售后状态 0-无售后 1-售后中 2-售后成功 3-售后关闭
  228 + dates: [], // 下单时间数组
  229 + page: 1,
  230 + shopName: '',
  231 + pageSize: 10
  232 + }
  233 + this.getAll(this.formInline)
206 }, 234 },
207 async kucunSet(){ 235 async kucunSet(){
208 const yuzhi={ 236 const yuzhi={
yanshouban/vue.config.js
  View file @341f183
@@ -67,7 +67,7 @@ module.exports = { @@ -67,7 +67,7 @@ module.exports = {
67 // changeOrigin: true, 67 // changeOrigin: true,
68 // }, 68 // },
69 '/meserver/admin-server/':{ 69 '/meserver/admin-server/':{
70 - target: 'https://jy.scjysm.asia:18086/meserver/admin-server/', // 测试 70 + target: 'https://jy.scjysm.asia:18086/admin-server/', // 测试
71 // target: 'http://172.16.61.123:8080/meserver/admin-server/', // 测试 71 // target: 'http://172.16.61.123:8080/meserver/admin-server/', // 测试
72 // https://jy.scjysm.asia:18086/admin-server http://172.16.61.123:8080/meserver/admin-server/ https://wjdc.scjysm.asia1443/cdwlMall/admin-server 72 // https://jy.scjysm.asia:18086/admin-server http://172.16.61.123:8080/meserver/admin-server/ https://wjdc.scjysm.asia1443/cdwlMall/admin-server
73 // target: 'http://localhost:9003/', // 平台端 73 // target: 'http://localhost:9003/', // 平台端